capistrano 2.6.1.pre → 2.7.0

data/CHANGELOG

@@ -14,8 +14,8 @@ implemented simply as `self.gsub(/\s+/, ' ')`.
 Here's the run-down of changes, and their committers, as always - a huge thank
 you to the community that continues to drive Capistrano's development.
 
-* `deploy:setup` now respects `:group_writable` (Mathew Davies)
-* Fixes to `:scm_verbose` for the Git module (defaults to On.) (Daniel Duvall)
+* `deploy:setup` now respects `:group_writable` (Daniel Duvall)
+* Fixes to `:scm_verbose` for the Git module (defaults to On.) (Matthew Davies)
 * Will now copy hidden files in the project's root into the release
 directory (Mark Jaquith)
 * Now handles closing already-dead connections in a sane way (does not raise

data/Gemfile

@@ -3,4 +3,12 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in capistrano.gemspec
 gemspec
 
-gem "rake"
+#
+# Development Dependencies from the Gemfile 
+# are merged here.
+#
+group :development do
+  gem 'rake'
+  gem 'ruby-debug',   :platform => :mri_18
+  gem 'ruby-debug19', :platform => :mri_19
+end

data/README.mdown

@@ -1,8 +1,15 @@
 ## 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.
+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
 
@@ -16,17 +23,18 @@ Capistrano was originally designed to simplify and automate deployment of web ap
 * [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](https://github.com/fauna/echoe)
-* [Mocha](http://mocha.rubyforge.org)
+If you want to run the tests, you'll also need to install the dependencies with
+Bundler, see the `Gemfile` within .
 
 ## ASSUMPTIONS
 
-Capistrano is "opinionated software", which means it has very firm ideas about how things ought to be done, and tries to force those ideas on you. Some of the assumptions behind these opinions are:
+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.
+* 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.
 
@@ -39,9 +47,12 @@ In general, you'll use Capistrano as follows:
 
 Use the `cap` script as follows:
 
-    cap sometask
+		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.
+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:
 

data/lib/capistrano/cli/help.txt

@@ -33,7 +33,7 @@ The following options are understood:
 
   <%= color '-n, --dry-run', :bold %>
 	Causes Capistrano to simply display each remote command, without executing it. In this sense it is similar to --debug, but without the prompt. Note that commands executed locally are still run--only remote commands are skipped.
-  
+
   <%= color '-p, --password', :bold %>
 	Normally, cap will prompt for the password on-demand, the first time it is needed. This can make it hard to walk away from Capistrano, since you might not know if it will prompt for a password down the road. In such cases, you can use the -p option to force cap to prompt for the password immediately.
 

data/lib/capistrano/cli/options.rb

@@ -54,9 +54,9 @@ module Capistrano
             exit
           end
 
-					opts.on("-l", "--logger [STDERR|STDOUT|file]", 
+					opts.on("-l", "--logger [STDERR|STDOUT|file]",
 						"Choose logger method. STDERR used by default."
-					) do |value| 
+					) do |value|
 						options[:output] = if value.nil? || value.upcase == 'STDERR'
 																 # Using default logger.
 																 nil
@@ -201,7 +201,7 @@ module Capistrano
       def default_sysconf #:nodoc:
         File.join(sysconf_directory, "capistrano.conf")
       end
-      
+
       def default_dotfile #:nodoc:
         File.join(home_directory, ".caprc")
       end
@@ -211,7 +211,7 @@ module Capistrano
         # appropriate location for this file in Windows.
         ENV["SystemRoot"] || '/etc'
       end
-      
+
       def home_directory #:nodoc:
         ENV["HOME"] ||
           (ENV["HOMEPATH"] && "#{ENV["HOMEDRIVE"]}#{ENV["HOMEPATH"]}") ||

data/lib/capistrano/cli/ui.rb

@@ -22,7 +22,7 @@ module Capistrano
         def password_prompt(prompt="Password: ")
           ui.ask(prompt) { |q| q.echo = false }
         end
-        
+
         # Debug mode prompt
         def debug_prompt(cmd)
           ui.say("Preparing to execute command: #{cmd}")
@@ -37,4 +37,4 @@ module Capistrano
       end
     end
   end
-end
+end

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

@@ -111,6 +111,9 @@ module Capistrano
         # * :except - specifies a condition limiting which hosts will be selected to
         #   run the command. This is the inverse of :only (hosts that do _not_ match
         #   the condition will be selected).
+        # * :on_no_matching_servers - if :continue, will continue to execute tasks if
+        #   no matching servers are found for the host criteria. The default is to raise
+        #   a NoMatchingServersError exception.
         # * :once - if true, only the first matching server will be selected. The default
         #   is false (all matching servers will be selected).
         # * :max_hosts - specifies the maximum number of hosts that should be selected

data/lib/capistrano/configuration/connections.rb

@@ -156,7 +156,7 @@ module Capistrano
           servers = find_servers_for_task(task, options)
 
           if servers.empty?
-            if ENV['HOSTFILTER']
+            if ENV['HOSTFILTER'] || task.options.merge(options)[:on_no_matching_servers] == :continue
               logger.info "skipping `#{task.fully_qualified_name}' because no servers matched"
               return
             else
@@ -170,7 +170,10 @@ module Capistrano
           end
         else
           servers = find_servers(options)
-          raise Capistrano::NoMatchingServersError, "no servers found to match #{options.inspect}" if servers.empty?
+          if servers.empty?
+            raise Capistrano::NoMatchingServersError, "no servers found to match #{options.inspect}" if options[:on_no_matching_servers] != :continue
+            return
+          end
         end
 
         servers = [servers.first] if options[:once]

data/lib/capistrano/recipes/deploy.rb

@@ -56,7 +56,7 @@ _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}", :except => { :no_release => true }).split.sort }
-_cset(:current_release)   { File.join(releases_path, releases.last) }
+_cset(:current_release)   { releases.length > 0 ? File.join(releases_path, releases.last) : nil }
 _cset(:previous_release)  { releases.length > 1 ? File.join(releases_path, releases[-2]) : nil }
 
 _cset(:current_revision)  { capture("cat #{current_path}/REVISION",     :except => { :no_release => true }).chomp }
@@ -304,23 +304,11 @@ namespace :deploy do
   end
 
   desc <<-DESC
-    Restarts your application. This works by calling the script/process/reaper \
-    script under the current path.
-    
-    If you are deploying a Rails 2.3.x application, you will need to install 
-    these http://github.com/rails/irs_process_scripts (more info about why
-    on that page.)
-    
-    By default, this will be invoked via sudo as the `app' user. If \
-    you wish to run it as a different user, set the :runner variable to \
-    that user. If you are in an environment where you can't use sudo, set \
-    the :use_sudo variable to false:
-    
-      set :use_sudo, false
+    Blank task exists as a hook into which to install your own environment \
+    specific behaviour.
   DESC
   task :restart, :roles => :app, :except => { :no_release => true } do
-    warn "[DEPRECATED] `deploy:restart` is going to be changed to Passenger mod_rails' method after 2.5.9 - see http://is.gd/2BPeA"
-    try_runner "#{current_path}/script/process/reaper"
+    # Empty Task to overload with your platform specifics
   end
 
   namespace :rollback do
@@ -488,37 +476,19 @@ namespace :deploy do
   end
 
   desc <<-DESC
-    Start the application servers. This will attempt to invoke a script \
-    in your application called `script/spin', which must know how to start \
-    your application listeners. For Rails applications, you might just have \
-    that script invoke `script/process/spawner' with the appropriate \
-    arguments.
-
-    By default, the script will be executed via sudo as the `app' user. If \
-    you wish to run it as a different user, set the :runner variable to \
-    that user. If you are in an environment where you can't use sudo, set \
-    the :use_sudo variable to false.
+    Blank task exists as a hook into which to install your own environment \
+    specific behaviour.
   DESC
   task :start, :roles => :app do
-    warn "[DEPRECATED] `deploy:start` is going to be removed after 2.5.9 - see http://is.gd/2BPeA"
-    run "cd #{current_path} && #{try_runner} nohup script/spin"
+    # Empty Task to overload with your platform specifics
   end
 
   desc <<-DESC
-    Stop the application servers. This will call script/process/reaper for \
-    both the spawner process, and all of the application processes it has \
-    spawned. As such, it is fairly Rails specific and may need to be \
-    overridden for other systems.
-
-    By default, the script will be executed via sudo as the `app' user. If \
-    you wish to run it as a different user, set the :runner variable to \
-    that user. If you are in an environment where you can't use sudo, set \
-    the :use_sudo variable to false.
+    Blank task exists as a hook into which to install your own environment \
+    specific behaviour.
   DESC
   task :stop, :roles => :app do
-    warn "[DEPRECATED] `deploy:start` is going to be removed after 2.5.9 - see http://is.gd/2BPeA"
-    run "if [ -f #{current_path}/tmp/pids/dispatch.spawner.pid ]; then #{try_runner} #{current_path}/script/process/reaper -a kill -r dispatch.spawner.pid; fi"
-    try_runner "#{current_path}/script/process/reaper -a kill"
+    # Empty Task to overload with your platform specifics
   end
 
   namespace :pending do

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

@@ -148,7 +148,11 @@ module Capistrano
           if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
-            execute << "#{git} submodule #{verbose} update --init --recursive"
+            if false == variable(:git_submodules_recursive)
+              execute << "#{git} submodule #{verbose} update --init"
+            else
+              execute << "#{git} submodule #{verbose} update --init --recursive"
+            end
           end
 
           execute.join(" && ").compact
@@ -187,7 +191,11 @@ module Capistrano
             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 --init --recursive"
+            if false == variable(:git_submodules_recursive)
+              execute << "#{git} submodule #{verbose} update --init"
+            else
+              execute << "#{git} submodule #{verbose} update --init --recursive"
+            end
           end
 
           # Make sure there's nothing else lying around in the repository (for

data/lib/capistrano/task_definition.rb

@@ -4,13 +4,13 @@ module Capistrano
   # Represents the definition of a single task.
   class TaskDefinition
     attr_reader :name, :namespace, :options, :body, :desc, :on_error, :max_hosts
-    
+
     def initialize(name, namespace, options={}, &block)
-      
+
       if name.to_s =~ /^(?:before_|after_)/
         Kernel.warn("[Deprecation Warning] Naming tasks with before_ and after_ is deprecated, please see the new before() and after() methods. (Offending task name was #{name})")
       end
-      
+
       @name, @namespace, @options = name, namespace, options
       @desc = @options.delete(:desc)
       @on_error = options.delete(:on_error)
@@ -18,7 +18,7 @@ module Capistrano
       @body = block or raise ArgumentError, "a task requires a block"
       @servers = nil
     end
-    
+
     # Returns the task's fully-qualified name, including the namespace
     def fully_qualified_name
       @fully_qualified_name ||= begin
@@ -29,7 +29,7 @@ module Capistrano
         end
       end
     end
-    
+
     # Returns the description for this task, with newlines collapsed and
     # whitespace stripped. Returns the empty string if there is no
     # description for this task.
@@ -37,7 +37,7 @@ module Capistrano
       @description = nil if rebuild
       @description ||= begin
         description = @desc || ""
-        
+
         indentation = description[/\A\s+/]
         if indentation
           reformatted_description = ""

data/lib/capistrano/version.rb

@@ -4,11 +4,11 @@ module Capistrano
   class Version
 
     MAJOR = 2
-    MINOR = 6
-    PATCH = 1
+    MINOR = 7
+    PATCH = 0
 
     def self.to_s
-      "#{MAJOR}.#{MINOR}.#{PATCH}.pre"
+      "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
 
   end

data/test/cli/options_test.rb

@@ -198,7 +198,7 @@ class CLIOptionsTest < Test::Unit::TestCase
 
   def test_parse_options_with_V_should_show_version_and_exit
     @cli.args << "-V"
-    @cli.expects(:puts).with { |s| s.include?(Capistrano::Version::STRING) }
+    @cli.expects(:puts).with { |s| s.include?(Capistrano::Version.to_s) }
     @cli.expects(:exit).raises(ExitException)
     assert_raises(ExitException) { @cli.parse_options! }
   end

data/test/command_test.rb

@@ -214,7 +214,9 @@ class CommandTest < Test::Unit::TestCase
                 mock_session(new_channel[10]),
                 mock_session(new_channel[7])]
     cmd = Capistrano::Command.new("ls", sessions)
