capistrano 2.14.2 → 2.15.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 01115be3e8ab363fc0f9555eb6e3504e3e6eb709
+  data.tar.gz: 9b8b1fc5f765d23f5a336f25c28c2a3078793806
+SHA512:
+  metadata.gz: 85916614f98a4f4d0f816b9ad2689e952fe05ec7ec3db49ff83e4ff08423c9d6b9e7a57cb84bdd401020172548a842ecf6bcc8458ed27438d3b9d727401dc8a0
+  data.tar.gz: 9283b6c3631fe2be2884b826141be26944a6b1d4037a2f036c8fed81ed8e776a7fc02c80ffa2a353e97ac084fe793c7429410c95df9dd5dc82c0fdfd1adebcfc

data/.travis.yml

@@ -3,4 +3,5 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ree

data/CHANGELOG

@@ -1,4 +1,45 @@
-## 2.14.1 (tentative) / January 10 2013
+## 2.15.0 / April 23 2013
+
+* New varaible :shared_assets_prefix to allow people to host somewhere other
+  than `/assets/`. Default is `assets`.
+* Bring back web:enable and web:disable tasks. Sincerely apologies to all affected
+  removing these was one of the most glaring mistakes we've made on this projec
+  and I feel personally responsible.
+* Makes :git_shallow_clone work with branches (@cannikin)
+* Avoid removing required assets (@bosko)
+* Fix escaping of asset_paths when calling `deploy:finalize_update` (@mcary)
+* Improve parallel command logging (@mpapis)
+* Allow updating variables in the cap shell `cap> set :some_setting new_value`
+  (@jpfuentes2)
+* Add the option to configure `Capistrano::Logger.default_formatters=` this
+  relates to the previous merging of the capistrano-colors gem. (@kellyredding)
+* Don't attempt to connect to a nil `:gateway` (@mattheath)
+* Simplify our .gemspec dependency list (@timoschilling)
+* Make the existece of `config/deploy/{stage}.rb` optional, it'll be loaded if
+  it exists, otherwise we continue without it (@ymainier)
+* Misc spelling/typo fixes. (@mv)
+* Update mtime and atime with touch when fixing asset timestamps (@wildoats)
+* Change call of `rake {env} precompile:all` to drop the errornous `{env}` (@zxiest)
+* Evaluate assets_role at runtime using a lambda (@nlenepveu)
+* Handle when hosts (for example by joining/leaving the no_release meta group)
+  have different old releases for `deploy:cleanup` (@oggy)
+* Check for nil when tearing down connections (@yyuu)
+* Go back to using SCP for uploads as against SFTP (@pjungwir)
+* Added an option to dereference symlinks when using the :copy strategy
+  (`set :copy_dereference_symlink, true`) useful when your working directory
+  contains files symlinked in from outside your project root (@mehmetc)
+* Small typo fix in README (@yule)
+* Add Ruby 2.0.0-p0 to the TravisCI build (@jarrettmeyer)
+* Add the option to set the shared asset prefix for Rails,
+  (`set :shared_assets_prefix, "my_shared_assets"`) corresponds with it's
+  namesake in Rails. By default is set to `assets`. (@spectator)
+* Improved error messages for `cap {stage} deploy:check` (@petems)
+* Make `run_locally` work with the `--dry-run` flag. (@flagthisiskun)
+* Fix a link in the README to writing a good commit message. (@mhutchin)
+* Code style fixes (@mv)
+* Report differently if the command was killed by a signal (for example the
+  oom killer on Ubuntu/Debian). (@tanob)
+
 
 ## 2.14.0 / January 9 2013
 
@@ -227,26 +268,26 @@ Git-version requirement for the new implementation is now >= 1.5.6, from
 previously un-documented. (1.5.6 is new-enough that I think this is
 acceptable)
 
-	* Upgrade Net::SSH-gateway dependency to 1.1 (fixes a thread-deadlocking bug on MRI	1.9)
-	* Respect "dry-run" on transfer methods (Florian Frank)
-	* Add support for multiple gateways: (Ryan Duryea)
+  * Upgrade Net::SSH-gateway dependency to 1.1 (fixes a thread-deadlocking bug on MRI  1.9)
+  * Respect "dry-run" on transfer methods (Florian Frank)
+  * Add support for multiple gateways: (Ryan Duryea)
         set :gateway, {
           'gate1.example.com' => 'server1.example.com',
           [ 'gate2.example.com', 'gate3.example.com' ] => [ 'server5.example.com', 'server6.example.com' ]
         }
