capistrano 2.5.18 → 2.5.20

data/CHANGELOG

@@ -1,18 +1,36 @@
-== 2.5.18 / March 14, 2010
+## 2.5.20 / March 16 2011
+
+  * `deploy:migrations` will now always operate on the latest_release, not
+	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)
+  * Changed the default `Git` submodule behaviour to use `--recursive`, Lighthouse Issue #176. (Lee Hambley)
+  * `:public_children` can now be `set()`, the default is unchanged, thanks (Chris Griego)
+  * Fixing the load path in the default `Capfile` to search vendored/unpacked Gems. Lighthouse Issue #174 (Mari Carmen/Rafael García)
+  * Adds a `maintenance_basename` variable (default value is `maintenance`) to allow you to set the maintenance page name (Celestino Gomes)
+  * Spelling fixes in inline-documentation (Tom Copeland)
+  * Make `zip` and `tar` handle symlinks the same way (zip follows symlinks by default, tar needs the option `-h`) (Ross Cooperman)
+
+## 2.5.19 / June 21, 2010
+
+  * Small bug fixes, no improvements for people who weren't experiencing problems anyway.
+
+## 2.5.18 / March 14, 2010
 
 Small fix for rolling back if a shell scripts exits non-zero; enabled a rollback if git (or other) externals fail during the deploy.
 
   * #151 check return code status of system command to create local copy and rollback if not 0 (David King)
 
-== 2.5.17 / February 27, 2010
+## 2.5.17 / February 27, 2010
 
 Various small bug fixes.
 
-== 2.5.16 / February 14, 2010
+## 2.5.16 / February 14, 2010
 
 Fixed a small regression in 2.5.15
 
-== 2.5.15 / 14 February 2010
+## 2.5.15 / 14 February 2010
 
 Fixes a feature request not to overwrite roles when using the ROLES environmental variable.
 
@@ -20,34 +38,34 @@ Fixes a feature request not to overwrite roles when using the ROLES environmenta
   * Removed the `upgrade` file as it has been a couple of years since 1.x was in the wild.
   * Slight internal re-factor of the way we calculate the `version`
 
-== 2.5.14 / 18 January 2010
+## 2.5.14 / 18 January 2010
 
 Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 
   * #139 - Improves consistency of variable lookup, scm variables with a local_ prefix will be honoured with priority locally (Chris Griego)
 
-== 2.5.13 / 6 January 2010
+## 2.5.13 / 6 January 2010
 
 * Small maintenance release:
 
   * #118 - Modified CLI test to not load user or system configuration file (Emily Price)
   * #88  - Re-fixed a problem here, massive apologies to all concerned. (Hangover from 2.5.12)
 
-== 2.5.12 / 5 January 2010
+## 2.5.12 / 5 January 2010
 
 * Tweak the directory version listing (caused a lot of problems, please upgrade immediately)
 
-== 2.5.11 / December 2009
+## 2.5.11 / December 2009
 
 * Deprecations and other small changes
 
-== 2.5.10 / 3 November 2009
+## 2.5.10 / 3 November 2009
 
 * Fixes Darcs remote repository problem when using the copy strategy [Alex `regularfry` Young]
 * Documentation improvements for embedding Capistrano [Lee Hambley]
 * Fixes ticket #95 -formally deprecating the before_something and after_something methods [Lee Hambley] 
 
-== 2.5.9 / 1 August 2009
+## 2.5.9 / 1 August 2009
 
 * Adds support for customizing which `tar` command to use. [Jeremy Wells]
 
@@ -62,11 +80,11 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
   * Improved web:disable task, now suggests a .htaccess block to use suggested by Rafael García
   * Includes more logger options (can now select stdout, stderr of a file) [Rafael García] 
 
-== 2.5.8 / July 2009
+## 2.5.8 / July 2009
 
 * Fixes a problem in 2.5.7 where deploy:finalize_update had been badly merged.
 
-== 2.5.6 & 2.5.7 / July 2009
+## 2.5.6 & 2.5.7 / July 2009
 
 * 2.5.7 masks a broken 2.5.6 release that was accidentally mirrored via Rubyforge.
 
@@ -80,12 +98,12 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 
 * Capify now creates the config directory in directories without one.
 
-== 2.5.5 / 24 Feb 2009
+## 2.5.5 / 24 Feb 2009
 
 * Make sure role(:foo) actually declares an (empty) role for :foo, even without server arguments [Jamis Buck]
 
 
