capistrano 2.5.0 → 2.5.1

data/CHANGELOG.rdoc

@@ -1,3 +1,32 @@
+== 2.5.1 / November 7, 2008
+
+* Add -t (--tools) switch for better task lists for external tools [Jamis Buck]
+
+* Make the RemoteDependency#try method use invoke_command instead of run, for sudo-ability [Matthias Marschall]
+
+* Make locally executed commands in Windows more Windows-friendly [esad@esse.at]
+
+* Added :scm_arguments variable for custom SCM arguments (subversion-only, currently) [David Abdemoulaie]
+
+* Don't emit -p for sudo when :sudo_prompt is blank [Matthias Marschall]
+
+* Copy symlinks when using rsync [Paul Paradise]
+
+* Make sure git query-revision matches on exact branch name [grant@nightriot.com]
+
+* Use -T <arg> to filter listed tasks by a pattern [Mathias Meyer, Geoffrey Grosenbach]
+
+* Expose the #scm method on SCM::Base for building custom scm commands [Mathias Meyer]
+
+* Start logging some locally executed commands [springyweb]
+
+* Added HOSTFILTER environment variable for constraining tasks so they run only on hosts matching the given list of servers [Walter Smith]
+
+* Make sure the glob matching for copy excludes does not delete parent directories [Fabio Akita]
+
+* Ruby 1.9 compatibility [Jamis Buck]
+
+
 == 2.5.0 / August 28, 2008
 
 * Allow :gateway to be set to an array, in which case a chain of tunnels is created [Kerry Buckley]

data/capistrano.gemspec

@@ -1,14 +1,14 @@
 
-# Gem::Specification for Capistrano-2.5.0
+# Gem::Specification for Capistrano-2.5.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano}
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-08-28}
+  s.date = %q{2008-11-07}
   s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
   s.email = %q{jamis@jamisbuck.org}
   s.executables = ["cap", "capify"]

data/lib/capistrano/cli/help.rb

@@ -12,7 +12,7 @@ module Capistrano
 
       def execute_requested_actions_with_help(config)
         if options[:tasks]
-          task_list(config)
+          task_list(config, options[:tasks])
         elsif options[:explain]
           explain_task(config, options[:explain])
         else
@@ -20,11 +20,19 @@ module Capistrano
         end
       end
 
