Changeset 104

Show
Ignore:
Timestamp:
06/26/07 20:00:07 (2 years ago)
Author:
mbailey
Message:

Capistrano::CLI.prompt() now accepts a default value and includes this in the prompt. If the user just hits 'return' this value will be used.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1-7-stable/lib/deprec/capistrano_extensions/cli_extensions.rb

    r92 r104  
    2020    end 
    2121     
    22     def self.prompt(prompt="Password: ") 
     22    def self.prompt(prompt="Password", default=nil) 
    2323      sync = STDOUT.sync 
    2424      begin 
    2525          STDOUT.sync = true 
    26           print(prompt) 
    27           STDIN.gets.chomp 
     26          print("#{prompt}") 
     27          print " [#{default}]" if default 
     28          print ': ' 
     29          response = STDIN.gets.chomp 
     30          response == '' ? default : response 
    2831      ensure 
    2932        STDOUT.sync = sync 

  • branches/1-7-stable/lib/deprec/recipes.rb

    r92 r104  
    22require 'deprec/recipes/svn' 
    33require 'deprec/recipes/trac' 
     4require 'deprec/recipes/rails' 
    45require 'deprec/recipes/ubuntu' 
    56require 'deprec/recipes/apache' 
    …… 
    1415 
    1516Capistrano.configuration(:must_exist).load do 
    16   set :application, lambda { Capistrano::CLI.prompt "Enter application name: " } 
     17  set :application, lambda { Capistrano::CLI.prompt "Enter application name" } 
    1718  set :user, (defined?(user) ? user : ENV['USER']) # user who is deploying 
    1819  set :group, 'deploy'           # deployment group 
    …… 
    211212      
    212213  task :setup_admin_account do 
    213     user = Capistrano::CLI.prompt "Enter userid for new user: "  
     214    user = Capistrano::CLI.prompt "Enter userid for new user"  
    214215    deprec.useradd(user, :shell => '/bin/bash') 
    215216    puts "Setting pasword for new account"