-    assert_nothing_raised { cmd.process! }
+    assert_nothing_raised do
+      cmd.process!
+    end
   end
 
   def test_process_should_instantiate_command_and_process!
@@ -240,11 +242,12 @@ class CommandTest < Test::Unit::TestCase
   private
 
     def mock_session(channel=nil)
-      stub('session', :open_channel => channel,
-        :preprocess => true,
-        :postprocess => true,
-        :listeners => {},
-        :xserver => server("capistrano"))
+      stub('session',
+           :open_channel => channel,
+           :preprocess   => true,
+           :postprocess  => true,
+           :listeners    => {},
+           :xserver      => server("capistrano"))
     end
 
     class MockChannel < Hash

data/test/configuration/connections_test.rb

@@ -71,7 +71,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     Net::SSH::Gateway.expects(:new).with("gateway", "user", :debug => :verbose, :port => 8080, :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_chain_gateways_if_gateway_variable_is_an_array
     @config.values[:gateway] = ["j@gateway1", "k@gateway2"]
     gateway1 = mock
@@ -80,7 +80,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     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_chain_gateways_if_gateway_variable_is_a_hash
     @config.values[:gateway] = { ["j@gateway1", "k@gateway2"] => :default }
     gateway1 = mock
@@ -89,7 +89,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     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)
@@ -98,7 +98,7 @@ 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)
@@ -107,7 +107,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     @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)
@@ -123,23 +123,23 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     Capistrano::SSH.expects(:connect).with { |s,| s.host == "capistrano" }.returns(:success)
     assert @config.sessions.empty?
     @config.establish_connections_to(server("capistrano"))