-      def task_list(config) #:nodoc:
-        tasks = config.task_list(:all)
+      def task_list(config, pattern = true) #:nodoc:
+        tool_output = options[:tool]
+
+        if pattern.is_a?(String)
+          tasks = config.task_list(:all).select {|t| t.fully_qualified_name =~ /#{pattern}/}
+        end
+        if tasks.nil? || tasks.length == 0
+          warn "Pattern '#{pattern}' not found. Listing all tasks.\n\n" if !tool_output && !pattern.is_a?(TrueClass)
+          tasks = config.task_list(:all)
+        end
 
         if tasks.empty?
-          warn "There are no tasks available. Please specify a recipe file to load."
+          warn "There are no tasks available. Please specify a recipe file to load." unless tool_output
         else
           all_tasks_length = tasks.length
           if options[:verbose].to_i < 1
@@ -38,19 +46,25 @@ module Capistrano
           max_length = MIN_MAX_LEN if max_length < MIN_MAX_LEN
 
           tasks.each do |task|
-            puts "cap %-#{longest}s # %s" % [task.fully_qualified_name, task.brief_description(max_length)]
+            if tool_output
+              puts "cap #{task.fully_qualified_name}"
+            else
+              puts "cap %-#{longest}s # %s" % [task.fully_qualified_name, task.brief_description(max_length)]
+            end
           end
 
-          if all_tasks_length > tasks.length
+          unless tool_output
+            if all_tasks_length > tasks.length
+              puts
+              puts "Some tasks were not listed, either because they have no description,"
+              puts "or because they are only used internally by other tasks. To see all"
+              puts "tasks, type `#{File.basename($0)} -vT'."
+            end
+
             puts
-            puts "Some tasks were not listed, either because they have no description,"
-            puts "or because they are only used internally by other tasks. To see all"
-            puts "tasks, type `#{File.basename($0)} -Tv'."
+            puts "Extended help may be available for these tasks."
+            puts "Type `#{File.basename($0)} -e taskname' to view it."
           end
-
-          puts
-          puts "Extended help may be available for these tasks."
-          puts "Type `#{File.basename($0)} -e taskname' to view it."
         end
       end
 
@@ -101,4 +115,4 @@ module Capistrano
       end
     end
   end
-end
+end

data/lib/capistrano/cli/help.txt

@@ -43,8 +43,11 @@ The following options are understood:
   <%= color '-s, --set NAME=VALUE', :bold %>
 	Sets the given variable to the given value, after loading all recipe files. This is useful when you want to override the value of a variable which is used in a task. Note that this will set the variables too late for them to affect conditions that are executed as the recipes are loaded.
 
-  <%= color '-T, --tasks', :bold %>
-	Displays the list of all tasks in all loaded recipe files. If a task has no description, or if the description starts with the [internal] tag, the task will not be listed unless you also specify -v.
+  <%= color '-T, --tasks PATTERN', :bold %>
+	Displays the list of all tasks (matching optional PATTERN) in all loaded recipe files. If a task has no description, or if the description starts with the [internal] tag, the task will not be listed unless you also specify -v.
+
+  <%= color '-t, --tool', :bold %>
+	Abbreviates the output of -T for integration with other tools. Without -t, -T will list tasks with their summaries, and may include additional instructive text at the bottom. When integrating with other tools (e.g., bash auto-expansion and the like) that additional text can get in the way. This switch makes it easier for those tools to parse the list of tasks. (The -t switch has no effect if the -T switch is not specified.)
 
   <%= color '-V, --version', :bold %>
 	Shows the current Capistrano version number and exits.

data/lib/capistrano/cli/options.rb

@@ -79,13 +79,21 @@ module Capistrano
             options[:vars][name.to_sym] = value
           end
 
-          opts.on("-T", "--tasks",
-            "List all tasks in the loaded recipe files."
-          ) do 
-            options[:tasks] = true
+          opts.on("-T", "--tasks [PATTERN]",
+            "List all tasks (matching optional PATTERN) in the loaded recipe files."
+          ) do |value|
+            options[:tasks] = if value
+              value
+            else
+              true
+            end
             options[:verbose] ||= 0
           end
 
+          opts.on("-t", "--tool",
+            "Abbreviates the output of -T for tool integration."
+          ) { options[:tool] = true }
+
           opts.on("-V", "--version",
             "Display the Capistrano version, and exit."
           ) do
@@ -96,7 +104,10 @@ module Capistrano
 
           opts.on("-v", "--verbose",
             "Be more verbose. May be given more than once."
-          ) { options[:verbose] ||= 0; options[:verbose] += 1 }
+          ) do
+            options[:verbose] ||= 0
+            options[:verbose] += 1
+          end
 
           opts.on("-X", "--skip-system-config",
             "Don't load the system config file (capistrano.conf)"

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

@@ -103,7 +103,8 @@ module Capistrano
           command = parameters.first
           user = options[:as] && "-u #{options.delete(:as)}"
 
-          sudo_command = [fetch(:sudo, "sudo"), "-p '#{sudo_prompt}'", user].compact.join(" ")
+          sudo_prompt_option = "-p '#{sudo_prompt}'" unless sudo_prompt.empty?
+          sudo_command = [fetch(:sudo, "sudo"), sudo_prompt_option, user].compact.join(" ")
 
           if command
             command = sudo_command + " " + command

data/lib/capistrano/configuration/connections.rb

@@ -131,7 +131,12 @@ module Capistrano
           servers = find_servers_for_task(task, options)
 
           if servers.empty?
-            raise Capistrano::NoMatchingServersError, "`#{task.fully_qualified_name}' is only run for servers matching #{task.options.inspect}, but no servers matched"
+            if ENV['HOSTFILTER']
+              logger.info "skipping `#{task.fully_qualified_name}' because no servers matched"
+              return
+            else
+              raise Capistrano::NoMatchingServersError, "`#{task.fully_qualified_name}' is only run for servers matching #{task.options.inspect}, but no servers matched"
+            end
           end
 
           if task.continue_on_error?

data/lib/capistrano/configuration/namespaces.rb

@@ -67,7 +67,7 @@ module Capistrano
         raise ArgumentError, "expected a block" unless block_given?
 
         namespace_already_defined = namespaces.key?(name)
-        if all_methods.include?(name.to_s) && !namespace_already_defined
+        if all_methods.any? { |m| m.to_sym == name } && !namespace_already_defined
           thing = tasks.key?(name) ? "task" : "method"
           raise ArgumentError, "defining a namespace named `#{name}' would shadow an existing #{thing} with that name"
         end
@@ -92,7 +92,7 @@ module Capistrano
         raise ArgumentError, "expected a block" unless block_given?
 
         task_already_defined = tasks.key?(name)
-        if all_methods.include?(name.to_s) && !task_already_defined
+        if all_methods.any? { |m| m.to_sym == name } && !task_already_defined
           thing = namespaces.key?(name) ? "namespace" : "method"
           raise ArgumentError, "defining a task named `#{name}' would shadow an existing #{thing} with that name"
         end

data/lib/capistrano/configuration/servers.rb

@@ -21,6 +21,9 @@ module Capistrano
       # variable will take precedence over other options. If both HOSTS and
       # ROLES are given, HOSTS wins.
       #
+      # Yet additionally, if the HOSTFILTER environment variable is set, it
+      # will limit the result to hosts found in that (comma-separated) list.
+      #
       # Usage:
       #
       #   # return all known servers
@@ -37,7 +40,7 @@ module Capistrano
         hosts  = server_list_from(ENV['HOSTS'] || options[:hosts])
         
         if hosts.any?
-          hosts.uniq
+          filter_server_list(hosts.uniq)
         else
           roles  = role_list_from(ENV['ROLES'] || options[:roles] || self.roles.keys)
           only   = options[:only] || {}
@@ -46,12 +49,18 @@ module Capistrano
           servers = roles.inject([]) { |list, role| list.concat(self.roles[role]) }
           servers = servers.select { |server| only.all? { |key,value| server.options[key] == value } }
           servers = servers.reject { |server| except.any? { |key,value| server.options[key] == value } }
-          servers.uniq
+          filter_server_list(servers.uniq)
         end
       end
 
     protected
 
+      def filter_server_list(servers)
+        return servers unless ENV['HOSTFILTER']
+        filters = ENV['HOSTFILTER'].split(/,/)
+        servers.select { |server| filters.include?(server.host) }
+      end
+
       def server_list_from(hosts)
         hosts = hosts.split(/,/) if String === hosts
         hosts = build_list(hosts)

data/lib/capistrano/extensions.rb

@@ -25,7 +25,7 @@ module Capistrano
       Capistrano::Configuration.protected_instance_methods +
       Capistrano::Configuration.private_instance_methods
 
-    if methods.include?(name.to_s)
+    if methods.any? { |m| m.to_sym == name }
       raise Capistrano::Error, "registering a plugin named `#{name}' would shadow a method on Capistrano::Configuration with the same name"
     end
 

data/lib/capistrano/logger.rb

@@ -30,7 +30,7 @@ module Capistrano
     def log(level, message, line_prefix=nil)
       if level <= self.level
         indent = "%*s" % [MAX_LEVEL, "*" * (MAX_LEVEL - level)]
-        message.each do |line|
+        (RUBY_VERSION >= "1.9" ? message.lines : message).each do |line|
           if line_prefix
             device.puts "#{indent} [#{line_prefix}] #{line.strip}\n"
           else

data/lib/capistrano/recipes/deploy.rb

@@ -34,7 +34,7 @@ _cset(:revision)  { source.head }
 # =========================================================================
 
 _cset(:source)            { Capistrano::Deploy::SCM.new(scm, self) }
-_cset(:real_revision)     { source.local.query_revision(revision) { |cmd| with_env("LC_ALL", "C") { `#{cmd}` } } }
+_cset(:real_revision)     { source.local.query_revision(revision) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } } }
 
 _cset(:strategy)          { Capistrano::Deploy::Strategy.new(deploy_via, self) }
 
