capistrano 2.5.22 → 2.6.0

data/CHANGELOG

@@ -1,3 +1,24 @@
+## 2.6.0 / May 3 2011
+
+A rather large release, feature-version bump because of the new
+multiple-gateways feature as implemented by Ryan Duryea (way to go!)
+
+Please also note from this release that if you use Git submodules, the
+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)
+        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)
+  * 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)

data/README.mdown

@@ -1,25 +1,25 @@
 ## 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 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]]
+* [http://github.com/capistrano/capistrano/wiki/Documentation-v2.x](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]]
+* [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)
+* [Echoe](https://github.com/fauna/echoe)
+* [Mocha](http://mocha.rubyforge.org)
 
 ## ASSUMPTIONS
 

data/VERSION

@@ -1 +1 @@
-2.5.22
+2.6.0

data/capistrano.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   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.date        = %q{2011-03-22}
-
   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) }
@@ -28,13 +27,13 @@ Gem::Specification.new do |s|
       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.0.0"])
+      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.1.0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     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.0.0"])
+      s.add_dependency(%q<net-ssh-gateway>, [">= 1.1.0"])
       s.add_dependency(%q<highline>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
@@ -42,7 +41,7 @@ Gem::Specification.new do |s|
     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.0.0"])
+    s.add_dependency(%q<net-ssh-gateway>, [">= 1.1.0"])
     s.add_dependency(%q<highline>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end

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

@@ -37,7 +37,11 @@ module Capistrano
         def transfer(direction, from, to, options={}, &block)
           execute_on_servers(options) do |servers|
             targets = servers.map { |s| sessions[s] }
-            Transfer.process(direction, from, to, targets, options.merge(:logger => logger), &block)
+            if dry_run
+              logger.debug "transfering: #{[direction, from, to, targets, options.merge(:logger => logger).inspect ] * ', '}"
+            else
+              Transfer.process(direction, from, to, targets, options.merge(:logger => logger), &block)
+            end
           end
         end
 

data/lib/capistrano/configuration/connections.rb

@@ -24,13 +24,29 @@ module Capistrano
       class GatewayConnectionFactory #:nodoc:
         def initialize(gateway, options)
           @options = options
-          @options[:logger].debug "Creating gateway using #{[*gateway].join(', ')}" if @options[:logger]
           Thread.abort_on_exception = true
-          @gateways = [*gateway].collect { |g| ServerDefinition.new(g) }
-          tunnel = SSH.connection_strategy(@gateways[0], @options) do |host, user, connect_options|
+          @gateways = {}
+          if gateway.is_a?(Hash)
+            @options[:logger].debug "Creating multiple gateways using #{gateway.inspect}" if @options[:logger]
+            gateway.each do |gw, hosts|
+              gateway_connection = add_gateway(gw)
+              [*hosts].each do |host|
+                @gateways[:default] ||= gateway_connection
+                @gateways[host] = gateway_connection
+              end
+            end
+          else
+            @options[:logger].debug "Creating gateway using #{[*gateway].join(', ')}" if @options[:logger]
+            @gateways[:default] = add_gateway(gateway)
+          end
+        end
+
+        def add_gateway(gateway)
+          gateways = [*gateway].collect { |g| ServerDefinition.new(g) }
+          tunnel = SSH.connection_strategy(gateways[0], @options) do |host, user, connect_options|
             Net::SSH::Gateway.new(host, user, connect_options)
           end
-          @gateway = (@gateways[1..-1]).inject(tunnel) do |tunnel, destination|
+          (gateways[1..-1]).inject(tunnel) do |tunnel, destination|
             @options[:logger].debug "Creating tunnel to #{destination}" if @options[:logger]
             local_host = ServerDefinition.new("127.0.0.1", :user => destination.user, :port => tunnel.open(destination.host, (destination.port || 22)))
             SSH.connection_strategy(local_host, @options) do |host, user, connect_options|
@@ -41,11 +57,15 @@ module Capistrano
         
         def connect_to(server)
           @options[:logger].debug "establishing connection to `#{server}' via gateway" if @options[:logger]
-          local_host = ServerDefinition.new("127.0.0.1", :user => server.user, :port => @gateway.open(server.host, server.port || 22))
+          local_host = ServerDefinition.new("127.0.0.1", :user => server.user, :port => gateway_for(server).open(server.host, server.port || 22))
           session = SSH.connect(local_host, @options)
           session.xserver = server
           session
         end
+
+        def gateway_for(server)
+          @gateways[server.host] || @gateways[:default]
+        end
       end
 
       # A hash of the SSH sessions that are currently open and available.
@@ -87,7 +107,7 @@ module Capistrano
       def connection_factory
         @connection_factory ||= begin
           if exists?(:gateway)
-            logger.debug "establishing connection to gateway `#{fetch(:gateway)}'"
+            logger.debug "establishing connection to gateway `#{fetch(:gateway).inspect}'"
             GatewayConnectionFactory.new(fetch(:gateway), self)
           else
             DefaultConnectionFactory.new(self)

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

@@ -148,7 +148,7 @@ module Capistrano
           if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
-            execute << "#{git} submodule #{verbose} update --recursive"
+            execute << "#{git} submodule #{verbose} update --init --recursive"
           end
 
           execute.join(" && ")
@@ -181,13 +181,13 @@ module Capistrano
           end
 
           # since we're in a local branch already, just reset to specified revision rather than merge
-          execute << "#{git} fetch #{verbose} #{remote} && #{git} reset #{verbose} --hard #{revision}"
+          execute << "#{git} fetch #{verbose} #{remote} && #{git} fetch --tags #{verbose} #{remote} && #{git} reset #{verbose} --hard #{revision}"
 
           if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done"
             execute << "#{git} submodule #{verbose} sync"
-            execute << "#{git} submodule #{verbose} update"
+            execute << "#{git} submodule #{verbose} update --init --recursive"
           end
 
           # Make sure there's nothing else lying around in the repository (for

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

@@ -58,9 +58,10 @@ module Capistrano
               raise Capistrano::Error, "shell command failed with return code #{$?}"
             end
 
+            FileUtils.mkdir_p(destination)
+
             logger.debug "copying cache to deployment staging area #{destination}"
             Dir.chdir(copy_cache) do
-              FileUtils.mkdir_p(destination)
               queue = Dir.glob("*", File::FNM_DOTMATCH)
               while queue.any?
                 item = queue.shift
@@ -70,12 +71,12 @@ module Capistrano
                 next if copy_exclude.any? { |pattern| File.fnmatch(pattern, item) }
 
                 if File.symlink?(item)
-                  FileUtils.ln_s(File.readlink(File.join(copy_cache, item)), File.join(destination, item))
+                  FileUtils.ln_s(File.readlink(item), File.join(destination, item))
                 elsif File.directory?(item)
                   queue += Dir.glob("#{item}/*", File::FNM_DOTMATCH)
                   FileUtils.mkdir(File.join(destination, item))
                 else
-                  FileUtils.ln(File.join(copy_cache, item), File.join(destination, item))
+                  FileUtils.ln(item, File.join(destination, item))
                 end
               end
             end
@@ -99,7 +100,7 @@ module Capistrano
           File.open(File.join(destination, "REVISION"), "w") { |f| f.puts(revision) }
 
           logger.trace "compressing #{destination} to #{filename}"
-          Dir.chdir(tmpdir) { system(compress(File.basename(destination), File.basename(filename)).join(" ")) }
+          Dir.chdir(copy_dir) { system(compress(File.basename(destination), File.basename(filename)).join(" ")) }
 
           distribute!
         ensure
@@ -121,8 +122,8 @@ module Capistrano
         # is +true+, a default cache location will be returned.
         def copy_cache
           @copy_cache ||= configuration[:copy_cache] == true ?
-            File.join(Dir.tmpdir, configuration[:application]) :
-            configuration[:copy_cache]
+            File.expand_path(configuration[:application], Dir.tmpdir) :
+            File.expand_path(configuration[:copy_cache], Dir.pwd) rescue nil
         end
 
         private
@@ -136,7 +137,7 @@ module Capistrano
           # Returns the basename of the release_path, which will be used to
           # name the local copy and archive file.
           def destination
-            @destination ||= File.join(tmpdir, File.basename(configuration[:release_path]))
+            @destination ||= File.join(copy_dir, File.basename(configuration[:release_path]))
           end
 
           # Returns the value of the :copy_strategy variable, defaulting to
@@ -159,12 +160,12 @@ module Capistrano
           # Returns the name of the file that the source code will be
           # compressed to.
           def filename
-            @filename ||= File.join(tmpdir, "#{File.basename(destination)}.#{compression.extension}")
+            @filename ||= File.join(copy_dir, "#{File.basename(destination)}.#{compression.extension}")
           end
 
           # The directory to which the copy should be checked out
-          def tmpdir
-            @tmpdir ||= configuration[:copy_dir] || Dir.tmpdir
+          def copy_dir
+            @copy_dir ||= File.expand_path(configuration[:copy_dir] || Dir.tmpdir, Dir.pwd)
           end
 
           # The directory on the remote server to which the archive should be

data/test/configuration/actions/file_transfer_test.rb

@@ -4,7 +4,7 @@ require 'capistrano/configuration/actions/file_transfer'
 class ConfigurationActionsFileTransferTest < Test::Unit::TestCase
   class MockConfig
     include Capistrano::Configuration::Actions::FileTransfer
-    attr_accessor :sessions
+    attr_accessor :sessions, :dry_run
   end
 
   def setup

data/test/configuration/actions/invocation_test.rb

@@ -1,5 +1,6 @@
 require "utils"
 require 'capistrano/configuration/actions/invocation'
+require 'capistrano/configuration/actions/file_transfer'
 
 class ConfigurationActionsInvocationTest < Test::Unit::TestCase
   class MockConfig
@@ -7,9 +8,11 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     attr_accessor :debug
     attr_accessor :dry_run
 		attr_accessor :preserve_roles
+    attr_accessor :servers
 
     def initialize
       @options = {}
+      @servers = []
     end
 
     def [](*args)
@@ -24,13 +27,17 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
       @options.fetch(*args)
     end
 
+    def execute_on_servers(options = {})
+      yield @servers
+    end
+
     include Capistrano::Configuration::Actions::Invocation
+    include Capistrano::Configuration::Actions::FileTransfer
   end
 
   def setup
-    @config = MockConfig.new
+    @config = make_config
     @original_io_proc = MockConfig.default_io_proc
-    @config.stubs(:logger).returns(stub_everything)
   end
 
   def teardown
@@ -48,6 +55,15 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     @config.run "ls", :foo => "bar"
   end
 
+  def test_put_wont_transfer_if_dry_run
+    config = make_config
+    config.dry_run = true
+    config.servers = %w[ foo ]
+    config.expects(:sessions).returns({ 'foo-server' => 'bar' })
+    ::Capistrano::Transfer.expects(:process).never
+    config.put "foo", "bar", :mode => 0644
+  end
+
   def test_add_default_command_options_should_return_bare_options_if_there_is_no_env_or_shell_specified
     assert_equal({:foo => "bar"}, @config.add_default_command_options(:foo => "bar"))
   end
@@ -203,6 +219,12 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
 
   private
 
+    def make_config
+      config = MockConfig.new
+      config.stubs(:logger).returns(stub_everything)
+      config
+    end
+
     def inspectable_proc
       Proc.new do |ch, stream, data|
         ch.called

data/test/configuration/connections_test.rb

@@ -81,6 +81,15 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     assert_instance_of Capistrano::Configuration::Connections::GatewayConnectionFactory, @config.connection_factory
   end
   
+  def test_connection_factory_as_gateway_should_chain_gateways_if_gateway_variable_is_a_hash
+    @config.values[:gateway] = { ["j@gateway1", "k@gateway2"] => :default }
+    gateway1 = mock
+    Net::SSH::Gateway.expects(:new).with("gateway1", "j", :password => nil, :auth_methods => %w(publickey hostbased), :config => false).returns(gateway1)
+    gateway1.expects(:open).returns(65535)
+    Net::SSH::Gateway.expects(:new).with("127.0.0.1", "k", :port => 65535, :password => nil, :auth_methods => %w(publickey hostbased), :config => false).returns(stub_everything)
+    assert_instance_of Capistrano::Configuration::Connections::GatewayConnectionFactory, @config.connection_factory
+  end
+  
   def test_connection_factory_as_gateway_should_share_gateway_between_connections
     @config.values[:gateway] = "j@gateway"
     Net::SSH::Gateway.expects(:new).once.with("gateway", "j", :password => nil, :auth_methods => %w(publickey hostbased), :config => false).returns(stub_everything)
@@ -89,6 +98,26 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     @config.establish_connections_to(server("capistrano"))
     @config.establish_connections_to(server("another"))
   end
+  
+  def test_connection_factory_as_gateway_should_share_gateway_between_like_connections_if_gateway_variable_is_a_hash
+    @config.values[:gateway] = { "j@gateway" => [ "capistrano", "another"] }
+    Net::SSH::Gateway.expects(:new).once.with("gateway", "j", :password => nil, :auth_methods => %w(publickey hostbased), :config => false).returns(stub_everything)
+    Capistrano::SSH.stubs(:connect).returns(stub_everything)
+    assert_instance_of Capistrano::Configuration::Connections::GatewayConnectionFactory, @config.connection_factory
+    @config.establish_connections_to(server("capistrano"))
+    @config.establish_connections_to(server("another"))
+  end
+  
+  def test_connection_factory_as_gateways_should_not_share_gateway_between_unlike_connections_if_gateway_variable_is_a_hash
+    @config.values[:gateway] = { "j@gateway" => [ "capistrano", "another"], "k@gateway2" => "yafhost" }
+    Net::SSH::Gateway.expects(:new).once.with("gateway", "j", :password => nil, :auth_methods => %w(publickey hostbased), :config => false).returns(stub_everything)
+    Net::SSH::Gateway.expects(:new).once.with("gateway2", "k", :password => nil, :auth_methods => %w(publickey hostbased), :config => false).returns(stub_everything)
+    Capistrano::SSH.stubs(:connect).returns(stub_everything)
+    assert_instance_of Capistrano::Configuration::Connections::GatewayConnectionFactory, @config.connection_factory
+    @config.establish_connections_to(server("capistrano"))
+    @config.establish_connections_to(server("another"))
+    @config.establish_connections_to(server("yafhost"))
+  end
 
   def test_establish_connections_to_should_accept_a_single_nonarray_parameter
     Capistrano::SSH.expects(:connect).with { |s,| s.host == "capistrano" }.returns(:success)

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 --recursive", @source.checkout(rev, dest).gsub(/\s+/, ' ')
+    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 --init --recursive", @source.checkout(rev, dest).gsub(/\s+/, ' ')
   end
 
   def test_checkout_with_verbose_should_not_use_q_switch
@@ -92,16 +92,16 @@ class DeploySCMGitTest < Test::Unit::TestCase
   def test_sync
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "cd #{dest} && git fetch -q origin && git reset -q --hard #{rev} && git clean -q -d -x -f", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && git fetch -q origin && git fetch --tags -q origin && git reset -q --hard #{rev} && git clean -q -d -x -f", @source.sync(rev, dest)
 
     # With :scm_command
     git = "/opt/local/bin/git"
     @config[:scm_command] = git
-    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} reset -q --hard #{rev} && #{git} clean -q -d -x -f", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} fetch --tags -q origin && #{git} reset -q --hard #{rev} && #{git} clean -q -d -x -f", @source.sync(rev, dest)
 
     # with submodules
     @config[:git_enable_submodules] = true
-    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} reset -q --hard #{rev} && #{git} submodule -q init && for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done && #{git} submodule -q sync && #{git} submodule -q update && #{git} clean -q -d -x -f", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} fetch --tags -q origin && #{git} reset -q --hard #{rev} && #{git} submodule -q init && for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done && #{git} submodule -q sync && #{git} submodule -q update --init --recursive && #{git} clean -q -d -x -f", @source.sync(rev, dest)
   end
 
   def test_sync_with_remote
@@ -113,7 +113,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:repository] = repository
     @config[:remote] = remote
 