-== 2.5.4 / 4 Feb 2009
+## 2.5.4 / 4 Feb 2009
 
 * When using rsync with the remote_cache strategy include -t switch to preserve file times [Kevin McCarthy]
 
@@ -100,7 +118,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Add supported environment variables to -H output [François Beausoleil]
 
 
-== 2.5.3 / December 6, 2008
+## 2.5.3 / December 6, 2008
 
 * Make previous_release return nil if there is no previous release [Mathias Meyer]
 
@@ -113,12 +131,12 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Fix issue with git SCM that caused "Unable to resolve revision" errors when there was trailing whitespace in git's output [Mark Zuneska, Daniel Berlinger and Evan Closson]
 
 
-== 2.5.2 / November 13, 2008
+## 2.5.2 / November 13, 2008
 
 * Fix issue with git SCM that caused "Unable to resolve revision for 'HEAD'" errors on deploy [Jamis Buck]
 
 
-== 2.5.1 / November 7, 2008
+## 2.5.1 / November 7, 2008
 
 * Add -t (--tools) switch for better task lists for external tools [Jamis Buck]
 
@@ -147,7 +165,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Ruby 1.9 compatibility [Jamis Buck]
 
 
-== 2.5.0 / August 28, 2008
+## 2.5.0 / August 28, 2008
 
 * Allow :gateway to be set to an array, in which case a chain of tunnels is created [Kerry Buckley]
 
@@ -186,17 +204,17 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Added -n/--dry-run switch, to display but not execute remote tasks [Paul Gross]
 
 
-== 2.4.3 / June 28, 2008
+## 2.4.3 / June 28, 2008
 
 * Fix gem dependencies so gem actually understands them [Jamis Buck]
 
 
-== 2.4.2 / June 27, 2008
+## 2.4.2 / June 27, 2008
 
 * Specify gem dependencies in rakefile [Jamis Buck]
 
 
-== 2.4.1 / June 27, 2008
+## 2.4.1 / June 27, 2008
 
 * Use Echoe to manage the Rakefile [Jamis Buck]
 
@@ -205,12 +223,12 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Changed capture() helper to not raise an exception on error, but to warn instead [Jeff Forcier]
 
 
-== 2.4.0 / June 13, 2008
+## 2.4.0 / June 13, 2008
 
 * Added :normalize_asset_timestamps option to deployment, defaulting to true, which allows asset timestamping to be disabled [John Trupiano]
 
 
-== 2.4.0 Preview Release #1 (2.3.101) / June 5, 2008 
+## 2.4.0 Preview Release #1 (2.3.101) / June 5, 2008 
 
 * Only make deploy:start, deploy:stop, and deploy:restart try sudo as :runner. The other sudo-enabled tasks (deploy:setup, deploy:cleanup, etc.) will now use the :admin_runner user (which by default is unset). [Jamis Buck]
 
@@ -255,7 +273,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Add debug switch for enabling conditional execution of commands [Mark Imbriaco]
 
 
-== 2.3.0 / May 2, 2008
+## 2.3.0 / May 2, 2008
 
 * Make deploy:setup obey the :use_sudo and :runner directives, and generalize the :use_sudo and :runner options into a try_sudo() helper method [Jamis Buck]
 
@@ -282,7 +300,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Improved "copy" strategy supports local caching and pattern exclusion (via :copy_cache and :copy_exclude variables) [Jamis Buck]
 
 
-== 2.2.0 / February 27, 2008
+## 2.2.0 / February 27, 2008
 
 * Fix git submodule support to init on sync [halorgium]
 
@@ -329,7 +347,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Prepare for Net::SSH v2 by making sure Capistrano only tries to load Net::SSH versions less than 1.99.0 [Jamis Buck]
 
 
-== 2.1.0 / October 14, 2007
+## 2.1.0 / October 14, 2007
 
 * Default to 0664 instead of 0660 on upload [Jamis Buck]
 