@@ -90,6 +90,13 @@ ensure
   ENV[name] = saved
 end
 
+# logs the command then executes it locally.
+# returns the command output as a string
+def run_locally(cmd)
+  logger.trace "executing locally: #{cmd.inspect}" if logger
+  `#{cmd}`
+end
+
 # If a command is given, this will try to execute the given command, as
 # described below. Otherwise, it will return a string for use in embedding in
 # another command, for executing that command as described below.

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

@@ -9,6 +9,7 @@ module Capistrano
       def initialize(configuration)
         @configuration = configuration
         @success = true
+        @hosts = nil
       end
 
       def directory(path, options={})
@@ -83,7 +84,7 @@ module Capistrano
 
       def message
         s = @message.dup
-        s << " (#{@hosts})" if @hosts && @hosts.any?
+        s << " (#{@hosts})" if @hosts
         s
       end
 
@@ -91,7 +92,7 @@ module Capistrano
 
       def try(command, options)
         return unless @success # short-circuit evaluation
-        configuration.run(command, options) do |ch,stream,out|
+        configuration.invoke_command(command, options) do |ch,stream,out|
           warn "#{ch[:server]}: #{out}" if stream == :err
           yield ch, stream, out if block_given?
         end

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

@@ -54,7 +54,7 @@ module Capistrano
         # and "local_scm_command" to be set, if the two differ.
         #
         # Alternatively, it may be called with a block, and for the duration of