-    assert ["capistrano"], @config.sessions.keys
+    assert_equal ["capistrano"], @config.sessions.keys.map(&:host)
   end
 
   def test_establish_connections_to_should_accept_an_array
     Capistrano::SSH.expects(:connect).times(3).returns(:success)
     assert @config.sessions.empty?
     @config.establish_connections_to(%w(cap1 cap2 cap3).map { |s| server(s) })
-    assert %w(cap1 cap2 cap3), @config.sessions.keys.sort
+    assert_equal %w(cap1 cap2 cap3), @config.sessions.keys.sort.map(&:host)
   end
 
   def test_establish_connections_to_should_not_attempt_to_reestablish_existing_connections
     Capistrano::SSH.expects(:connect).times(2).returns(:success)
     @config.sessions[server("cap1")] = :ok
     @config.establish_connections_to(%w(cap1 cap2 cap3).map { |s| server(s) })
-    assert %w(cap1 cap2 cap3), @config.sessions.keys.sort.map { |s| s.host }
+    assert_equal %w(cap1 cap2 cap3), @config.sessions.keys.sort.map(&:host)
   end
-  
+
   def test_establish_connections_to_should_raise_one_connection_error_on_failure
     Capistrano::SSH.expects(:connect).times(2).raises(Exception)
     assert_raises(Capistrano::ConnectionError) {
@@ -149,7 +149,6 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
 
   def test_connection_error_should_include_accessor_with_host_array
     Capistrano::SSH.expects(:connect).times(2).raises(Exception)
-
     begin
       @config.establish_connections_to(%w(cap1 cap2).map { |s| server(s) })
       flunk "expected an exception to be raised"
@@ -158,7 +157,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       assert_equal %w(cap1 cap2), e.hosts.map { |h| h.to_s }.sort
     end
   end
-  
+
   def test_connection_error_should_only_include_failed_hosts
     Capistrano::SSH.expects(:connect).with(server('cap1'), anything).raises(Exception)
     Capistrano::SSH.expects(:connect).with(server('cap2'), anything).returns(:success)
@@ -189,6 +188,11 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     assert_raises(Capistrano::NoMatchingServersError) { @config.execute_on_servers(:a => :b, :c => :d) { |list| } }
   end
 
+  def test_execute_on_servers_without_current_task_should_not_raise_error_if_no_matching_servers_and_continue_on_no_matching_servers
+    @config.expects(:find_servers).with(:a => :b, :c => :d, :on_no_matching_servers => :continue).returns([])
+    assert_nothing_raised { @config.execute_on_servers(:a => :b, :c => :d, :on_no_matching_servers => :continue) { |list| } }
+  end
+
   def test_execute_on_servers_should_raise_an_error_if_the_current_task_has_no_matching_servers_by_default
     @config.current_task = mock_task
     @config.expects(:find_servers_for_task).with(@config.current_task, {}).returns([])
@@ -198,7 +202,27 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       end
     end
   end
-  
+
+  def test_execute_on_servers_should_not_raise_an_error_if_the_current_task_has_no_matching_servers_by_default_and_continue_on_no_matching_servers
+    @config.current_task = mock_task(:on_no_matching_servers => :continue)
+    @config.expects(:find_servers_for_task).with(@config.current_task, {}).returns([])
+    assert_nothing_raised do
+      @config.execute_on_servers do
+        flunk "should not get here"
+      end
+    end
+  end
+
+  def test_execute_on_servers_should_not_raise_an_error_if_the_current_task_has_no_matching_servers_by_default_and_command_continues_on_no_matching_servers
+    @config.current_task = mock_task
+    @config.expects(:find_servers_for_task).with(@config.current_task, :on_no_matching_servers => :continue).returns([])
+    assert_nothing_raised do
+      @config.execute_on_servers(:on_no_matching_servers => :continue) do
+        flunk "should not get here"
+      end
+    end
+  end
+
   def test_execute_on_servers_should_determine_server_list_from_active_task
     assert @config.sessions.empty?
     @config.current_task = mock_task
@@ -237,7 +261,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     assert block_called
     assert_equal %w(cap1), @config.sessions.keys.sort.map { |s| s.host }
   end
-  
+
   def test_execute_servers_should_raise_connection_error_on_failure_by_default
     @config.current_task = mock_task
     @config.expects(:find_servers_for_task).with(@config.current_task, {}).returns([server("cap1")])
@@ -248,7 +272,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_execute_servers_should_not_raise_connection_error_on_failure_with_on_errors_continue
     @config.current_task = mock_task(:on_error => :continue)
     @config.expects(:find_servers_for_task).with(@config.current_task, {}).returns([server("cap1"), server("cap2")])
@@ -260,7 +284,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       end
     }
   end