-    assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch -q #{remote} && git reset -q --hard #{rev} && git clean -q -d -x -f", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch -q #{remote} && git fetch --tags -q username && git reset -q --hard #{rev} && git clean -q -d -x -f", @source.sync(rev, dest)
   end
 
   def test_shallow_clone
@@ -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 --recursive", @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 --init --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

@@ -232,7 +232,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
-  def test_with_copy_cache_with_custom_cache_dir_should_use_specified_cache_dir
+  def test_with_copy_cache_with_custom_absolute_cache_dir_path_should_use_specified_cache_dir
     @config[:copy_cache] = "/u/caches/captest"
 
     Dir.stubs(:tmpdir).returns("/temp/dir")
@@ -250,6 +250,25 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
+  def test_with_copy_cache_with_custom_relative_cache_dir_path_should_use_specified_cache_dir
+    @config[:copy_cache] = "caches/captest"
+
+    Dir.stubs(:pwd).returns("/u")
+    Dir.stubs(:tmpdir).returns("/temp/dir")
+    File.expects(:exists?).with("/u/caches/captest").returns(true)
+    Dir.expects(:chdir).with("/u/caches/captest").yields
+
+    @source.expects(:sync).with("154", "/u/caches/captest").returns(:local_sync)
+    @strategy.expects(:system).with(:local_sync)
+
+    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
+
+    prepare_directory_tree!("/u/caches/captest")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
   def test_with_copy_cache_with_excludes_should_not_copy_excluded_files
     @config[:copy_cache] = true
     @config[:copy_exclude] = "*/bar.txt"
