capistrano 2.3.0 → 2.4.0

data/test/configuration/loading_test.rb

@@ -117,6 +117,11 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
     end
   end
 
+  def test_require_from_config_should_return_false_when_called_a_second_time_with_same_args
+    assert @config.require("#{File.dirname(__FILE__)}/../fixtures/custom")
+    assert_equal false, @config.require("#{File.dirname(__FILE__)}/../fixtures/custom")
+  end
+  
   def test_require_in_multiple_instances_should_load_recipes_in_each_instance
     config2 = MockConfig.new
     @config.require "#{File.dirname(__FILE__)}/../fixtures/custom"
@@ -124,4 +129,4 @@ class ConfigurationLoadingTest < Test::Unit::TestCase
     assert_equal :custom, @config.ping
     assert_equal :custom, config2.ping
   end
-end
+end

data/test/deploy/local_dependency_test.rb

@@ -0,0 +1,73 @@
+require "utils"
+require 'capistrano/recipes/deploy/local_dependency'
+
+class LocalDependencyTest < Test::Unit::TestCase
+  def setup
+    @config = { }
+    @dependency = Capistrano::Deploy::LocalDependency.new(@config)
+  end
+  
+  def test_should_use_standard_error_message
+    setup_for_one_path_entry(false)
+    @dependency.command("cat")
+    assert_equal "`cat' could not be found in the path on the local host", @dependency.message
+  end
+  
+  def test_should_use_alternative_message_if_provided
+    setup_for_one_path_entry(false)
+    @dependency.command("cat").or("Sorry")
+    assert_equal "Sorry", @dependency.message
+  end
+  
+  def test_env_with_no_path_should_never_find_command
+    ENV.expects(:[]).with("PATH").returns(nil)
+    assert !@dependency.command("cat").pass?
+  end
+  
+  def test_env_with_one_path_entry_should_fail_if_command_not_found
+    setup_for_one_path_entry(false)
+    assert !@dependency.command("cat").pass?
+  end
+  
+  def test_env_with_one_path_entry_should_pass_if_command_found
+    setup_for_one_path_entry(true)
+    assert @dependency.command("cat").pass?
+  end
+  
+  def test_env_with_three_path_entries_should_fail_if_command_not_found
+    setup_for_three_path_entries(false)
+    assert !@dependency.command("cat").pass?
+  end
+  
+  def test_env_with_three_path_entries_should_pass_if_command_found
+    setup_for_three_path_entries(true)
+    assert @dependency.command("cat").pass?
+  end
+  
+  def test_env_with_one_path_entry_on_windows_should_pass_if_command_found_with_extension
+    setup_for_one_path_entry_on_windows(true)
+    assert @dependency.command("cat").pass?
+  end
+  
+  private
+
+  def setup_for_one_path_entry(command_found)
+    ENV.expects(:[]).with("PATH").returns("/bin")
+    File.expects(:executable?).with("/bin/cat").returns(command_found)
+  end
+  
+  def setup_for_three_path_entries(command_found)
+    path = %w(/bin /usr/bin /usr/local/bin).join(File::PATH_SEPARATOR)
+    ENV.expects(:[]).with("PATH").returns(path)
+    File.expects(:executable?).with("/usr/bin/cat").returns(command_found)
+    File.expects(:executable?).at_most(1).with("/bin/cat").returns(false)
+    File.expects(:executable?).at_most(1).with("/usr/local/bin/cat").returns(false)
+  end
+  
+  def setup_for_one_path_entry_on_windows(command_found)
+    Capistrano::Deploy::LocalDependency.expects(:on_windows?).returns(true)
+    ENV.expects(:[]).with("PATH").returns("/cygwin/bin")
+    File.stubs(:executable?).returns(false)
+    File.expects(:executable?).with("/cygwin/bin/cat.exe").returns(command_found)
+  end
+end

data/test/deploy/remote_dependency_test.rb