-        # the block, all requests on this configuration object will be 
+        # the block, all requests on this configuration object will be
         # considered local.
         def local
           if block_given?
@@ -150,6 +150,13 @@ module Capistrano
           command || default_command
         end
 
+        # A helper method that can be used to define SCM commands naturally.
+        # It returns a single string with all arguments joined by spaces,
+        # with the scm command prefixed onto it.
+        def scm(*args)
+          [command, *args].compact.join(" ")
+        end
+
         private
 
           # A helper for accessing variable values, which takes into
@@ -174,17 +181,14 @@ module Capistrano
             self.class.default_command
           end
 
-          # A helper method that can be used to define SCM commands naturally.
-          # It returns a single string with all arguments joined by spaces,
-          # with the scm command prefixed onto it.
-          def scm(*args)
-            [command, *args].compact.join(" ")
-          end
-
           # A convenience method for accessing the declared repository value.
           def repository
             variable(:repository)
           end
+
+          def arguments
+            variable(:scm_arguments)
+          end
       end
 
     end

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

@@ -123,9 +123,9 @@ module Capistrano
           def cvs_revision(rev)
             revision = ""
             revision << case revision_type(rev)
-              when :date:
+              when :date
                 "-D \"#{rev}\"" if revision_type(rev) == :date
-              when :revision:
+              when :revision
                 "-r #{rev}"
               else
                 "-r #{head}"

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

@@ -210,10 +210,17 @@ module Capistrano
         def query_revision(revision)
           raise ArgumentError, "Deploying remote branches has been deprecated.  Specify the remote branch as a local branch for the git repository you're deploying from (ie: '#{revision.gsub('origin/', '')}' rather than '#{revision}')." if revision =~ /^origin\//
           return revision if revision =~ /^[0-9a-f]{40}$/
-          command = scm('ls-remote', repository, revision)
+          command = scm('ls-remote -h -t', repository, revision)
           result = yield(command)
