capistrano 2.5.8 → 2.5.9

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== 2.5.9 / 12 September 2009
+
+  * #105 - Adds skip_hostfilter option to find_servers() [Eric]
+  * #103 - Fixes Using non-master branch fails with Ruby 1.9 [Suraj Kurapati]
+  * #96  - Tweak for 1.9 Compatibility
+  * #79  - Fixes Capistrano hangs on shell command for many computers
+  * #77  - Fixes Copy command doesn't work on Solaris due to tar/gtar
+  * #76  - Fixes 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] 
+  * Fixes a couple of documentation problems, typos and worse. [Lee Hambley]
+
 == 2.5.8 / July 2009
 
 * Fixes a problem in 2.5.7 where deploy:finalize_update had been badly merged.
@@ -5,10 +17,15 @@
 == 2.5.6 & 2.5.7 / July 2009
 
 * 2.5.7 masks a broken 2.5.6 release that was accidentally mirrored via Rubyforge.
+
 * Clean the cached git repository [Graeme Mathieson]
+
 * Fixes perforce issues reported at http://bit.ly/wt0es [Scott Johnson]
+
 * Improved back-tick handling code in relation to the above.
+
 * Fixes a Git issue when submodules update upstream. (via mailing list) [sneakin]
+
 * Capify now creates the config directory in directories without one.
 
 == 2.5.5 / 24 Feb 2009

data/README.rdoc

@@ -64,8 +64,8 @@ If you want to try Capistrano code that hasn't been formerly released yet, this
 
     git clone git://github.com/capistrano/capistrano.git capistrano-capistrano
     cd capistrano-capsitrano
-    gem build capistrano.gemspec
-    sudo gem install capistrano-*.gem
+    rake package
+    sudo gem install pkg/capistrano-*.gem
 
 This will install the most recent version of capistrano and make it available for both cap, and capify.
 

data/Rakefile

@@ -15,8 +15,8 @@ Echoe.new('capistrano', version) do |p|
   p.include_gemspec = true
   p.changelog        = "CHANGELOG.rdoc"
 
-  p.author           = "Jamis Buck"
-  p.email            = "jamis@jamisbuck.org"
+  p.author           = ["Jamis Buck", "Lee Hambley"]
+  p.email            = ["jamis@jamisbuck.org", "lee.hambley@gmail.com"]
 
   p.summary = <<-DESC.strip.gsub(/\n\s+/, " ")
     Capistrano is a utility and framework for executing commands in parallel
@@ -27,7 +27,7 @@ Echoe.new('capistrano', version) do |p|
   p.need_zip         = true
   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
 