-	* Properly support nested Git submodules, moves Git requirement to >= 1.5.6 [if	you rely upon submodules] (Ken Miller)
+  * Properly support nested Git submodules, moves Git requirement to >= 1.5.6 [if  you rely upon submodules] (Ken Miller)
   * Fetch tags into the remote cache, allows deploying a tag when using Git, with the remote_cache strategy (Florian Frank)
   * Various fixes to path handling bugs in the copt strategy. (Philippe Rathé)
 
 ## 2.5.21 / April 6 2011
 
-	* Fixed to follow best-practice guidelines from Bundler (Ben Langfeld)
-	* No longer force a gemset for Capistrano development. (Ben Langfeld)
+  * Fixed to follow best-practice guidelines from Bundler (Ben Langfeld)
+  * No longer force a gemset for Capistrano development. (Ben Langfeld)
 
 ## 2.5.20 / March 16 2011
 
   * `deploy:migrations` will now always operate on the latest_release, not
-	current_release (Mike Vincent)
+  current_release (Mike Vincent)
   * Adds a check for the presence of `rsync` when using the copy strategy with `rsync`. (Chris Griego)
   * Do not try to look up the `:release_path` on servers which are defined `:no_release` (Chris Griego)
   * Tiny patch to the `CVS` SCM code to be Ruby 1.9 compatible (Martin Carpenter)

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 #
-# Development Dependencies from the Gemfile 
+# Development Dependencies from the Gemfile
 # are merged here.
 #
 group :development do

data/README.md