@@ -0,0 +1,114 @@
+require "utils"
+require 'capistrano/recipes/deploy/remote_dependency'
+
+class RemoteDependencyTest < Test::Unit::TestCase
+  def setup
+    @config = { }
+    @dependency = Capistrano::Deploy::RemoteDependency.new(@config)
+  end
+
+  def test_should_use_standard_error_message_for_directory
+    setup_for_a_configuration_run("test -d /data", false)
+    @dependency.directory("/data")
+    assert_equal "`/data' is not a directory (host)", @dependency.message
+  end
+
+  def test_should_use_standard_error_message_for_file
+    setup_for_a_configuration_run("test -f /data/foo.txt", false)
+    @dependency.file("/data/foo.txt")
+    assert_equal "`/data/foo.txt' is not a file (host)", @dependency.message
+  end
+
+  def test_should_use_standard_error_message_for_writable
+    setup_for_a_configuration_run("test -w /data/foo.txt", false)
+    @dependency.writable("/data/foo.txt")
+    assert_equal "`/data/foo.txt' is not writable (host)", @dependency.message
+  end
+
+  def test_should_use_standard_error_message_for_command
+    setup_for_a_configuration_run("which cat", false)
+    @dependency.command("cat")
+    assert_equal "`cat' could not be found in the path (host)", @dependency.message
+  end
+
+  def test_should_use_standard_error_message_for_gem
+    setup_for_a_configuration_gem_run("capistrano", "9.9", false)
+    @dependency.gem("capistrano", 9.9)
+    assert_equal "gem `capistrano' 9.9 could not be found (host)", @dependency.message
+  end
+
+  def test_should_fail_if_directory_not_found
+    setup_for_a_configuration_run("test -d /data", false)
+    assert !@dependency.directory("/data").pass?
+  end
+
+  def test_should_pass_if_directory_found
+    setup_for_a_configuration_run("test -d /data", true)
+    assert @dependency.directory("/data").pass?
+  end
+
+  def test_should_fail_if_file_not_found
+    setup_for_a_configuration_run("test -f /data/foo.txt", false)
+    assert !@dependency.file("/data/foo.txt").pass?
+  end
+
+  def test_should_pas_if_file_found
+    setup_for_a_configuration_run("test -f /data/foo.txt", true)
+    assert @dependency.file("/data/foo.txt").pass?
+  end
+
+  def test_should_fail_if_writable_not_found
+    setup_for_a_configuration_run("test -w /data/foo.txt", false)
+    assert !@dependency.writable("/data/foo.txt").pass?
+  end
+
+  def test_should_pass_if_writable_found
+    setup_for_a_configuration_run("test -w /data/foo.txt", true)
+    assert @dependency.writable("/data/foo.txt").pass?
+  end
+
+  def test_should_fail_if_command_not_found
+    setup_for_a_configuration_run("which cat", false)
+    assert !@dependency.command("cat").pass?
+  end
+
+  def test_should_pass_if_command_found
+    setup_for_a_configuration_run("which cat", true)
+    assert @dependency.command("cat").pass?
+  end
+
+  def test_should_fail_if_gem_not_found
+    setup_for_a_configuration_gem_run("capistrano", "9.9", false)
+    assert !@dependency.gem("capistrano", 9.9).pass?
+  end
+
+  def test_should_pass_if_gem_found
+    setup_for_a_configuration_gem_run("capistrano", "9.9", true)
+    assert @dependency.gem("capistrano", 9.9).pass?
+  end
+
+  def test_should_use_alternative_message_if_provided
+    setup_for_a_configuration_run("which cat", false)
+    @dependency.command("cat").or("Sorry")
+    assert_equal "Sorry (host)", @dependency.message
+  end
+
+  private
+
+  def setup_for_a_configuration_run(command, passing)
+    expectation = @config.expects(:run).with(command, {})
+    if passing
+      expectation.returns(true)
+    else
+      error = Capistrano::CommandError.new
+      error.expects(:hosts).returns(["host"])
+      expectation.raises(error)
+    end
+  end
+
+  def setup_for_a_configuration_gem_run(name, version, passing)
+    @config.expects(:fetch).with(:gem_command, "gem").returns("gem")
+    find_gem_cmd = "gem specification --version '#{version}' #{name} 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
+    setup_for_a_configuration_run(find_gem_cmd, passing)
+  end
+end

data/test/deploy/scm/git_test.rb

@@ -31,12 +31,20 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:repository] = "git@somehost.com:project.git"
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy #{rev}", @source.checkout(rev, dest)
+    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 :scm_command
     git = "/opt/local/bin/git"
     @config[:scm_command] = git
-    assert_equal "#{git} clone git@somehost.com:project.git /var/www && cd /var/www && #{git} checkout -b deploy #{rev}", @source.checkout(rev, dest)
+    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)
+  end
+
+  def test_checkout_with_verbose_should_not_use_q_switch
+    @config[:repository] = "git@somehost.com:project.git"
+    @config[:scm_verbose] = true
+    dest = "/var/www"
+    rev = 'c2d9e79'
+    assert_equal "git clone  git@somehost.com:project.git /var/www && cd /var/www && git checkout  -b deploy #{rev}", @source.checkout(rev, dest)
   end
 
   def test_diff
