capistrano 2.9.0 → 2.11.2

data/.travis.yml

@@ -1,4 +1,6 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree

data/CHANGELOG

@@ -1,3 +1,53 @@
+## 2.11.2 / Febuary 22 2012
+
+Fixes some bugs with the now deprecated `deploy:symlink` fallback option.
+
+## 2.11.0 / Febuary 20 2012
+
+This release replaces and fixes a broken 2.10.0 release (see below for
+information)
+
+This release includes all fixes as documented for 2.10.0, plus additional code
+cleanup (SHA: 3eecac2), as well as changing the public API from
+`deploy:symlink`, to `deploy:create_symlink`
+
+* Remove a testing dependency on `ruby-debug` (Lee Hambley, reported by Serg
+Podtynnyi)
+
+* Formerly deprecate `deploy:symlink`, this move was prompted by the Rake
+namespace fiasco of their 0.9.0 release, and is replaced by
+`deploy:create_symlink`. If you are looking for a place to hook asset related
+tasks, please consider `deploy:finalize_update`. Replaced by
+`deploy:create_symlink`, `deploy:symlink` now raises a deprecation warning,
+and defers to `deploy:symlink`. (Lee Hambley)
+
+* Update the 2.10.0 changelog. (Lee Hambley, reported by Jérémy Lecour)
+
+## 2.10.0 / Febuary 19 2012
+
+If you are reading this after Febuary 20th 2012, do not be surprised when you
+cannot find 2.10.0 on Rubygems.org, it has been removed because of a breaking
+API change. It is replaced logically enough by 2.11.0 where the API is still
+changed, but now issues a warning and falls back to the expected behaviour.
+
+The CHANGELOG for this release was updated retrospectively, I'm sorry I missed
+that when releasing the gem, 2.10.0 apparently not my finest hour as a
+maintainer.
+
+Ths fixes in this release include
+
+* Include sample NGinx config for `deploy:web:disable`(added by Roger Ertesvåg)
+
+* Fix gemspec time format warning (reported by Tony Arcieri, fixed by building the Gem against Ruby-1.9.3)
+
+* Finally removed deprecated `before_` and `after_` tasks. (Lee Hambley)
+
+* Rake 0.9.x compatibility (reported by James Miller, fixed by Lee Hambley)
+
+* More detailed logging output (fixed by Huang Liang)
+
+* Includes multistage, without `capistrano-ext`. `require 'capistrano/ext/multistage'` (fixed by Lee Hambley)
+
 ## 2.9.0 / September 24 2011
 
 A vairly heavy release, including some new features which most of you won't

data/Gemfile

@@ -9,6 +9,4 @@ gemspec
 #
 group :development do
   gem 'rake', '0.8.7'
-  gem 'ruby-debug',   :platform => :mri_18
-  gem 'ruby-debug19', :platform => :mri_19
 end

data/README.mdown

@@ -67,7 +67,7 @@ tasks.
 * Push to your branch - `git push origin my_branch`
 * Create a Pull Request from your branch, include as much documentation
   as you can in the commit message/pull request, following these
