capistrano 2.5.5 → 2.5.6

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 2.5.6 / 25 May 2009
+
+* 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.
+* Removes rails-assumptions, more info see a freshly generated config/deploy.rb
+* Fixes a Git issue when submodules update upstream. (via mailing list) [sneakin]
+* Ensures that the deploy_to directory is chowned :user/:user during deploy:setup
+* Capify now creates the config directory in directories without one.
+
 == 2.5.5 / 24 Feb 2009
 
 * Make sure role(:foo) actually declares an (empty) role for :foo, even without server arguments [Jamis Buck]

data/README.rdoc

@@ -5,6 +5,39 @@ 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.
 
+== 2.5.6 Warning
+
+_+Warning+_: while every care has been taken to make sure you do not feel too much disruption from existing deploys when upgrading to 2.5.6 unless you alter your capfile (see "New Style Capification" towards the end of the readme for more) will require a couple more lines to keep compatibility with old recipes.
+
+The changes in 2.5.6 include bug fixes, but importantly also remove a number of rails assumptions. This has been done both to ensure that people who aren't deploy Rails applications aren't put-off using Capistrano, and also that those of us that do use Rails have a choice about certain things. (starting our app, restarting it, stopping it, do we want cap to manage migrations, etc..)
+
+As a result failure to read this document thoroughly could lead to problems, if you do install 2.5.6 and your recipe breaks, please either uninstall the gem and file a bug report (we will try to fix them within hours if received through our lighthouse app account.) or invoke cap in the following way to dictate which version you wish to use:
+
+    cap _2.5.5_ deploy
+    cap _2.5.5_ staging my:task:here
+    cap _2.5.5_ -vT
+    cap _2.5.6_ -vT
+
+Please open issues on the bug tracer at http://capistrano.lighthouseapp.com/ if you experience problems
+
+== Documentation
+
+We know that documentation is something that really lets us down, that's why there is a repository for a handbook below, please open an issue on it if you would like something documented:
+
+* http://github.com/leehambley/capistrano-handbook
+
+If you prefer the wiki style of documentation, then please see our wiki
+
+* http://wiki.capify.org
+
+Due to a failure of MySQL with PHP, searches shorter than three characters are all but ignored, we're going to rectify this, but in the meantime, please do what you can, tickets opened on the handbook for the wiki will be answered too, so please let us know if you don't find something you needed.
+
+We take bug reports via lighthouse app, you can find that page here:
+
+* http://capistrano.lighthouseapp.com
+
+More documentation is on the way, if in doubt try opening the recipes that ship with capistrano.
+
 == DEPENDENCIES
 
 * Net::SSH v2 (http://net-ssh.rubyforge.org)
@@ -40,6 +73,63 @@ Use the +cap+ script as follows:
 
 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.
 
+== Capistrano Edge
+
+If you want to try Capistrano code that hasn't been formerly released yet, this repository now includes a gemspec that should build what you need, here's how to get a copy:
+
+    git clone git://github.com/capistrano/capistrano.git capistrano-capistrano
+    cd capistrano-capsitrano
+    gem build capistrano.gemspec
+    sudo gem install capistrano-*.gem
+
+This will install the most recent version of capistrano and make it available for both cap, and capify.
+
+We recommend that you capify a new test application, as the resulting files are different to previous versions.
+
+If you have multiple versions of capistrano (or indeed any gem with a binary) installed, you can call `cap` like so to specify which version to use:
+
+    cap _2.5.5_ deploy
+    cap _2.5.6_ deploy:setup
+
+== New Style Capification
+
+When calling `capify`  on a new application, the result will look something like the following, this is a big change to previous versions, please take this as a warning and read the following thoroughly:
+
+    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
+   
+    # 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}"
+   
+    # 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/'"
+   
+    role :web, "your web-server here"
+
+When adding or removing extensions, where you have previously tested a `deploy:setup` we recommend that you perform another, especially for example when adding the rails-shared-directory code.
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -12,6 +12,7 @@ if ENV['SNAPSHOT'].to_i == 1
 end
 
 Echoe.new('capistrano', version) do |p|
+  p.include_gemspec = true
   p.changelog        = "CHANGELOG.rdoc"
 
   p.author           = "Jamis Buck"

data/bin/capify

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'fileutils'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -45,6 +46,24 @@ files = {
     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
+
     # 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:
@@ -53,10 +72,10 @@ files = {
     # 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/'"
 
-    role :app, "your app-server here"
     role :web, "your web-server here"
-    role :db,  "your db-server here", :primary => true
+    
   FILE
 }
 
@@ -68,7 +87,9 @@ files.each do |file, content|
   elsif File.exists?(file.downcase)
     warn "[skip] `#{file.downcase}' exists, which could conflict with `#{file}'"
   elsif !File.exists?(File.dirname(file))
-    warn "[skip] directory `#{File.dirname(file)}' does not exist"
+    FileUtils.mkdir(File.dirname(file))
+    retry
+    warn "[skip] directory `#{File.dirname(file)}' did not exist, created."
   else
     puts "[add] writing `#{file}'"
     File.open(file, "w") { |f| f.write(content) }

data/capistrano.gemspec

@@ -1,22 +1,24 @@
 Gem::Specification.new do |s|
   s.name = %q{capistrano}
-  s.version = "2.5.5"
-
+  s.version = "2.5.6"
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jamis Buck"]
+  s.authors = ["Jamis Buck", "Lee Hambley"]
   s.date = %q{2009-02-24}
   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.email = %q{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"]
+  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/ext/rails-shared-directories.rb",
+"lib/capistrano/recipes/ext/rails-database-migrations.rb", "lib/capistrano/recipes/ext/web-disable-enable.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"]
   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.summary = %q{Simple. The way it should be.}
   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/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

data/lib/capistrano/cli/options.rb

@@ -24,6 +24,7 @@ module Capistrano
       # line switches for Capistrano, and what their corresponding behaviors
       # are.
       def option_parser #:nodoc:
+        @logger = Logger.new
         @option_parser ||= OptionParser.new do |opts|
           opts.banner = "Usage: #{File.basename($0)} [options] action ..."
 
@@ -167,6 +168,7 @@ module Capistrano
           %w(Capfile capfile).each do |file|
             if File.file?(file)
               options[:recipes] << file
+              @logger.info "Using recipes from #{File.join(current,file)}"
               return
             end
           end

data/lib/capistrano/command.rb

@@ -209,8 +209,8 @@ module Capistrano
                     shell = nil
                   else
                     shell = "#{options[:shell] || "sh"} -c"
-                    cmd = cmd.gsub(/[$\\`"]/) { |m| "\\#{m}" }
-                    cmd = "\"#{cmd}\""
+                    cmd = cmd.gsub(/'/) { |m| "'\\''" }
+                    cmd = "'#{cmd}'"
                   end
 
                   command_line = [environment, shell, cmd].compact.join(" ")

data/lib/capistrano/configuration/connections.rb

@@ -51,24 +51,26 @@ module Capistrano
       # A hash of the SSH sessions that are currently open and available.
       # Because sessions are constructed lazily, this will only contain
       # connections to those servers that have been the targets of one or more
-      # executed tasks.
-      attr_reader :sessions
+      # executed tasks. Stored on a per-thread basis to improve thread-safety.
+      def sessions
+        Thread.current[:sessions] ||= {}
+      end
 
       def initialize_with_connections(*args) #:nodoc:
         initialize_without_connections(*args)
-        @sessions = {}
-        @failed_sessions = []
+        Thread.current[:sessions] = {}
+        Thread.current[:failed_sessions] = []
       end
 
       # Indicate that the given server could not be connected to.
       def failed!(server)
-        @failed_sessions << server
+        Thread.current[:failed_sessions] << server
       end
 
       # Query whether previous connection attempts to the given server have
       # failed.
       def has_failed?(server)
-        @failed_sessions.include?(server)
+        Thread.current[:failed_sessions].include?(server)
       end
 
       # Used to force connections to be made to the current task's servers.
@@ -116,9 +118,9 @@ module Capistrano
       # Destroys sessions for each server in the list.
       def teardown_connections_to(servers)
         servers.each do |server|
-           @sessions[server].close
-           @sessions.delete(server)
-         end
+          sessions[server].close
+          sessions.delete(server)
+        end
       end
 
       # Determines the set of servers within the current task's scope and
@@ -186,11 +188,13 @@ module Capistrano
         # prevents problems with the thread's scope seeing the wrong 'server'
         # variable if the thread just happens to take too long to start up.
         def establish_connection_to(server, failures=nil)
-          Thread.new { safely_establish_connection_to(server, failures) }
+          current_thread = Thread.current
+          Thread.new { safely_establish_connection_to(server, current_thread, failures) }
         end
 
-        def safely_establish_connection_to(server, failures=nil)
-          sessions[server] ||= connection_factory.connect_to(server)
+        def safely_establish_connection_to(server, thread, failures=nil)
+          thread[:sessions] ||= {}
+          thread[:sessions][server] ||= connection_factory.connect_to(server)
         rescue Exception => err
           raise unless failures
           failures << { :server => server, :error => err }

data/lib/capistrano/configuration/execution.rb

@@ -8,22 +8,11 @@ module Capistrano
         base.send :alias_method, :initialize, :initialize_with_execution
       end
 
-      # The call stack of the tasks. The currently executing task may inspect
-      # this to see who its caller was. The current task is always the last
-      # element of this stack.
-      attr_reader :task_call_frames
-
-      # The stack of tasks that have registered rollback handlers within the
-      # current transaction. If this is nil, then there is no transaction
-      # that is currently active.
-      attr_reader :rollback_requests
-
       # A struct for representing a single instance of an invoked task.
       TaskCallFrame = Struct.new(:task, :rollback)
 
       def initialize_with_execution(*args) #:nodoc:
         initialize_without_execution(*args)
-        @task_call_frames = []
       end
       private :initialize_with_execution
 
@@ -32,6 +21,25 @@ module Capistrano
         !rollback_requests.nil?
       end
 
+      # The call stack of the tasks. The currently executing task may inspect
+      # this to see who its caller was. The current task is always the last
+      # element of this stack.
+      def task_call_frames
+        Thread.current[:task_call_frames] ||= []
+      end
+      
+      
+      # The stack of tasks that have registered rollback handlers within the
+      # current transaction. If this is nil, then there is no transaction
+      # that is currently active.
+      def rollback_requests
+        Thread.current[:rollback_requests]
+      end
+
+      def rollback_requests=(rollback_requests)
+        Thread.current[:rollback_requests] = rollback_requests
+      end
+
       # Invoke a set of tasks in a transaction. If any task fails (raises an
       # exception), all tasks executed within the transaction are inspected to
       # see if they have an associated on_rollback hook, and if so, that hook
@@ -44,14 +52,14 @@ module Capistrano
 
         logger.info "transaction: start"
         begin
-          @rollback_requests = []
+          self.rollback_requests = []
           yield
           logger.info "transaction: commit"
         rescue Object => e
           rollback!
           raise
         ensure
-          @rollback_requests = nil
+          self.rollback_requests = nil if Thread.main == Thread.current
         end
       end
 
@@ -99,6 +107,9 @@ module Capistrano
     protected
 
       def rollback!
+        return if Thread.current[:rollback_requests].nil?
+        Thread.current[:rolled_back] = true
+   
         # throw the task back on the stack so that roles are properly
         # interpreted in the scope of the task in question.
         rollback_requests.reverse.each do |frame|

data/lib/capistrano/recipes/deploy.rb

@@ -151,9 +151,18 @@ namespace :deploy do
   DESC
   task :default do
     update
-    restart
+    # restart
   end
 
+  [:start, :stop, :restart].each do |deprecated_task|
+    desc "#{deprecated_task.to_s} is deprecated. Please see "
+    task deprecated_task do
+
+    end
+  end
+    
+    
+    
   desc <<-DESC
     Prepares one or more servers for deployment. Before you can use any \
     of the Capistrano deployment tasks with your project, you will need to \
@@ -222,23 +231,6 @@ namespace :deploy do
   DESC
   task :finalize_update, :except => { :no_release => true } do
     run "chmod -R g+w #{latest_release}" if fetch(:group_writable, true)
-
-    # mkdir -p is making sure that the directories are there for some SCM's that don't
-    # save empty folders
-    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
-    CMD
-
-    if fetch(:normalize_asset_timestamps, true)
-      stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
-      asset_paths = %w(images stylesheets javascripts).map { |p| "#{latest_release}/public/#{p}" }.join(" ")
-      run "find #{asset_paths} -exec touch -t #{stamp} {} ';'; true", :env => { "TZ" => "UTC" }
-    end
   end
 
   desc <<-DESC
@@ -287,21 +279,6 @@ namespace :deploy do
     files.each { |file| top.upload(file, File.join(current_path, file)) }
   end
 
-  desc <<-DESC
-    Restarts your application. This works by calling the script/process/reaper \
-    script under the current path.
-    
-    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 \
-    the :use_sudo variable to false:
-    
-      set :use_sudo, false
-  DESC
-  task :restart, :roles => :app, :except => { :no_release => true } do
-    try_runner "#{current_path}/script/process/reaper"
-  end
-
   namespace :rollback do
     desc <<-DESC
       [internal] Points the current symlink at the previous revision.
@@ -328,8 +305,7 @@ namespace :deploy do
     desc <<-DESC
       Rolls back to the previously deployed version. The `current' symlink will \
       be updated to point at the previously deployed version, and then the \
-      current release will be removed from the servers. You'll generally want \
-      to call `rollback' instead, as it performs a `restart' as well.
+      current release will be removed from the servers.
     DESC
     task :code, :except => { :no_release => true } do
       revision
@@ -343,56 +319,10 @@ namespace :deploy do
     DESC
     task :default do
       revision
-      restart
       cleanup
     end
   end
 
-  desc <<-DESC
-    Run the migrate rake task. By default, it runs this in most recently \
-    deployed version of the app. However, you can specify a different release \
-    via the migrate_target variable, which must be one of :latest (for the \
-    default behavior), or :current (for the release indicated by the \
-    `current' symlink). Strings will work for those values instead of symbols, \
-    too. You can also specify additional environment variables to pass to rake \
-    via the migrate_env variable. Finally, you can specify the full path to the \
-    rake executable by setting the rake variable. The defaults are:
-
-      set :rake,           "rake"
-      set :rails_env,      "production"
-      set :migrate_env,    ""
-      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)
-
-    directory = case migrate_target.to_sym
-      when :current then current_path
-      when :latest  then current_release
-      else raise ArgumentError, "unknown migration target #{migrate_target.inspect}"
-      end
-
-    run "cd #{directory}; #{rake} RAILS_ENV=#{rails_env} #{migrate_env} db:migrate"
-  end
-
-  desc <<-DESC
-    Deploy and run pending migrations. This will work similarly to the \
-    `deploy' task, but will also run any pending migrations (via the \
-    `deploy:migrate' task) prior to updating the symlink. Note that the \
-    update in this case it is not atomic, and transactions are not used, \
-    because migrations are not guaranteed to be reversible.
-  DESC
-  task :migrations do
-    set :migrate_target, :latest
-    update_code
-    migrate
-    symlink
-    restart
-  end
-
   desc <<-DESC
     Clean up old releases. By default, the last 5 releases are kept on each \
     server (though you can change this with the keep_releases variable). All \
@@ -462,40 +392,6 @@ namespace :deploy do
   DESC
   task :cold do
     update
-    migrate
-    start
-  end
-
-  desc <<-DESC
-    Start the application servers. This will attempt to invoke a script \
-    in your application called `script/spin', which must know how to start \
-    your application listeners. For Rails applications, you might just have \
-    that script invoke `script/process/spawner' with the appropriate \
-    arguments.
-
-    By default, the script will be executed 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 \
-    the :use_sudo variable to false.
-  DESC
-  task :start, :roles => :app do
-    run "cd #{current_path} && #{try_runner} nohup script/spin"
-  end
-
-  desc <<-DESC
-    Stop the application servers. This will call script/process/reaper for \
-    both the spawner process, and all of the application processes it has \
-    spawned. As such, it is fairly Rails specific and may need to be \
-    overridden for other systems.
-
-    By default, the script will be executed 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 \
-    the :use_sudo variable to false.
-  DESC
-  task :stop, :roles => :app do
-    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
 
   namespace :pending do
@@ -519,44 +415,4 @@ namespace :deploy do
     end
   end
 
-  namespace :web do
-    desc <<-DESC
-      Present a maintenance page to visitors. Disables your application's web \
-      interface by writing a "maintenance.html" file to each web server. The \
-      servers must be configured to detect the presence of this file, and if \
-      it is present, always display it instead of performing the request.
-
-      By default, the maintenance page will just say the site is down for \
-      "maintenance", and will be back "shortly", but you can customize the \
-      page by specifying the REASON and UNTIL environment variables:
-
-        $ cap deploy:web:disable \\
-              REASON="hardware upgrade" \\
-              UNTIL="12pm Central Time"
-
-      Further customization will require that you write your own task.
-    DESC
-    task :disable, :roles => :web, :except => { :no_release => true } do
-      require 'erb'
-      on_rollback { run "rm #{shared_path}/system/maintenance.html" }
-
-      reason = ENV['REASON']
-      deadline = ENV['UNTIL']
-
-      template = File.read(File.join(File.dirname(__FILE__), "templates", "maintenance.rhtml"))
-      result = ERB.new(template).result(binding)
-
-      put result, "#{shared_path}/system/maintenance.html", :mode => 0644
-    end
-
-    desc <<-DESC
-      Makes the application web-accessible again. Removes the \
-      "maintenance.html" page generated by deploy:web:disable, which (if your \
-      web servers are configured correctly) will make your application \
-      web-accessible again.
-    DESC
-    task :enable, :roles => :web, :except => { :no_release => true } do
-      run "rm #{shared_path}/system/maintenance.html"
-    end
-  end
 end

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

@@ -151,6 +151,7 @@ module Capistrano
           
           if configuration[:git_enable_submodules]
             execute << "#{git} submodule #{verbose} init"
+            execute << "#{git} submodule #{verbose} sync"
             execute << "#{git} submodule #{verbose} update"
           end
 
@@ -188,9 +189,15 @@ module Capistrano
 
           if configuration[:git_enable_submodules]
             execute << "#{git} submodule #{verbose} init"
+            execute << "for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done"
+            execute << "#{git} submodule #{verbose} sync"
             execute << "#{git} submodule #{verbose} update"
           end
 
+          # Make sure there's nothing else lying around in the repository (for
+          # example, a submodule that has subsequently been removed).
+          execute << "#{git} clean #{verbose} -d -x -f"
+
           execute.join(" && ")
         end
 

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

@@ -18,7 +18,7 @@ module Capistrano
         # For mercurial HEAD == tip except that it bases this assumption on what
         # tip is in the current repository (so push before you deploy)
         def head
-          "tip"
+          configuration[:branch] || "tip"
         end
 
         # Clone the repository and update to the specified changeset.
@@ -134,4 +134,4 @@ module Capistrano
       end
     end
   end
-end
+end

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

@@ -49,7 +49,7 @@ module Capistrano
 
         # Returns a "p4 changes" command for the two revisions.
         def log(from=1, to=head)
-          scm authentication, :changes, "-s submitted", "//#{p4client}/...#{rev_no(from)},#(rev_no(to)}"
+          scm authentication, :changes, "-s submitted", "//#{p4client}/...#{rev_no(from)},#{rev_no(to)}"
         end
 
         def query_revision(revision)
@@ -58,6 +58,11 @@ module Capistrano
           yield(command)[/Change (\d+) on/, 1]
         end
 
+        # Increments the given revision number and returns it.
+        def next_revision(revision)
+          revision.to_i + 1
+        end
+
         # Determines what the response should be for a particular bit of text
         # from the SCM. Password prompts, connection requests, passphrases,
         # etc. are handled here.

data/lib/capistrano/recipes/ext/rails-database-migrations.rb

@@ -0,0 +1,50 @@
+namespace :deploy do
+
+  desc <<-DESC
+    Run the migrate rake task. By default, it runs this in most recently \
+    deployed version of the app. However, you can specify a different release \
+    via the migrate_target variable, which must be one of :latest (for the \
+    default behavior), or :current (for the release indicated by the \
+    `current' symlink). Strings will work for those values instead of symbols, \
+    too. You can also specify additional environment variables to pass to rake \
+    via the migrate_env variable. Finally, you can specify the full path to the \
+    rake executable by setting the rake variable. The defaults are:
+
+      set :rake,           "rake"
+      set :rails_env,      "production"
+      set :migrate_env,    ""
+      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)
+
+    directory = case migrate_target.to_sym
+      when :current then current_path
+      when :latest  then current_release
+      else raise ArgumentError, "unknown migration target #{migrate_target.inspect}"
+      end
+
+    run "cd #{directory}; #{rake} RAILS_ENV=#{rails_env} #{migrate_env} db:migrate"
+  end
+
+  desc <<-DESC
+    Deploy and run pending migrations. This will work similarly to the \
+    `deploy' task, but will also run any pending migrations (via the \
+    `deploy:migrate' task) prior to updating the symlink. Note that the \
+    update in this case it is not atomic, and transactions are not used, \
+    because migrations are not guaranteed to be reversible.
+  DESC
+  task :migrations do
+    set :migrate_target, :latest
+    update_code
+    migrate
+    symlink
+    restart
+  end
+  
+end
+
+after('deploy:update_code', 'deploy:migrate')

data/lib/capistrano/recipes/ext/rails-shared-directories.rb

@@ -0,0 +1,21 @@
+_cset :shared_children,   %w(system log pids)
+
+after 'deploy:finalize_update' do
+  # mkdir -p is making sure that the directories are there for some SCM's that don't
+  # save empty folders
+  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
+  CMD
+
+  if fetch(:normalize_asset_timestamps, true)
+    stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
+    asset_paths = %w(images stylesheets javascripts).map { |p| "#{latest_release}/public/#{p}" }.join(" ")
+    run "find #{asset_paths} -exec touch -t #{stamp} {} ';'; true", :env => { "TZ" => "UTC" }
+  end
+  
+end

data/lib/capistrano/recipes/ext/web-disable-enable.rb

@@ -0,0 +1,40 @@
+namespace :web do
+  desc <<-DESC
+    Present a maintenance page to visitors. Disables your application's web \
+    interface by writing a "maintenance.html" file to each web server. The \
+    servers must be configured to detect the presence of this file, and if \
+    it is present, always display it instead of performing the request.
+
+    By default, the maintenance page will just say the site is down for \
+    "maintenance", and will be back "shortly", but you can customize the \
+    page by specifying the REASON and UNTIL environment variables:
+
+      $ cap deploy:web:disable \\
+            REASON="hardware upgrade" \\
+            UNTIL="12pm Central Time"
+
+    Further customization will require that you write your own task.
+  DESC
+  task :disable, :roles => :web, :except => { :no_release => true } do
+    require 'erb'
+    on_rollback { run "rm #{shared_path}/system/maintenance.html" }
+
+    reason = ENV['REASON']
+    deadline = ENV['UNTIL']
+
+    template = File.read(File.join(File.dirname(__FILE__), "templates", "maintenance.rhtml"))
+    result = ERB.new(template).result(binding)
+
+    put result, "#{shared_path}/system/maintenance.html", :mode => 0644
+  end
+
+  desc <<-DESC
+    Makes the application web-accessible again. Removes the \
+    "maintenance.html" page generated by deploy:web:disable, which (if your \
+    web servers are configured correctly) will make your application \
+    web-accessible again.
+  DESC
+  task :enable, :roles => :web, :except => { :no_release => true } do
+    run "rm #{shared_path}/system/maintenance.html"
+  end
+end

data/lib/capistrano/version.rb

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

data/test/command_test.rb

@@ -20,7 +20,7 @@ class CommandTest < Test::Unit::TestCase
 
   def test_command_with_pty_should_request_pty_and_register_success_callback
     session = setup_for_extracting_channel_action(:request_pty, true) do |ch|
-      ch.expects(:exec).with(%(sh -c "ls"))
+      ch.expects(:exec).with(%(sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :pty => true)
   end
@@ -28,35 +28,35 @@ class CommandTest < Test::Unit::TestCase
   def test_command_with_env_key_should_have_environment_constructed_and_prepended
     session = setup_for_extracting_channel_action do |ch|
       ch.expects(:request_pty).never
-      ch.expects(:exec).with(%(env FOO=bar sh -c "ls"))
+      ch.expects(:exec).with(%(env FOO=bar sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :env => { "FOO" => "bar" })
   end
 
   def test_env_with_symbolic_key_should_be_accepted_as_a_string
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(env FOO=bar sh -c "ls"))
+      ch.expects(:exec).with(%(env FOO=bar sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :env => { :FOO => "bar" })
   end
 
   def test_env_as_string_should_be_substituted_in_directly
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(env HOWDY=there sh -c "ls"))
+      ch.expects(:exec).with(%(env HOWDY=there sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :env => "HOWDY=there")
   end
 
   def test_env_with_symbolic_value_should_be_accepted_as_string
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(env FOO=bar sh -c "ls"))
+      ch.expects(:exec).with(%(env FOO=bar sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :env => { "FOO" => :bar })
   end
 
   def test_env_value_should_be_escaped
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(env FOO=(\\ \\\"bar\\\"\\ ) sh -c "ls"))
+      ch.expects(:exec).with(%(env FOO=(\\ \\\"bar\\\"\\ ) sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :env => { "FOO" => '( "bar" )' })
   end
@@ -68,7 +68,7 @@ class CommandTest < Test::Unit::TestCase
         command =~ /\ba=b\b/ &&
         command =~ /\bc=d\b/ &&
         command =~ /\be=f\b/ &&
-        command =~ / sh -c "ls"$/
+        command =~ / sh -c 'ls'$/
       end
     end
     Capistrano::Command.new("ls", [session], :env => { :a => :b, :c => :d, :e => :f })
@@ -90,14 +90,14 @@ class CommandTest < Test::Unit::TestCase
 
   def test_successful_channel_should_send_command
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(sh -c "ls"))
+      ch.expects(:exec).with(%(sh -c 'ls'))
     end
     Capistrano::Command.new("ls", [session])
   end
 
   def test_successful_channel_with_shell_option_should_send_command_via_specified_shell
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(/bin/bash -c "ls"))
+      ch.expects(:exec).with(%(/bin/bash -c 'ls'))
     end
     Capistrano::Command.new("ls", [session], :shell => "/bin/bash")
   end
@@ -111,7 +111,7 @@ class CommandTest < Test::Unit::TestCase
 
   def test_successful_channel_should_send_data_if_data_key_is_present
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(sh -c "ls"))
+      ch.expects(:exec).with(%(sh -c 'ls'))
       ch.expects(:send_data).with("here we go")
     end
     Capistrano::Command.new("ls", [session], :data => "here we go")
@@ -225,14 +225,14 @@ class CommandTest < Test::Unit::TestCase
 
   def test_process_with_host_placeholder_should_substitute_placeholder_with_each_host
     session = setup_for_extracting_channel_action do |ch|
-      ch.expects(:exec).with(%(sh -c "echo capistrano"))
+      ch.expects(:exec).with(%(sh -c 'echo capistrano'))
     end
     Capistrano::Command.new("echo $CAPISTRANO:HOST$", [session])
   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\\$"))
+      ch.expects(:exec).with(%(sh -c 'echo $CAPISTRANO:OTHER$'))
     end
     Capistrano::Command.new("echo $CAPISTRANO:OTHER$", [session])
   end

data/test/deploy/scm/git_test.rb

@@ -37,6 +37,10 @@ class DeploySCMGitTest < Test::Unit::TestCase
     git = "/opt/local/bin/git"
     @config[:scm_command] = git
     assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
+
+    # with submodules
+    @config[:git_enable_submodules] = true
+    assert_equal "#{git} clone -q git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -q -b deploy #{rev} && #{git} submodule -q init && #{git} submodule -q sync && #{git} submodule -q update", @source.checkout(rev, dest)
   end
 
   def test_checkout_with_verbose_should_not_use_q_switch
@@ -88,12 +92,16 @@ class DeploySCMGitTest < Test::Unit::TestCase
   def test_sync
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "cd #{dest} && git fetch -q origin && git reset -q --hard #{rev}", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && git fetch -q origin && git reset -q --hard #{rev} && git clean -q -d -x -f", @source.sync(rev, dest)
 
     # With :scm_command
     git = "/opt/local/bin/git"
     @config[:scm_command] = git
-    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} reset -q --hard #{rev}", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} reset -q --hard #{rev} && #{git} clean -q -d -x -f", @source.sync(rev, dest)
+
+    # with submodules
+    @config[:git_enable_submodules] = true
+    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} reset -q --hard #{rev} && #{git} submodule -q init && for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done && #{git} submodule -q sync && #{git} submodule -q update && #{git} clean -q -d -x -f", @source.sync(rev, dest)
   end
 
   def test_sync_with_remote
@@ -105,7 +113,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:repository] = repository
     @config[:remote] = remote
 
-    assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch -q #{remote} && git reset -q --hard #{rev}", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch -q #{remote} && git reset -q --hard #{rev} && git clean -q -d -x -f", @source.sync(rev, dest)
   end
 
   def test_shallow_clone
@@ -124,6 +132,15 @@ class DeploySCMGitTest < Test::Unit::TestCase
     assert_equal "git clone -q -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
   end
 
+  def test_remote_clone_with_submodules
+    @config[:repository] = "git@somehost.com:project.git"
+    @config[:remote] = "username"
+    @config[:git_enable_submodules] = true
+    dest = "/var/www"
+    rev = 'c2d9e79'
+    assert_equal "git clone -q -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev} && git submodule -q init && git submodule -q sync && git submodule -q update", @source.checkout(rev, dest)
+  end
+
   # Tests from base_test.rb, makin' sure we didn't break anything up there!
   def test_command_should_default_to_default_command
     assert_equal "git", @source.command

data/test/deploy/scm/mercurial_test.rb

@@ -17,6 +17,11 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     assert_equal "tip", @source.head
   end
 
+  def test_different_head
+    @config[:branch] = "staging"
+    assert_equal "staging", @source.head
+  end
+
   def test_checkout
     @config[:repository] = "http://example.com/project-hg"
     dest = "/var/www"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors: 
 - Jamis Buck
+- Lee Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -07:00
+date: 2009-02-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +74,7 @@ dependencies:
         version: "0"
     version: 
 description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
-email: jamis@jamisbuck.org
+email: lee.hambley@gmail.com
 executables: 
 - cap
 - capify
@@ -194,6 +195,9 @@ files:
 - lib/capistrano/recipes/deploy/strategy.rb
 - lib/capistrano/recipes/deploy/templates/maintenance.rhtml
 - lib/capistrano/recipes/deploy.rb
+- lib/capistrano/recipes/ext/rails-shared-directories.rb
+- lib/capistrano/recipes/ext/rails-database-migrations.rb
+- lib/capistrano/recipes/ext/web-disable-enable.rb
 - lib/capistrano/recipes/standard.rb
 - lib/capistrano/recipes/templates/maintenance.rhtml
 - lib/capistrano/recipes/upgrade.rb
@@ -247,8 +251,11 @@ files:
 - test/utils.rb
 - Manifest
 - capistrano.gemspec
+- test/deploy/scm/none_test.rb
 has_rdoc: true
 homepage: http://www.capify.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -274,10 +281,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capistrano
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 2
-summary: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
+summary: Simple. The way it should be.
 test_files: 
 - test/cli/execute_test.rb
 - test/cli/help_test.rb