@@ -45,7 +53,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
   end
 
   def test_log
-    assert_equal "git log master", @source.log('master')
+    assert_equal "git log master..", @source.log('master')
     assert_equal "git log master..branch", @source.log('master', 'branch')
   end
 
@@ -57,6 +65,12 @@ class DeploySCMGitTest < Test::Unit::TestCase
     assert_equal "d11006102c07c94e5d54dd0ee63dca825c93ed61", revision
   end
 
+  def test_query_revision_deprecation_error
+    assert_raise(ArgumentError) do
+      revision = @source.query_revision('origin/release') {}
+    end
+  end
+
   def test_command_should_be_backwards_compatible
     # 1.x version of this module used ":git", not ":scm_command"
     @config[:git] = "/srv/bin/git"
@@ -66,12 +80,12 @@ class DeploySCMGitTest < Test::Unit::TestCase
   def test_sync
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "cd #{dest} && git fetch --tags origin && git reset --hard #{rev}", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && git fetch -q origin && git reset -q --hard #{rev}", @source.sync(rev, dest)
 
     # With :scm_command
     git = "/opt/local/bin/git"
     @config[:scm_command] = git
-    assert_equal "cd #{dest} && #{git} fetch --tags origin && #{git} reset --hard #{rev}", @source.sync(rev, dest)
+    assert_equal "cd #{dest} && #{git} fetch -q origin && #{git} reset -q --hard #{rev}", @source.sync(rev, dest)
   end
 
   def test_sync_with_remote
@@ -83,7 +97,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 --tags #{remote} && git reset --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}", @source.sync(rev, dest)
   end
 
   def test_shallow_clone
@@ -91,7 +105,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:git_shallow_clone] = 1
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone --depth 1 git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy #{rev}", @source.checkout(rev, dest)
+    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_remote_clone
@@ -99,7 +113,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
     @config[:remote] = "username"
     dest = "/var/www"
     rev = 'c2d9e79'
-    assert_equal "git clone -o username git@somehost.com:project.git /var/www && cd /var/www && git checkout -b deploy #{rev}", @source.checkout(rev, dest)
+    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
 
   # Tests from base_test.rb, makin' sure we didn't break anything up there!

data/test/deploy/scm/mercurial_test.rb

@@ -43,10 +43,10 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     require 'capistrano/logger'
     @config[:scm_user] = "fred"
     text = "user:"
-    assert_equal "fred\n", @source.handle_data(:test_state, :test_stream, text)
+    assert_equal "fred\n", @source.handle_data(mock_state, :test_stream, text)
     # :scm_username takes priority
     @config[:scm_username] = "wilma"
-    assert_equal "wilma\n", @source.handle_data(:test_state, :test_stream, text)
+    assert_equal "wilma\n", @source.handle_data(mock_state, :test_stream, text)
   end
 
   def test_sync
@@ -67,7 +67,7 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     require 'capistrano/logger'
     text = "password:"
     @config[:scm_password] = "opensesame"
-    assert_equal "opensesame\n", @source.handle_data(:test_state, :test_stream, text)
+    assert_equal "opensesame\n", @source.handle_data(mock_state, :test_stream, text)
   end
   
   def test_prompts_for_password_if_preferred
@@ -76,7 +76,7 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     Capistrano::CLI.stubs(:password_prompt).with("hg password: ").returns("opensesame")
     @config[:scm_prefer_prompt] = true
     text = "password:"
-    assert_equal "opensesame\n", @source.handle_data(:test_state, :test_stream, text)
+    assert_equal "opensesame\n", @source.handle_data(mock_state, :test_stream, text)
   end
 
 
@@ -120,4 +120,10 @@ class DeploySCMMercurialTest < Test::Unit::TestCase
     assert_equal "hg", @source.local.command
     assert_equal "/foo/bar/hg", @source.command
   end
+
+  private
+
+    def mock_state
+      { :channel => { :host => "abc" } }
+    end
 end

data/test/deploy/strategy/copy_test.rb

@@ -53,13 +53,12 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     @strategy.expects(:system).with(:local_checkout)
     @strategy.expects(:system).with("zip -qr 1234567890.zip 1234567890")
-    @strategy.expects(:put).with(:mock_file_contents, "/tmp/1234567890.zip")
+    @strategy.expects(:upload).with("/temp/dir/1234567890.zip", "/tmp/1234567890.zip")
     @strategy.expects(:run).with("cd /u/apps/test/releases && unzip -q /tmp/1234567890.zip && rm /tmp/1234567890.zip")
 
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    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")
@@ -75,20 +74,29 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     @strategy.expects(:system).with(:local_checkout)
     @strategy.expects(:system).with("tar cjf 1234567890.tar.bz2 1234567890")
-    @strategy.expects(:put).with(:mock_file_contents, "/tmp/1234567890.tar.bz2")
+    @strategy.expects(:upload).with("/temp/dir/1234567890.tar.bz2", "/tmp/1234567890.tar.bz2")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xjf /tmp/1234567890.tar.bz2 && rm /tmp/1234567890.tar.bz2")
 
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-    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")
 
     @strategy.deploy!
   end
-
+  
+  def test_deploy_with_unknown_compression_type_should_error
+    @config[:copy_compression] = :bogus
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.stubs(:system)
+    File.stubs(:open)
+    
+    assert_raises(ArgumentError) { @strategy.deploy! }
+  end
+  
   def test_deploy_with_custom_copy_dir_should_use_that_as_tmpdir
     Dir.expects(:tmpdir).never
     Dir.expects(:chdir).with("/other/path").yields
@@ -97,13 +105,12 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     @strategy.expects(:system).with(:local_checkout)
     @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
-    @strategy.expects(:put).with(:mock_file_contents, "/tmp/1234567890.tar.gz")
+    @strategy.expects(:upload).with("/other/path/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
     mock_file = mock("file")
     mock_file.expects(:puts).with("154")
     File.expects(:open).with("/other/path/1234567890/REVISION", "w").yields(mock_file)
-    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")
@@ -119,13 +126,12 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
 
     @strategy.expects(:system).with(:local_checkout)
     @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
-    @strategy.expects(:put).with(:mock_file_contents, "/somewhere/else/1234567890.tar.gz")
+    @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/somewhere/else/1234567890.tar.gz")
     @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /somewhere/else/1234567890.tar.gz && rm /somewhere/else/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)
-    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")
@@ -226,13 +232,12 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     def prepare_standard_compress_and_copy!
       Dir.expects(:chdir).with("/temp/dir").yields
       @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
-      @strategy.expects(:put).with(:mock_file_contents, "/tmp/1234567890.tar.gz")
+      @strategy.expects(:upload).with("/temp/dir/1234567890.tar.gz", "/tmp/1234567890.tar.gz")
       @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /tmp/1234567890.tar.gz")
 
       mock_file = mock("file")
       mock_file.expects(:puts).with("154")
       File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
-      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/role_test.rb

@@ -0,0 +1,11 @@
+require "utils"
+require 'capistrano/role'
+
+class RoleTest < Test::Unit::TestCase
+  def test_clearing_a_populated_role_should_yield_no_servers
+    role = Capistrano::Role.new("app1.capistrano.test", lambda { "app2.capistrano.test" })
+    assert_equal 2, role.servers.size
+    role.clear
+    assert role.servers.empty?
+  end
+end

data/test/server_definition_test.rb

@@ -62,6 +62,19 @@ class ServerDefinitionTest < Test::Unit::TestCase
     server = Capistrano::ServerDefinition.new("www.capistrano.test", :primary => true)
     assert_equal true, server.options[:primary]
   end
+  
+  def test_default_user_should_try_to_guess_username
+    ENV.stubs(:[]).returns(nil)
+    assert_equal "not-specified", Capistrano::ServerDefinition.default_user
+    
+    ENV.stubs(:[]).returns(nil)
+    ENV.stubs(:[]).with("USERNAME").returns("ryan")
+    assert_equal "ryan", Capistrano::ServerDefinition.default_user
+
+    ENV.stubs(:[]).returns(nil)
+    ENV.stubs(:[]).with("USER").returns("jamis")
+    assert_equal "jamis", Capistrano::ServerDefinition.default_user
+  end
 
   def test_comparison_should_match_when_host_user_port_are_same
     s1 = server("jamis@www.capistrano.test:8080")
@@ -105,4 +118,4 @@ class ServerDefinitionTest < Test::Unit::TestCase
     assert_equal "jamis@www.capistrano.test", server("jamis@www.capistrano.test").to_s
     assert_equal "jamis@www.capistrano.test:1234", server("jamis@www.capistrano.test:1234").to_s
   end
-end
+end