-          revdata = result.split("\t")
-          newrev = revdata[0]
+          revdata = result.split(/[\t\n]/)
+	  newrev = nil
+	  revdata.each_slice(2) do |refs|
+	    rev, ref = *refs
+	    if ref.sub(/refs\/.*?\//, '') == revision
+	      newrev = rev
+	      break
+            end
+	  end
           raise "Unable to resolve revision for '#{revision}' on repository '#{repository}'." unless newrev =~ /^[0-9a-f]{40}$/
           return newrev
         end

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

@@ -119,9 +119,9 @@ module Capistrano
         # verbosity configuration grokking :)
         def verbose
           case variable(:scm_verbose)
-            when nil:   nil
-            when false: "--quiet"
-            else        "--verbose"
+            when nil   then nil
+            when false then "--quiet"
+            else            "--verbose"
           end
         end
         

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

@@ -21,19 +21,19 @@ module Capistrano
         # Returns the command that will check out the given revision to the
         # given destination.
         def checkout(revision, destination)
-          scm :checkout, verbose, authentication, "-r#{revision}", repository, destination
+          scm :checkout, arguments, verbose, authentication, "-r#{revision}", repository, destination
         end
 
         # Returns the command that will do an "svn update" to the given
         # revision, for the working copy at the given destination.
         def sync(revision, destination)
-          scm :update, verbose, authentication, "-r#{revision}", destination
+          scm :update, arguments, verbose, authentication, "-r#{revision}", destination
         end
 
         # Returns the command that will do an "svn export" of the given revision
         # to the given destination.
         def export(revision, destination)
-          scm :export, verbose, authentication, "-r#{revision}", repository, destination
+          scm :export, arguments, verbose, authentication, "-r#{revision}", repository, destination
         end
 
         # Returns the command that will do an "svn diff" for the two revisions.

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

@@ -48,8 +48,17 @@ module Capistrano
 
           # A wrapper for Kernel#system that logs the command being executed.
           def system(*args)
-            logger.trace "executing locally: #{args.join(' ')}"
-            super
+            cmd = args.join(' ')
+            if RUBY_PLATFORM =~ /win32/
+              cmd.gsub!('/','\\') # Replace / with \\
+              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)
+            else
+              logger.trace "executing locally: #{cmd}"
+              super
+            end
           end
 
         private
@@ -67,4 +76,4 @@ module Capistrano
 
     end
   end
-end
+end

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

@@ -80,7 +80,14 @@ module Capistrano
 
             if copy_exclude.any?
               logger.debug "processing exclusions..."
-              copy_exclude.each { |pattern| FileUtils.rm_rf(Dir.glob(File.join(destination, pattern), File::FNM_DOTMATCH)) }
+              if copy_exclude.any?
+                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 =~ /\/\.\.$/ }
+                  FileUtils.rm_rf(delete_list.compact)
+                end
+              end
             end
           end
 

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

@@ -42,7 +42,7 @@ module Capistrano
               run "cp -RPp #{repository_cache} #{configuration[:release_path]} && #{mark}"
             else
               exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
-              run "rsync -rp #{exclusions} #{repository_cache}/* #{configuration[:release_path]} && #{mark}"
+              run "rsync -lrp #{exclusions} #{repository_cache}/* #{configuration[:release_path]} && #{mark}"
             end
           end
           

data/lib/capistrano/version.rb

@@ -6,7 +6,7 @@ module Capistrano
   class Version < Net::SSH::Version
     MAJOR = 2
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/test/cli/help_test.rb

@@ -33,7 +33,7 @@ class CLIHelpTest < Test::Unit::TestCase
 
   def test_execute_requested_actions_with_tasks_should_call_task_list
     @cli.options[:tasks] = true
-    @cli.expects(:task_list).with(:config)
+    @cli.expects(:task_list).with(:config, true)
     @cli.expects(:explain_task).never
     @cli.execute_requested_actions(:config)
     assert !@cli.called_original
@@ -57,13 +57,38 @@ class CLIHelpTest < Test::Unit::TestCase
     expected_max_len = 80 - 3 - MockCLI::LINE_PADDING
     task_list = [task("c"), task("g", "c:g"), task("b", "c:b"), task("a")]
     task_list.each { |t| t.expects(:brief_description).with(expected_max_len).returns(t.fully_qualified_name) }
-  
+
     config = mock("config")
     config.expects(:task_list).with(:all).returns(task_list)
     @cli.stubs(:puts)
     @cli.task_list(config)
   end
 
