capistrano 2.4.0 → 2.4.1

data/{CHANGELOG → CHANGELOG.rdoc}

@@ -1,9 +1,18 @@
-*2.4.0* June 13, 2008
+== 2.4.1 / June 27, 2008
+
+* Use Echoe to manage the Rakefile [Jamis Buck]
+
+* Let Net::SSH manage the default SSH port selection [Ben Lavender]
+
+* Changed capture() helper to not raise an exception on error, but to warn instead [Jeff Forcier]
+
+
+== 2.4.0 / June 13, 2008
 
 * 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]
 
@@ -48,7 +57,7 @@
 * Add debug switch for enabling conditional execution of commands [Mark Imbriaco]
 
 
-*2.3.0* May 2, 2008
+== 2.3.0 / May 2, 2008
 
 * Make deploy:setup obey the :use_sudo and :runner directives, and generalize the :use_sudo and :runner options into a try_sudo() helper method [Jamis Buck]
 
@@ -75,7 +84,7 @@
 * Improved "copy" strategy supports local caching and pattern exclusion (via :copy_cache and :copy_exclude variables) [Jamis Buck]
 
 
-*2.2.0* February 27, 2008
+== 2.2.0 / February 27, 2008
 
 * Fix git submodule support to init on sync [halorgium]
 
@@ -122,7 +131,7 @@
 * Prepare for Net::SSH v2 by making sure Capistrano only tries to load Net::SSH versions less than 1.99.0 [Jamis Buck]
 
 
-*2.1.0* October 14, 2007
+== 2.1.0 / October 14, 2007
 
 * Default to 0664 instead of 0660 on upload [Jamis Buck]
 
@@ -143,7 +152,7 @@
 * Use the --password switch for subversion by default, but add :scm_prefer_prompt variable (defaults to false) [Jamis Buck]
 
 