-  
+
   def test_execute_on_servers_should_not_try_to_connect_to_hosts_with_connection_errors_with_on_errors_continue
     list = [server("cap1"), server("cap2")]
     @config.current_task = mock_task(:on_error => :continue)
@@ -275,7 +299,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       assert_equal %w(cap2), servers.map { |s| s.host }
     end
   end
-  
+
   def test_execute_on_servers_should_not_try_to_connect_to_hosts_with_command_errors_with_on_errors_continue
     cap1 = server("cap1")
     cap2 = server("cap2")
@@ -292,7 +316,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       assert_equal %w(cap2), servers.map { |s| s.host }
     end
   end
-  
+
   def test_execute_on_servers_should_not_try_to_connect_to_hosts_with_transfer_errors_with_on_errors_continue
     cap1 = server("cap1")
     cap2 = server("cap2")
@@ -309,7 +333,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
       assert_equal %w(cap2), servers.map { |s| s.host }
     end
   end
-  
+
   def test_connect_should_establish_connections_to_all_servers_in_scope
     assert @config.sessions.empty?
     @config.current_task = mock_task
@@ -318,7 +342,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     @config.connect!
     assert_equal %w(cap1 cap2 cap3), @config.sessions.keys.sort.map { |s| s.host }
   end
-  
+
   def test_execute_on_servers_should_only_run_on_tasks_max_hosts_hosts_at_once
     cap1 = server("cap1")
     cap2 = server("cap2")