+  def test_task_list_should_query_tasks_with_pattern
+    expected_max_len = 80 - 3 - MockCLI::LINE_PADDING
+    task_list = [task("g", "c:g"), task("b", "c:b")]
+    task_list.each { |t| t.expects(:brief_description).with(expected_max_len).returns(t.fully_qualified_name)}
+
+    config = mock("config")
+    config.expects(:task_list).with(:all).once.returns(task_list)
+
+    @cli.stubs(:puts)
+    @cli.task_list(config, "c")
+  end
+
+  def test_task_list_should_query_for_all_tasks_when_pattern_doesnt_match
+    expected_max_len = 80 - 3 - MockCLI::LINE_PADDING
+    task_list = [task("g", "c:g"), task("b", "c:b")]
+    task_list.each { |t| t.expects(:brief_description).with(expected_max_len).returns(t.fully_qualified_name) }
+
+    config = mock("config")
+    config.expects(:task_list).with(:all).times(2).returns(task_list)
+
+    @cli.stubs(:warn)
+    @cli.stubs(:puts)
+    @cli.task_list(config, "z")
+  end
+
   def test_task_list_should_never_use_less_than_MIN_MAX_LEN_chars_for_descriptions
     @ui.stubs(:output_cols).returns(20)
     t = task("c")
@@ -133,7 +158,8 @@ class CLIHelpTest < Test::Unit::TestCase
 
   private
 
-    def task(name, fqn=name, desc="a description")
-      stub("task", :name => name, :fully_qualified_name => fqn, :description => desc)
-    end
-end
+  def task(name, fqn=name, desc="a description")
+    stub("task", :name => name, :fully_qualified_name => fqn, :description => desc)
+  end
+
+end

data/test/cli/options_test.rb

@@ -261,7 +261,8 @@ class CLIOptionsTest < Test::Unit::TestCase
     assert_equal "world", ENV["HELLO"]
     assert_equal "value", ENV["ANOTHER"]
   ensure
-    ENV["HELLO"] = ENV["ANOTHER"] = nil
+    ENV.delete("HELLO")
+    ENV.delete("ANOTHER")
   end
 
   def test_remaining_args_should_be_added_to_actions_list
@@ -269,7 +270,7 @@ class CLIOptionsTest < Test::Unit::TestCase
     @cli.parse_options!
     assert_equal %w(something else), @cli.args
   ensure
-    ENV["HELLO"] = nil
+    ENV.delete("HELLO")
   end
 
   def test_search_for_default_recipe_file_should_look_for_Capfile

data/test/configuration/actions/invocation_test.rb

@@ -114,6 +114,12 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     @config.sudo "ls", :foo => "bar"
   end
 
+  def test_sudo_should_avoid_minus_p_when_sudo_prompt_is_empty
+    @config.set :sudo_prompt, ""
+    @config.expects(:run).with("sudo ls", {})
+    @config.sudo "ls"
+  end
+
   def test_sudo_should_interpret_sudo_prompt_variable_as_custom_prompt
     @config.set :sudo_prompt, "give it to me: "
     @config.expects(:run).with("sudo -p 'give it to me: ' ls", {})

data/test/configuration/loading_test.rb

@@ -23,7 +23,7 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
 
   def teardown
     MockConfig.instance = nil
-    $".delete "#{File.dirname(__FILE__)}/../fixtures/custom.rb"
+    $LOADED_FEATURES.delete_if { |a| a =~ /fixtures\/custom\.rb$/ }
   end
 
   def test_initialize_should_init_collections

data/test/configuration/namespace_dsl_test.rb

@@ -108,9 +108,9 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
   end
 
   def test_defining_ask_should_add_task_as_method
-    assert !@config.methods.include?("original")
+    assert !@config.methods.any? { |m| m.to_sym == :original }
     @config.task(:original) { puts "foo" }
-    assert @config.methods.include?("original")
+    assert @config.methods.any? { |m| m.to_sym == :original }
   end
 
   def test_calling_defined_task_should_delegate_to_execute_task

data/test/configuration/servers_test.rb

@@ -59,7 +59,7 @@ class ConfigurationServersTest < Test::Unit::TestCase
     task = new_task(:testing)
     assert_equal %w(app1 app2 app3 file).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
   ensure