-*2.0.100 (2.1 Preview 1)* September 1, 2007
+== 2.0.100 (2.1 Preview 1) / September 1, 2007
 
 * capify-generated Capfile will autoload all recipes from vendor/plugins/*/recipes/*.rb [Graeme Mathieson]
 
@@ -176,7 +185,7 @@
 * Change the "-h" output so that it does not say that "-q" is the default [Jamis Buck]
 
 
-*2.0.0* July 21, 2007
+== 2.0.0 / July 21, 2007
 
 * Make the "no matching servers" error more sane [halorgium]
 
@@ -205,7 +214,7 @@
 * Spelling corrections in docs [Tim Carey-Smith, Giles Bowkett]
 
 
-*1.99.3 (2.0 Preview 4)* June 28, 2007
+== 1.99.3 (2.0 Preview 4) / June 28, 2007
 
 * Don't break task descriptions on a period that appears in the middle of a sentence [Jamis Buck]
 
@@ -238,7 +247,7 @@
 * Make sure symlink and finalize_update tasks reference the most recent release when called by themselves [Jamis Buck]
 
 
-*1.99.2 (2.0 Preview 3)* June 15, 2007
+== 1.99.2 (2.0 Preview 3) / June 15, 2007
  
 * CVS SCM module [Brian Phillips]
 
@@ -263,7 +272,7 @@
 * Add :default_environment variable, which is applied to every command
 
 
-*1.99.1 (2.0 Preview 2)* May 10, 2007
+== 1.99.1 (2.0 Preview 2) / May 10, 2007
 
 * Fix some documentation typos [eventualbuddha]
 
@@ -298,7 +307,7 @@
 * Make the copy strategy check out to a temporary directory [Jamis Buck]
 
 
-*1.99.0 (2.0 Preview 1)* April 24, 2007
+== 1.99.0 (2.0 Preview 1) / April 24, 2007
 
 * Add `capify' script to make it easier to prepare a project for deployment using cap [Jamis Buck]
 
@@ -319,7 +328,7 @@
 * Merged the Configuration and Actor classes, performed various other massive refactorings of the code [Jamis Buck]
 
 
-*1.4.1* (February 24, 2007)
+== 1.4.1 / February 24, 2007
 
 * Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [jonathan]
 
@@ -330,7 +339,7 @@
 * Add :env option to 'run' (and friends) so that you can specify environment variables to be injected into the new process' environment [Mathieu Lajugie]
 
 
-*1.4.0* (February 3, 2007)
+== 1.4.0 / February 3, 2007
 
 * Use the auth info for subversion more consistently [Jamis Buck]
 
@@ -357,12 +366,12 @@
 * Fix off-by-one bug in show_tasks width-computation [NeilW]
 
 
-*1.3.1* (January 5, 2007)
+== 1.3.1 / January 5, 2007
 
 * Fix connection problems when using gateways [Ezra Zygmuntowicz]
 
 
-*1.3.0* (December 23, 2006)
+== 1.3.0 / December 23, 2006
 
 * Deprecate rake integration in favor of invoking `cap' directly [Jamis Buck]
 
@@ -393,7 +402,7 @@
 * Added :as option to sudo, so you can specify who the command is executed as [Mark Imbriaco]
 
 
-*1.2.0* (September 14, 2006)
+== 1.2.0 / September 14, 2006
 
 * Add experimental 'shell' task [Jamis Buck]
 
@@ -477,7 +486,7 @@
 * Fix operator precedence problem in script for touching the revisions.log #3223 [jason.garber@emu.edu]
 
 
-*1.1.0* (March 6th, 2006)
+== 1.1.0 / March 6th, 2006
 
 * Simplify the generated capistrano.rake file, and make it easier to customize
 
@@ -490,12 +499,12 @@
 * Look for config/deploy.rb, capfile, and Capfile by default
 
 
-*1.0.1* (February 20th, 2006)
+== 1.0.1 / February 20th, 2006
 
 * Fix broken switchtower_invoke function in switchtower.rake (missing require statement)
 
 
-*1.0.0* (Feburary 18th, 2006)
+== 1.0.0 / Feburary 18th, 2006
 
 * Make CVS module's :local value default to "."
 
@@ -544,7 +553,7 @@
 * Set :actor key on SSH channel instances
 
 
-*0.10.0* (January 2nd, 2006)
+== 0.10.0 / January 2nd, 2006
 
 * Handle ssh password prompts like "someone's password:"
 
@@ -583,7 +592,7 @@
 * Require Net::SSH 1.0.5
 
 
-*0.9.0* (October 18th, 2005)
+== 0.9.0 / October 18th, 2005
 
 * Use process reaper instead of custom reap script for restarting
 

data/Manifest

@@ -0,0 +1,104 @@
+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

data/{README → README.rdoc}

@@ -5,7 +5,7 @@ Capistrano is a utility and framework for executing commands in parallel on mult
 Capistrano was originally designed to simplify and automate deployment of web applications to distributed environments, and originally came bundled with a set of tasks designed for deploying Rails applications. The deployment tasks are now (as of Capistrano 2.0) opt-in and require clients to explicitly put
 "load 'deploy'" in their recipes.
 
-== Dependencies
+== DEPENDENCIES
 
 * Net::SSH v2 (http://net-ssh.rubyforge.org)
 * Net::SFTP v2 (http://net-ssh.rubyforge.org)
@@ -15,9 +15,10 @@ Capistrano was originally designed to simplify and automate deployment of web ap
 
 If you want to run the tests, you'll also need to have the following dependencies installed:
 
+* Echoe (for the Rakefile)
 * Mocha (http://mocha.rubyforge.org)
 
-== Assumptions
+== ASSUMPTIONS
 
 Capistrano is "opinionated software", which means it has very firm ideas about how things ought to be done, and tries to force those ideas on you. Some of the assumptions behind these opinions are:
 
@@ -26,7 +27,7 @@ Capistrano is "opinionated software", which means it has very firm ideas about h
 
 Do not expect these assumptions to change.
 
-== Usage
+== USAGE
 
 In general, you'll use Capistrano as follows:
 
@@ -38,3 +39,28 @@ Use the +cap+ script as follows:
     cap sometask
 
 By default, the script will look for a file called one of +capfile+ or +Capfile+. The +someaction+ text indicates which task to execute. You can do "cap -h" to see all the available options and "cap -T" to see all the available tasks.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2005-2008 Jamis Buck <jamis@37signals.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,28 @@
+require "./lib/capistrano/version"
+
+begin
+  require 'echoe'
+rescue LoadError
+  abort "You'll need to have `echoe' installed to use Capistrano's Rakefile"
+end
+
+version = Capistrano::Version::STRING.dup
+if ENV['SNAPSHOT'].to_i == 1
+  version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
+end
+
+Echoe.new('capistrano', version) do |p|
+  p.changelog        = "CHANGELOG.rdoc"
+
+  p.author           = "Jamis Buck"
+  p.email            = "jamis@jamisbuck.org"
+
+  p.summary = <<-DESC.strip.gsub(/\n\s+/, " ")
+    Capistrano is a utility and framework for executing commands in parallel
+    on multiple remote machines, via SSH.
+  DESC
+
+  p.url              = "http://www.capify.org"
+  p.need_zip         = true
+  p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
+end

data/capistrano.gemspec

@@ -0,0 +1,67 @@
+
+# Gem::Specification for Capistrano-2.4.1
+# Originally generated by Echoe
+
+Gem::Specification.new do |s|
+  s.name = %q{capistrano}
+  s.version = "2.4.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jamis Buck"]
+  s.date = %q{2008-06-27}
+  s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
+  s.email = %q{jamis@jamisbuck.org}
+  s.executables = ["cap", "capify"]
+  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"]
+  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.2.0}
+  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/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 current_version >= 3 then
+    else
+    end
+  else
+  end
+end
+
+
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# require "./lib/capistrano/version"
+# 
+# begin
+#   require 'echoe'
+# rescue LoadError
+#   abort "You'll need to have `echoe' installed to use Capistrano's Rakefile"
+# end
+# 
+# version = Capistrano::Version::STRING.dup
+# if ENV['SNAPSHOT'].to_i == 1
+#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
+# end
+# 
+# Echoe.new('capistrano', version) do |p|
+#   p.changelog        = "CHANGELOG.rdoc"
+# 
+#   p.author           = "Jamis Buck"
+#   p.email            = "jamis@jamisbuck.org"
+# 
+#   p.summary = <<-DESC.strip.gsub(/\n\s+/, " ")
+#     Capistrano is a utility and framework for executing commands in parallel
+#     on multiple remote machines, via SSH.
+#   DESC
+# 
+#   p.url              = "http://www.capify.org"
+#   p.need_zip         = true
+#   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
+# end

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

@@ -34,7 +34,7 @@ module Capistrano
           invoke_command(command, options.merge(:once => true)) do |ch, stream, data|
             case stream
             when :out then output << data
-            when :err then raise CaptureError, "error processing #{command.inspect}: #{data.inspect}"
+            when :err then warn "[err :: #{ch[:server]}] #{data}"
             end
           end
           output

data/lib/capistrano/ssh.rb

@@ -23,9 +23,6 @@ module Capistrano
       attr_accessor :xserver
     end
 
-    # The default port for SSH.
-    DEFAULT_PORT = 22
-
     # An abstraction to make it possible to connect to the server via public key
     # without prompting for the password. If the public key authentication fails
     # this will fall back to password authentication.
@@ -58,10 +55,11 @@ module Capistrano
       methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
       password_value = nil
 
-      ssh_options        = (server.options[:ssh_options] || {}).merge(options[:ssh_options] || {})
-      user               = server.user || options[:user] || ssh_options[:username] || ServerDefinition.default_user
-      ssh_options[:port] = server.port || options[:port] || ssh_options[:port] || DEFAULT_PORT
+      ssh_options = (server.options[:ssh_options] || {}).merge(options[:ssh_options] || {})
+      user        = server.user || options[:user] || ssh_options[:username] || ServerDefinition.default_user
+      port        = server.port || options[:port] || ssh_options[:port]
 
+      ssh_options[:port] = port if port
       ssh_options.delete(:username)
 
       begin