-[guidelies on writing a good commit message](http://spheredev.org/wiki/Git_for_the_lazy#Writing_good_commit_messages)
+[guidelines on writing a good commit message](http://spheredev.org/wiki/Git_for_the_lazy#Writing_good_commit_messages)
 * That's it!
 
 

data/bin/capify

@@ -37,7 +37,8 @@ end
 
 files = {
   "Capfile" => unindent(<<-FILE),
-    load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+
+    load 'deploy'
 
     # Uncomment if you are using Rails' asset pipeline
     # load 'deploy/assets'

data/capistrano.gemspec

@@ -3,6 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "capistrano/version"
 
 Gem::Specification.new do |s|
+
   s.name        = "capistrano"
   s.version     = Capistrano::Version.to_s
   s.platform    = Gem::Platform::RUBY

data/lib/capistrano.rb

@@ -1,3 +1,5 @@
+require 'capistrano/fix_rake_deprecated_dsl'
+
 require 'capistrano/configuration'
 require 'capistrano/extensions'
 require 'capistrano/ext/string'

data/lib/capistrano/command.rb

@@ -219,6 +219,8 @@ 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
@@ -261,7 +263,10 @@ module Capistrano
       end
 
       def replace_placeholders(command, channel)
-        command.gsub(/\$CAPISTRANO:HOST\$/, channel[:host])
+        roles = @tree.configuration && @tree.configuration.role_names_for_host(channel[:server])
+        command = command.gsub(/\$CAPISTRANO:HOST\$/, channel[:host])
+        command.gsub!(/\$CAPISTRANO:HOSTROLES\$/, roles.join(',')) if roles
+        command
       end
 
       # prepare a space-separated sequence of variables assignments

data/lib/capistrano/configuration.rb

@@ -1,5 +1,6 @@
 require 'capistrano/logger'
 
+require 'capistrano/configuration/alias_task'
 require 'capistrano/configuration/callbacks'
 require 'capistrano/configuration/connections'
 require 'capistrano/configuration/execution'
@@ -33,7 +34,7 @@ module Capistrano
 
     # The includes must come at the bottom, since they may redefine methods
     # defined in the base class.
-    include Connections, Execution, Loading, Namespaces, Roles, Servers, Variables
+    include AliasTask, Connections, Execution, Loading, Namespaces, Roles, Servers, Variables
 
     # Mix in the actions
     include Actions::FileTransfer, Actions::Inspect, Actions::Invocation

data/lib/capistrano/configuration/alias_task.rb

@@ -0,0 +1,25 @@
+module Capistrano
+  class Configuration
+    module AliasTask
+      # Attempts to find the task at the given fully-qualified path, and
+      # alias it. If arguments don't have correct task names, an ArgumentError
+      # wil be raised. If no such task exists, a Capistrano::NoSuchTaskError
+      # will be raised.
+      #
+      # Usage:
+      #
+      #   alias_task :original_deploy, :deploy
+      #
+      def alias_task(new_name, old_name)
+        if !new_name.respond_to?(:to_sym) or !old_name.respond_to?(:to_sym)
+          raise ArgumentError, "expected a valid task name"
+        end
+
+        task = find_task(old_name) or raise NoSuchTaskError, "the task `#{old_name}' does not exist"
+        task.name = new_name
+
+        define_task(task)
+      end
+    end
+  end
+end

data/lib/capistrano/configuration/callbacks.rb

@@ -19,18 +19,13 @@ module Capistrano
       end
 
       def invoke_task_directly_with_callbacks(task) #:nodoc:
-        before = find_hook(task, :before)
-        execute_task(before) if before
-
+        
         trigger :before, task
 
         result = invoke_task_directly_without_callbacks(task)
 
         trigger :after, task
 
-        after = find_hook(task, :after)
-        execute_task(after) if after
-
         return result
       end
 
@@ -129,20 +124,6 @@ module Capistrano
         end
       end
 
-      private
-
-        # Looks for before_foo or after_foo tasks. This method of extending tasks
-        # is now discouraged (though not formally deprecated). You should use the
-        # before and after methods to declare hooks for such callbacks.
-        def find_hook(task, hook)
-          if task == task.namespace.default_task
-            result = task.namespace.search_task("#{hook}_#{task.namespace.name}")
-            return result if result
-          end
-
-          task.namespace.search_task("#{hook}_#{task.name}")
-        end
-
     end
   end
-end
+end

data/lib/capistrano/configuration/execution.rb

@@ -140,4 +140,4 @@ module Capistrano
       end
     end
   end
-end
+end

data/lib/capistrano/configuration/namespaces.rb

@@ -97,12 +97,17 @@ module Capistrano
           raise ArgumentError, "defining a task named `#{name}' would shadow an existing #{thing} with that name"
         end
 
-        tasks[name] = TaskDefinition.new(name, self, {:desc => next_description(:reset)}.merge(options), &block)
 
-        if !task_already_defined
-          metaclass = class << self; self; end
-          metaclass.send(:define_method, name) { execute_task(tasks[name]) }
-        end
+        task = TaskDefinition.new(name, self, {:desc => next_description(:reset)}.merge(options), &block)
+
+        define_task(task)
+      end
+
+      def define_task(task)
+        tasks[task.name] = task
+
+        metaclass = class << self; self; end
+        metaclass.send(:define_method, task.name) { execute_task(tasks[task.name]) }
       end
 
       # Find the task with the given name, where name is the fully-qualified
@@ -151,7 +156,7 @@ module Capistrano
         return nil if parent.nil?
         return tasks[DEFAULT_TASK]
       end
-  
+
       # Returns the tasks in this namespace as an array of TaskDefinition
       # objects. If a non-false parameter is given, all tasks in all
       # namespaces under this namespace will be returned as well.
@@ -189,9 +194,10 @@ module Capistrano
             end
           end
 
+          include Capistrano::Configuration::AliasTask
           include Capistrano::Configuration::Namespaces
           undef :desc, :next_description
         end
     end
   end
-end
+end

data/lib/capistrano/configuration/roles.rb

@@ -68,6 +68,10 @@ module Capistrano
         raise ArgumentError, "you must associate a server with at least one role" if roles.empty?
         roles.each { |name| role(name, host, options) }
       end
+      
+      def role_names_for_host(host)
+        roles.map {|role_name, role| role_name if role.include?(host) }.compact || []
+      end
     end
   end
 end

data/lib/capistrano/ext/multistage.rb

@@ -0,0 +1,62 @@
+require 'fileutils'
+
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "capistrano/ext/multistage requires Capistrano 2"
+end
+
+Capistrano::Configuration.instance.load do
+  location = fetch(:stage_dir, "config/deploy")
+
+  unless exists?(:stages)
+    set :stages, Dir["#{location}/*.rb"].map { |f| File.basename(f, ".rb") }
+  end
+
+  stages.each do |name|
+    desc "Set the target stage to `#{name}'."
+    task(name) do
+      set :stage, name.to_sym
+      load "#{location}/#{stage}"
+    end
+  end
+
+  on :load do
+    if stages.include?(ARGV.first)
+      # Execute the specified stage so that recipes required in stage can contribute to task list
+      find_and_execute_task(ARGV.first) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
+    else
+      # Execute the default stage so that recipes required in stage can contribute tasks
+      find_and_execute_task(default_stage) if exists?(:default_stage)
+    end
+  end
+
+  namespace :multistage do
+    desc "[internal] Ensure that a stage has been selected."
+    task :ensure do
+      if !exists?(:stage)
+        if exists?(:default_stage)
+          logger.important "Defaulting to `#{default_stage}'"
+          find_and_execute_task(default_stage)
+        else
+          abort "No stage specified. Please specify one of: #{stages.join(', ')} (e.g. `cap #{stages.first} #{ARGV.last}')"
+        end
+      end 
+    end
+
+    desc "Stub out the staging config files."
+    task :prepare do
+      FileUtils.mkdir_p(location)
+      stages.each do |name|
+        file = File.join(location, name + ".rb")
+        unless File.exists?(file)
+          File.open(file, "w") do |f|
+            f.puts "# #{name.upcase}-specific deployment configuration"
+            f.puts "# please put general deployment config in config/deploy.rb"
+          end
+        end
+      end
+    end
+  end
+
+  on :start, "multistage:ensure", :except => stages + ['multistage:prepare']
+
+end

data/lib/capistrano/fix_rake_deprecated_dsl.rb

@@ -0,0 +1,8 @@
+#
+# See https://github.com/jimweirich/rake/issues/81
+#
+if defined?(Rake::DeprecatedObjectDSL)
+  Rake::DeprecatedObjectDSL.private_instance_methods.each do |m|
+    Rake::DeprecatedObjectDSL.send("undef_method", m)
+  end
+end

data/lib/capistrano/recipes/deploy.rb

@@ -32,6 +32,7 @@ _cset :rails_env, "production"
 _cset :rake, "rake"
 
 _cset :maintenance_basename, "maintenance"
+_cset(:maintenance_template_path) { File.join(File.dirname(__FILE__), "templates", "maintenance.rhtml") }
 
 # =========================================================================
 # These variables should NOT be changed unless you are very confident in
@@ -49,7 +50,7 @@ _cset(:release_name)      { set :deploy_timestamped, true; Time.now.utc.strftime
 
 _cset :version_dir,       "releases"
 _cset :shared_dir,        "shared"
-_cset :shared_children,   %w(system log pids)
+_cset :shared_children,   %w(public/system log tmp/pids)
 _cset :current_dir,       "current"
 
 _cset(:releases_path)     { File.join(deploy_to, version_dir) }
@@ -184,7 +185,7 @@ namespace :deploy do
   DESC
   task :setup, :except => { :no_release => true } do
     dirs = [deploy_to, releases_path, shared_path]
-    dirs += shared_children.map { |d| File.join(shared_path, d) }
+    dirs += shared_children.map { |d| File.join(shared_path, d.split('/').last) }
     run "#{try_sudo} mkdir -p #{dirs.join(' ')}"
     run "#{try_sudo} chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)
   end
@@ -200,7 +201,7 @@ namespace :deploy do
   task :update do
     transaction do
       update_code
-      symlink
+      create_symlink
     end
   end
 
@@ -246,11 +247,11 @@ namespace :deploy do
     run <<-CMD
       rm -rf #{latest_release}/log #{latest_release}/public/system #{latest_release}/tmp/pids &&
       mkdir -p #{latest_release}/public &&
-      mkdir -p #{latest_release}/tmp &&
-      ln -s #{shared_path}/log #{latest_release}/log &&
-      ln -s #{shared_path}/system #{latest_release}/public/system &&
-      ln -s #{shared_path}/pids #{latest_release}/tmp/pids
+      mkdir -p #{latest_release}/tmp
     CMD
+    shared_children.map do |d|
+      run "ln -s #{shared_path}/#{d.split('/').last} #{latest_release}/#{d}"
+    end
 
     if fetch(:normalize_asset_timestamps, true)
       stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
@@ -259,6 +260,13 @@ namespace :deploy do
     end
   end
 
+  desc <<-DESC
+    Deprecated API. This has become deploy:create_symlink, please update your recipes
+  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`."
+  end
+
   desc <<-DESC
     Updates the symlink to the most recently deployed version. Capistrano works \
     by putting each new release of your application in its own directory. When \
@@ -268,7 +276,10 @@ namespace :deploy do
     deploy, including `restart') or the 'update' task (which does everything \
     except `restart').
   DESC
-  task :symlink, :except => { :no_release => true } do
+  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"
@@ -375,6 +386,8 @@ namespace :deploy do
       set :migrate_target, :latest
   DESC
   task :migrate, :roles => :db, :only => { :primary => true } do
+    rake = fetch(:rake, "rake")
+    rails_env = fetch(:rails_env, "production")
     migrate_env = fetch(:migrate_env, "")
     migrate_target = fetch(:migrate_target, :latest)
 
@@ -398,7 +411,7 @@ namespace :deploy do
     set :migrate_target, :latest
     update_code
     migrate
-    symlink
+    create_symlink
     restart
   end
 
@@ -411,12 +424,12 @@ namespace :deploy do
   DESC
   task :cleanup, :except => { :no_release => true } do
     count = fetch(:keep_releases, 5).to_i
-    if count >= releases.length
+    local_releases = capture("ls -xt #{releases_path}").split.reverse
+    if count >= local_releases.length
       logger.important "no old releases to clean up"
     else
-      logger.info "keeping #{count} of #{releases.length} deployed releases"
-
-      directories = (releases - releases.last(count)).map { |release|
+      logger.info "keeping #{count} of #{local_releases.length} deployed releases"
+      directories = (local_releases - local_releases.last(count)).map { |release|
         File.join(releases_path, release) }.join(" ")
 
       try_sudo "rm -rf #{directories}"
@@ -527,6 +540,10 @@ namespace :deploy do
               REASON="hardware upgrade" \\
               UNTIL="12pm Central Time"
 
+      You can use a different template for the maintenance page by setting the \
+      :maintenance_template_path variable in your deploy.rb file. The template file \ 
+      should either be a plaintext or an erb file.
+
       Further customization will require that you write your own task.
     DESC
     task :disable, :roles => :web, :except => { :no_release => true } do
@@ -535,7 +552,7 @@ namespace :deploy do
 
       warn <<-EOHTACCESS
 
-        # Please add something like this to your site's htaccess to redirect users to the maintenance page.
+        # Please add something like this to your site's Apache htaccess to redirect users to the maintenance page.
         # More Info: http://www.shiftcommathree.com/articles/make-your-rails-maintenance-page-respond-with-a-503
 
         ErrorDocument 503 /system/#{maintenance_basename}.html
@@ -544,12 +561,23 @@ namespace :deploy do
         RewriteCond %{DOCUMENT_ROOT}/system/#{maintenance_basename}.html -f
         RewriteCond %{SCRIPT_FILENAME} !#{maintenance_basename}.html
         RewriteRule ^.*$  -  [redirect=503,last]
+
+        # Or if you are using Nginx add this to your server config:
+
+        if (-f $document_root/system/maintenance.html) {
+          return 503;
+        }
+        error_page 503 @maintenance;
+        location @maintenance {
+          rewrite  ^(.*)$  /system/maintenance.html last;
+          break;
+        }
       EOHTACCESS
 
       reason = ENV['REASON']
       deadline = ENV['UNTIL']
 
-      template = File.read(File.join(File.dirname(__FILE__), "templates", "maintenance.rhtml"))
+      template = File.read(maintenance_template_path)
       result = ERB.new(template).result(binding)
 
       put result, "#{shared_path}/system/#{maintenance_basename}.html", :mode => 0644

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

@@ -3,6 +3,8 @@ load 'deploy' unless defined?(_cset)
 _cset :asset_env, "RAILS_GROUPS=assets"
 _cset :assets_prefix, "assets"
 
+_cset :normalize_asset_timestamps, false
+
 before 'deploy:finalize_update', 'deploy:assets:symlink'
 after 'deploy:update_code', 'deploy:assets:precompile'
 

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

@@ -76,7 +76,7 @@ module Capistrano
             if revision == :head || revision.nil?
               nil
             else
-              "-r #{revision}"
+              "-r #{revision}".chomp
             end
           end
       end

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

@@ -38,6 +38,16 @@ module Capistrano
       # :copy_compression, which must be one of :gzip, :bz2, or
       # :zip, and which specifies how the source should be compressed for
       # transmission to each host.
+      #
+      # There is a possibility to pass a build command that will get
+      # executed if your code needs to be compiled or something needs to be
+      # done before the code is ready to run.
+      #
+      #   set :build_script, "make all"
+      #
+      # Note that if you use :copy_cache, the :build_script is used on the
+      # cache and thus you get faster compilation if your script does not
+      # recompile everything.
       class Copy < Base
         # Obtains a copy of the source code locally (via the #command method),
         # compresses it to a single file, copies that file to all target
@@ -58,6 +68,8 @@ module Capistrano
               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}"
@@ -84,6 +96,8 @@ module Capistrano
             logger.debug "getting (via #{copy_strategy}) revision #{revision} to #{destination}"
             system(command)
 
+            build(destination)
+
             if copy_exclude.any?
               logger.debug "processing exclusions..."
 
@@ -107,6 +121,18 @@ module Capistrano
           FileUtils.rm_rf destination rescue nil
         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
+        end
+
         def check!
           super.check do |d|
             d.local.command(source.local.command) if source.local.command
@@ -191,9 +217,9 @@ module Capistrano
 
             type = configuration[:copy_compression] || :gzip
             case type
-            when :gzip, :gz   then Compression.new("tar.gz",  [local_tar, 'chzf'], [remote_tar, 'xzf'])
-            when :bzip2, :bz2 then Compression.new("tar.bz2", [local_tar, 'chjf'], [remote_tar, 'xjf'])
-            when :zip         then Compression.new("zip",     %w(zip -qr), %w(unzip -q))
+            when :gzip, :gz   then Compression.new("tar.gz",  [local_tar, 'czf'], [remote_tar, 'xzf'])
+            when :bzip2, :bz2 then Compression.new("tar.bz2", [local_tar, 'cjf'], [remote_tar, 'xjf'])
+            when :zip         then Compression.new("zip",     %w(zip -qyr), %w(unzip -q))
             else raise ArgumentError, "invalid compression type #{type.inspect}"
             end
           end

data/lib/capistrano/ssh.rb

@@ -1,9 +1,3 @@
-begin
-  require 'rubygems'
-  gem 'net-ssh', ">= 2.0.10"
-rescue LoadError, NameError
-end
-
 require 'net/ssh'
 
 module Capistrano

data/lib/capistrano/task_definition.rb

@@ -1,22 +1,18 @@
 require 'capistrano/server_definition'
 
 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)
+      @desc      = @options.delete(:desc)
+      @on_error  = options.delete(:on_error)
       @max_hosts = options[:max_hosts] && options[:max_hosts].to_i
-      @body = block or raise ArgumentError, "a task requires a block"
-      @servers = nil
+      @body      = block or raise ArgumentError, "a task requires a block"
+      @servers   = nil
     end
 
     # Returns the task's fully-qualified name, including the namespace
@@ -30,6 +26,11 @@ module Capistrano
       end
     end
 
+    def name=(value)
+      raise ArgumentError, "expected a valid task name" if !value.respond_to?(:to_sym)
+      @name = value.to_sym
+    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.
@@ -71,5 +72,6 @@ module Capistrano
     def continue_on_error?
       @on_error == :continue
     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 "[#{channel[:host]}] #{name}" if logger && sent == 0
+          logger.trace "#{transport} #{operation} #{from} -> #{to}", channel[:host] 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 "[#{op[:host]}] #{args[0].remote}"
+              logger.trace "#{transport} #{operation} #{from} -> #{to}", op[:host]
             elsif event == :finish
-              logger.trace "[#{op[:host]}] done"
+              logger.trace "#{transport} #{operation} #{from} -> #{to} done", op[:host]
             end
           end
 
@@ -203,6 +203,8 @@ module Capistrano
       end
 
       def handle_error(error)
+        raise error if error.message.include?('expected a file to upload')
+
         transfer = session_map[error.session]
         transfer[:error] = error
         transfer[:failed] = true

data/lib/capistrano/version.rb

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

data/test/command_test.rb

@@ -226,13 +226,27 @@ class CommandTest < Test::Unit::TestCase
     Capistrano::Command.process("ls -l", %w(a b c), :foo => "bar")
   end
 
-  def test_process_with_host_placeholder_should_substitute_placeholder_with_each_host
+  def test_process_with_host_placeholder_should_substitute_host_placeholder_with_each_host
     session = setup_for_extracting_channel_action do |ch|
       ch.expects(:exec).with(%(sh -c 'echo capistrano'))
     end
     Capistrano::Command.new("echo $CAPISTRANO:HOST$", [session])
   end
 
+  class MockConfig
+    include Capistrano::Configuration::Roles
+  end
+  
+  def test_hostroles_substitution
+    @config = MockConfig.new
+    @config.server "capistrano", :db, :worker
+    server = @config.roles[:db].servers.first
+    channel = {:server => server, :host => 'capistrano'}
+    tree = Capistrano::Command::Tree.new(@config) { |t| t.else("echo $CAPISTRANO:HOSTROLES$") }
+    result = Capistrano::Command.new(tree, []).send(:replace_placeholders, "echo $CAPISTRANO:HOSTROLES$", channel)
+    assert result == "echo db,worker" || result == "echo worker,db"
+  end
+
   def test_process_with_unknown_placeholder_should_not_replace_placeholder
     session = setup_for_extracting_channel_action do |ch|
       ch.expects(:exec).with(%(sh -c 'echo $CAPISTRANO:OTHER$'))

data/test/configuration/alias_task_test.rb

@@ -0,0 +1,110 @@
+require 'utils'
+require 'capistrano/configuration/alias_task'
+require 'capistrano/configuration/execution'
+require 'capistrano/configuration/namespaces'
+require 'capistrano/task_definition'
+
+class AliasTaskTest < Test::Unit::TestCase
+  class MockConfig
+    attr_reader :options
+    attr_accessor :logger
+
+    def initialize(options={})
+      @options = {}
+      @logger = options.delete(:logger)
+    end
+
+    include Capistrano::Configuration::AliasTask
+    include Capistrano::Configuration::Execution
+    include Capistrano::Configuration::Namespaces
+  end
+
+  def setup
+    @config = MockConfig.new( :logger => stub(:debug => nil, :info => nil, :important => nil) )
+  end
+
+  def test_makes_a_copy_of_the_task
+    @config.task(:foo) { 42 }
+    @config.alias_task 'new_foo', 'foo'
+
+    assert @config.tasks.key?(:new_foo)
+  end
+
+  def test_aliased_task_do_the_same
+    @config.task(:foo) { 42 }
+    @config.alias_task 'new_foo', 'foo'
+
+    assert_equal 42, @config.find_and_execute_task('new_foo')
+  end
+
+  def test_aliased_task_should_preserve_description
+    @config.task(:foo, :desc => "the Ultimate Question of Life, the Universe, and Everything" ) { 42 }
+    @config.alias_task 'new_foo', 'foo'
+
+    task = @config.find_task('foo')
+    new_task = @config.find_task('new_foo')
+
+    assert_equal task.description, new_task.description
+  end
+
+  def test_aliased_task_should_preserve_on_error
+    @config.task(:foo, :on_error => :continue) { 42 }
+    @config.alias_task 'new_foo', 'foo'
+
+    task = @config.find_task('foo')
+    new_task = @config.find_task('new_foo')
+
+    assert_equal task.on_error, new_task.on_error
+  end
+
+  def test_aliased_task_should_preserve_max_hosts
+    @config.task(:foo, :max_hosts => 5) { 42 }
+    @config.alias_task 'new_foo', 'foo'
+
+    task = @config.find_task('foo')
+    new_task = @config.find_task('new_foo')
+
+    assert_equal task.max_hosts, new_task.max_hosts
+  end
+
+  def test_raise_exception_when_task_doesnt_exist
+    assert_raises(Capistrano::NoSuchTaskError) { @config.alias_task 'non_existant_task', 'fail_miserably' }
+  end
+
+  def test_convert_task_names_using_to_str
+    @config.task(:foo, :role => :app) { 42 }
+
+    @config.alias_task 'one', 'foo'
+    @config.alias_task :two, 'foo'
+    @config.alias_task 'three', :foo
+    @config.alias_task :four, :foo
+
+    assert @config.tasks.key?(:one)
+    assert @config.tasks.key?(:two)
+    assert @config.tasks.key?(:three)
+    assert @config.tasks.key?(:four)
+  end
+
+  def test_raise_an_exception_when_task_names_can_not_be_converted
+    @config.task(:foo, :role => :app) { 42 }
+
+    assert_raises(ArgumentError) { @config.alias_task mock('x'), :foo }
+  end
+
+  def test_should_include_namespace
+    @config.namespace(:outer) do
+      task(:foo) { 42 }
+      alias_task 'new_foo', 'foo'
+
+      namespace(:inner) do
+        task(:foo) { 43 }
+        alias_task 'new_foo', 'foo'
+      end
+    end
+
+    assert_equal 42, @config.find_and_execute_task('outer:new_foo')
+    assert_equal 42, @config.find_and_execute_task('outer:foo')
+    assert_equal 43, @config.find_and_execute_task('outer:inner:new_foo')
+    assert_equal 43, @config.find_and_execute_task('outer:inner:foo')
+  end
+end

data/test/configuration/callbacks_test.rb

@@ -174,47 +174,4 @@ class ConfigurationCallbacksTest < Test::Unit::TestCase
     assert_equal [task], @config.called
   end
 
-  def test_execute_task_with_named_before_hook_should_call_named_before_hook
-    ns = stub("namespace", :default_task => nil, :name => "old", :fully_qualified_name => "any:old")
-    task = stub(:fully_qualified_name => "any:old:thing", :name => "thing", :namespace => ns)
-    before_task = stub(:fully_qualified_name => "any:old:before_thing", :name => "before_thing", :namespace => ns)
-
-    ns.stubs(:search_task).returns(nil)
-    ns.expects(:search_task).with("before_thing").returns(before_task)
-
-    @config.execute_task(task)
-    assert_equal [before_task, task], @config.called
-  end
-
-  def test_execute_task_with_named_after_hook_should_call_named_after_hook
-    ns = stub("namespace", :default_task => nil, :name => "old", :fully_qualified_name => "any:old")
-    task = stub(:fully_qualified_name => "any:old:thing", :name => "thing", :namespace => ns)
-    after_task = stub(:fully_qualified_name => "any:old:after_thing", :name => "after_thing", :namespace => ns)
-
-    ns.stubs(:search_task).returns(nil)
-    ns.expects(:search_task).with("after_thing").returns(after_task)
-
-    @config.execute_task(task)
-    assert_equal [task, after_task], @config.called
-  end
-
-  def test_execute_task_with_on_hooks_should_trigger_hooks_around_task
-    ns = stub("namespace", :default_task => nil, :name => "old", :fully_qualified_name => "any:old")
-    task = stub(:fully_qualified_name => "any:old:thing", :name => "thing", :namespace => ns)
-    before_task = stub(:fully_qualified_name => "any:old:before_thing", :name => "before_thing", :namespace => ns)
-    after_task = stub(:fully_qualified_name => "any:old:after_thing", :name => "after_thing", :namespace => ns)
-
-    ns.stubs(:search_task).returns(nil)
-    ns.expects(:search_task).with("before_thing").returns(before_task)
-    ns.expects(:search_task).with("after_thing").returns(after_task)
-
-    @config.before("any:old:thing", :first_this, :then_this)
-    @config.after("any:old:thing", :and_then_this, :lastly_this)
-
-    [:first_this, :then_this, :and_then_this, :lastly_this].each do |t|
-      @config.expects(:find_and_execute_task).with(t)
-    end
-
-    @config.execute_task(task)
-  end
 end

data/test/configuration/roles_test.rb

@@ -21,6 +21,19 @@ class ConfigurationRolesTest < Test::Unit::TestCase
     assert @config.original_initialize_called
     assert @config.roles.empty?
   end
+  
+  def test_roles_for_host_with_one_role
+    @config.role :app, "app1.capistrano.test"
+    @config.role :not_app, "not-app.capistrano.test"
+    app_server = @config.roles[:app].servers.first
+    assert @config.role_names_for_host(app_server)==[ :app ]
+  end
+  
+  def test_roles_for_host_with_multiple_roles
+    @config.server "www.capistrano.test", :db, :worker
+    db_server = @config.roles[:db].servers.first
+    assert_equal @config.role_names_for_host(db_server).map(&:to_s).sort, [ 'db', 'worker' ]
+  end
 
   def test_role_should_allow_empty_list
     @config.role :app

data/test/configuration_test.rb

@@ -74,15 +74,4 @@ class ConfigurationTest < Test::Unit::TestCase
     assert !@config[:called_inner_first]
   end
 
-  def test_hooks_for_default_task_should_be_found_if_named_after_the_namespace
-    @config.namespace(:outer) do
-      task(:default) { set :called_default, true }
-      task(:before_outer) { set :called_before_outer, true }
-      task(:after_outer) { set :called_after_outer, true }
-    end
-    @config.outer.default
-    assert @config[:called_before_outer]
-    assert @config[:called_default]
-    assert @config[:called_after_outer]
-  end
 end

data/test/deploy/strategy/copy_test.rb

@@ -23,7 +23,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.expects(:system).with(:local_checkout)
 
     Dir.expects(:chdir).with("/temp/dir").yields
-    @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && gtar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
@@ -45,7 +45,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.expects(:system).with(:local_checkout)
 
     Dir.expects(:chdir).with("/temp/dir").yields
-    @strategy.expects(:system).with("gtar chzf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("gtar czf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
@@ -109,7 +109,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("zip -qr 1234567890.zip 1234567890")
+    @strategy.expects(:system).with("zip -qyr 1234567890.zip 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.zip", "/tmp/1234567890.zip")
     @strategy.expects(:run).with("cd /u/apps/test/releases && unzip -q /tmp/1234567890.zip && rm /tmp/1234567890.zip")
 
@@ -130,7 +130,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("tar chjf 1234567890.tar.bz2 1234567890")
+    @strategy.expects(:system).with("tar cjf 1234567890.tar.bz2 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.bz2", "/tmp/1234567890.tar.bz2")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xjf /tmp/1234567890.tar.bz2 && rm /tmp/1234567890.tar.bz2")
 
@@ -161,7 +161,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).with("154", "/other/path/1234567890").returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/other/path/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
@@ -182,7 +182,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).returns(:local_checkout)
 
     @strategy.expects(:system).with(:local_checkout)
-    @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
     @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/somewhere/else/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /somewhere/else/1234567890.tar.gz && rm /somewhere/else/1234567890.tar.gz")
 
@@ -288,6 +288,20 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
+  def test_with_build_script_should_run_script
+    @config[:build_script] = "mkdir bin"
+
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+
+    Dir.expects(:chdir).with("/temp/dir/1234567890").yields
+    @strategy.expects(:system).with("mkdir bin")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
   private
 
     def prepare_directory_tree!(cache, exclude=false)
@@ -307,7 +321,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     def prepare_standard_compress_and_copy!
       Dir.expects(:chdir).with("/temp/dir").yields
-      @strategy.expects(:system).with("tar chzf 1234567890.tar.gz 1234567890")
+      @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
       @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
       @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 

data/test/task_definition_test.rb

@@ -25,16 +25,17 @@ class TaskDefinitionTest < Test::Unit::TestCase
     assert_equal "default", task.fully_qualified_name
   end
 
-  def test_deprecation_warning_on_method_name_beginning_with_before_underscore
-    name = "before_test"
-    Kernel.expects(:warn).with("[Deprecation Warning] Naming tasks with before_ and after_ is deprecated, please see the new before() and after() methods. (Offending task name was #{name})")
-    new_task(name)
+  def test_name_should_change_task_name
+    task = new_task(:foo)
+    task.name = :bar
+
+    assert_equal :bar, task.name
   end
 
-  def test_deprecation_warning_on_method_name_beginning_with_after_underscore
-    name = "after_test"
-    Kernel.expects(:warn).with("[Deprecation Warning] Naming tasks with before_ and after_ is deprecated, please see the new before() and after() methods. (Offending task name was #{name})")
-    new_task(name)
+  def test_raise_an_exception_when_task_names_can_not_be_converted
+    task = new_task('valid task name')
+
+    assert_raises(ArgumentError) { task.name = ['invalid task name'] }
   end
 
   def test_fqn_in_namespace_when_default_should_be_namespace_fqn
@@ -113,4 +114,4 @@ class TaskDefinitionTest < Test::Unit::TestCase
     task = new_task(:testing, @namespace, :desc => "Take file.txt and copy it. Then do something else.")
     assert_equal "Take file.txt and copy it.", task.brief_description
   end
-end
+end

data/test/transfer_test.rb

@@ -133,6 +133,14 @@ class TransferTest < Test::Unit::TestCase
     transfer.process!
   end
 
+  def test_uploading_a_non_existing_file_should_raise_an_understandable_error
+    s = session('app1')
+    error = Capistrano::Processable::SessionAssociation.on(ArgumentError.new('expected a file to upload'), s)
+    transfer = Capistrano::Transfer.new(:up, "from", "to", [], :via => :scp)
+    transfer.expects(:process_iteration).raises(error)
+    assert_raise(ArgumentError, 'expected a file to upload') { transfer.process! }
+  end
+
   private
 
     class ExceptionWithSession < ::Exception

data/test/utils.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'ruby-debug'
 require 'test/unit'
 require 'mocha'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70363620892360 !ruby/object:Gem::Requirement
+  requirement: &70157295072440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363620892360
+  version_requirements: *70157295072440
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70363620908220 !ruby/object:Gem::Requirement
+  requirement: &70157295071180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 2.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70363620908220
+  version_requirements: *70157295071180
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &70363620907740 !ruby/object:Gem::Requirement
+  requirement: &70157295069420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70363620907740
+  version_requirements: *70157295069420
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70363620907260 !ruby/object:Gem::Requirement
+  requirement: &70157295068700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70363620907260
+  version_requirements: *70157295068700
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
-  requirement: &70363620906780 !ruby/object:Gem::Requirement
+  requirement: &70157295058440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70363620906780
+  version_requirements: *70157295058440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70363620906300 !ruby/object:Gem::Requirement
+  requirement: &70157295056280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363620906300
+  version_requirements: *70157295056280
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH.
 email:
@@ -91,7 +91,6 @@ extra_rdoc_files:
 - README.mdown
 files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - CHANGELOG
 - Gemfile
@@ -113,6 +112,7 @@ files:
 - lib/capistrano/configuration/actions/file_transfer.rb
 - lib/capistrano/configuration/actions/inspect.rb
 - lib/capistrano/configuration/actions/invocation.rb
+- lib/capistrano/configuration/alias_task.rb
 - lib/capistrano/configuration/callbacks.rb
 - lib/capistrano/configuration/connections.rb
 - lib/capistrano/configuration/execution.rb
@@ -122,8 +122,10 @@ files:
 - lib/capistrano/configuration/servers.rb
 - lib/capistrano/configuration/variables.rb
 - lib/capistrano/errors.rb
+- lib/capistrano/ext/multistage.rb
 - lib/capistrano/ext/string.rb
 - lib/capistrano/extensions.rb
+- lib/capistrano/fix_rake_deprecated_dsl.rb
 - lib/capistrano/logger.rb
 - lib/capistrano/processable.rb
 - lib/capistrano/recipes/compat.rb
@@ -160,7 +162,6 @@ files:
 - lib/capistrano/task_definition.rb
 - lib/capistrano/transfer.rb
 - lib/capistrano/version.rb
-- rvmrc.sample
 - test/cli/execute_test.rb
 - test/cli/help_test.rb
 - test/cli/options_test.rb
@@ -170,6 +171,7 @@ files:
 - test/configuration/actions/file_transfer_test.rb
 - test/configuration/actions/inspect_test.rb
 - test/configuration/actions/invocation_test.rb
+- test/configuration/alias_task_test.rb
 - test/configuration/callbacks_test.rb
 - test/configuration/connections_test.rb
 - test/configuration/execution_test.rb
@@ -224,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH
@@ -238,6 +240,7 @@ test_files:
 - test/configuration/actions/file_transfer_test.rb
 - test/configuration/actions/inspect_test.rb
 - test/configuration/actions/invocation_test.rb
+- test/configuration/alias_task_test.rb
 - test/configuration/callbacks_test.rb
 - test/configuration/connections_test.rb
 - test/configuration/execution_test.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.8.7

data/rvmrc.sample

@@ -1 +0,0 @@
-rvm use 1.8.7@capistrano-devel --create