capistrano 2.14.2 → 2.15.0

data/lib/capistrano/recipes/standard.rb

@@ -34,4 +34,4 @@ DESC
 task :shell do
   require 'capistrano/shell'
   Capistrano::Shell.run(self)
-end
+end

data/lib/capistrano/server_definition.rb

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

data/lib/capistrano/shell.rb

@@ -64,6 +64,9 @@ INTRO
           return false
         when /^set -(\w)\s*(\S+)/
           set_option($1, $2)
+        when /^set :(.*)\s+(.*)/
+          configuration.set($1.to_sym, $2)
+          puts "updated :#{$1} to #{$2}"
         when /^(?:(with|on)\s*(\S+))?\s*(\S.*)?/i
           process_command($1, $2, $3)
         else
@@ -171,7 +174,7 @@ HELP
 
       # Execute a command on the given list of servers.
       def exec_command(command, servers)
-        command = command.gsub(/\bsudo\b/, "sudo -p '#{configuration.sudo_prompt}'")
+        command = command.gsub(/^(\s*)sudo\b|([|;&])\s*sudo\b/, "\\0 -p '#{configuration.sudo_prompt}'")
         processor = configuration.sudo_behavior_callback(Configuration.default_io_proc)
         sessions = servers.map { |server| configuration.sessions[server] }
         options = configuration.add_default_command_options({})

data/lib/capistrano/ssh.rb

@@ -70,7 +70,7 @@ module Capistrano
       port = server.port || options[:port] || ssh_options[:port]
 
       # the .ssh/config file might have changed the host-name on us
-      host = ssh_options.fetch(:host_name, server.host) 
+      host = ssh_options.fetch(:host_name, server.host)
 
       ssh_options[:port] = port if port
 

data/lib/capistrano/version.rb

@@ -1,8 +1,8 @@
 module Capistrano
   class Version
     MAJOR = 2
-    MINOR = 14
-    PATCH = 2
+    MINOR = 15
+    PATCH = 0
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

data/test/cli/options_test.rb

@@ -23,7 +23,7 @@ class CLIOptionsTest < Test::Unit::TestCase
     @cli.expects(:exit).raises(ExitException)
     assert_raises(ExitException) { @cli.parse_options! }
   end
-  
+
   def test_parse_options_with_d_should_set_debug_option
     @cli.args << "-d"
     @cli.parse_options!

data/test/cli/ui_test.rb

@@ -25,4 +25,4 @@ class CLIUITest < Test::Unit::TestCase
     MockCLI.expects(:ui).returns(ui)
     assert_equal "sayuncle", MockCLI.password_prompt("Give the passphrase: ")
   end
-end
+end

data/test/command_test.rb

@@ -154,6 +154,16 @@ class CommandTest < Test::Unit::TestCase
     assert_equal 5, channel[:status]
   end
 
+  def test_on_request_should_log_exit_signal_if_logger_present
+    data = mock(:read_string => "TERM")
+    logger = stub_everything
+
+    session = setup_for_extracting_channel_action([:on_request, "exit-signal"], data)
+    logger.expects(:important).with("command received signal TERM", server("capistrano"))
+
+    Capistrano::Command.new("puppet", [session], :logger => logger)
+  end
+
   def test_on_close_should_set_channel_closed
     channel = nil
     session = setup_for_extracting_channel_action(:on_close) { |ch| channel = ch }
@@ -236,7 +246,7 @@ class CommandTest < Test::Unit::TestCase
   class MockConfig
     include Capistrano::Configuration::Roles
   end
-  
+
   def test_hostroles_substitution
     @config = MockConfig.new
     @config.server "capistrano", :db, :worker

data/test/configuration/actions/invocation_test.rb

@@ -7,7 +7,7 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
     attr_reader :options
     attr_accessor :debug
     attr_accessor :dry_run
-		attr_accessor :preserve_roles
+    attr_accessor :preserve_roles
     attr_accessor :servers
 
     def initialize
@@ -27,6 +27,10 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
       @options.fetch(*args)
     end
 
+    def filter_servers(options = {})
+      [nil, @servers]
+    end
+
     def execute_on_servers(options = {})
       yield @servers
     end

data/test/configuration/callbacks_test.rb

