capistrano 2.0.0 → 2.15.2

data/Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in capistrano.gemspec
+gemspec
+
+#
+# Development Dependencies from the Gemfile
+# are merged here.
+#
+group :development do
+  gem "rake"
+end

data/README.md

@@ -0,0 +1,94 @@
+## Capistrano
+
+[![Build
+Status](https://secure.travis-ci.org/capistrano/capistrano.png)](http://travis-ci.org/capistrano/capistrano)[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/capistrano/capistrano)
+
+
+Capistrano is a utility and framework for executing commands in parallel on
+multiple remote machines, via SSH. It uses a simple DSL (borrowed in part from
+[Rake](http://rake.rubyforge.org/)) that allows you to define _tasks_, which may
+be applied to machines in certain roles. It also supports tunneling connections
+via some gateway machine to allow operations to be performed behind VPN's and
+firewalls.
+
+Capistrano was originally designed to simplify and automate deployment of web
+applications to distributed environments, and originally came bundled with a set
+of tasks designed for deploying Rails applications.
+
+## Documentation
+
+* [https://github.com/capistrano/capistrano/wiki](https://github.com/capistrano/capistrano/wiki)
+
+## DEPENDENCIES
+
+* [Net::SSH](http://net-ssh.rubyforge.org)
+* [Net::SFTP](http://net-ssh.rubyforge.org)
+* [Net::SCP](http://net-ssh.rubyforge.org)
+* [Net::SSH::Gateway](http://net-ssh.rubyforge.org)
+* [HighLine](http://highline.rubyforge.org)
+* [Ruby](http://www.ruby-lang.org/en/) ≥ 1.8.7
+
+If you want to run the tests, you'll also need to install the dependencies with
+Bundler, see the `Gemfile` within .
+
+## ASSUMPTIONS
+
+Capistrano is "opinionated software", which means it has very firm ideas about
+how things ought to be done, and tries to force those ideas on you. Some of the
+assumptions behind these opinions are:
+
+* You are using SSH to access the remote servers.
+* You either have the same password to all target machines, or you have public
+  keys in place to allow passwordless access to them.
+
+Do not expect these assumptions to change.
+
+## USAGE
+
+In general, you'll use Capistrano as follows:
+
+* Create a recipe file ("capfile" or "Capfile").
+* Use the `cap` script to execute your recipe.
+
+Use the `cap` script as follows:
+
+    cap sometask
+
+By default, the script will look for a file called one of `capfile` or
+`Capfile`. The `sometask` text indicates which task to execute. You can do
+"cap -h" to see all the available options and "cap -T" to see all the available
+tasks.
+
+## CONTRIBUTING:
+
+* Fork Capistrano
+* Create a topic branch - `git checkout -b my_branch`
+* Rebase your branch so that all your changes are reflected in one
+  commit
+* Push to your branch - `git push origin my_branch`
+* Create a Pull Request from your branch, include as much documentation
+  as you can in the commit message/pull request, following these
+[guidelines on writing a good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+* That's it!
+
+
+## LICENSE:
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,11 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+task :default => :test

data/bin/capify

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'fileutils'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -36,40 +37,54 @@ end
 
 files = {
   "Capfile" => unindent(<<-FILE),
-    load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-    load 'config/deploy'
+
+    load 'deploy'
+
+    # Uncomment if you are using Rails' asset pipeline
+    # load 'deploy/assets'
+
+    load 'config/deploy' # remove this line to skip loading any of the default tasks
   FILE
 
-  "config/deploy.rb" => unindent(<<-FILE),
-    set :application, "set your application name here"
-    set :repository,  "set your repository location here"
+  "config/deploy.rb" => 'set :application, "set your application name here"
+set :repository,  "set your repository location here"
 
-    # If you aren't deploying to /u/apps/\#{application} on the target
-    # servers (which is the default), you can specify the actual location
-    # via the :deploy_to variable:
-    # set :deploy_to, "/var/www/\#{application}"
+# set :scm, :git # You can set :scm explicitly or Capistrano will make an intelligent guess based on known version control directory names
+# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
 
-    # If you aren't using Subversion to manage your source code, specify
-    # your SCM below:
-    # set :scm, :subversion
+role :web, "your web-server here"                          # Your HTTP server, Apache/etc
+role :app, "your app-server here"                          # This may be the same as your `Web` server
+role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
+role :db,  "your slave db-server here"
 
-    role :app, "your app-server here"
-    role :web, "your web-server here"
-    role :db,  "your db-server here", :primary => true
-  FILE
-}
+# if you want to clean up old releases on each deploy uncomment this:
+# after "deploy:restart", "deploy:cleanup"
+
+# if you\'re still using the script/reaper helper you will need
+# these http://github.com/rails/irs_process_scripts
+
+# If you are using Passenger mod_rails uncomment this:
+# namespace :deploy do
+#   task :start do ; end
+#   task :stop do ; end
+#   task :restart, :roles => :app, :except => { :no_release => true } do
+#     run "#{try_sudo} touch #{File.join(current_path,\'tmp\',\'restart.txt\')}"
+#   end
+# end'}
 
 base = ARGV.shift
 files.each do |file, content|
   file = File.join(base, file)
   if File.exists?(file)
-    warn "[skip] `#{file}' already exists"
+    warn "[skip] '#{file}' already exists"
   elsif File.exists?(file.downcase)
-    warn "[skip] `#{file.downcase}' exists, which could conflict with `#{file}'"
-  elsif !File.exists?(File.dirname(file))
-    warn "[skip] directory `#{File.dirname(file)}' does not exist"
+    warn "[skip] '#{file.downcase}' exists, which could conflict with `#{file}'"
   else
-    puts "[add] writing `#{file}'"
+    unless File.exists?(File.dirname(file))
+      puts "[add] making directory '#{File.dirname(file)}'"
+      FileUtils.mkdir(File.dirname(file))
+    end
+    puts "[add] writing '#{file}'"
     File.open(file, "w") { |f| f.write(content) }
   end
 end

data/capistrano.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "capistrano/version"
+
+Gem::Specification.new do |s|
+
+  s.name        = "capistrano"
+  s.version     = Capistrano::Version.to_s
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jamis Buck", "Lee Hambley"]
+  s.email       = ["jamis@jamisbuck.org", "lee.hambley@gmail.com"]
+  s.homepage    = "http://github.com/capistrano/capistrano"
+  s.summary     = %q{Capistrano - Welcome to easy deployment with Ruby over SSH}
+  s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+
+  s.specification_version = 3 if s.respond_to? :specification_version
+
+  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    s.add_runtime_dependency(%q<highline>, [">= 0"])
+    s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.14"])
+    s.add_runtime_dependency(%q<net-sftp>, [">= 2.0.0"])
+    s.add_runtime_dependency(%q<net-scp>, [">= 1.0.0"])
+    s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.1.0"])
+    s.add_development_dependency(%q<mocha>, ["0.9.12"])
+  else
+    s.add_dependency(%q<net-ssh>, [">= 2.0.14"])
+    s.add_dependency(%q<net-sftp>, [">= 2.0.0"])
+    s.add_dependency(%q<net-scp>, [">= 1.0.0"])
+    s.add_dependency(%q<net-ssh-gateway>, [">= 1.1.0"])
+    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<mocha>, ["0.9.12"])
+  end
+end

data/lib/capistrano/callback.rb

@@ -37,5 +37,9 @@ module Capistrano
     def call
       config.find_and_execute_task(source)
     end
+
+    def applies_to?(task)
+      super && (task.nil? || task.fully_qualified_name != source.to_s)
+    end
   end
-end
+end

data/lib/capistrano/cli/execute.rb

@@ -21,7 +21,10 @@ module Capistrano
       #
       # Returns the Configuration instance used, if successful.
       def execute!
-        config = instantiate_configuration
+        config = instantiate_configuration(options)
+        config.debug = options[:debug]
+        config.dry_run = options[:dry_run]
+        config.preserve_roles = options[:preserve_roles]
         config.logger.level = options[:verbose]
 
         set_pre_vars(config)
@@ -52,10 +55,10 @@ module Capistrano
       def load_recipes(config) #:nodoc:
         # load the standard recipe definition
         config.load "standard"
-      
+
         # load systemwide config/recipe definition
-        config.load(options[:sysconf]) if options[:sysconf] && File.file?(options[:sysconf])        
-      
+        config.load(options[:sysconf]) if options[:sysconf] && File.file?(options[:sysconf])
+
         # load user config/recipe definition
         config.load(options[:dotfile]) if options[:dotfile] && File.file?(options[:dotfile])
 
@@ -64,8 +67,8 @@ module Capistrano
 
       # Primarily useful for testing, but subclasses of CLI could conceivably
       # override this method to return a Configuration subclass or replacement.
-      def instantiate_configuration #:nodoc:
-        Capistrano::Configuration.new
+      def instantiate_configuration(options={}) #:nodoc:
+        Capistrano::Configuration.new(options)
       end
 
       def handle_error(error) #:nodoc:
@@ -79,4 +82,4 @@ module Capistrano
       end
     end
   end
-end
+end

data/lib/capistrano/cli/help.rb

@@ -12,7 +12,7 @@ module Capistrano
 
       def execute_requested_actions_with_help(config)
         if options[:tasks]
-          task_list(config)
+          task_list(config, options[:tasks])
         elsif options[:explain]
           explain_task(config, options[:explain])
         else
@@ -20,11 +20,19 @@ module Capistrano
         end
       end
 
-      def task_list(config) #:nodoc:
-        tasks = config.task_list(:all)
+      def task_list(config, pattern = true) #:nodoc:
+        tool_output = options[:tool]
+
+        if pattern.is_a?(String)
+          tasks = config.task_list(:all).select {|t| t.fully_qualified_name =~ /#{pattern}/}
+        end
+        if tasks.nil? || tasks.length == 0
+          warn "Pattern '#{pattern}' not found. Listing all tasks.\n\n" if !tool_output && !pattern.is_a?(TrueClass)
+          tasks = config.task_list(:all)
+        end
 
         if tasks.empty?
-          warn "There are no tasks available. Please specify a recipe file to load."
+          warn "There are no tasks available. Please specify a recipe file to load." unless tool_output
         else
           all_tasks_length = tasks.length
           if options[:verbose].to_i < 1
@@ -38,19 +46,25 @@ module Capistrano
           max_length = MIN_MAX_LEN if max_length < MIN_MAX_LEN
 
           tasks.each do |task|
-            puts "cap %-#{longest}s # %s" % [task.fully_qualified_name, task.brief_description(max_length)]
+            if tool_output
+              puts "cap #{task.fully_qualified_name}"
+            else
+              puts "cap %-#{longest}s # %s" % [task.fully_qualified_name, task.brief_description(max_length)]
+            end
           end
 
-          if all_tasks_length > tasks.length
+          unless tool_output
+            if all_tasks_length > tasks.length
+              puts
+              puts "Some tasks were not listed, either because they have no description,"
+              puts "or because they are only used internally by other tasks. To see all"
+              puts "tasks, type `#{File.basename($0)} -vT'."
+            end
+
             puts
-            puts "Some tasks were not listed, either because they have no description,"
-            puts "or because they are only used internally by other tasks. To see all"
-            puts "tasks, type `#{File.basename($0)} -Tv'."
+            puts "Extended help may be available for these tasks."
+            puts "Type `#{File.basename($0)} -e taskname' to view it."
           end
-
-          puts
-          puts "Extended help may be available for these tasks."
-          puts "Type `#{File.basename($0)} -e taskname' to view it."
         end
       end
 
@@ -84,7 +98,9 @@ module Capistrano
         text.each_line do |line|
           indentation = line[/^\s+/] || ""
           indentation_size = indentation.split(//).inject(0) { |c,s| c + (s[0] == ?\t ? 8 : 1) }
-          lines = line.strip.gsub(/(.{1,#{output_columns - indentation_size}})(?:\s+|\Z)/, "\\1\n").split(/\n/)
+          line_length = output_columns - indentation_size
+          line_length = MIN_MAX_LEN if line_length < MIN_MAX_LEN
+          lines = line.strip.gsub(/(.{1,#{line_length}})(?:\s+|\Z)/, "\\1\n").split(/\n/)
           if lines.empty?
             formatted << "\n"
           else
@@ -95,8 +111,15 @@ module Capistrano
       end
 
       def output_columns #:nodoc:
-        @output_columns ||= self.class.ui.output_cols > 80 ? 80 : self.class.ui.output_cols
+        if ( @output_columns.nil? )
+          if ( self.class.ui.output_cols.nil? )
+            @output_columns = 80
+          else
+            @output_columns = self.class.ui.output_cols
+          end
+        end
+        @output_columns
       end
     end
   end
-end
+end

data/lib/capistrano/cli/help.txt

@@ -6,48 +6,76 @@ Capistrano is a utility for automating the execution of commands across multiple
 
 The command-line interface to Capistrano is via the `cap' command.
 
-	cap [ option ] ... action ...
+  cap [ option ] ... action ...
 
 The following options are understood:
 
+  <%= color '-d, --debug', :bold %>
+  Causes Capistrano to pause and prompt before executing any remote command, giving the user the option to either execute the command, skip the command, or abort execution entirely. This makes it a great way to troubleshoot tasks, or test custom tasks, by executing commands one at a time and checking the server to make sure they worked as expected before moving on to the next command. (Compare this to the --dry-run command.)
+
   <%= color '-e, --explain TASK', :bold %>
-	Displays the extended description of the given task. Not all tasks will have an extended description, but for those that do, this can provide a wealth of additional usage information, such as describing environment variables or settings that can affect the execution of the task.
+  Displays the extended description of the given task. Not all tasks will have an extended description, but for those that do, this can provide a wealth of additional usage information, such as describing environment variables or settings that can affect the execution of the task.
 
   <%= color '-F, --default-config', :bold %>
-	By default, cap will search for a config file named `Capfile' or `capfile' in the current directory, or in any parent directory, and will automatically load it. However, if you specify the -f flag (see below), cap will use that file instead of the default config. If you want to use both the default config, and files loaded via -f, you can specify -F to force cap to search for and load the default config, even if additional files were specified via -f.
+  By default, cap will search for a config file named `Capfile' or `capfile' in the current directory, or in any parent directory, and will automatically load it. However, if you specify the -f flag (see below), cap will use that file instead of the default config. If you want to use both the default config, and files loaded via -f, you can specify -F to force cap to search for and load the default config, even if additional files were specified via -f.
 
   <%= color '-f, --file FILE', :bold %>
-	Causes the named file to be loaded. Capistrano will search both its own recipe directory, as well as the current directory, looking for the named file. An ".rb" extension is optional. The -f option may be given any number of times, but if it is given, it will take the place of the normal `Capfile' or `capfile' detection. Use -F if you want the default capfile to be loaded when you use -f.
+  Causes the named file to be loaded. Capistrano will search both its own recipe directory, as well as the current directory, looking for the named file. An ".rb" extension is optional. The -f option may be given any number of times, but if it is given, it will take the place of the normal `Capfile' or `capfile' detection. Use -F if you want the default capfile to be loaded when you use -f.
 
   <%= color '-H, --long-help', :bold %>
-	Displays this document and exits.
+  Displays this document and exits.
 
   <%= color '-h, --help', :bold %>
-	Shows a brief summary of these options and exits.
+  Shows a brief summary of these options and exits.
+
+  <%= color '-l, --logger [STDERR|STDOUT|file]', :bold %>
+  Change the file used to print the output. It offers three options: standard error(stderr), standard output and file. Options are not case sensitive. By default Capistrano uses stderr.
+
+  <%= color '-n, --dry-run', :bold %>
+  Causes Capistrano to simply display each remote command, without executing it. In this sense it is similar to --debug, but without the prompt. Note that commands executed locally are still run--only remote commands are skipped.
 
   <%= color '-p, --password', :bold %>
-	Normally, cap will prompt for the password on-demand, the first time it is needed. This can make it hard to walk away from Capistrano, since you might not know if it will prompt for a password down the road. In such cases, you can use the -p option to force cap to prompt for the password immediately.
+  Normally, cap will prompt for the password on-demand, the first time it is needed. This can make it hard to walk away from Capistrano, since you might not know if it will prompt for a password down the road. In such cases, you can use the -p option to force cap to prompt for the password immediately.
 
   <%= color '-q, --quiet', :bold %>
-	Display only critical error messages. All other output is suppressed.
+  Display only critical error messages. All other output is suppressed.
 
   <%= color '-S, --set-before NAME=VALUE', :bold %>
-	Sets the given variable to the given value, before loading any recipe files. This is useful if you have a recipe file that depends on a certain variable being set, at the time it is loaded.
+  Sets the given variable to the given value, before loading any recipe files. This is useful if you have a recipe file that depends on a certain variable being set, at the time it is loaded.
 
   <%= color '-s, --set NAME=VALUE', :bold %>
-	Sets the given variable to the given value, after loading all recipe files. This is useful when you want to override the value of a variable which is used in a task. Note that this will set the variables too late for them to affect conditions that are executed as the recipes are loaded.
+  Sets the given variable to the given value, after loading all recipe files. This is useful when you want to override the value of a variable which is used in a task. Note that this will set the variables too late for them to affect conditions that are executed as the recipes are loaded.
 
-  <%= color '-T, --tasks', :bold %>
-	Displays the list of all tasks in all loaded recipe files. If a task has no description, or if the description starts with the [internal] tag, the task will not be listed unless you also specify -v.
+  <%= color '-T, --tasks PATTERN', :bold %>
+  Displays the list of all tasks (matching optional PATTERN) in all loaded recipe files. If a task has no description, or if the description starts with the [internal] tag, the task will not be listed unless you also specify -v.
+
+  <%= color '-t, --tool', :bold %>
+  Abbreviates the output of -T for integration with other tools. Without -t, -T will list tasks with their summaries, and may include additional instructive text at the bottom. When integrating with other tools (e.g., bash auto-expansion and the like) that additional text can get in the way. This switch makes it easier for those tools to parse the list of tasks. (The -t switch has no effect if the -T switch is not specified.)
 
   <%= color '-V, --version', :bold %>
-	Shows the current Capistrano version number and exits.
+  Shows the current Capistrano version number and exits.
 
   <%= color '-v, --verbose', :bold %>
-	Increase the verbosity. You can specify this option up to three times to further increase verbosity. By default, cap will use maximum verbosity, but if you specify an explicit verbosity, that will be used instead. See also -q.
+  Increase the verbosity. You can specify this option up to three times to further increase verbosity. By default, cap will use maximum verbosity, but if you specify an explicit verbosity, that will be used instead. See also -q.
 
   <%= color '-X, --skip-system-config', :bold %>
-	By default, cap will look for and (if it exists) load the global system configuration file located in /etc/capistrano.conf. If you don't want cap to load that file, give this option.
+  By default, cap will look for and (if it exists) load the global system configuration file located in /etc/capistrano.conf. If you don't want cap to load that file, give this option.
 
   <%= color '-x, --skip-user-config', :bold %>
-	By default, cap will look for and (if it exists) load the user-specific configuration file located in $HOME/.caprc. If you don't want cap to load that file, give this option.
+  By default, cap will look for and (if it exists) load the user-specific configuration file located in $HOME/.caprc. If you don't want cap to load that file, give this option.
+
+-----------------------------
+<%= color('Environment Variables', :bold) %>
+-----------------------------
+
+  <%= color 'HOSTS', :bold %>
+  Execute the tasks against this comma-separated list of hosts.  Effectively, this makes the host(s) part of every roles.
+
+  <%= color 'HOSTFILTER', :bold %>
+  Execute tasks against this comma-separated list of host, but only if the host has the proper role for the task.
+
+  <%= color 'HOSTROLEFILTER', :bold %>
+  Execute tasks against the hosts in this comma-separated list of roles, but only if the host has the proper role for the task.
+
+  <%= color 'ROLES', :bold %>
+  Execute tasks against this comma-separated list of roles.  Hosts which do not have the right roles will be skipped.

data/lib/capistrano/cli/options.rb

@@ -24,9 +24,14 @@ module Capistrano
       # line switches for Capistrano, and what their corresponding behaviors
       # are.
       def option_parser #:nodoc:
+        @logger = Logger.new
         @option_parser ||= OptionParser.new do |opts|
           opts.banner = "Usage: #{File.basename($0)} [options] action ..."
 
+          opts.on("-d", "--debug",
+            "Prompts before each remote command execution."
+          ) { |value| options[:debug] = true }
+
           opts.on("-e", "--explain TASK",
             "Displays help (if available) for the task."
           ) { |value| options[:explain] = value }
@@ -39,7 +44,7 @@ module Capistrano
             "A recipe file to load. May be given more than once."
           ) { |value| options[:recipes] << value }
 
-          opts.on("-H", "--long-help", "Explain these options.") do
+          opts.on("-H", "--long-help", "Explain these options and environment variables.") do
             long_help
             exit
           end
@@ -49,14 +54,35 @@ module Capistrano
             exit
           end
 
+          opts.on("-l", "--logger [STDERR|STDOUT|file]",
+            "Choose logger method. STDERR used by default."
+          ) do |value|
+            options[:output] = if value.nil? || value.upcase == 'STDERR'
+                                 # Using default logger.
+                                 nil
+                               elsif value.upcase == 'STDOUT'
+                                 $stdout
+                               else
+                                 value
+                               end
+          end
+
+          opts.on("-n", "--dry-run",
+            "Prints out commands without running them."
+          ) { |value| options[:dry_run] = true }
+
           opts.on("-p", "--password",
             "Immediately prompt for the password."
           ) { options[:password] = nil }
 
           opts.on("-q", "--quiet",
-            "Make the output as quiet as possible (default)"
+            "Make the output as quiet as possible."
           ) { options[:verbose] = 0 }
 
+          opts.on("-r", "--preserve-roles",
+            "Preserve task roles"
+          ) { options[:preserve_roles] = true }
+
           opts.on("-S", "--set-before NAME=VALUE",
             "Set a variable before the recipes are loaded."
           ) do |pair|
@@ -71,24 +97,35 @@ module Capistrano
             options[:vars][name.to_sym] = value
           end
 
-          opts.on("-T", "--tasks",
-            "List all tasks in the loaded recipe files."
-          ) do 
-            options[:tasks] = true
+          opts.on("-T", "--tasks [PATTERN]",
+            "List all tasks (matching optional PATTERN) in the loaded recipe files."
+          ) do |value|
+            options[:tasks] = if value
+              value
+            else
+              true
+            end
             options[:verbose] ||= 0
           end
 
+          opts.on("-t", "--tool",
+            "Abbreviates the output of -T for tool integration."
+          ) { options[:tool] = true }
+
           opts.on("-V", "--version",
             "Display the Capistrano version, and exit."
           ) do
             require 'capistrano/version'
-            puts "Capistrano v#{Capistrano::Version::STRING}"
+            puts "Capistrano v#{Capistrano::Version}"
             exit
           end
 
           opts.on("-v", "--verbose",
             "Be more verbose. May be given more than once."
-          ) { options[:verbose] ||= 0; options[:verbose] += 1 }
+          ) do
+            options[:verbose] ||= 0
+            options[:verbose] += 1
+          end
 
           opts.on("-X", "--skip-system-config",
             "Don't load the system config file (capistrano.conf)"
@@ -116,6 +153,8 @@ module Capistrano
 
         option_parser.parse!(args)
 
+        coerce_variable_types!
+
         # if no verbosity has been specified, be verbose
         options[:verbose] = 3 if !options.has_key?(:verbose)
 
@@ -146,6 +185,7 @@ module Capistrano
           %w(Capfile capfile).each do |file|
             if File.file?(file)
               options[:recipes] << file
+              @logger.info "Using recipes from #{File.join(current,file)}"
               return
             end
           end
@@ -161,7 +201,7 @@ module Capistrano
       def default_sysconf #:nodoc:
         File.join(sysconf_directory, "capistrano.conf")
       end
-      
+
       def default_dotfile #:nodoc:
         File.join(home_directory, ".caprc")
       end
@@ -171,13 +211,33 @@ module Capistrano
         # appropriate location for this file in Windows.
         ENV["SystemRoot"] || '/etc'
       end
-      
+
       def home_directory #:nodoc:
         ENV["HOME"] ||
           (ENV["HOMEPATH"] && "#{ENV["HOMEDRIVE"]}#{ENV["HOMEPATH"]}") ||
           "/"
       end
 
+      def coerce_variable_types!
+        [:pre_vars, :vars].each do |collection|
+          options[collection].keys.each do |key|
+            options[collection][key] = coerce_variable(options[collection][key])
+          end
+        end
+      end
+
+      def coerce_variable(value)
+        case value
+        when /^"(.*)"$/ then $1
+        when /^'(.*)'$/ then $1
+        when /^\d+$/ then value.to_i
+        when /^\d+\.\d*$/ then value.to_f
+        when "true" then true
+        when "false" then false
+        when "nil" then nil
+        else value
+        end
+      end
     end
   end
-end
+end