-  p.dependencies     = ["net-ssh         >=2.0.10",
+  p.dependencies     = ["net-ssh         >=2.0.14",
                         "net-sftp        >=2.0.0",
                         "net-scp         >=1.0.0",
                         "net-ssh-gateway >=1.0.0",

data/bin/capify

@@ -39,59 +39,46 @@ files = {
   "Capfile" => unindent(<<-FILE),
     load 'deploy' if respond_to?(:namespace) # cap2 differentiator
     Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-    load 'config/deploy'
+
+    load 'config/deploy' # remove this line to skip loading any of the default tasks
   FILE
 
-  "config/deploy.rb" => unindent(<<-FILE),
-    set :application, "set your application name here"
-    set :repository,  "set your repository location here"
+  "config/deploy.rb" => 'set :application, "set your application name here"
+set :repository,  "set your repository location here"
 
-    # If you have previously been relying upon the code to start, stop 
-    # and restart your mongrel application, or if you rely on the database
-    # migration code, please uncomment the lines you require below
-    
-    # If you are deploying a rails app you probably need these:
-    
-    # load 'ext/rails-database-migrations.rb'
-    # load 'ext/rails-shared-directories.rb'
-    
-    # There are also new utility libaries shipped with the core these 
-    # include the following, please see individual files for more
-    # documentation, or run `cap -vT` with the following lines commented
-    # out to see what they make available.
-    
-    # load 'ext/spinner.rb'              # Designed for use with script/spin
-    # load 'ext/passenger-mod-rails.rb'  # Restart task for use with mod_rails
-    # load 'ext/web-disable-enable.rb'   # Gives you web:disable and web:enable
+set :scm, :subversion
+# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
 
-    # If you aren't deploying to /u/apps/\#{application} on the target
-    # servers (which is the default), you can specify the actual location
-    # via the :deploy_to variable:
-    # set :deploy_to, "/var/www/\#{application}"
+role :web, "your web-server here"                          # Your HTTP server, Apache/etc
+role :app, "your app-server here"                          # This may be the same as your `Web` server
+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 aren't using Subversion to manage your source code, specify
-    # your SCM below:
-    # set :scm, :subversion
-    # see a full list by running "gem contents capistrano | grep 'scm/'"
+# If you are using Passenger mod_rails uncomment this:
+# if you\'re still using the script/reapear helper you will need
+# these http://github.com/rails/irs_process_scripts
 
-    role :web, "your web-server here"
-    
-  FILE
-}
+# namespace :deploy do
+#   task :start {}
+#   task :stop {}
+#   task :restart, :roles => :app, :except => { :no_release => true } do
+#     run "#{try_sudo} touch #{File.join(current_path,\'tmp\',\'restart.txt\')}"
+#   end
+# end'}
 
 base = ARGV.shift
 files.each do |file, content|
   file = File.join(base, file)
   if File.exists?(file)
-    warn "[skip] `#{file}' already exists"
+    warn "[skip] '#{file}' already exists"
   elsif File.exists?(file.downcase)
-    warn "[skip] `#{file.downcase}' exists, which could conflict with `#{file}'"
-  elsif !File.exists?(File.dirname(file))
-    FileUtils.mkdir(File.dirname(file))
-    retry
-    warn "[skip] directory `#{File.dirname(file)}' did not exist, created."
+    warn "[skip] '#{file.downcase}' exists, which could conflict with `#{file}'"
   else
-    puts "[add] writing `#{file}'"
+    unless File.exists?(File.dirname(file))
+      puts "[add] making directory '#{File.dirname(file)}'"
+      FileUtils.mkdir(File.dirname(file))
+    end
+    puts "[add] writing '#{file}'"
     File.open(file, "w") { |f| f.write(content) }
   end
 end

data/capistrano.gemspec

@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{capistrano}
+  s.version = "2.5.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jamis Buck, Lee Hambley"]
+  s.date = %q{2009-09-12}
+  s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
+  s.email = ["jamis@jamisbuck.org", "lee.hambley@gmail.com"]
+  s.executables = ["cap", "capify"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/capistrano/callback.rb", "lib/capistrano/cli/execute.rb", "lib/capistrano/cli/help.rb", "lib/capistrano/cli/help.txt", "lib/capistrano/cli/options.rb", "lib/capistrano/cli/ui.rb", "lib/capistrano/cli.rb", "lib/capistrano/command.rb", "lib/capistrano/configuration/actions/file_transfer.rb", "lib/capistrano/configuration/actions/inspect.rb", "lib/capistrano/configuration/actions/invocation.rb", "lib/capistrano/configuration/callbacks.rb", "lib/capistrano/configuration/connections.rb", "lib/capistrano/configuration/execution.rb", "lib/capistrano/configuration/loading.rb", "lib/capistrano/configuration/namespaces.rb", "lib/capistrano/configuration/roles.rb", "lib/capistrano/configuration/servers.rb", "lib/capistrano/configuration/variables.rb", "lib/capistrano/configuration.rb", "lib/capistrano/errors.rb", "lib/capistrano/extensions.rb", "lib/capistrano/logger.rb", "lib/capistrano/processable.rb", "lib/capistrano/recipes/compat.rb", "lib/capistrano/recipes/deploy/dependencies.rb", "lib/capistrano/recipes/deploy/local_dependency.rb", "lib/capistrano/recipes/deploy/remote_dependency.rb", "lib/capistrano/recipes/deploy/scm/accurev.rb", "lib/capistrano/recipes/deploy/scm/base.rb", "lib/capistrano/recipes/deploy/scm/bzr.rb", "lib/capistrano/recipes/deploy/scm/cvs.rb", "lib/capistrano/recipes/deploy/scm/darcs.rb", "lib/capistrano/recipes/deploy/scm/git.rb", "lib/capistrano/recipes/deploy/scm/mercurial.rb", "lib/capistrano/recipes/deploy/scm/none.rb", "lib/capistrano/recipes/deploy/scm/perforce.rb", "lib/capistrano/recipes/deploy/scm/subversion.rb", "lib/capistrano/recipes/deploy/scm.rb", "lib/capistrano/recipes/deploy/strategy/base.rb", "lib/capistrano/recipes/deploy/strategy/checkout.rb", "lib/capistrano/recipes/deploy/strategy/copy.rb", "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.rb", "lib/capistrano/recipes/deploy/templates/maintenance.rhtml", "lib/capistrano/recipes/deploy.rb", "lib/capistrano/recipes/standard.rb", "lib/capistrano/recipes/templates/maintenance.rhtml", "lib/capistrano/recipes/upgrade.rb", "lib/capistrano/role.rb", "lib/capistrano/server_definition.rb", "lib/capistrano/shell.rb", "lib/capistrano/ssh.rb", "lib/capistrano/task_definition.rb", "lib/capistrano/transfer.rb", "lib/capistrano/version.rb", "lib/capistrano.rb", "README.rdoc"]
+  s.files = ["bin/cap", "bin/capify", "CHANGELOG.rdoc", "examples/sample.rb", "lib/capistrano/callback.rb", "lib/capistrano/cli/execute.rb", "lib/capistrano/cli/help.rb", "lib/capistrano/cli/help.txt", "lib/capistrano/cli/options.rb", "lib/capistrano/cli/ui.rb", "lib/capistrano/cli.rb", "lib/capistrano/command.rb", "lib/capistrano/configuration/actions/file_transfer.rb", "lib/capistrano/configuration/actions/inspect.rb", "lib/capistrano/configuration/actions/invocation.rb", "lib/capistrano/configuration/callbacks.rb", "lib/capistrano/configuration/connections.rb", "lib/capistrano/configuration/execution.rb", "lib/capistrano/configuration/loading.rb", "lib/capistrano/configuration/namespaces.rb", "lib/capistrano/configuration/roles.rb", "lib/capistrano/configuration/servers.rb", "lib/capistrano/configuration/variables.rb", "lib/capistrano/configuration.rb", "lib/capistrano/errors.rb", "lib/capistrano/extensions.rb", "lib/capistrano/logger.rb", "lib/capistrano/processable.rb", "lib/capistrano/recipes/compat.rb", "lib/capistrano/recipes/deploy/dependencies.rb", "lib/capistrano/recipes/deploy/local_dependency.rb", "lib/capistrano/recipes/deploy/remote_dependency.rb", "lib/capistrano/recipes/deploy/scm/accurev.rb", "lib/capistrano/recipes/deploy/scm/base.rb", "lib/capistrano/recipes/deploy/scm/bzr.rb", "lib/capistrano/recipes/deploy/scm/cvs.rb", "lib/capistrano/recipes/deploy/scm/darcs.rb", "lib/capistrano/recipes/deploy/scm/git.rb", "lib/capistrano/recipes/deploy/scm/mercurial.rb", "lib/capistrano/recipes/deploy/scm/none.rb", "lib/capistrano/recipes/deploy/scm/perforce.rb", "lib/capistrano/recipes/deploy/scm/subversion.rb", "lib/capistrano/recipes/deploy/scm.rb", "lib/capistrano/recipes/deploy/strategy/base.rb", "lib/capistrano/recipes/deploy/strategy/checkout.rb", "lib/capistrano/recipes/deploy/strategy/copy.rb", "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.rb", "lib/capistrano/recipes/deploy/templates/maintenance.rhtml", "lib/capistrano/recipes/deploy.rb", "lib/capistrano/recipes/standard.rb", "lib/capistrano/recipes/templates/maintenance.rhtml", "lib/capistrano/recipes/upgrade.rb", "lib/capistrano/role.rb", "lib/capistrano/server_definition.rb", "lib/capistrano/shell.rb", "lib/capistrano/ssh.rb", "lib/capistrano/task_definition.rb", "lib/capistrano/transfer.rb", "lib/capistrano/version.rb", "lib/capistrano.rb", "Rakefile", "README.rdoc", "setup.rb", "test/cli/execute_test.rb", "test/cli/help_test.rb", "test/cli/options_test.rb", "test/cli/ui_test.rb", "test/cli_test.rb", "test/command_test.rb", "test/configuration/actions/file_transfer_test.rb", "test/configuration/actions/inspect_test.rb", "test/configuration/actions/invocation_test.rb", "test/configuration/callbacks_test.rb", "test/configuration/connections_test.rb", "test/configuration/execution_test.rb", "test/configuration/loading_test.rb", "test/configuration/namespace_dsl_test.rb", "test/configuration/roles_test.rb", "test/configuration/servers_test.rb", "test/configuration/variables_test.rb", "test/configuration_test.rb", "test/deploy/local_dependency_test.rb", "test/deploy/remote_dependency_test.rb", "test/deploy/scm/accurev_test.rb", "test/deploy/scm/base_test.rb", "test/deploy/scm/git_test.rb", "test/deploy/scm/mercurial_test.rb", "test/deploy/strategy/copy_test.rb", "test/extensions_test.rb", "test/fixtures/cli_integration.rb", "test/fixtures/config.rb", "test/fixtures/custom.rb", "test/logger_test.rb", "test/role_test.rb", "test/server_definition_test.rb", "test/shell_test.rb", "test/ssh_test.rb", "test/task_definition_test.rb", "test/transfer_test.rb", "test/utils.rb", "Manifest", "capistrano.gemspec", "test/deploy/scm/none_test.rb", "test/deploy/scm/subversion_test.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://www.capify.org}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Capistrano", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{capistrano}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
+  s.test_files = ["test/cli/execute_test.rb", "test/cli/help_test.rb", "test/cli/options_test.rb", "test/cli/ui_test.rb", "test/cli_test.rb", "test/command_test.rb", "test/configuration/actions/file_transfer_test.rb", "test/configuration/actions/inspect_test.rb", "test/configuration/actions/invocation_test.rb", "test/configuration/callbacks_test.rb", "test/configuration/connections_test.rb", "test/configuration/execution_test.rb", "test/configuration/loading_test.rb", "test/configuration/namespace_dsl_test.rb", "test/configuration/roles_test.rb", "test/configuration/servers_test.rb", "test/configuration/variables_test.rb", "test/configuration_test.rb", "test/deploy/local_dependency_test.rb", "test/deploy/remote_dependency_test.rb", "test/deploy/scm/accurev_test.rb", "test/deploy/scm/base_test.rb", "test/deploy/scm/git_test.rb", "test/deploy/scm/mercurial_test.rb", "test/deploy/scm/none_test.rb", "test/deploy/scm/subversion_test.rb", "test/deploy/strategy/copy_test.rb", "test/extensions_test.rb", "test/logger_test.rb", "test/role_test.rb", "test/server_definition_test.rb", "test/shell_test.rb", "test/ssh_test.rb", "test/task_definition_test.rb", "test/transfer_test.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.14"])
+      s.add_runtime_dependency(%q<net-sftp>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<net-scp>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
+    else
+      s.add_dependency(%q<net-ssh>, [">= 2.0.14"])
+      s.add_dependency(%q<net-sftp>, [">= 2.0.0"])
+      s.add_dependency(%q<net-scp>, [">= 1.0.0"])
+      s.add_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
+      s.add_dependency(%q<highline>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<net-ssh>, [">= 2.0.14"])
+    s.add_dependency(%q<net-sftp>, [">= 2.0.0"])
+    s.add_dependency(%q<net-scp>, [">= 1.0.0"])
+    s.add_dependency(%q<net-ssh-gateway>, [">= 1.0.0"])
+    s.add_dependency(%q<highline>, [">= 0"])
+  end
+end

data/lib/capistrano/cli/execute.rb

@@ -21,7 +21,7 @@ module Capistrano
       #
       # Returns the Configuration instance used, if successful.
       def execute!
-        config = instantiate_configuration
+        config = instantiate_configuration(options)
         config.debug = options[:debug]
         config.dry_run = options[:dry_run]
         config.logger.level = options[:verbose]
@@ -66,8 +66,8 @@ module Capistrano
 
       # Primarily useful for testing, but subclasses of CLI could conceivably
       # override this method to return a Configuration subclass or replacement.
-      def instantiate_configuration #:nodoc:
-        Capistrano::Configuration.new
+      def instantiate_configuration(options={}) #:nodoc:
+        Capistrano::Configuration.new(options)
       end
 
       def handle_error(error) #:nodoc:
@@ -81,4 +81,4 @@ module Capistrano
       end
     end
   end
-end
+end

data/lib/capistrano/cli/help.txt

@@ -28,6 +28,9 @@ The following options are understood:
   <%= color '-h, --help', :bold %>
 	Shows a brief summary of these options and exits.
 
+  <%= color '-l, --logger [STDERR|STDOUT|file]', :bold %>
+	Change the file used to print the output. It offers three options: standard error(stderr), standard output and file. Options are not case sensitive. By default Capistrano uses stderr.
+
   <%= color '-n, --dry-run', :bold %>
 	Causes Capistrano to simply display each remote command, without executing it. In this sense it is similar to --debug, but without the prompt. Note that commands executed locally are still run--only remote commands are skipped.
   
@@ -72,4 +75,4 @@ The following options are understood:
 	Execute tasks against this comma-separated list of host, but only if the host has the proper role for the task.
 
   <%= color 'ROLES', :bold %>
-	Execute tasks against this comma-separated list of roles.  Hosts which do not have the right roles will be skipped.
+	Execute tasks against this comma-separated list of roles.  Hosts which do not have the right roles will be skipped.

data/lib/capistrano/cli/options.rb

@@ -54,6 +54,19 @@ module Capistrano
             exit
           end
 
+					opts.on("-l", "--logger [STDERR|STDOUT|file]", 
+						"Choose logger method. STDERR used by default."
+					) do |value| 
+						options[:output] = if value.nil? || value.upcase == 'STDERR'
+																 # Using default logger.
+																 nil
+															 elsif value.upcase == 'STDOUT'
+																 $stdout
+															 else
+																 value
+															 end
+					end
+
           opts.on("-n", "--dry-run",
             "Prints out commands without running them."
           ) { |value| options[:dry_run] = true }

data/lib/capistrano/configuration.rb

@@ -21,10 +21,10 @@ module Capistrano
     # The logger instance defined for this configuration.
     attr_accessor :debug, :logger, :dry_run
 
-    def initialize #:nodoc:
+    def initialize(options={}) #:nodoc:
       @debug = false
       @dry_run = false
-      @logger = Logger.new
+      @logger = Logger.new(options)
     end
 
     # make the DSL easier to read when using lazy evaluation via lambdas

data/lib/capistrano/configuration/servers.rb

@@ -13,8 +13,10 @@ module Capistrano
       # The options hash may include a :hosts option (which should specify
       # an array of host names or ServerDefinition instances), a :roles
       # option (specifying an array of roles), an :only option (specifying
-      # a hash of key/value pairs that any matching server must match), and
-      # an :exception option (like :only, but the inverse).
+      # a hash of key/value pairs that any matching server must match), 
+      # an :exception option (like :only, but the inverse), and a 
+      # :skip_hostfilter option to ignore the HOSTFILTER environment variable
+      # described below.
       #
       # Additionally, if the HOSTS environment variable is set, it will take
       # precedence over any other options. Similarly, the ROLES environment
@@ -40,7 +42,11 @@ module Capistrano
         hosts  = server_list_from(ENV['HOSTS'] || options[:hosts])
         
         if hosts.any?
-          filter_server_list(hosts.uniq)
+          if options[:skip_hostfilter]
+            hosts.uniq
+          else
+            filter_server_list(hosts.uniq)
+          end
         else
           roles  = role_list_from(ENV['ROLES'] || options[:roles] || self.roles.keys)
           only   = options[:only] || {}
@@ -49,7 +55,12 @@ 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 } }
-          filter_server_list(servers.uniq)
+
+          if options[:skip_hostfilter]
+            servers.uniq
+          else
+            filter_server_list(servers.uniq)
+          end
         end
       end
 

data/lib/capistrano/recipes/deploy.rb

@@ -94,9 +94,18 @@ end
 # returns the command output as a string
 def run_locally(cmd)
   logger.trace "executing locally: #{cmd.inspect}" if logger
+  command_present?(cmd)
   `#{cmd}`
 end
 
+# tests if the given command is present on the local system
+def command_present?(cmd)
+  executable = cmd.to_s.split(" ").first
+  unless system("which #{executable}")
+    logger.important "executable '#{executable}' not present or not in $PATH on the local system!"
+  end
+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.
@@ -291,6 +300,10 @@ namespace :deploy do
     Restarts your application. This works by calling the script/process/reaper \
     script under the current path.
     
+    If you are deploying a Rails 2.3.x application, you will need to install 
+    these http://github.com/rails/irs_process_scripts (more info about why
+    on that page.)
+    
     By default, this will be invoked via sudo as the `app' user. If \
     you wish to run it as a different user, set the :runner variable to \
     that user. If you are in an environment where you can't use sudo, set \
@@ -299,6 +312,7 @@ namespace :deploy do
       set :use_sudo, false
   DESC
   task :restart, :roles => :app, :except => { :no_release => true } do
+    warn "[DEPRECATED] `deploy:restart` is going to be changed to Passenger mod_rails' method after 2.5.9 - see http://is.gd/2BPeA"
     try_runner "#{current_path}/script/process/reaper"
   end
 
@@ -479,6 +493,7 @@ namespace :deploy do
     the :use_sudo variable to false.
   DESC
   task :start, :roles => :app do
+    warn "[DEPRECATED] `deploy:start` is going to be removed after 2.5.9 - see http://is.gd/2BPeA"
     run "cd #{current_path} && #{try_runner} nohup script/spin"
   end
 
@@ -494,6 +509,7 @@ namespace :deploy do
     the :use_sudo variable to false.
   DESC
   task :stop, :roles => :app do
+    warn "[DEPRECATED] `deploy:start` is going to be removed after 2.5.9 - see http://is.gd/2BPeA"
     run "if [ -f #{current_path}/tmp/pids/dispatch.spawner.pid ]; then #{try_runner} #{current_path}/script/process/reaper -a kill -r dispatch.spawner.pid; fi"
     try_runner "#{current_path}/script/process/reaper -a kill"
   end
@@ -540,6 +556,19 @@ namespace :deploy do
       require 'erb'
       on_rollback { run "rm #{shared_path}/system/maintenance.html" }
 
+      warn <<-EOHTACCESS
+      
+        # Please add something like this to your site's 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.html
+        RewriteEngine On
+        RewriteCond %{REQUEST_URI} !\.(css|gif|jpg|png)$
+        RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+        RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+        RewriteRule ^.*$  -  [redirect=503,last]
+      EOHTACCESS
+
       reason = ENV['REASON']
       deadline = ENV['UNTIL']
 

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

@@ -223,7 +223,7 @@ module Capistrano
           newrev = nil
           revdata.each_slice(2) do |refs|
             rev, ref = *refs
-            if ref.sub(/refs\/.*?\//, '').strip == revision
+            if ref.sub(/refs\/.*?\//, '').strip == revision.to_s
               newrev = rev
               break
             end

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

@@ -56,7 +56,7 @@ module Capistrano
           result = yield(command)
           yaml = YAML.load(result)
           raise "tried to run `#{command}' and got unexpected result #{result.inspect}" unless Hash === yaml