@@ -350,7 +368,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Use the --password switch for subversion by default, but add :scm_prefer_prompt variable (defaults to false) [Jamis Buck]
 
 
-== 2.0.100 (2.1 Preview 1) / September 1, 2007
+## 2.0.100 (2.1 Preview 1) / September 1, 2007
 
 * capify-generated Capfile will autoload all recipes from vendor/plugins/*/recipes/*.rb [Graeme Mathieson]
 
@@ -383,7 +401,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Change the "-h" output so that it does not say that "-q" is the default [Jamis Buck]
 
 
-== 2.0.0 / July 21, 2007
+## 2.0.0 / July 21, 2007
 
 * Make the "no matching servers" error more sane [halorgium]
 
@@ -412,7 +430,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Spelling corrections in docs [Tim Carey-Smith, Giles Bowkett]
 
 
-== 1.99.3 (2.0 Preview 4) / June 28, 2007
+## 1.99.3 (2.0 Preview 4) / June 28, 2007
 
 * Don't break task descriptions on a period that appears in the middle of a sentence [Jamis Buck]
 
@@ -445,7 +463,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Make sure symlink and finalize_update tasks reference the most recent release when called by themselves [Jamis Buck]
 
 
-== 1.99.2 (2.0 Preview 3) / June 15, 2007
+## 1.99.2 (2.0 Preview 3) / June 15, 2007
  
 * CVS SCM module [Brian Phillips]
 
@@ -470,7 +488,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Add :default_environment variable, which is applied to every command
 
 
-== 1.99.1 (2.0 Preview 2) / May 10, 2007
+## 1.99.1 (2.0 Preview 2) / May 10, 2007
 
 * Fix some documentation typos [eventualbuddha]
 
@@ -505,7 +523,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Make the copy strategy check out to a temporary directory [Jamis Buck]
 
 
-== 1.99.0 (2.0 Preview 1) / April 24, 2007
+## 1.99.0 (2.0 Preview 1) / April 24, 2007
 
 * Add `capify' script to make it easier to prepare a project for deployment using cap [Jamis Buck]
 
@@ -526,7 +544,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Merged the Configuration and Actor classes, performed various other massive refactorings of the code [Jamis Buck]
 
 
-== 1.4.1 / February 24, 2007
+## 1.4.1 / February 24, 2007
 
 * Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [jonathan]
 
@@ -537,7 +555,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Add :env option to 'run' (and friends) so that you can specify environment variables to be injected into the new process' environment [Mathieu Lajugie]
 
 
-== 1.4.0 / February 3, 2007
+## 1.4.0 / February 3, 2007
 
 * Use the auth info for subversion more consistently [Jamis Buck]
 
@@ -564,12 +582,12 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Fix off-by-one bug in show_tasks width-computation [NeilW]
 
 
-== 1.3.1 / January 5, 2007
+## 1.3.1 / January 5, 2007
 
 * Fix connection problems when using gateways [Ezra Zygmuntowicz]
 
 
-== 1.3.0 / December 23, 2006
+## 1.3.0 / December 23, 2006
 
 * Deprecate rake integration in favor of invoking `cap' directly [Jamis Buck]
 
@@ -600,7 +618,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Added :as option to sudo, so you can specify who the command is executed as [Mark Imbriaco]
 
 
-== 1.2.0 / September 14, 2006
+## 1.2.0 / September 14, 2006
 
 * Add experimental 'shell' task [Jamis Buck]
 
@@ -684,7 +702,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Fix operator precedence problem in script for touching the revisions.log #3223 [jason.garber@emu.edu]
 
 
-== 1.1.0 / March 6th, 2006
+## 1.1.0 / March 6th, 2006
 
 * Simplify the generated capistrano.rake file, and make it easier to customize
 
@@ -697,12 +715,12 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Look for config/deploy.rb, capfile, and Capfile by default
 
 
-== 1.0.1 / February 20th, 2006
+## 1.0.1 / February 20th, 2006
 
 * Fix broken switchtower_invoke function in switchtower.rake (missing require statement)
 
 
-== 1.0.0 / Feburary 18th, 2006
+## 1.0.0 / Feburary 18th, 2006
 
 * Make CVS module's :local value default to "."
 
@@ -751,7 +769,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Set :actor key on SSH channel instances
 
 
-== 0.10.0 / January 2nd, 2006
+## 0.10.0 / January 2nd, 2006
 
 * Handle ssh password prompts like "someone's password:"
 
@@ -790,7 +808,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Require Net::SSH 1.0.5
 
 
-== 0.9.0 / October 18th, 2005
+## 0.9.0 / October 18th, 2005
 
 * Use process reaper instead of custom reap script for restarting
 

data/Gemfile

@@ -0,0 +1,17 @@
+#
+# This is the gemfile for local development
+# these are the requirements for running
+# the test suite.
+#
+
+source :gemcutter
+
+gem 'net-ssh'
+gem 'net-ssh-gateway'
+gem 'net-sftp'
+gem 'net-scp'
+gem 'highline'
+
+group :test do
+  gem "mocha"
+end

data/README.mdown

@@ -0,0 +1,65 @@
+## 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
+
+* [[http://github.com/capistrano/capistrano/wiki/Documentation-v2.x]]
+
+## 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]]
+
+If you want to run the tests, you'll also need to have the following dependencies installed:
+
+* Echoe (for the Rakefile)
+* Mocha (http://mocha.rubyforge.org)
+
+## 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 `someaction` 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.
+
+## 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

@@ -1,4 +1,11 @@
-require "./lib/capistrano/version"
+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
 
 begin
   require 'jeweler'
@@ -6,7 +13,7 @@ begin
     gem.version
     gem.name            = "capistrano"
     gem.executables     = %W(capify cap)
-    gem.summary         = %Q{Capistrano – Welcome to easy deployment with Ruby over SSH}
+    gem.summary         = %Q{Capistrano - Welcome to easy deployment with Ruby over SSH}
     gem.description     = %Q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
     gem.homepage        = "http://github.com/capistrano/capistrano"
     gem.email           = [ "jamis@jamisbuck.org", "lee.hambley@gmail.com" ]
@@ -20,15 +27,4 @@ begin
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-task :test => :check_dependencies
-task :default => :test
-
+end

data/VERSION

@@ -1 +1 @@
-2.5.18
+2.5.20

data/bin/capify

@@ -38,7 +38,7 @@ end
 files = {
   "Capfile" => unindent(<<-FILE),
     load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-    Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+    Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
     load 'config/deploy' # remove this line to skip loading any of the default tasks
   FILE
@@ -54,10 +54,10 @@ role :app, "your app-server here"                          # This may be the sam
 role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
 role :db,  "your slave db-server here"
 
-# If you are using Passenger mod_rails uncomment this:
-# if you\'re still using the script/reapear helper you will need
+# 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

data/lib/capistrano/command.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 require 'capistrano/errors'
 require 'capistrano/processable'
 
@@ -159,11 +160,13 @@ module Capistrano
     # fails (non-zero return code) on any of the hosts, this will raise a
     # Capistrano::CommandError.
     def process!
-      loop do
-        break unless process_iteration { @channels.any? { |ch| !ch[:closed] } }
+      elapsed = Benchmark.realtime do
+        loop do
+          break unless process_iteration { @channels.any? { |ch| !ch[:closed] } }
+        end
       end
 
-      logger.trace "command finished" if logger
+      logger.trace "command finished in #{(elapsed * 1000).round}ms" if logger
 
       if (failed = @channels.select { |ch| ch[:status] != 0 }).any?
         commands = failed.inject({}) { |map, ch| (map[ch[:command]] ||= []) << ch[:server]; map }

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

@@ -26,7 +26,7 @@ module Capistrano
           transfer(:up, from, to, options, &block)
           if mode
             mode = mode.is_a?(Numeric) ? mode.to_s(8) : mode.to_s
-            run "chmod #{mode} #{to}"
+            run "chmod #{mode} #{to}", options
           end
         end
 

data/lib/capistrano/recipes/deploy/remote_dependency.rb

@@ -43,6 +43,12 @@ module Capistrano
         self
       end
 
+      def deb(name, version, options={})
+        @message ||= "package `#{name}' #{version} could not be found"
+        try("dpkg -s #{name} | grep '^Version: #{version}'", options)
+        self
+      end
+
       def match(command, expect, options={})
         expect = Regexp.new(Regexp.escape(expect.to_s)) unless expect.is_a?(Regexp)
 

data/lib/capistrano/recipes/deploy/scm/cvs.rb

@@ -69,7 +69,8 @@ module Capistrano
         def query_revision(revision)
           return revision if revision_type(revision) == :date
           revision = yield(scm(cvs_root, :log, "-r#{revision}")).
-                       grep(/^date:/).
+                       split("\n").
+                       select { |line| line =~ /^date:/ }.
                        map { |line| line[/^date: (.*?);/, 1] }.
                        sort.last + " UTC"
           return revision

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -152,7 +152,7 @@ module Capistrano
           if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
-            execute << "#{git} submodule #{verbose} update"
+            execute << "#{git} submodule #{verbose} update --recursive"
           end
 
           execute.join(" && ")

data/lib/capistrano/recipes/deploy/scm/subversion.rb

@@ -52,7 +52,7 @@ module Capistrano
         # executed (svn info), and will extract the revision from the response.
         def query_revision(revision)
           return revision if revision =~ /^\d+$/
-          command = scm(:info, repository, authentication, "-r#{revision}")
+          command = scm(:info, arguments, repository, authentication, "-r#{revision}")
           result = yield(command)
           yaml = YAML.load(result)
           raise "tried to run `#{command}' and got unexpected result #{result.inspect}" unless Hash === yaml

data/lib/capistrano/recipes/deploy/strategy/base.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 require 'capistrano/recipes/deploy/dependencies'
 
 module Capistrano
@@ -49,16 +50,24 @@ module Capistrano
           # A wrapper for Kernel#system that logs the command being executed.
           def system(*args)
             cmd = args.join(' ')
+            result = nil
             if RUBY_PLATFORM =~ /win32/
 							cmd = cmd.split(/\s+/).collect {|w| w.match(/^[\w+]+:\/\//) ? w : w.gsub('/', '\\') }.join(' ') # Split command by spaces, change / by \\ unless element is a some+thing:// 
               cmd.gsub!(/^cd /,'cd /D ') # Replace cd with cd /D
               cmd.gsub!(/&& cd /,'&& cd /D ') # Replace cd with cd /D
               logger.trace "executing locally: #{cmd}"
-              super(cmd)
+              elapsed = Benchmark.realtime do
+                result = super(cmd)
+              end
             else
               logger.trace "executing locally: #{cmd}"
-              super
+              elapsed = Benchmark.realtime do
+                result = super
+              end
             end
+            
+            logger.trace "command finished in #{(elapsed * 1000).round}ms"
+            result
           end
 
         private

data/lib/capistrano/recipes/deploy/strategy/copy.rb

@@ -86,7 +86,7 @@ module Capistrano
             if copy_exclude.any?
               logger.debug "processing exclusions..."
               if copy_exclude.any?
-                copy_exclude.each do |pattern| 
+                copy_exclude.each do |pattern|
                   delete_list = Dir.glob(File.join(destination, pattern), File::FNM_DOTMATCH)
                   # avoid the /.. trap that deletes the parent directories
                   delete_list.delete_if { |dir| dir =~ /\/\.\.$/ }
@@ -101,8 +101,7 @@ module Capistrano
           logger.trace "compressing #{destination} to #{filename}"
           Dir.chdir(tmpdir) { system(compress(File.basename(destination), File.basename(filename)).join(" ")) }
 
-          upload(filename, remote_filename)
-          run "cd #{configuration[:releases_path]} && #{decompress(remote_filename).join(" ")} && rm #{remote_filename}"
+          distribute!
         ensure
           FileUtils.rm filename rescue nil
           FileUtils.rm_rf destination rescue nil
@@ -184,21 +183,21 @@ module Capistrano
           # Commands are arrays, where the first element is the utility to be
           # used to perform the compression or decompression.
           Compression = Struct.new(:extension, :compress_command, :decompress_command)
-          
+
           # The compression method to use, defaults to :gzip.
           def compression
             remote_tar = configuration[:copy_remote_tar] || 'tar'
             local_tar = configuration[:copy_local_tar] || 'tar'
-            
+
             type = configuration[:copy_compression] || :gzip
             case type
-            when :gzip, :gz   then Compression.new("tar.gz",  [local_tar, 'czf'], [remote_tar, 'xzf'])
-            when :bzip2, :bz2 then Compression.new("tar.bz2", [local_tar, 'cjf'], [remote_tar, 'xjf'])
+            when :gzip, :gz   then Compression.new("tar.gz",  [local_tar, 'chzf'], [remote_tar, 'xzf'])
+            when :bzip2, :bz2 then Compression.new("tar.bz2", [local_tar, 'chjf'], [remote_tar, 'xjf'])
             when :zip         then Compression.new("zip",     %w(zip -qr), %w(unzip -q))
             else raise ArgumentError, "invalid compression type #{type.inspect}"
             end
           end
-          
+
           # Returns the command necessary to compress the given directory
           # into the given file.
           def compress(directory, file)
@@ -211,6 +210,12 @@ module Capistrano
           def decompress(file)
             compression.decompress_command + [file]
           end
+
+          # Distributes the file to the remote servers
+          def distribute!
+            upload(filename, remote_filename)
+            run "cd #{configuration[:releases_path]} && #{decompress(remote_filename).join(" ")} && rm #{remote_filename}"
+          end
       end
 
     end

data/lib/capistrano/recipes/deploy/strategy/remote_cache.rb

@@ -18,6 +18,7 @@ module Capistrano
 
         def check!
           super.check do |d|
+            d.remote.command("rsync") unless copy_exclude.empty?
             d.remote.writable(shared_path)
           end
         end