capistrano 2.5.19 → 2.5.20

data/VERSION

@@ -1 +1 @@
-2.5.19
+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/recipes/deploy.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 require 'yaml'
 require 'capistrano/recipes/deploy/scm'
 require 'capistrano/recipes/deploy/strategy'
@@ -27,6 +28,9 @@ _cset :deploy_via, :checkout
 _cset(:deploy_to) { "/u/apps/#{application}" }
 _cset(:revision)  { source.head }
 
+# Maintenance base filename
+_cset :maintenance_basename, "maintenance"
+
 # =========================================================================
 # These variables should NOT be changed unless you are very confident in
 # what you are doing. Make sure you understand all the implications of your
@@ -51,13 +55,13 @@ _cset(:shared_path)       { File.join(deploy_to, shared_dir) }
 _cset(:current_path)      { File.join(deploy_to, current_dir) }
 _cset(:release_path)      { File.join(releases_path, release_name) }
 
-_cset(:releases)          { capture("ls -x #{releases_path}").split.sort }
+_cset(:releases)          { capture("ls -x #{releases_path}", :except => { :no_release => true }).split.sort }
 _cset(:current_release)   { File.join(releases_path, releases.last) }
 _cset(:previous_release)  { releases.length > 1 ? File.join(releases_path, releases[-2]) : nil }
 
-_cset(:current_revision)  { capture("cat #{current_path}/REVISION").chomp }
-_cset(:latest_revision)   { capture("cat #{current_release}/REVISION").chomp }
-_cset(:previous_revision) { capture("cat #{previous_release}/REVISION").chomp }
+_cset(:current_revision)  { capture("cat #{current_path}/REVISION",     :except => { :no_release => true }).chomp }
+_cset(:latest_revision)   { capture("cat #{current_release}/REVISION",  :except => { :no_release => true }).chomp }
+_cset(:previous_revision) { capture("cat #{previous_release}/REVISION", :except => { :no_release => true }).chomp if previous_release }
 
 _cset(:run_method)        { fetch(:use_sudo, true) ? :sudo : :run }
 
@@ -95,10 +99,14 @@ end
 # returns the command output as a string
 def run_locally(cmd)
   logger.trace "executing locally: #{cmd.inspect}" if logger
-  output_on_stdout = `#{cmd}`
+  output_on_stdout = nil
+  elapsed = Benchmark.realtime do
+    output_on_stdout = `#{cmd}`
+  end
   if $?.to_i > 0 # $? is command exit code (posix style)
     raise Capistrano::LocalArgumentError, "Command #{cmd} returned status code #{$?}"
   end
+  logger.trace "command finished in #{(elapsed * 1000).round}ms" if logger
   output_on_stdout
 end
 
@@ -224,7 +232,8 @@ namespace :deploy do
     public/stylesheets, and public/javascripts so that the times are \
     consistent (so that asset timestamping works).  This touch process \
     is only carried out if the :normalize_asset_timestamps variable is \
-    set to true, which is the default.
+    set to true, which is the default The asset directories can be overridden \
+    using the :public_children variable.
   DESC
   task :finalize_update, :except => { :no_release => true } do
     run "chmod -R g+w #{latest_release}" if fetch(:group_writable, true)
@@ -242,7 +251,7 @@ namespace :deploy do
 
     if fetch(:normalize_asset_timestamps, true)
       stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
-      asset_paths = %w(images stylesheets javascripts).map { |p| "#{latest_release}/public/#{p}" }.join(" ")
+      asset_paths = fetch(:public_children, %w(images stylesheets javascripts)).map { |p| "#{latest_release}/public/#{p}" }.join(" ")
       run "find #{asset_paths} -exec touch -t #{stamp} {} ';'; true", :env => { "TZ" => "UTC" }
     end
   end
@@ -382,11 +391,10 @@ namespace :deploy do
 
     directory = case migrate_target.to_sym
       when :current then current_path
-      when :latest  then current_release
+      when :latest  then latest_release
       else raise ArgumentError, "unknown migration target #{migrate_target.inspect}"
       end
 
-    puts "#{migrate_target} => #{directory}"
     run "cd #{directory}; #{rake} RAILS_ENV=#{rails_env} #{migrate_env} db:migrate"
   end
 
@@ -536,7 +544,7 @@ namespace :deploy do
   namespace :web do
     desc <<-DESC
       Present a maintenance page to visitors. Disables your application's web \
-      interface by writing a "maintenance.html" file to each web server. The \
+      interface by writing a "#{maintenance_basename}.html" file to each web server. The \
       servers must be configured to detect the presence of this file, and if \
       it is present, always display it instead of performing the request.
 
@@ -552,18 +560,18 @@ namespace :deploy do
     DESC
     task :disable, :roles => :web, :except => { :no_release => true } do
       require 'erb'
-      on_rollback { run "rm #{shared_path}/system/maintenance.html" }
+      on_rollback { run "rm #{shared_path}/system/#{maintenance_basename}.html" }
 
       warn <<-EOHTACCESS
-      
+
         # Please add something like this to your site's htaccess to redirect users to the maintenance page.
         # More Info: http://www.shiftcommathree.com/articles/make-your-rails-maintenance-page-respond-with-a-503
-        
-        ErrorDocument 503 /system/maintenance.html
+
+        ErrorDocument 503 /system/#{maintenance_basename}.html
         RewriteEngine On
         RewriteCond %{REQUEST_URI} !\.(css|gif|jpg|png)$
-        RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
-        RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+        RewriteCond %{DOCUMENT_ROOT}/system/#{maintenance_basename}.html -f
+        RewriteCond %{SCRIPT_FILENAME} !#{maintenance_basename}.html
         RewriteRule ^.*$  -  [redirect=503,last]
       EOHTACCESS
 
@@ -573,17 +581,17 @@ namespace :deploy do
       template = File.read(File.join(File.dirname(__FILE__), "templates", "maintenance.rhtml"))
       result = ERB.new(template).result(binding)
 
-      put result, "#{shared_path}/system/maintenance.html", :mode => 0644
+      put result, "#{shared_path}/system/#{maintenance_basename}.html", :mode => 0644
     end
 
     desc <<-DESC
       Makes the application web-accessible again. Removes the \
-      "maintenance.html" page generated by deploy:web:disable, which (if your \
+      "#{maintenance_basename}.html" page generated by deploy:web:disable, which (if your \
       web servers are configured correctly) will make your application \
       web-accessible again.
     DESC
     task :enable, :roles => :web, :except => { :no_release => true } do
-      run "rm #{shared_path}/system/maintenance.html"
+      run "rm #{shared_path}/system/#{maintenance_basename}.html"
     end
   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

data/test/deploy/remote_dependency_test.rb

@@ -37,6 +37,12 @@ class RemoteDependencyTest < Test::Unit::TestCase
     assert_equal "gem `capistrano' 9.9 could not be found (host)", @dependency.message
   end
 
+  def test_should_use_standard_error_message_for_deb
+    setup_for_a_configuration_deb_run("dpkg", "1.15", false)
+    @dependency.deb("dpkg", "1.15")
+    assert_equal "package `dpkg' 1.15 could not be found (host)", @dependency.message
+  end
+
   def test_should_fail_if_directory_not_found
     setup_for_a_configuration_run("test -d /data", false)
     assert !@dependency.directory("/data").pass?
@@ -52,7 +58,7 @@ class RemoteDependencyTest < Test::Unit::TestCase
     assert !@dependency.file("/data/foo.txt").pass?
   end
 
-  def test_should_pas_if_file_found
+  def test_should_pass_if_file_found
     setup_for_a_configuration_run("test -f /data/foo.txt", true)
     assert @dependency.file("/data/foo.txt").pass?
   end
@@ -87,6 +93,16 @@ class RemoteDependencyTest < Test::Unit::TestCase
     assert @dependency.gem("capistrano", 9.9).pass?
   end
 
+  def test_should_pass_if_deb_found
+    setup_for_a_configuration_deb_run("dpkg", "1.15", true)
+    assert @dependency.deb("dpkg", "1.15").pass?
+  end
+
+  def test_should_fail_if_deb_not_found
+    setup_for_a_configuration_deb_run("dpkg", "1.15", false)
+    assert !@dependency.deb("dpkg", "1.15").pass?
+  end
+
   def test_should_use_alternative_message_if_provided
     setup_for_a_configuration_run("which cat", false)
     @dependency.command("cat").or("Sorry")
@@ -111,4 +127,9 @@ class RemoteDependencyTest < Test::Unit::TestCase
     find_gem_cmd = "gem specification --version '#{version}' #{name} 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
     setup_for_a_configuration_run(find_gem_cmd, passing)
   end
+
+  def setup_for_a_configuration_deb_run(name, version, passing)
+    find_deb_cmd = "dpkg -s #{name} | grep '^Version: #{version}'"
+    setup_for_a_configuration_run(find_deb_cmd, passing)
+  end
 end

data/test/deploy/scm/git_test.rb

@@ -40,7 +40,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
 
     # with submodules
     @config[:git_enable_submodules] = true
-    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && #{git} submodule -q update", @source.checkout(rev, dest)
+    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && #{git} submodule -q update --recursive", @source.checkout(rev, dest)
   end
 
   def test_checkout_with_verbose_should_not_use_q_switch
@@ -138,7 +138,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:git_enable_submodules] = true
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone -q -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev} && git submodule -q init && git submodule -q sync && git submodule -q update", @source.checkout(rev, dest)
+    assert_equal "git clone -q -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev} && git submodule -q init && git submodule -q sync && git submodule -q update --recursive", @source.checkout(rev, dest)
   end
 
   # Tests from base_test.rb, makin' sure we didn't break anything up there!