@@ -126,7 +126,7 @@ class ConfigurationCallbacksTest < Test::Unit::TestCase
     assert_equal 1, @config.callbacks[:before].length
     assert_equal %w(primary), @config.callbacks[:before].first.except
   end
-  
+
   def test_on_without_tasks_or_block_should_raise_error
     assert_raises(ArgumentError) { @config.on(:before) }
   end

data/test/configuration/connections_test.rb

@@ -5,6 +5,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
   class MockConfig
     attr_reader :original_initialize_called
     attr_reader :values
+    attr_reader :dry_run
     attr_accessor :current_task
 
     def initialize
@@ -397,6 +398,24 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     @config.execute_on_servers {}
   end
 
+  def test_execute_on_servers_should_cope_with_already_disconnected_connections_when_attempting_to_close_them
+    cap1 = server("cap1")
+    cap2 = server("cap2")
+    connection1 = mock()
+    connection2 = mock()
+    connection3 = mock()
+    connection4 = mock()
+    connection1.expects(:close).raises(Net::SSH::Disconnect)
+    connection2.expects(:close)
+    connection3.expects(:close)
+    connection4.expects(:close)
+    @config.current_task = mock_task(:max_hosts => 1)
+    @config.expects(:find_servers_for_task).times(2).with(@config.current_task, {}).returns([cap1, cap2])
+    Capistrano::SSH.expects(:connect).times(4).returns(connection1).then.returns(connection2).then.returns(connection3).then.returns(connection4)
+    @config.execute_on_servers {}
+    @config.execute_on_servers {}
+  end
+
   def test_connect_should_honor_once_option
     assert @config.sessions.empty?
     @config.current_task = mock_task

data/test/configuration/execution_test.rb

@@ -172,4 +172,4 @@ class ConfigurationExecutionTest < Test::Unit::TestCase
       block ||= stack_inspector
       namespace.tasks[name] = Capistrano::TaskDefinition.new(name, namespace, &block)
     end
-end
+end

data/test/configuration/namespace_dsl_test.rb

@@ -146,7 +146,7 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
 
   def test_parent_for_namespace_should_be_the_top_level
     @config.namespace(:outer) {}
-    assert_equal @config, @config.namespaces[:outer].parent    
+    assert_equal @config, @config.namespaces[:outer].parent
   end
 
   def test_fqn_for_nested_namespace_should_be_color_delimited
@@ -238,7 +238,7 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
     ns = @config.namespaces[:outer]
     assert ns.respond_to?(:original_initialize_called)
   end
-  
+
   def test_namespace_should_accept_respond_to_with_include_priv_parameter
     @config.namespace(:outer) {}
     ns = @config.namespaces[:outer]
@@ -308,16 +308,16 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
     end
     assert_nil @config.find_task("outer::inner")
   end
-  
+
   def test_kernel_method_clashing_should_not_affect_method_delegation_to_parent
     @config.class.class_eval do
       def some_weird_method() 'config' end
     end
-    
+
     @config.namespace(:clash) {}
     namespace = @config.namespaces[:clash]
     assert_equal 'config', namespace.some_weird_method
-    
+
     Kernel.module_eval do
       def some_weird_method() 'kernel' end
     end
@@ -325,7 +325,7 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
     @config.namespace(:clash2) {}
     namespace = @config.namespaces[:clash2]
     assert_equal 'config', namespace.some_weird_method
-    
+
     Kernel.send :remove_method, :some_weird_method
     @config.class.send :remove_method, :some_weird_method
   end

data/test/configuration/roles_test.rb

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

data/test/configuration/servers_test.rb

@@ -5,11 +5,11 @@ require 'capistrano/configuration/servers'
 class ConfigurationServersTest < Test::Unit::TestCase
   class MockConfig
     attr_reader :roles
-		attr_accessor :preserve_roles
+    attr_accessor :preserve_roles
 
     def initialize
       @roles = {}
-			@preserve_roles = false
+      @preserve_roles = false
     end
 
     include Capistrano::Configuration::Servers
@@ -66,31 +66,31 @@ class ConfigurationServersTest < Test::Unit::TestCase
 
   def test_task_with_roles_as_environment_variable_and_preserve_roles_should_apply_only_to_existant_task_role
     ENV['ROLES'] = "app,file"
-		@config.preserve_roles = true
+    @config.preserve_roles = true
     task = new_task(:testing,@config, :roles => :app)
     assert_equal %w(app1 app2 app3).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
   ensure
     ENV.delete('ROLES')
-	end
+  end
 
   def test_task_with_roles_as_environment_variable_and_preserve_roles_should_apply_only_to_existant_task_roles
     ENV['ROLES'] = "app,file,web"
-		@config.preserve_roles = true
+    @config.preserve_roles = true
     task = new_task(:testing,@config, :roles => [ :app,:file ])
     assert_equal %w(app1 app2 app3 file).sort, @config.find_servers_for_task(task).map { |s| s.host }.sort
   ensure
     ENV.delete('ROLES')
-	end
+  end
 
   def test_task_with_roles_as_environment_variable_and_preserve_roles_should_not_apply_if_not_exists_those_task_roles
     ENV['ROLES'] = "file,web"
-		@config.preserve_roles = true
+    @config.preserve_roles = true
     task = new_task(:testing,@config, :roles => [ :app ])
     assert_equal [], @config.find_servers_for_task(task).map { |s| s.host }.sort
   ensure
     ENV.delete('ROLES')
-	end
-	
+  end
+  
   def test_task_with_hosts_as_environment_variable_should_apply_only_to_those_hosts
     ENV['HOSTS'] = "foo,bar"
     task = new_task(:testing)
@@ -163,7 +163,7 @@ class ConfigurationServersTest < Test::Unit::TestCase
     assert_equal %w(app1 app2 app3), @config.find_servers(:roles => lambda { :app }).map { |s| s.host }.sort
     assert_equal %w(app2 file), @config.find_servers(:roles => lambda { [:report, :file] }).map { |s| s.host }.sort
   end
-  
+
   def test_find_servers_with_hosts_nil_or_empty
     assert_equal [], @config.find_servers(:hosts => nil)
     assert_equal [], @config.find_servers(:hosts => [])
@@ -172,12 +172,12 @@ class ConfigurationServersTest < Test::Unit::TestCase
     result = @config.find_servers(:hosts => "app1")
     assert_equal 1, result.size
   end
-  
+
   def test_find_servers_with_rolees_nil_or_empty
     assert_equal [], @config.find_servers(:roles => nil)
     assert_equal [], @config.find_servers(:roles => [])
     result = @config.find_servers(:roles => :report)
     assert_equal 1, result.size
   end
-  
+
 end

data/test/configuration/variables_test.rb

@@ -53,13 +53,13 @@ class ConfigurationVariablesTest < Test::Unit::TestCase
     @config[:sample] = :value
     assert @config.respond_to?(:sample)
   end
-  
+
   def test_respond_to_should_be_true_when_passed_a_string
     assert !@config.respond_to?('sample')
     @config[:sample] = :value
     assert @config.respond_to?('sample')
   end
-  
+
   def test_respond_to_with_include_priv_paramter
     assert !@config.respond_to?(:sample, true)
   end
@@ -187,4 +187,4 @@ class ConfigurationVariablesTest < Test::Unit::TestCase
       assert_nil @config[:sample]
     end
   end
-end
+end

data/test/deploy/scm/bzr_test.rb

@@ -41,7 +41,7 @@ class DeploySCMBzrTest < Test::Unit::TestCase
                          'before:revid:aaaa@bbbb-1234567890',
                          'last:3',
                          nil, {}, [], true, false, 1.34, ]
-    
+
     revision_samples.each do |revivsion_spec|
       assert_equal(revivsion_spec,
                    @source.query_revision(revivsion_spec),

data/test/deploy/scm/darcs_test.rb

@@ -15,7 +15,7 @@ class DeploySCMDarcsTest < Test::Unit::TestCase
   # We should be able to pick a specific hash.
   def test_checkout_hash
     hsh = "*version_hash*"
-    assert_match(%r{--to-match=.hash #{Regexp.quote(hsh)}}, 
+    assert_match(%r{--to-match=.hash #{Regexp.quote(hsh)}},
                  @source.checkout(hsh, "*foo_location*"),
                 "Specifying a revision hash got the --to-match option wrong.")
   end
@@ -31,7 +31,7 @@ class DeploySCMDarcsTest < Test::Unit::TestCase
   # Leaving the revision as nil shouldn't break anything.
   def test_checkout_nil
     assert_no_match(%r{--to-match}, @source.checkout(nil, "*foo_location*"),
-                    "Leaving the revision as nil incorrectly produced a --to-match option.") 
+                    "Leaving the revision as nil incorrectly produced a --to-match option.")
   end
 end
 

data/test/deploy/scm/git_test.rb

@@ -145,11 +145,21 @@ class DeploySCMGitTest < Test::Unit::TestCase
   def test_shallow_clone
     @config[:repository] = "git@somehost.com:project.git"
     @config[:git_shallow_clone] = 1
+    @config[:branch] = nil
     dest = "/var/www"
     rev = 'c2d9e79'
     assert_equal "git clone -q --depth 1 git@somehost.com:project.git /var/www && cd /var/www && git checkout -q -b deploy #{rev}", @source.checkout(rev, dest)
   end
 
+  def test_shallow_clone_with_branch
+    @config[:repository] = "git@somehost.com:project.git"
+    @config[:git_shallow_clone] = 1
+    @config[:branch] = 'foobar'
+    dest = "/var/www"
+    rev = 'c2d9e79'
+    assert_equal "git clone -q -b foobar --depth 1 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
     @config[:repository] = "git@somehost.com:project.git"
     @config[:remote] = "username"

data/test/deploy/scm/mercurial_test.rb

@@ -62,19 +62,19 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     @config[:scm_command] = "/opt/local/bin/hg"
     assert_equal "/opt/local/bin/hg pull --repository /var/www && /opt/local/bin/hg update --repository /var/www --clean 8a8e00b8f11b", @source.sync('8a8e00b8f11b', dest)
   end
-  
+
   def test_export
     dest = "/var/www"
     assert_raise(NotImplementedError) { @source.export('8a8e00b8f11b', dest) }
   end
-  
+
   def test_sends_password_if_set
     require 'capistrano/logger'
     text = "password:"
     @config[:scm_password] = "opensesame"
     assert_equal "opensesame\n", @source.handle_data(mock_state, :test_stream, text)
   end
-  
+
   def test_prompts_for_password_if_preferred
     require 'capistrano/logger'
     require 'capistrano/cli'

data/test/deploy/scm/perforce_test.rb

@@ -20,4 +20,4 @@ class DeploySCMPerforceTest < Test::Unit::TestCase
     assert_equal "@some_p4_label", @source.send(:rev_no, 'foo')
   end
 
-end
+end

data/test/deploy/strategy/copy_test.rb

@@ -197,6 +197,27 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
+  def test_deploy_with_copy_via_should_use_the_given_transfer_method
+    @config[:copy_via] = :scp
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    Dir.expects(:chdir).yields
+    @source.expects(:checkout).returns(:local_checkout)
+
+    @strategy.expects(:system).with(:local_checkout)
+    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
+    @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz", {:via => :scp})
+    @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_with_copy_cache_should_checkout_to_cache_if_cache_does_not_exist_and_then_copy
     @config[:copy_cache] = true
 
@@ -306,13 +327,16 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
   private
 
     def prepare_directory_tree!(cache, exclude=false)
-      Dir.expects(:glob).with("*", File::FNM_DOTMATCH).returns([".", "..", "app", "foo.txt"])
+      Dir.expects(:glob).with("*", File::FNM_DOTMATCH).returns([".", "..", "app", "app{1}", "foo.txt"])
       File.expects(:ftype).with("app").returns("directory")
+      File.expects(:ftype).with("app{1}").returns("directory")
       FileUtils.expects(:mkdir).with("/temp/dir/1234567890/app")
+      FileUtils.expects(:mkdir).with("/temp/dir/1234567890/app{1}")
       File.expects(:ftype).with("foo.txt").returns("file")
       FileUtils.expects(:ln).with("foo.txt", "/temp/dir/1234567890/foo.txt")
 
       Dir.expects(:glob).with("app/*", File::FNM_DOTMATCH).returns(["app/.", "app/..", "app/bar.txt"])
+      Dir.expects(:glob).with("app\\{1\\}/*", File::FNM_DOTMATCH).returns(["app{1}/.", "app{1}/.."])
 
       unless exclude
       File.expects(:ftype).with("app/bar.txt").returns("file")