-          yaml['Last Changed Rev'] || yaml['Revision']
+          [ (yaml['Last Changed Rev'] || 0).to_i, (yaml['Revision'] || 0).to_i ].max
         end
 
         # Increments the given revision number and returns it.

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

@@ -50,7 +50,7 @@ module Capistrano
           def system(*args)
             cmd = args.join(' ')
             if RUBY_PLATFORM =~ /win32/
-              cmd.gsub!('/','\\') # Replace / with \\
+							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}"

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

@@ -182,10 +182,13 @@ module Capistrano
           
           # The compression method to use, defaults to :gzip.
           def compression
+            remote_tar = configuration[:copy_remote_tar] || 'tar'
+            local_tar = configuration[:copy_local_tar] || 'tar'
+            
             type = configuration[:copy_compression] || :gzip
             case type
-            when :gzip, :gz   then Compression.new("tar.gz",  %w(tar czf), %w(tar xzf))
-            when :bzip2, :bz2 then Compression.new("tar.bz2", %w(tar cjf), %w(tar xjf))
+            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 -qr), %w(unzip -q))
             else raise ArgumentError, "invalid compression type #{type.inspect}"
             end

data/lib/capistrano/version.rb

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

data/test/configuration/servers_test.rb

@@ -78,7 +78,7 @@ class ConfigurationServersTest < Test::Unit::TestCase
     ENV.delete('HOSTS')
   end
 