data/test/deploy/strategy/copy_test.rb

@@ -14,16 +14,16 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @config.stubs(:source).returns(@source)
     @strategy = Capistrano::Deploy::Strategy::Copy.new(@config)
   end
-  
+
   def test_deploy_with_defaults_should_use_remote_gtar
     @config[:copy_remote_tar] = 'gtar'
-    
+
     Dir.expects(:tmpdir).returns("/temp/dir")
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
     @strategy.expects(:system).with(:local_checkout)
 
     Dir.expects(:chdir).with("/temp/dir").yields
-    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && gtar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
@@ -33,19 +33,19 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
-    
+
     @strategy.deploy!
   end
-  
+
   def test_deploy_with_defaults_should_use_local_gtar
     @config[:copy_local_tar] = 'gtar'
-    
+
     Dir.expects(:tmpdir).returns("/temp/dir")
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
     @strategy.expects(:system).with(:local_checkout)
 
     Dir.expects(:chdir).with("/temp/dir").yields
-    @strategy.expects(:system).with("gtar czf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("gtar chzf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
@@ -55,9 +55,9 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
-    
+
     @strategy.deploy!
-  end  
+  end
 
   def test_deploy_with_defaults_should_use_tar_gz_and_checkout
     Dir.expects(:tmpdir).returns("/temp/dir")
@@ -130,7 +130,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("tar cjf 1234567890.tar.bz2 1234567890")
+    @strategy.expects(:system).with("tar chjf 1234567890.tar.bz2 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.bz2", "/tmp/1234567890.tar.bz2")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xjf /tmp/1234567890.tar.bz2 && rm /tmp/1234567890.tar.bz2")
 
@@ -143,17 +143,17 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     @strategy.deploy!
   end
-  
+
   def test_deploy_with_unknown_compression_type_should_error
     @config[:copy_compression] = :bogus
     Dir.expects(:tmpdir).returns("/temp/dir")
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
     @strategy.stubs(:system)
     File.stubs(:open)
-    
+
     assert_raises(ArgumentError) { @strategy.deploy! }
   end
-  
+
   def test_deploy_with_custom_copy_dir_should_use_that_as_tmpdir
     Dir.expects(:tmpdir).never
     Dir.expects(:chdir).with("/other/path").yields
@@ -161,7 +161,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).with("154", "/other/path/1234567890").returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/other/path/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
@@ -182,7 +182,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/somewhere/else/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /somewhere/else/1234567890.tar.gz && rm /somewhere/else/1234567890.tar.gz")
 
@@ -288,7 +288,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     def prepare_standard_compress_and_copy!
       Dir.expects(:chdir).with("/temp/dir").yields
-      @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
+      @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
       @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
       @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")