@@ -1,7 +1,7 @@
 ## Capistrano
 
 [![Build
-Status](https://secure.travis-ci.org/capistrano/capistrano.png)](http://travis-ci.org/capistrano/capistrano)
+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
@@ -39,7 +39,7 @@ 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.
+  keys in place to allow passwordless access to them.
 
 Do not expect these assumptions to change.
 
@@ -55,7 +55,7 @@ Use the `cap` script as follows:
     cap sometask
 
 By default, the script will look for a file called one of `capfile` or
-`Capfile`. The `someaction` text indicates which task to execute. You can do
+`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.
 
@@ -68,7 +68,7 @@ tasks.
 * 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://spheredev.org/wiki/Git_for_the_lazy#Writing_good_commit_messages)
+[guidelines on writing a good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
 * That's it!
 
 

data/capistrano.gemspec

@@ -20,23 +20,15 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-    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
+  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"])

data/lib/capistrano/callback.rb

@@ -42,4 +42,4 @@ module Capistrano
       super && (task.nil? || task.fully_qualified_name != source.to_s)
     end
   end
-end
+end

data/lib/capistrano/cli.rb

@@ -20,7 +20,7 @@ module Capistrano
     #   Capistrano::CLI.parse(%W(-vvvv -f config/deploy update_code)).execute!
     #
     # Note that you can also embed cap directly by creating a new Configuration
-    # instance and setting it up, The above snippet, redone using the 
+    # instance and setting it up, The above snippet, redone using the
     # Configuration class directly, would look like:
     #
     #   require 'capistrano'

data/lib/capistrano/cli/execute.rb

@@ -55,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])
 

data/lib/capistrano/cli/help.rb

@@ -111,14 +111,14 @@ module Capistrano
       end
 
       def output_columns #:nodoc:
-        if ( @output_columns.nil? ) 
+        if ( @output_columns.nil? )
           if ( self.class.ui.output_cols.nil? )
-            @output_columns = 80 
+            @output_columns = 80
           else
             @output_columns = self.class.ui.output_cols
           end
         end
-        @output_columns 
+        @output_columns
       end
     end
   end

data/lib/capistrano/cli/help.txt

@@ -6,76 +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.)
+  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.
+  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.
+  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 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.
+  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.)
+  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.
+  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.
+  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.
+  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.
+  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

@@ -54,18 +54,18 @@ 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("-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."

data/lib/capistrano/command.rb

@@ -17,7 +17,7 @@ module Capistrano
       include Enumerable
 
       class Branch
-        attr_accessor :command, :callback
+        attr_accessor :command, :callback, :condition
         attr_reader :options
 
         def initialize(command, options, callback)
@@ -43,14 +43,17 @@ module Capistrano
           true
         end
 
-        def to_s
-          command.inspect
+        def to_s(parallel=false)
+          if parallel && @condition
+            "#{condition.inspect} :: #{command.inspect}"
+          else
+            command.inspect
+          end
         end
       end
 
       class ConditionBranch < Branch
         attr_accessor :configuration
-        attr_accessor :condition
 
         class Evaluator
           attr_reader :configuration, :condition, :server
@@ -89,9 +92,12 @@ module Capistrano
         def match(server)
           Evaluator.new(configuration, condition, server).result
         end
+      end
 
-        def to_s
-          "#{condition.inspect} :: #{command.inspect}"
+      class ElseBranch < Branch
+        def initialize(command, options, callback)
+          @condition = "else"
+          super(command, options, callback)
         end
       end
 
@@ -106,7 +112,7 @@ module Capistrano
       end
 
       def else(command, &block)
-        @fallback = Branch.new(command, {}, block)
+        @fallback = ElseBranch.new(command, {}, block)
       end
 
       def branches_for(server)
@@ -243,6 +249,13 @@ module Capistrano
                 ch[:status] = data.read_long
               end
 
+              channel.on_request("exit-signal") do |ch, data|
+                if logger
+                  exit_signal = data.read_string
+                  logger.important "command received signal #{exit_signal}", ch[:server]
+                end
+              end
+
               channel.on_close do |ch|
                 ch[:closed] = true
               end

data/lib/capistrano/configuration/actions/invocation.rb

@@ -59,7 +59,7 @@ module Capistrano
         #
         # The string specified as the first argument to +when+ may be any valid
         # Ruby code. It has access to the following variables and methods:
-        # 
+        #
         # * +in?(role)+ returns true if the server participates in the given role
         # * +server+ is the ServerDefinition object for the server. This can be
         #   used to get the host-name, etc.
@@ -121,7 +121,7 @@ module Capistrano
         #   to run, then the hosts will be run in groups of max_hosts. The default is nil,
         #   which indicates that there is no maximum host limit. Please note this does not
         #   limit the number of SSH channels that can be open, only the number of hosts upon
-        #   which this will be called. 
+        #   which this will be called.
         # * :shell - says which shell should be used to invoke commands. This
         #   defaults to "sh". Setting this to false causes Capistrano to invoke
         #   the commands directly, without wrapping them in a shell invocation.
@@ -159,12 +159,26 @@ module Capistrano
         # use, but should instead be called indirectly, via #run or #parallel,
         # or #invoke_command.
         def run_tree(tree, options={}) #:nodoc:
-          if tree.branches.empty? && tree.fallback
-            logger.debug "executing #{tree.fallback}" unless options[:silent]
-          elsif tree.branches.any?
-            logger.debug "executing multiple commands in parallel"
-            tree.each do |branch|
-              logger.trace "-> #{branch}"
+          options = add_default_command_options(options)
+
+          if tree.branches.any? || tree.fallback
+            _, servers = filter_servers(options)
+            branches = servers.map{|server| tree.branches_for(server)}.compact
+            case branches.size
+            when 0
+              branches = tree.branches.dup + [tree.fallback]
+              case branches.size
+              when 1
+                logger.debug "no servers for #{branches.first}"
+              else
+                logger.debug "no servers for commands"
+                branches.each{ |branch| logger.trace "-> #{branch.to_s(true)}" }
+              end
+            when 1
+              logger.debug "executing #{branches.first}" unless options[:silent]
+            else
+              logger.debug "executing multiple commands in parallel"
+              branches.each{ |branch| logger.trace "-> #{branch.to_s(true)}" }
             end
           else
             raise ArgumentError, "attempt to execute without specifying a command"
@@ -172,8 +186,6 @@ module Capistrano
 
           return if dry_run || (debug && continue_execution(tree) == false)
 
-          options = add_default_command_options(options)
-
           tree.each do |branch|
             if branch.command.include?(sudo)
               branch.callback = sudo_behavior_callback(branch.callback)
@@ -279,7 +291,7 @@ module Capistrano
         def sudo_prompt
           fetch(:sudo_prompt, "sudo password: ")
         end
-        
+
         def continue_execution(tree)
           if tree.branches.length == 1
             continue_execution_for_branch(tree.branches.first)