@@ -276,13 +295,13 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
       File.expects(:directory?).with("app").returns(true)
       FileUtils.expects(:mkdir).with("/temp/dir/1234567890/app")
       File.expects(:directory?).with("foo.txt").returns(false)
-      FileUtils.expects(:ln).with("#{cache}/foo.txt", "/temp/dir/1234567890/foo.txt")
+      FileUtils.expects(:ln).with("foo.txt", "/temp/dir/1234567890/foo.txt")
 
       Dir.expects(:glob).with("app/*", File::FNM_DOTMATCH).returns(["app/.", "app/..", "app/bar.txt"])
 
       unless exclude
         File.expects(:directory?).with("app/bar.txt").returns(false)
-        FileUtils.expects(:ln).with("#{cache}/app/bar.txt", "/temp/dir/1234567890/app/bar.txt")
+        FileUtils.expects(:ln).with("app/bar.txt", "/temp/dir/1234567890/app/bar.txt")
       end
     end
 

metadata

@@ -1,114 +1,130 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: capistrano
-version: !ruby/object:Gem::Version
-  version: 2.5.22
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 2
+  - 6
+  - 0
+  version: 2.6.0
 platform: ruby
-authors:
+authors: 
 - Jamis Buck
 - Lee Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-03-22 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.14
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 0
+        - 14
         version: 2.0.14
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-sftp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: net-scp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh-gateway
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: net-ssh-gateway
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Capistrano is a utility and framework for executing commands in parallel
-  on multiple remote machines, via SSH.
-email:
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
+email: 
 - jamis@jamisbuck.org
 - lee.hambley@gmail.com
-executables:
+executables: 
 - cap
 - capify
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.mdown
-files:
-- ".gitignore"
-- ".rvmrc"
+files: 
+- .gitignore
+- .rvmrc
 - CHANGELOG
 - Gemfile
 - README.mdown
@@ -217,30 +233,41 @@ files:
 - test/task_definition_test.rb
 - test/transfer_test.rb
 - test/utils.rb
+has_rdoc: true
 homepage: http://github.com/capistrano/capistrano
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
-test_files:
+test_files: 
 - test/cli/execute_test.rb
 - test/cli/help_test.rb
 - test/cli/options_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: dd3e47b31f5733b124cf9106d52ce64876fce150
-  data.tar.gz: e26eb9054ce03bca5b0b54db956d30a070b7fce7
-SHA512:
-  metadata.gz: c2e3dbcfed0c70cfa919c8269eecfe54bddc14881bc5d480d934a75be37cfdc584bb45af515813bd82901bfb9bb17fb19a3fcf81e391b08029215e7e62afc50d
-  data.tar.gz: d643fa943cb3408cb66eaf4255e44afb5c48bd98d1d9e105657b3970135c13344b22c9b3195f4bcbb8b5186f50d807a51cac53cb70acd10a97fe67c822ef4da7