@@ -336,7 +360,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     end
     assert_equal 2, block_called
   end
-  
+
   def test_execute_on_servers_should_only_run_on_max_hosts_hosts_at_once
     cap1 = server("cap1")
     cap2 = server("cap2")
@@ -354,7 +378,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     end
     assert_equal 2, block_called
   end
-  
+
   def test_execute_on_servers_should_cope_with_already_dropped_connections_when_attempting_to_close_them
     cap1 = server("cap1")
     cap2 = server("cap2")
@@ -372,7 +396,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     @config.execute_on_servers {}
     @config.execute_on_servers {}
   end
-  
+
   def test_connect_should_honor_once_option
     assert @config.sessions.empty?
     @config.current_task = mock_task

data/test/configuration/loading_test.rb

@@ -1,4 +1,4 @@
-require "utils"
+require 'utils'
 require 'capistrano/configuration/loading'
 
 class ConfigurationLoadingTest < Test::Unit::TestCase
@@ -106,7 +106,7 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
 
   def test_require_from_config_should_load_file_in_config_scope
     assert_nothing_raised do
-      @config.require "#{File.dirname(__FILE__)}/../fixtures/custom"
+      @config.require "#{File.expand_path(File.dirname(__FILE__))}/../fixtures/custom"
     end
     assert_equal :custom, @config.ping
   end