-  def test_task_with_onlyhosts_environment_variable_should_apply_only_to_those_hosts
+  def test_task_with_hostfilter_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
@@ -86,7 +86,7 @@ class ConfigurationServersTest < Test::Unit::TestCase
     ENV.delete('HOSTFILTER')
   end
 
-  def test_task_with_onlyhosts_environment_variable_should_filter_hosts_option
+  def test_task_with_hostfilter_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
@@ -94,6 +94,14 @@ class ConfigurationServersTest < Test::Unit::TestCase
     ENV.delete('HOSTFILTER')
   end
 
+  def test_task_with_hostfilter_environment_variable_and_skip_hostfilter_should_not_filter_hosts_option
+    ENV['HOSTFILTER'] = "foo"
+    task = new_task(:testing, @config, :hosts => %w(foo bar), :skip_hostfilter => true)
+    assert_equal %w(foo bar).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
     task = new_task(:testing, @config, :roles => :app, :only => { :primary => true })
     assert_equal %w(app1), @config.find_servers_for_task(task).map { |s| s.host }

data/test/deploy/scm/subversion_test.rb

@@ -0,0 +1,32 @@
+require "utils"
+require 'capistrano/recipes/deploy/scm/subversion'
+
+class DeploySCMSubversionTest < Test::Unit::TestCase
+  class TestSCM < Capistrano::Deploy::SCM::Subversion
+    default_command "svn"
+  end
+
+  def setup
+    @config = { :repository => "." }
+    def @config.exists?(name); key?(name); end
+
+    @source = TestSCM.new(@config)
+  end
+
+  def test_query_revision
+    revision = @source.query_revision('HEAD') do |o|
+      assert_equal "svn info .  -rHEAD", o
+      %Q{Path: rails_2_3
+URL: svn+ssh://example.com/var/repos/project/branches/rails_2_3
+Repository Root: svn+ssh://example.com/var/repos
+Repository UUID: 2d86388d-c40f-0410-ad6a-a69da6a65d20
+Revision: 2095
+Node Kind: directory
+Last Changed Author: sw
+Last Changed Rev: 2064
+Last Changed Date: 2009-03-11 11:04:25 -0700 (Wed, 11 Mar 2009)
+}
+    end
+    assert_equal 2095, revision
+  end
+end