-    ENV['ROLES'] = nil
+    ENV.delete('ROLES')
   end
 
   def test_task_with_hosts_as_environment_variable_should_apply_only_to_those_hosts
@@ -67,7 +67,7 @@ class ConfigurationServersTest < Test::Unit::TestCase
     task = new_task(:testing)
     assert_equal %w(foo bar).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
   ensure
-    ENV['HOSTS'] = nil
+    ENV.delete('HOSTS')
   end
 
   def test_task_with_hosts_as_environment_variable_should_not_inspect_roles_at_all
@@ -75,7 +75,23 @@ class ConfigurationServersTest < Test::Unit::TestCase
     task = new_task(:testing, @config, :roles => :bogus)
     assert_equal %w(foo bar).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
   ensure
-    ENV['HOSTS'] = nil
+    ENV.delete('HOSTS')
+  end
+
+  def test_task_with_onlyhosts_environment_variable_should_apply_only_to_those_hosts
+    ENV['HOSTFILTER'] = "app1,web1"
+    task = new_task(:testing)
+    assert_equal %w(app1 web1).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
+  ensure
+    ENV.delete('HOSTFILTER')
+  end
+
+  def test_task_with_onlyhosts_environment_variable_should_filter_hosts_option
+    ENV['HOSTFILTER'] = "foo"
+    task = new_task(:testing, @config, :hosts => %w(foo bar))
+    assert_equal %w(foo).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
+  ensure
+    ENV.delete('HOSTFILTER')
   end
 
   def test_task_with_only_should_apply_only_to_matching_tasks

data/test/deploy/remote_dependency_test.rb

@@ -96,7 +96,7 @@ class RemoteDependencyTest < Test::Unit::TestCase
   private
 
   def setup_for_a_configuration_run(command, passing)
-    expectation = @config.expects(:run).with(command, {})
+    expectation = @config.expects(:invoke_command).with(command, {})
     if passing
       expectation.returns(true)
     else

data/test/deploy/scm/git_test.rb

@@ -59,7 +59,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
 
   def test_query_revision
     revision = @source.query_revision('HEAD') do |o|
-      assert_equal "git ls-remote . HEAD", o
+      assert_equal "git ls-remote -h -t . HEAD", o
       "d11006102c07c94e5d54dd0ee63dca825c93ed61\tHEAD"
     end
     assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision

data/test/deploy/strategy/copy_test.rb

@@ -29,9 +29,9 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     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(:glob).with("/temp/dir/1234567890/.git", File::FNM_DOTMATCH).returns("/temp/dir/1234567890/.git")
+    Dir.expects(:glob).with("/temp/dir/1234567890/.git", File::FNM_DOTMATCH).returns(%w(/temp/dir/1234567890/.git))
 
-    FileUtils.expects(:rm_rf).with("/temp/dir/1234567890/.git")
+    FileUtils.expects(:rm_rf).with(%w(/temp/dir/1234567890/.git))
     prepare_standard_compress_and_copy!
     @strategy.deploy!
   end
@@ -41,9 +41,9 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     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(:glob).with("/temp/dir/1234567890/.gi*", File::FNM_DOTMATCH).returns("/temp/dir/1234567890/.git")
+    Dir.expects(:glob).with("/temp/dir/1234567890/.gi*", File::FNM_DOTMATCH).returns(%w(/temp/dir/1234567890/.git))
 
-    FileUtils.expects(:rm_rf).with("/temp/dir/1234567890/.git")
+    FileUtils.expects(:rm_rf).with(%w(/temp/dir/1234567890/.git))
     prepare_standard_compress_and_copy!
     @strategy.deploy!
   end

data/test/role_test.rb

@@ -3,7 +3,7 @@ require 'capistrano/role'
 
 class RoleTest < Test::Unit::TestCase
   def test_clearing_a_populated_role_should_yield_no_servers
-    role = Capistrano::Role.new("app1.capistrano.test", lambda { "app2.capistrano.test" })
+    role = Capistrano::Role.new("app1.capistrano.test", lambda { |o| "app2.capistrano.test" })
     assert_equal 2, role.servers.size
     role.clear
     assert role.servers.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 -06:00
+date: 2008-11-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency