capistrano 2.11.2 → 2.12.0

data/CHANGELOG

@@ -1,6 +1,22 @@
-## 2.11.2 / Febuary 22 2012
-
-Fixes some bugs with the now deprecated `deploy:symlink` fallback option.
+## 2.12.0 / April 13 2012
+
+This release revserts the very verbose logging introduced in the previous version, it also
+enables a handful of power-user features which are largely un-documented, but shouldn't be
+important unless you are looking for them. Undocumented code shouldn't scare you, simply
+read through deploy.rb in the Gem if you want to know how a new feature works!
+
+ * Update mapped commands to remove symlink deprecation warning. Despo Pentara (despo)
+ * Add the "rpm" remote dependency. Nick Hoffman (nickhoffman)
+ * Add commented deploy:cleanup task to default recipe. Jean-Philippe Doyle (j15e)
+ * Teach deploy:web:enable to fail gracefully. Lee Marlow (lmarlow)
+ * Ticket 193 alias task show wrong name when it is not overridden. Rafa García (rgo)
+ * Allow configuration of which roles assets are precompiled on. Frederick Cheung (fcheung)
+ * Fix transfer action to honor dry-run flag. Serg Podtynnyi (shtirlic)
+ * Changed single to double quotes for Windows, fixes a Windows bug in the HG module. Matthew J Morrison (mattjmorrison)
+ * Add UnsharedRemoteCache (copied from eycap gem). Ben Symonds (bensymonds)
+
+As ever, a sincere thanks to all contributors, and do not hesitate to contact me if this
+release causes problems for you.
 
 ## 2.11.0 / Febuary 20 2012
 
@@ -190,7 +206,7 @@ acceptable)
   * 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)
 	* No longer force a gemset for Capistrano development. (Ben Langfeld)
 
@@ -259,7 +275,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 
 * Fixes Darcs remote repository problem when using the copy strategy [Alex `regularfry` Young]
 * Documentation improvements for embedding Capistrano [Lee Hambley]
-* Fixes ticket #95 -formally deprecating the before_something and after_something methods [Lee Hambley] 
+* Fixes ticket #95 -formally deprecating the before_something and after_something methods [Lee Hambley]
 
 ## 2.5.9 / 1 August 2009
 
@@ -274,7 +290,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
   * #77  - Copy command doesn't work on Solaris due to tar/gtar
   * #76  - Invalid Subversion URL
   * Improved web:disable task, now suggests a .htaccess block to use suggested by Rafael García
-  * Includes more logger options (can now select stdout, stderr of a file) [Rafael García] 
+  * Includes more logger options (can now select stdout, stderr of a file) [Rafael García]
 
 ## 2.5.8 / July 2009
 
@@ -424,7 +440,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 * Added :normalize_asset_timestamps option to deployment, defaulting to true, which allows asset timestamping to be disabled [John Trupiano]
 
 
-## 2.4.0 Preview Release #1 (2.3.101) / June 5, 2008 
+## 2.4.0 Preview Release #1 (2.3.101) / June 5, 2008
 
 * Only make deploy:start, deploy:stop, and deploy:restart try sudo as :runner. The other sudo-enabled tasks (deploy:setup, deploy:cleanup, etc.) will now use the :admin_runner user (which by default is unset). [Jamis Buck]
 
@@ -452,7 +468,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 
 * Revert "make sudo helper play nicely with complex command chains", since it broke stuff [Jamis Buck]
 
-* Make set(:default_shell, false) work for not using a shell on a per-command basis [Ryan McGeary] 
+* Make set(:default_shell, false) work for not using a shell on a per-command basis [Ryan McGeary]
 
 * Improved test coverage [Ryan McGeary]
 
@@ -660,7 +676,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
 
 
 ## 1.99.2 (2.0 Preview 3) / June 15, 2007
- 
+
 * CVS SCM module [Brian Phillips]
 
 * Fix typo in Perforce SCM module [Chris Bailey]
@@ -870,7 +886,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
       on_rollback { run "ln -nfs #{previous_release} #{current_path}" }
       run "ln -nfs #{current_release} #{current_path}"
     end
-    
+
     cap symlink # will not run on 192.168.0.3
 
 * Deprecate the -r/--recipe switch in favor of -f/--file (for more make/rake-like semantics) [Jamis Buck]
@@ -886,7 +902,7 @@ Fixes a low-value bug, thanks to Chris G for the well submitted patch:
     task :setup, :roles => [ :app, :web, :db ]
       # normally this would run every where
     end
-    
+
     ROLES=app cap setup # this will only run for the app role, overwritting the default declaration
 
 * Added :hosts option to task definition that allows you to specify cross-cutting tasks [DHH]. Example:

data/bin/capify

@@ -59,6 +59,9 @@ role :app, "your app-server here"                          # This may be the sam
 role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
 role :db,  "your slave db-server here"
 
+# if you want to clean up old releases on each deploy uncomment this:
+# after "deploy:restart", "deploy:cleanup"
+
 # if you\'re still using the script/reaper helper you will need
 # these http://github.com/rails/irs_process_scripts
 

data/lib/capistrano/command.rb

@@ -219,8 +219,6 @@ module Capistrano
                   command_line = [environment, shell, cmd].compact.join(" ")
                   ch[:command] = command_line
 
-                  logger.trace command_line, ch[:server] if logger
-
                   ch.exec(command_line)
                   ch.send_data(options[:data]) if options[:data]
                 else

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

@@ -12,7 +12,7 @@ module Capistrano
           opts = options.dup
           upload(StringIO.new(data), path, opts)
         end
-    
+
         # Get file remote_path from FIRST server targeted by
         # the current task and transfer it to local machine as path.
         #
@@ -35,13 +35,12 @@ module Capistrano
         end
 
         def transfer(direction, from, to, options={}, &block)
+          if dry_run
+            return logger.debug "transfering: #{[direction, from, to] * ', '}"
+          end
           execute_on_servers(options) do |servers|
             targets = servers.map { |s| sessions[s] }
-            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/alias_task.rb

@@ -15,7 +15,8 @@ module Capistrano
           raise ArgumentError, "expected a valid task name"
         end
 
-        task = find_task(old_name) or raise NoSuchTaskError, "the task `#{old_name}' does not exist"
+        original_task = find_task(old_name) or raise NoSuchTaskError, "the task `#{old_name}' does not exist"
+        task = original_task.dup # Dup. task to avoid modify original task
         task.name = new_name
 
         define_task(task)

data/lib/capistrano/configuration/callbacks.rb

@@ -90,7 +90,7 @@ module Capistrano
       # Usage:
       #
       #  on :before, "some:hook", "another:hook", :only => "deploy:update"
-      #  on :after, "some:hook", :except => "deploy:symlink"
+      #  on :after, "some:hook", :except => "deploy:create_symlink"
       #  on :before, "global:hook"
       #  on :after, :only => :deploy do
       #    puts "after deploy here"

data/lib/capistrano/configuration/namespaces.rb

@@ -176,6 +176,8 @@ module Capistrano
           def initialize(name, parent)
             @parent = parent
             @name = name
+            
+            explicitly_define_clashing_kernel_methods
           end
 
           def role(*args)
@@ -197,6 +199,17 @@ module Capistrano
           include Capistrano::Configuration::AliasTask
           include Capistrano::Configuration::Namespaces
           undef :desc, :next_description
+          
+          protected
+            def explicitly_define_clashing_kernel_methods
+              (parent.public_methods & Kernel.methods).each do |m|
+                next if self.method(m).owner == self.class
+                if parent.method(m).owner == parent.class
+                  metaclass = class << self; self; end
+                  metaclass.send(:define_method, m) {|*args, &block| parent.send(m, *args, &block)}
+                end
+              end
+            end
         end
     end
   end

data/lib/capistrano/recipes/compat.rb

@@ -7,7 +7,7 @@ load 'deploy'
 map = { "diff_from_last_deploy"  => "deploy:pending:diff",
         "update"                 => "deploy:update",
         "update_code"            => "deploy:update_code",
-        "symlink"                => "deploy:symlink",
+        "symlink"                => "deploy:create_symlink",
         "restart"                => "deploy:restart",
         "rollback"               => "deploy:rollback",
         "cleanup"                => "deploy:cleanup",
@@ -29,4 +29,4 @@ task :spinner do
   warn "[DEPRECATED] `spinner' is deprecated. Use `deploy:start' instead."
   set :runner, fetch(:spinner_user, "app")
   deploy.start
-end
+end

data/lib/capistrano/recipes/deploy.rb

@@ -265,6 +265,7 @@ namespace :deploy do
   DESC
   task :symlink, :except => { :no_release => true } do
     Kernel.warn "[Deprecation Warning] This API has changed, please hook `deploy:create_symlink` instead of `deploy:symlink`."
+    create_symlink
   end
 
   desc <<-DESC
@@ -277,9 +278,6 @@ namespace :deploy do
     except `restart').
   DESC
   task :create_symlink, :except => { :no_release => true } do
-
-    symlink # (Deprecated)
-
     on_rollback do
       if previous_release
         run "rm -f #{current_path}; ln -s #{previous_release} #{current_path}; true"
@@ -548,7 +546,7 @@ namespace :deploy do
     DESC
     task :disable, :roles => :web, :except => { :no_release => true } do
       require 'erb'
-      on_rollback { run "rm #{shared_path}/system/#{maintenance_basename}.html" }
+      on_rollback { run "rm -f #{shared_path}/system/#{maintenance_basename}.html" }
 
       warn <<-EOHTACCESS
 
@@ -590,7 +588,7 @@ namespace :deploy do
       web-accessible again.
     DESC
     task :enable, :roles => :web, :except => { :no_release => true } do
-      run "rm #{shared_path}/system/#{maintenance_basename}.html"
+      run "rm -f #{shared_path}/system/#{maintenance_basename}.html"
     end
   end
 end

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

@@ -2,6 +2,7 @@ load 'deploy' unless defined?(_cset)
 
 _cset :asset_env, "RAILS_GROUPS=assets"
 _cset :assets_prefix, "assets"
+_cset :assets_role, [:web]
 
 _cset :normalize_asset_timestamps, false
 
@@ -18,7 +19,7 @@ namespace :deploy do
       for efficiency. If you cutomize the assets path prefix, override the \
       :assets_prefix variable to match.
     DESC
-    task :symlink, :roles => :web, :except => { :no_release => true } do
+    task :symlink, :roles => assets_role, :except => { :no_release => true } do
       run <<-CMD
         rm -rf #{latest_release}/public/#{assets_prefix} &&
         mkdir -p #{latest_release}/public &&
@@ -37,7 +38,7 @@ namespace :deploy do
         set :rails_env, "production"
         set :asset_env, "RAILS_GROUPS=assets"
     DESC
-    task :precompile, :roles => :web, :except => { :no_release => true } do
+    task :precompile, :roles => assets_role, :except => { :no_release => true } do
       run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile"
     end
 
@@ -52,7 +53,7 @@ namespace :deploy do
         set :rails_env, "production"
         set :asset_env, "RAILS_GROUPS=assets"
     DESC
-    task :clean, :roles => :web, :except => { :no_release => true } do
+    task :clean, :roles => assets_role, :except => { :no_release => true } do
       run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:clean"
     end
   end

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

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

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

@@ -59,7 +59,7 @@ module Capistrano
           cmd = scm :log,
                     verbose,
                     "-r #{changeset}",
-                    "--template '{node|short}'"
+                    '--template "{node|short}"'
                     yield cmd
         end
 

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

@@ -34,7 +34,7 @@ module Capistrano
             d.remote.writable(configuration[:releases_path]).or("You do not have permissions to write to `#{configuration[:releases_path]}'.")
           end
         end
-          
+
         protected
 
           # This is to allow helper methods like "run" and "put" to be more
@@ -52,7 +52,7 @@ module Capistrano
             cmd = args.join(' ')
             result = nil
             if RUBY_PLATFORM =~ /win32/
-							cmd = cmd.split(/\s+/).collect {|w| w.match(/^[\w+]+:\/\//) ? w : w.gsub('/', '\\') }.join(' ') # Split command by spaces, change / by \\ unless element is a some+thing:// 
+              cmd = cmd.split(/\s+/).collect {|w| w.match(/^[\w+]+:\/\//) ? w : w.gsub('/', '\\') }.join(' ') # Split command by spaces, change / by \\ unless element is a some+thing://
               cmd.gsub!(/^cd /,'cd /D ') # Replace cd with cd /D
               cmd.gsub!(/&& cd /,'&& cd /D ') # Replace cd with cd /D
               logger.trace "executing locally: #{cmd}"
@@ -65,7 +65,7 @@ module Capistrano
                 result = super
               end
             end
-            
+
             logger.trace "command finished in #{(elapsed * 1000).round}ms"
             result
           end

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

@@ -54,83 +54,19 @@ module Capistrano
         # servers, and uncompresses it on each of them into the deployment
         # directory.
         def deploy!
-          if copy_cache
-            if File.exists?(copy_cache)
-              logger.debug "refreshing local cache to revision #{revision} at #{copy_cache}"
-              system(source.sync(revision, copy_cache))
-            else
-              logger.debug "preparing local cache at #{copy_cache}"
-              system(source.checkout(revision, copy_cache))
-            end
-
-            # Check the return code of last system command and rollback if not 0
-            unless $? == 0
-              raise Capistrano::Error, "shell command failed with return code #{$?}"
-            end
-
-            build(copy_cache)
-
-            FileUtils.mkdir_p(destination)
-
-            logger.debug "copying cache to deployment staging area #{destination}"
-            Dir.chdir(copy_cache) do
-              queue = Dir.glob("*", File::FNM_DOTMATCH)
-              while queue.any?
-                item = queue.shift
-                name = File.basename(item)
-
-                next if name == "." || name == ".."
-                next if copy_exclude.any? { |pattern| File.fnmatch(pattern, item) }
-
-                if File.symlink?(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(item, File.join(destination, item))
-                end
-              end
-            end
-          else
-            logger.debug "getting (via #{copy_strategy}) revision #{revision} to #{destination}"
-            system(command)
-
-            build(destination)
-
-            if copy_exclude.any?
-              logger.debug "processing exclusions..."
-
-              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
-
-          File.open(File.join(destination, "REVISION"), "w") { |f| f.puts(revision) }
-
-          logger.trace "compressing #{destination} to #{filename}"
-          Dir.chdir(copy_dir) { system(compress(File.basename(destination), File.basename(filename)).join(" ")) }
+          copy_cache ? run_copy_cache_strategy : run_copy_strategy
 
+          create_revision_file
+          compress_repository
           distribute!
         ensure
-          FileUtils.rm filename rescue nil
-          FileUtils.rm_rf destination rescue nil
+          rollback_changes
         end
 
-        def build(directory)
-          return unless configuration[:build_script]
-
-          Dir.chdir(directory) do
-            self.system(configuration[:build_script])
-            # Check the return code of last system command and rollback if not 0
-            unless $? == 0
-              raise Capistrano::Error, "shell command failed with return code #{$?}"
-            end
-          end
+        def build directory
+          execute "running build script on #{directory}" do
+            Dir.chdir(directory) { system(build_script) }
+          end if build_script
         end
 
         def check!
@@ -153,6 +89,143 @@ module Capistrano
 
         private
 
+          def run_copy_cache_strategy
+            copy_repository_to_local_cache
+            build copy_cache
+            copy_cache_to_staging_area
+          end
+
+          def run_copy_strategy
+            copy_repository_to_server
+            build destination
+            remove_excluded_files if copy_exclude.any?
+          end
+
+          def execute description, &block
+            logger.debug description
+            handle_system_errors &block
+          end
+
+          def handle_system_errors &block
+            block.call
+            raise_command_failed if last_command_failed?
+          end
+
+          def refresh_local_cache
+            execute "refreshing local cache to revision #{revision} at #{copy_cache}" do
+              system(source.sync(revision, copy_cache))
+            end
+          end
+
+          def create_local_cache
+            execute "preparing local cache at #{copy_cache}" do
+              system(source.checkout(revision, copy_cache))
+            end
+          end
+
+          def raise_command_failed
+            raise Capistrano::Error, "shell command failed with return code #{$?}"
+          end
+
+          def last_command_failed?
+            $? != 0
+          end
+
+          def copy_cache_to_staging_area
+            execute "copying cache to deployment staging area #{destination}" do
+              create_destination
+              Dir.chdir(copy_cache) { copy_files(queue_files) }
+            end
+          end
+
+          def create_destination
+            FileUtils.mkdir_p(destination)
+          end
+
+          def copy_files files
+            files.each { |name| process_file(name) }
+          end
+
+          def process_file name
+            send "copy_#{filetype(name)}", name
+          end
+
+          def filetype name
+            filetype = File.ftype name
+            filetype = "file" unless ["link", "directory"].include? filetype
+            filetype
+          end
+
+          def copy_link name
+            FileUtils.ln_s(File.readlink(name), File.join(destination, name))
+          end
+
+          def copy_directory name
+            FileUtils.mkdir(File.join(destination, name))
+            copy_files(queue_files(name))
+          end
+
+          def copy_file name
+            FileUtils.ln(name, File.join(destination, name))
+          end
+
+          def queue_files directory=nil
+            Dir.glob(pattern_for(directory), File::FNM_DOTMATCH).reject! { |file| excluded_files_contain? file }
+          end
+
+          def pattern_for directory
+            !directory.nil? ? "#{directory}/*" : "*"
+          end
+
+          def excluded_files_contain? file
+            copy_exclude.any? { |p| File.fnmatch(p, file) } or [ ".", ".."].include? File.basename(file)
+          end
+
+          def copy_repository_to_server
+            execute "getting (via #{copy_strategy}) revision #{revision} to #{destination}" do
+              copy_repository_via_strategy
+            end
+          end
+
+          def copy_repository_via_strategy
+              system(command)
+          end
+
+          def remove_excluded_files
+            logger.debug "processing exclusions..."
+
+            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
+
+          def create_revision_file
+            File.open(File.join(destination, "REVISION"), "w") { |f| f.puts(revision) }
+          end
+
+          def compress_repository
+            execute "Compressing #{destination} to #{filename}" do
+              Dir.chdir(copy_dir) { system(compress(File.basename(destination), File.basename(filename)).join(" ")) }
+            end
+          end
+
+          def rollback_changes
+            FileUtils.rm filename rescue nil
+            FileUtils.rm_rf destination rescue nil
+          end
+
+          def copy_repository_to_local_cache
+            return refresh_local_cache if File.exists?(copy_cache)
+            create_local_cache
+          end
+
+          def build_script
+            configuration[:build_script]
+          end
+
           # Specify patterns to exclude from the copy. This is only valid
           # when using a local cache.
           def copy_exclude
@@ -237,10 +310,14 @@ module Capistrano
             compression.decompress_command + [file]
           end
 
+          def decompress_remote_file
+            run "cd #{configuration[:releases_path]} && #{decompress(remote_filename).join(" ")} && rm #{remote_filename}"
+          end
+
           # Distributes the file to the remote servers
           def distribute!
             upload(filename, remote_filename)
-            run "cd #{configuration[:releases_path]} && #{decompress(remote_filename).join(" ")} && rm #{remote_filename}"
+            decompress_remote_file
           end
       end
 

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

@@ -0,0 +1,21 @@
+require 'capistrano/recipes/deploy/strategy/remote_cache'
+
+module Capistrano
+  module Deploy
+    module Strategy
+      class UnsharedRemoteCache < RemoteCache
+        def check!
+          super.check do |d|
+            d.remote.writable(repository_cache)
+          end
+        end
+
+        private
+
+        def repository_cache
+          configuration[:repository_cache]
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/transfer.rb

@@ -117,7 +117,7 @@ module Capistrano
 
       def prepare_scp_transfer(from, to, session)
         real_callback = callback || Proc.new do |channel, name, sent, total|
-          logger.trace "#{transport} #{operation} #{from} -> #{to}", channel[:host] if logger && sent == 0
+          logger.trace "[#{channel[:host]}] #{name}" if logger && sent == 0
         end
 
         channel = case direction
@@ -167,9 +167,9 @@ module Capistrano
             if callback
               callback.call(event, op, *args)
             elsif event == :open
-              logger.trace "#{transport} #{operation} #{from} -> #{to}", op[:host]
+              logger.trace "[#{op[:host]}] #{args[0].remote}"
             elsif event == :finish
-              logger.trace "#{transport} #{operation} #{from} -> #{to} done", op[:host]
+              logger.trace "[#{op[:host]}] done"
             end
           end
 

data/lib/capistrano/version.rb

@@ -4,8 +4,8 @@ module Capistrano
   class Version
 
     MAJOR = 2
-    MINOR = 11
-    PATCH = 2
+    MINOR = 12
+    PATCH = 0
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

data/test/configuration/actions/invocation_test.rb

@@ -59,7 +59,7 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     config = make_config
     config.dry_run = true
     config.servers = %w[ foo ]
-    config.expects(:sessions).returns({ 'foo-server' => 'bar' })
+    config.expects(:execute_on_servers).never
     ::Capistrano::Transfer.expects(:process).never
     config.put "foo", "bar", :mode => 0644
   end
@@ -203,7 +203,7 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     a = mock("channel", :called => true)
     b = mock("stream", :called => true)
     c = mock("data", :called => true)
-  
+
     callback[a, b, c]
   end
 

data/test/configuration/alias_task_test.rb

@@ -30,6 +30,14 @@ class AliasTaskTest < Test::Unit::TestCase
     assert @config.tasks.key?(:new_foo)
   end
 
+  def test_original_task_remain_with_same_name
+    @config.task(:foo) { 42 }
+    @config.alias_task 'new_foo', 'foo'
+
+    assert_equal :foo, @config.tasks[:foo].name
+    assert_equal :new_foo, @config.tasks[:new_foo].name
+  end
+
   def test_aliased_task_do_the_same
     @config.task(:foo) { 42 }
     @config.alias_task 'new_foo', 'foo'

data/test/configuration/namespace_dsl_test.rb

@@ -308,4 +308,25 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
     end
     assert_nil @config.find_task("outer::inner")
   end
+  
+  def test_kernel_method_clashing_should_not_affect_method_delegation_to_parent
+    @config.class.class_eval do
+      def some_weird_method() 'config' end
+    end
+    
+    @config.namespace(:clash) {}
+    namespace = @config.namespaces[:clash]
+    assert_equal 'config', namespace.some_weird_method
+    
+    Kernel.module_eval do
+      def some_weird_method() 'kernel' end
+    end
+    
+    @config.namespace(:clash2) {}
+    namespace = @config.namespaces[:clash2]
+    assert_equal 'config', namespace.some_weird_method
+    
+    Kernel.send :remove_method, :some_weird_method
+    @config.class.send :remove_method, :some_weird_method
+  end
 end

data/test/deploy/remote_dependency_test.rb

@@ -43,6 +43,12 @@ class RemoteDependencyTest < Test::Unit::TestCase
     assert_equal "package `dpkg' 1.15 could not be found (host)", @dependency.message
   end
 
+  def test_should_use_standard_error_message_for_rpm
+    setup_for_a_configuration_rpm_run("rpm", "4.8", false)
+    @dependency.rpm("rpm", "4.8")
+    assert_equal "package `rpm' 4.8 could not be found (host)", @dependency.message
+  end
+
   def test_should_fail_if_directory_not_found
     setup_for_a_configuration_run("test -d /data", false)
     assert !@dependency.directory("/data").pass?
@@ -132,4 +138,9 @@ class RemoteDependencyTest < Test::Unit::TestCase
     find_deb_cmd = "dpkg -s #{name} | grep '^Version: #{version}'"
     setup_for_a_configuration_run(find_deb_cmd, passing)
   end
+
+  def setup_for_a_configuration_rpm_run(name, version, passing)
+    find_rpm_cmd = "rpm -q #{name} | grep '#{version}'"
+    setup_for_a_configuration_run(find_rpm_cmd, passing)
+  end
 end

data/test/deploy/scm/mercurial_test.rb

@@ -39,7 +39,7 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
   end
 
   def test_query_revision
-    assert_equal "hg log -r 8a8e00b8f11b --template '{node|short}'", @source.query_revision('8a8e00b8f11b') { |o| o }
+    assert_equal "hg log -r 8a8e00b8f11b --template \"{node|short}\"", @source.query_revision('8a8e00b8f11b') { |o| o }
   end
 
   def test_username_should_be_backwards_compatible

data/test/deploy/strategy/copy_test.rb

@@ -306,15 +306,15 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     def prepare_directory_tree!(cache, exclude=false)
       Dir.expects(:glob).with("*", File::FNM_DOTMATCH).returns([".", "..", "app", "foo.txt"])
-      File.expects(:directory?).with("app").returns(true)
+      File.expects(:ftype).with("app").returns("directory")
       FileUtils.expects(:mkdir).with("/temp/dir/1234567890/app")
-      File.expects(:directory?).with("foo.txt").returns(false)
+      File.expects(:ftype).with("foo.txt").returns("file")
       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)
+      File.expects(:ftype).with("app/bar.txt").returns("file")
         FileUtils.expects(:ln).with("app/bar.txt", "/temp/dir/1234567890/app/bar.txt")
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70157295072440 !ruby/object:Gem::Requirement
+  requirement: &70100200770260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157295072440
+  version_requirements: *70100200770260
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70157295071180 !ruby/object:Gem::Requirement
+  requirement: &70100200769760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70157295071180
+  version_requirements: *70100200769760
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &70157295069420 !ruby/object:Gem::Requirement
+  requirement: &70100200769280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157295069420
+  version_requirements: *70100200769280
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70157295068700 !ruby/object:Gem::Requirement
+  requirement: &70100200768800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157295068700
+  version_requirements: *70100200768800
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
-  requirement: &70157295058440 !ruby/object:Gem::Requirement
+  requirement: &70100200768320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70157295058440
+  version_requirements: *70100200768320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70157295056280 !ruby/object:Gem::Requirement
+  requirement: &70100200767840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157295056280
+  version_requirements: *70100200767840
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -152,6 +152,7 @@ files:
 - lib/capistrano/recipes/deploy/strategy/export.rb
 - lib/capistrano/recipes/deploy/strategy/remote.rb
 - lib/capistrano/recipes/deploy/strategy/remote_cache.rb
+- lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb
 - lib/capistrano/recipes/deploy/templates/maintenance.rhtml
 - lib/capistrano/recipes/standard.rb
 - lib/capistrano/recipes/templates/maintenance.rhtml
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH