capistrano 2.0.0 → 2.1.0

data/test/configuration/actions/invocation_test.rb

@@ -97,38 +97,45 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase
   end
 
   def test_sudo_should_default_to_sudo
-    @config.expects(:run).with("sudo ls", {})
+    @config.expects(:run).with("sudo -p 'sudo password: ' ls", {})
     @config.sudo "ls"
   end
 
   def test_sudo_should_use_sudo_variable_definition
-    @config.expects(:run).with("/opt/local/bin/sudo ls", {})
+    @config.expects(:run).with("/opt/local/bin/sudo -p 'sudo password: ' ls", {})
     @config.options[:sudo] = "/opt/local/bin/sudo"
     @config.sudo "ls"
   end
 
   def test_sudo_should_interpret_as_option_as_user
-    @config.expects(:run).with("sudo -u app ls", {})
+    @config.expects(:run).with("sudo -p 'sudo password: ' -u app ls", {})
     @config.sudo "ls", :as => "app"
   end
 
   def test_sudo_should_pass_options_through_to_run
-    @config.expects(:run).with("sudo ls", :foo => "bar")
+    @config.expects(:run).with("sudo -p 'sudo password: ' ls", :foo => "bar")
     @config.sudo "ls", :foo => "bar"
   end
 
-  def test_sudo_behavior_callback_should_send_password_when_prompted
+  def test_sudo_should_interpret_sudo_prompt_variable_as_custom_prompt
+    @config.set :sudo_prompt, "give it to me: "
+    @config.expects(:run).with("sudo -p 'give it to me: ' ls", {})
+    @config.sudo "ls"
+  end
+
+  def test_sudo_behavior_callback_should_send_password_when_prompted_with_default_sudo_prompt
     ch = mock("channel")
     ch.expects(:send_data).with("g00b3r\n")
     @config.options[:password] = "g00b3r"
-    @config.sudo_behavior_callback(nil)[ch, nil, "Password: "]
+    @config.sudo_behavior_callback(nil)[ch, nil, "sudo password: "]
   end
 
-  def test_sudo_behavior_callback_should_send_password_when_prompted_with_SuSE_dialect
+  def test_sudo_behavior_callback_should_send_password_when_prompted_with_custom_sudo_prompt
     ch = mock("channel")
     ch.expects(:send_data).with("g00b3r\n")
+    @config.set :sudo_prompt, "give it to me: "
     @config.options[:password] = "g00b3r"
-    @config.sudo_behavior_callback(nil)[ch, nil, "user's password: "]
+    @config.sudo_behavior_callback(nil)[ch, nil, "give it to me: "]
   end
 
   def test_sudo_behavior_callback_with_incorrect_password_on_first_prompt

data/test/configuration/connections_test.rb

@@ -96,7 +96,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
   def test_establish_connections_to_should_raise_one_connection_error_on_failure
     Capistrano::SSH.expects(:connect).times(2).raises(Exception)
     assert_raises(Capistrano::ConnectionError) {
-      @config.establish_connections_to(%w(cap1 cap2)).map { |s| servers(s) }
+      @config.establish_connections_to(%w(cap1 cap2).map { |s| server(s) })
     }
   end
 
@@ -104,7 +104,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     Capistrano::SSH.expects(:connect).times(2).raises(Exception)
 
     begin
-      @config.establish_connections_to(%w(cap1 cap2)).map { |s| servers(s) }      
+      @config.establish_connections_to(%w(cap1 cap2).map { |s| server(s) })
       flunk "expected an exception to be raised"
     rescue Capistrano::ConnectionError => e
       assert e.respond_to?(:hosts)
@@ -116,7 +116,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
     Capistrano::SSH.expects(:connect).times(2).raises(Exception).then.returns(:success)
 
     begin
-      @config.establish_connections_to(%w(cap1 cap2)).map { |s| servers(s) }      
+      @config.establish_connections_to(%w(cap1 cap2).map { |s| server(s) })
       flunk "expected an exception to be raised"
     rescue Capistrano::ConnectionError => e
       assert_equal %w(cap1), e.hosts.map { |h| h.to_s }

data/test/configuration/loading_test.rb

@@ -116,4 +116,12 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
       require "#{File.dirname(__FILE__)}/../fixtures/custom"
     end
   end
+
+  def test_require_in_multiple_instances_should_load_recipes_in_each_instance
+    config2 = MockConfig.new
+    @config.require "#{File.dirname(__FILE__)}/../fixtures/custom"
+    config2.require "#{File.dirname(__FILE__)}/../fixtures/custom"
+    assert_equal :custom, @config.ping
+    assert_equal :custom, config2.ping
+  end
 end

data/test/configuration/namespace_dsl_test.rb

@@ -280,4 +280,18 @@ class ConfigurationNamespacesDSLTest < Test::Unit::TestCase
     inner = @config.namespaces[:outer].namespaces[:inner]
     assert_nil inner.search_task(:first)
   end
+
+  def test_top_should_return_self_if_self_is_top
+    assert_equal @config, @config.top
+  end
+
+  def test_top_should_return_parent_if_parent_is_top
+    @config.namespace(:outer) {}
+    assert_equal @config, @config.namespaces[:outer].top
+  end
+
+  def test_top_should_return_topmost_parent_if_self_is_deeply_nested
+    @config.namespace(:outer) { namespace(:middle) { namespace(:inner) {} } }
+    assert_equal @config, @config.namespaces[:outer].namespaces[:middle].namespaces[:inner].top
+  end
 end

data/test/deploy/scm/accurev_test.rb

@@ -0,0 +1,23 @@
+require "#{File.dirname(__FILE__)}/../../utils"
+require 'capistrano/recipes/deploy/scm/accurev'
+
+class AccurevTest < Test::Unit::TestCase
+  include Capistrano::Deploy::SCM
+
+  def test_internal_revision_to_s
+    assert_equal 'foo/1', Accurev::InternalRevision.new('foo', 1).to_s
+    assert_equal 'foo/highest', Accurev::InternalRevision.new('foo', 'highest').to_s
+  end
+
+  def test_internal_revision_parse
+    revision = Accurev::InternalRevision.parse('foo')
+    assert_equal 'foo', revision.stream
+    assert_equal 'highest', revision.transaction_id
+    assert_equal 'foo/highest', revision.to_s
+
+    revision = Accurev::InternalRevision.parse('foo/1')
+    assert_equal 'foo', revision.stream
+    assert_equal '1', revision.transaction_id
+    assert_equal 'foo/1', revision.to_s
+  end
+end

data/test/deploy/scm/git_test.rb

@@ -0,0 +1,112 @@
+require "#{File.dirname(__FILE__)}/../../utils"
+require 'capistrano/recipes/deploy/scm/git'
+
+class DeploySCMGitTest < Test::Unit::TestCase
+  class TestSCM < Capistrano::Deploy::SCM::Git
+    default_command "git"
+  end
+
+  def setup
+    @config = { }
+    def @config.exists?(name); key?(name); end
+
+    @source = TestSCM.new(@config)
+  end
+
+  def test_head
+    assert_equal "HEAD", @source.head
+    @config[:branch] = "master"
+    assert_equal "master", @source.head
+  end
+
+  def test_checkout
+    @config[:repository] = "git@somehost.com:project.git"
+    dest = "/var/www"
+    assert_equal "git clone git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy HEAD", @source.checkout('Not used', dest)
+
+    # With branch
+    @config[:branch] = "origin/foo"
+    assert_equal "git clone git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy origin/foo", @source.checkout('Not used', dest)
+  end
+
+  def test_diff
+    assert_equal "git diff master", @source.diff('master')
+    assert_equal "git diff master..branch", @source.diff('master', 'branch')
+  end
+
+  def test_log
+    assert_equal "git log master", @source.log('master')
+    assert_equal "git log master..branch", @source.log('master', 'branch')
+  end
+
+  def test_query_revision
+    assert_equal "git rev-parse HEAD", @source.query_revision('HEAD') { |o| o }
+  end
+
+  def test_command_should_be_backwards_compatible
+    # 1.x version of this module used ":git", not ":scm_command"
+    @config[:git] = "/srv/bin/git"
+    assert_equal "/srv/bin/git", @source.command
+  end
+
+  def test_sync
+    dest = "/var/www"
+    assert_equal "cd #{dest} && git fetch origin && git merge origin/HEAD", @source.sync('Not used', dest)
+
+    # With branch
+    @config[:branch] = "origin/foo"
+    assert_equal "cd #{dest} && git fetch origin && git merge origin/foo", @source.sync('Not used', dest)
+  end
+
+  def test_shallow_clone
+    @config[:repository] = "git@somehost.com:project.git"
+    @config[:git_shallow_clone] = 1
+    dest = "/var/www"
+    assert_equal "git clone --depth 1 git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy HEAD", @source.checkout('Not used', dest)
+
+    # With branch
+    @config[:branch] = "origin/foo"
+    assert_equal "git clone --depth 1 git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy origin/foo", @source.checkout('Not used', 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
+    @source.local { assert_equal "git", @source.command }
+  end
+
+  def test_command_should_use_scm_command_if_available
+    @config[:scm_command] = "/opt/local/bin/git"
+    assert_equal "/opt/local/bin/git", @source.command
+  end
+
+  def test_command_should_use_scm_command_in_local_mode_if_local_scm_command_not_set
+    @config[:scm_command] = "/opt/local/bin/git"
+    @source.local { assert_equal "/opt/local/bin/git", @source.command }
+  end
+
+  def test_command_should_use_local_scm_command_in_local_mode_if_local_scm_command_is_set
+    @config[:scm_command] = "/opt/local/bin/git"
+    @config[:local_scm_command] = "/usr/local/bin/git"
+    assert_equal "/opt/local/bin/git", @source.command
+    @source.local { assert_equal "/usr/local/bin/git", @source.command }
+  end
+
+  def test_command_should_use_default_if_scm_command_is_default
+    @config[:scm_command] = :default
+    assert_equal "git", @source.command
+  end
+
+  def test_command_should_use_default_in_local_mode_if_local_scm_command_is_default
+    @config[:scm_command] = "/foo/bar/git"
+    @config[:local_scm_command] = :default
+    @source.local { assert_equal "git", @source.command }
+  end
+
+  def test_local_mode_proxy_should_treat_messages_as_being_in_local_mode
+    @config[:scm_command] = "/foo/bar/git"
+    @config[:local_scm_command] = :default
+    assert_equal "git", @source.local.command
+    assert_equal "/foo/bar/git", @source.command
+  end
+end

data/test/deploy/strategy/copy_test.rb

@@ -1,6 +1,7 @@
 require "#{File.dirname(__FILE__)}/../../utils"
 require 'capistrano/logger'
 require 'capistrano/recipes/deploy/strategy/copy'
+require 'stringio'
 
 class DeployStrategyCopyTest < Test::Unit::TestCase
   def setup
@@ -26,7 +27,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    File.expects(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
+    File.expects(:open).with("/temp/dir/1234567890.tar.gz", "rb").yields(StringIO.new).returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -48,7 +49,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    File.expects(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
+    File.expects(:open).with("/temp/dir/1234567890.tar.gz", "rb").yields(StringIO.new).returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -70,7 +71,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    File.expects(:read).with("/temp/dir/1234567890.zip").returns(:mock_file_contents)
+    File.expects(:open).with("/temp/dir/1234567890.zip", "rb").yields(StringIO.new).returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.zip")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -92,7 +93,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    File.expects(:read).with("/temp/dir/1234567890.tar.bz2").returns(:mock_file_contents)
+    File.expects(:open).with("/temp/dir/1234567890.tar.bz2", "rb").yields(StringIO.new).returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.bz2")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -114,7 +115,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/other/path/1234567890/REVISION", "w").yields(mock_file)
-    File.expects(:read).with("/other/path/1234567890.tar.gz").returns(:mock_file_contents)
+    File.expects(:open).with("/other/path/1234567890.tar.gz", "rb").yields(StringIO.new).returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/other/path/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/other/path/1234567890")
@@ -136,7 +137,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    File.expects(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
+    File.expects(:open).with("/temp/dir/1234567890.tar.gz", "rb").yields(StringIO.new).returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")

data/test/upload_test.rb

@@ -33,7 +33,7 @@ class UploadTest < Test::Unit::TestCase
 
   def test_process_when_sftp_open_fails_should_raise_error
     sftp = mock_sftp
-    sftp.expects(:open).with("test.txt", @mode, 0660).yields(mock("status", :code => "bad status", :message => "bad status"), :file_handle)
+    sftp.expects(:open).with("test.txt", @mode, 0664).yields(mock("status", :code => "bad status", :message => "bad status"), :file_handle)
     session = mock("session", :sftp => sftp, :xserver => server("capistrano"))
     upload = Capistrano::Upload.new([session], "test.txt", :data => "data", :logger => stub_everything)
     assert_raises(Capistrano::UploadError) { upload.process! }
@@ -43,7 +43,7 @@ class UploadTest < Test::Unit::TestCase
 
   def test_process_when_sftp_write_fails_should_raise_error
     sftp = mock_sftp
-    sftp.expects(:open).with("test.txt", @mode, 0660).yields(mock("status1", :code => Net::SFTP::Session::FX_OK), :file_handle)
+    sftp.expects(:open).with("test.txt", @mode, 0664).yields(mock("status1", :code => Net::SFTP::Session::FX_OK), :file_handle)
     sftp.expects(:write).with(:file_handle, "data").yields(mock("status2", :code => "bad status", :message => "bad status"))
     session = mock("session", :sftp => sftp, :xserver => server("capistrano"))
     upload = Capistrano::Upload.new([session], "test.txt", :data => "data", :logger => stub_everything)
@@ -54,7 +54,7 @@ class UploadTest < Test::Unit::TestCase
   
   def test_upload_error_should_include_accessor_with_host_array
     sftp = mock_sftp
-    sftp.expects(:open).with("test.txt", @mode, 0660).yields(mock("status1", :code => Net::SFTP::Session::FX_OK), :file_handle)
+    sftp.expects(:open).with("test.txt", @mode, 0664).yields(mock("status1", :code => Net::SFTP::Session::FX_OK), :file_handle)
     sftp.expects(:write).with(:file_handle, "data").yields(mock("status2", :code => "bad status", :message => "bad status"))
     session = mock("session", :sftp => sftp, :xserver => server("capistrano"))
     upload = Capistrano::Upload.new([session], "test.txt", :data => "data", :logger => stub_everything)
@@ -70,7 +70,7 @@ class UploadTest < Test::Unit::TestCase
   
   def test_process_when_sftp_succeeds_should_raise_nothing
     sftp = mock_sftp
-    sftp.expects(:open).with("test.txt", @mode, 0660).yields(mock("status1", :code => Net::SFTP::Session::FX_OK), :file_handle)
+    sftp.expects(:open).with("test.txt", @mode, 0664).yields(mock("status1", :code => Net::SFTP::Session::FX_OK), :file_handle)
     sftp.expects(:write).with(:file_handle, "data").yields(mock("status2", :code => Net::SFTP::Session::FX_OK))
     sftp.expects(:close_handle).with(:file_handle).yields
     session = mock("session", :sftp => sftp, :xserver => server("capistrano"))

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
-date: 2007-07-21 00:00:00 -06:00
+  version: 2.1.0
+date: 2007-10-14 00:00:00 -06:00
 summary: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
 require_paths: 
 - lib
@@ -66,10 +66,12 @@ files:
 - lib/capistrano/recipes/deploy/local_dependency.rb
 - lib/capistrano/recipes/deploy/remote_dependency.rb
 - lib/capistrano/recipes/deploy/scm
+- 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/perforce.rb
 - lib/capistrano/recipes/deploy/scm/subversion.rb
@@ -120,7 +122,9 @@ files:
 - test/configuration_test.rb
 - test/deploy
 - test/deploy/scm
+- test/deploy/scm/accurev_test.rb
 - test/deploy/scm/base_test.rb
+- test/deploy/scm/git_test.rb
 - test/deploy/strategy
 - test/deploy/strategy/copy_test.rb
 - test/extensions_test.rb