@@ -118,14 +118,14 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
   end
 
   def test_require_from_config_should_return_false_when_called_a_second_time_with_same_args
-    assert @config.require("#{File.dirname(__FILE__)}/../fixtures/custom")
-    assert_equal false, @config.require("#{File.dirname(__FILE__)}/../fixtures/custom")
+    assert @config.require("#{File.expand_path(File.dirname(__FILE__))}/../fixtures/custom")
+    assert_equal false, @config.require("#{File.expand_path(File.dirname(__FILE__))}/../fixtures/custom")
   end
-  
+
   def test_require_in_multiple_instances_should_load_recipes_in_each_instance
     config2 = MockConfig.new
-    @config.require "#{File.dirname(__FILE__)}/../fixtures/custom"
-    config2.require "#{File.dirname(__FILE__)}/../fixtures/custom"
+    @config.require "#{File.expand_path(File.dirname(__FILE__))}/../fixtures/custom"
+    config2.require "#{File.expand_path(File.dirname(__FILE__))}/../fixtures/custom"
     assert_equal :custom, @config.ping
     assert_equal :custom, config2.ping
   end

data/test/recipes_test.rb

@@ -0,0 +1,25 @@
+require 'utils'
+require 'capistrano/configuration'
+
+class RecipesTest < Test::Unit::TestCase
+
+  def setup
+    @config = Capistrano::Configuration.new
+    @config.stubs(:logger).returns(stub_everything)
+  end
+
+  def test_current_releases_does_not_cause_error_on_dry_run
+    @config.dry_run = true
+    @config.load 'deploy'
+    @config.load do
+      set :application, "foo"
+      task :dry_run_test do
+        fetch :current_release
+      end
+    end
+
+    assert_nothing_raised do
+      @config.dry_run_test
+    end
+  end
+end

data/test/utils.rb

@@ -1,12 +1,10 @@
-begin
-  require 'rubygems'
-  require 'redgreen' unless ENV['TM_FILENAME']
-  gem     'mocha'
-rescue LoadError
-end
+require 'rubygems'
+require 'bundler/setup'
 
+require 'ruby-debug'
 require 'test/unit'
 require 'mocha'
+
 require 'capistrano/server_definition'
 
 module TestExtensions

metadata

@@ -1,136 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano
-version: !ruby/object:Gem::Version 
-  hash: 961915984
-  prerelease: 6
-  segments: 
-  - 2
-  - 6
-  - 1
-  - pre
-  version: 2.6.1.pre
+version: !ruby/object:Gem::Version
+  version: 2.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jamis Buck
 - Lee Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-22 00:00:00 +01:00
+date: 2011-03-22 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157549420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157549420
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &2157642760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 0
-        - 14
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.14
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157642760
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: &2157664760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: net-scp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157664760
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: &2157664160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: net-ssh-gateway
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2157664160
+- !ruby/object:Gem::Dependency
+  name: net-ssh-gateway
+  requirement: &2157663580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2157663580
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2157663000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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: 
+  prerelease: false
+  version_requirements: *2157663000
+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: 
+files:
 - .gitignore
 - .rvmrc
 - CHANGELOG
 - Gemfile
 - README.mdown
 - Rakefile
-- VERSION
 - bin/cap
 - bin/capify
 - capistrano.gemspec
@@ -228,6 +194,7 @@ files:
 - test/fixtures/config.rb
 - test/fixtures/custom.rb
 - test/logger_test.rb
+- test/recipes_test.rb
 - test/role_test.rb
 - test/server_definition_test.rb
 - test/shell_test.rb
@@ -238,40 +205,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/capistrano/capistrano
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 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
@@ -306,6 +262,7 @@ test_files:
 - test/fixtures/config.rb
 - test/fixtures/custom.rb
 - test/logger_test.rb
+- test/recipes_test.rb
 - test/role_test.rb
 - test/server_definition_test.rb
 - test/shell_test.rb

data/VERSION

@@ -1 +0,0 @@
-2.6.0