data/test/deploy/strategy/copy_test.rb

@@ -14,6 +14,50 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @config.stubs(:source).returns(@source)
     @strategy = Capistrano::Deploy::Strategy::Copy.new(@config)
   end
+  
+  def test_deploy_with_defaults_should_use_remote_gtar
+    @config[:copy_remote_tar] = 'gtar'
+    
+    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").yields
+    @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")
+
+    mock_file = mock("file")
+    mock_file.expects(:puts).with("154")
+    File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
+
+    FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
+    FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
+    
+    @strategy.deploy!
+  end
+  
+  def test_deploy_with_defaults_should_use_local_gtar
+    @config[:copy_local_tar] = 'gtar'
+    
+    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").yields
+    @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")
+
+    mock_file = mock("file")
+    mock_file.expects(:puts).with("154")
+    File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
+
+    FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
+    FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
+    
+    @strategy.deploy!
+  end  
 
   def test_deploy_with_defaults_should_use_tar_gz_and_checkout
     Dir.expects(:tmpdir).returns("/temp/dir")

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors: 
-- Jamis Buck
-- Lee Hambley
+- Jamis Buck, Lee Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 +01:00
+date: 2009-09-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.10
+        version: 2.0.14
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
@@ -63,18 +62,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
-email: lee.hambley@gmail.com
+email: 
+- jamis@jamisbuck.org
+- lee.hambley@gmail.com
 executables: 
 - cap
 - capify
@@ -247,11 +238,9 @@ files:
 - test/transfer_test.rb
 - test/utils.rb
 - Manifest
-- test/deploy/scm/none_test.rb
+- capistrano.gemspec
 has_rdoc: true
 homepage: http://www.capify.org
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -277,10 +266,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capistrano
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Simple. The way it should be.
+summary: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
 test_files: 
 - test/cli/execute_test.rb
 - test/cli/help_test.rb
@@ -307,6 +296,7 @@ test_files:
 - test/deploy/scm/git_test.rb
 - test/deploy/scm/mercurial_test.rb
 - test/deploy/scm/none_test.rb
+- test/deploy/scm/subversion_test.rb
 - test/deploy/strategy/copy_test.rb
 - test/extensions_test.rb
 - test/logger_test.rb