capistrano 2.0.0 → 2.15.2

data/test/deploy/strategy/copy_test.rb

@@ -1,32 +1,36 @@
-require "#{File.dirname(__FILE__)}/../../utils"
+require "utils"
 require 'capistrano/logger'
 require 'capistrano/recipes/deploy/strategy/copy'
+require 'stringio'
 
 class DeployStrategyCopyTest < Test::Unit::TestCase
   def setup
-    @config = { :logger => Capistrano::Logger.new(:output => StringIO.new),
+    @config = { :application => "captest",
                 :releases_path => "/u/apps/test/releases",
                 :release_path => "/u/apps/test/releases/1234567890",
                 :real_revision => "154" }
+    @config.stubs(:logger).returns(stub_everything)
+
     @source = mock("source")
     @config.stubs(:source).returns(@source)
     @strategy = Capistrano::Deploy::Strategy::Copy.new(@config)
   end
 
-  def test_deploy_with_defaults_should_use_tar_gz_and_checkout
+  def test_deploy_with_defaults_should_use_remote_gtar
+    @config[:copy_remote_tar] = 'gtar'
+
     Dir.expects(:tmpdir).returns("/temp/dir")
-    Dir.expects(:chdir).with("/temp/dir").yields
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
-
     @strategy.expects(:system).with(:local_checkout)
+
+    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(:run).with("cd /u/apps/test/releases && tar xzf /tmp/1234567890.tar.gz && rm /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 && gtar 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(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -34,21 +38,21 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
-  def test_deploy_with_export_should_use_tar_gz_and_export
+  def test_deploy_with_defaults_should_use_local_gtar
+    @config[:copy_local_tar] = 'gtar'
+
     Dir.expects(:tmpdir).returns("/temp/dir")
-    Dir.expects(:chdir).with("/temp/dir").yields
-    @config[:copy_strategy] = :export
-    @source.expects(:export).with("154", "/temp/dir/1234567890").returns(:local_export)
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
 
-    @strategy.expects(:system).with(:local_export)
-    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
-    @strategy.expects(:put).with(:mock_file_contents, "/tmp/1234567890.tar.gz")
+    Dir.expects(:chdir).with("/temp/dir").yields
+    @strategy.expects(:system).with("gtar czf 1234567890.tar.gz 1234567890")
+    @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(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -56,6 +60,49 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
+  def test_deploy_with_defaults_should_use_tar_gz_and_checkout
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_deploy_with_exclusions_should_remove_patterns_from_destination
+    @config[:copy_exclude] = ".git"
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+    Dir.expects(:glob).with("/temp/dir/1234567890/.git", File::FNM_DOTMATCH).returns(%w(/temp/dir/1234567890/.git))
+
+    FileUtils.expects(:rm_rf).with(%w(/temp/dir/1234567890/.git))
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_deploy_with_exclusions_should_remove_glob_patterns_from_destination
+    @config[:copy_exclude] = ".gi*"
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+    Dir.expects(:glob).with("/temp/dir/1234567890/.gi*", File::FNM_DOTMATCH).returns(%w(/temp/dir/1234567890/.git))
+
+    FileUtils.expects(:rm_rf).with(%w(/temp/dir/1234567890/.git))
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_deploy_with_export_should_use_tar_gz_and_export
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @config[:copy_strategy] = :export
+    @source.expects(:export).with("154", "/temp/dir/1234567890").returns(:local_export)
+    @strategy.expects(:system).with(:local_export)
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
   def test_deploy_with_zip_should_use_zip_and_checkout
     Dir.expects(:tmpdir).returns("/temp/dir")
     Dir.expects(:chdir).with("/temp/dir").yields
@@ -63,14 +110,13 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
 
     @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(:system).with("zip -qyr 1234567890.zip 1234567890")
+    @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(:read).with("/temp/dir/1234567890.zip").returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.zip")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -78,7 +124,7 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @strategy.deploy!
   end
 
-  def test_deploy_with_bzip2_should_use_zip_and_checkout
+  def test_deploy_with_bzip2_should_use_bz2_and_checkout
     Dir.expects(:tmpdir).returns("/temp/dir")
     Dir.expects(:chdir).with("/temp/dir").yields
     @config[:copy_compression] = :bzip2
@@ -86,13 +132,12 @@ 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(:read).with("/temp/dir/1234567890.tar.bz2").returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.bz2")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
@@ -100,6 +145,16 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
     @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
@@ -108,13 +163,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(:read).with("/other/path/1234567890.tar.gz").returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/other/path/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/other/path/1234567890")
@@ -130,17 +184,177 @@ 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(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
 
     FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
     FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
 
     @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
+
+    Dir.stubs(:tmpdir).returns("/temp/dir")
+    File.expects(:exists?).with("/temp/dir/captest").returns(false)
+    Dir.expects(:chdir).with("/temp/dir/captest").yields
+
+    @source.expects(:checkout).with("154", "/temp/dir/captest").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+
+    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
+
+    prepare_directory_tree!("/temp/dir/captest")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_with_copy_cache_should_update_cache_if_cache_exists_and_then_copy
+    @config[:copy_cache] = true
+
+    Dir.stubs(:tmpdir).returns("/temp/dir")
+    File.expects(:exists?).with("/temp/dir/captest").returns(true)
+    Dir.expects(:chdir).with("/temp/dir/captest").yields
+
+    @source.expects(:sync).with("154", "/temp/dir/captest").returns(:local_sync)
+    @strategy.expects(:system).with(:local_sync)
+
+    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
+
+    prepare_directory_tree!("/temp/dir/captest")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_with_copy_cache_with_custom_absolute_cache_dir_path_should_use_specified_cache_dir
+    @config[:copy_cache] = "/u/caches/captest"
+
+    Dir.stubs(:tmpdir).returns("/temp/dir")
+    File.expects(:exists?).with("/u/caches/captest").returns(true)
+    Dir.expects(:chdir).with("/u/caches/captest").yields
+
+    @source.expects(:sync).with("154", "/u/caches/captest").returns(:local_sync)
+    @strategy.expects(:system).with(:local_sync)
+
+    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
+
+    prepare_directory_tree!("/u/caches/captest")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_with_copy_cache_with_custom_relative_cache_dir_path_should_use_specified_cache_dir
+    @config[:copy_cache] = "caches/captest"
+
+    Dir.stubs(:pwd).returns("/u")
+    Dir.stubs(:tmpdir).returns("/temp/dir")
+    File.expects(:exists?).with("/u/caches/captest").returns(true)
+    Dir.expects(:chdir).with("/u/caches/captest").yields
+
+    @source.expects(:sync).with("154", "/u/caches/captest").returns(:local_sync)
+    @strategy.expects(:system).with(:local_sync)
+
+    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
+
+    prepare_directory_tree!("/u/caches/captest")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_with_copy_cache_with_excludes_should_not_copy_excluded_files
+    @config[:copy_cache] = true
+    @config[:copy_exclude] = "*/bar.txt"
+
+    Dir.stubs(:tmpdir).returns("/temp/dir")
+    File.expects(:exists?).with("/temp/dir/captest").returns(true)
+    Dir.expects(:chdir).with("/temp/dir/captest").yields
+
+    @source.expects(:sync).with("154", "/temp/dir/captest").returns(:local_sync)
+    @strategy.expects(:system).with(:local_sync)
+
+    FileUtils.expects(:mkdir_p).with("/temp/dir/1234567890")
+
+    prepare_directory_tree!("/temp/dir/captest", true)
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  def test_with_build_script_should_run_script
+    @config[:build_script] = "mkdir bin"
+
+    Dir.expects(:tmpdir).returns("/temp/dir")
+    @source.expects(:checkout).with("154", "/temp/dir/1234567890").returns(:local_checkout)
+    @strategy.expects(:system).with(:local_checkout)
+
+    Dir.expects(:chdir).with("/temp/dir/1234567890").yields
+    @strategy.expects(:system).with("mkdir bin")
+
+    prepare_standard_compress_and_copy!
+    @strategy.deploy!
+  end
+
+  private
+
+    def prepare_directory_tree!(cache, exclude=false)
+      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")
+        FileUtils.expects(:ln).with("app/bar.txt", "/temp/dir/1234567890/app/bar.txt")
+      end
+    end
+
+    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(: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)
+
+      FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
+      FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
+    end
 end

data/test/extensions_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano'
 
 class ExtensionsTest < Test::Unit::TestCase
@@ -66,4 +66,4 @@ class ExtensionsTest < Test::Unit::TestCase
     @config.expects(:run).with("hello")
     @config.custom_stuff.do_something("hello")
   end
-end
+end

data/test/logger_formatting_test.rb

@@ -0,0 +1,149 @@
+require File.expand_path("../utils", __FILE__)
+require 'capistrano/logger'
+require 'stringio'
+
+Capistrano::Logger.class_eval do
+  # Allows formatters to be changed during tests
+  def self.formatters=(formatters)
+    @formatters = formatters
+    @sorted_formatters = nil
+  end
+end
+
+class LoggerFormattingTest < Test::Unit::TestCase
+  def setup
+    @io = StringIO.new
+    @io.stubs(:tty?).returns(true)
+    @logger = Capistrano::Logger.new(:output => @io, :level => 3)
+  end
+
+  def test_matching_with_style_and_color
+    Capistrano::Logger.formatters = [{ :match => /^err ::/, :color => :red, :style => :underscore, :level => 0 }]
+    @logger.log(0, "err :: Error Occurred")
+    assert @io.string.include? "\e[4;31merr :: Error Occurred\e[0m"
+  end
+
+  def test_style_without_color
+    Capistrano::Logger.formatters = [{ :match => /.*/, :style => :underscore, :level => 0 }]
+    @logger.log(0, "test message")
+    # Default color should be blank (0m)
+    assert @io.string.include? "\e[4;0mtest message\e[0m"
+  end
+
+  def test_prepending_text
+    Capistrano::Logger.formatters = [{ :match => /^executing/, :level => 0, :prepend => '== Currently ' }]
+    @logger.log(0, "executing task")
+    assert @io.string.include? '== Currently executing task'
+  end
+
+  def test_replacing_matched_text
+    Capistrano::Logger.formatters = [{ :match => /^executing/, :level => 0, :replace => 'running' }]
+    @logger.log(0, "executing task")
+    assert @io.string.include? 'running task'
+  end
+
+  def test_prepending_timestamps
+    Capistrano::Logger.formatters = [{ :match => /.*/, :level => 0, :timestamp => true }]
+    @logger.log(0, "test message")
+    assert @io.string.match /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} test message/
+  end
+
+  def test_formatter_priorities
+    Capistrano::Logger.formatters = [
+      { :match => /.*/, :color => :red,  :level => 0, :priority => -10 },
+      { :match => /.*/, :color => :blue, :level => 0, :priority => -20, :prepend => '###' }
+    ]
+
+    @logger.log(0, "test message")
+    # Only the red formatter (color 31) should be applied.
+    assert @io.string.include? "\e[31mtest message"
+    # The blue formatter should not have prepended $$$
+    assert !@io.string.include?('###')
+  end
+
+  def test_no_formatting_if_no_color_or_style
+    Capistrano::Logger.formatters = []
+    @logger.log(0, "test message")
+    assert @io.string.include? "*** test message"
+  end
+
+  def test_formatter_log_levels
+    Capistrano::Logger.formatters = [{ :match => /.*/, :color => :blue, :level => 3 }]
+    @logger.log(0, "test message")
+    # Should not match log level
+    assert @io.string.include? "*** test message"
+
+    clear_logger
+    @logger.log(3, "test message")
+    # Should match log level and apply blue color
+    assert @io.string.include? "\e[34mtest message"
+  end
+
+  private
+
+  def colorize(message, color, style = nil)
+    style = "#{style};" if style
+    "\e[#{style}#{color}m" + message + "\e[0m"
+  end
+
+  def clear_logger
+    @io = StringIO.new
+    @io.stubs(:tty?).returns(true)
+    @logger.device = @io
+  end
+end
+
+class DefaultLoggerFormattersTest < Test::Unit::TestCase
+  def setup
+    @expected_default_formatter_values = [
+      # TRACE
+      { :match => /command finished/,          :color => :white,   :style => :dim, :level => 3, :priority => -10 },
+      { :match => /executing locally/,         :color => :yellow,  :level => 3, :priority => -20 },
+
+      # DEBUG
+      { :match => /executing `.*/,             :color => :green,   :level => 2, :priority => -10, :timestamp => true },
+      { :match => /.*/,                        :color => :yellow,  :level => 2, :priority => -30 },
+
+      # INFO
+      { :match => /.*out\] (fatal:|ERROR:).*/, :color => :red,     :level => 1, :priority => -10 },
+      { :match => /Permission denied/,         :color => :red,     :level => 1, :priority => -20 },
+      { :match => /sh: .+: command not found/, :color => :magenta, :level => 1, :priority => -30 },
+
+      # IMPORTANT
+      { :match => /^err ::/,                   :color => :red,     :level => 0, :priority => -10 },
+      { :match => /.*/,                        :color => :blue,    :level => 0, :priority => -20 }
+    ]
+
+    @custom_default_formatter_values = [
+      { :match => /.*/,  :color => :white }
+    ]
+
+  end
+
+  def test_default_formatters_api
+    assert Capistrano::Logger.respond_to? :default_formatters
+    assert Capistrano::Logger.respond_to? :default_formatters=
+  end
+
+  def test_default_formatters_values
+    assert_equal @expected_default_formatter_values, Capistrano::Logger.default_formatters
+    assert_equal @expected_default_formatter_values, Capistrano::Logger.instance_variable_get("@formatters")
+    assert_equal nil, Capistrano::Logger.instance_variable_get("@sorted_formatters")
+  end
+
+  def test_set_default_formatters_values
+    # when given an array
+    Capistrano::Logger.default_formatters = @custom_default_formatter_values
+
+    assert_equal @custom_default_formatter_values, Capistrano::Logger.default_formatters
+    Capistrano::Logger.default_formatters = @custom_default_formatter_values
+    assert_equal @custom_default_formatter_values, Capistrano::Logger.instance_variable_get("@formatters")
+    assert_equal nil, Capistrano::Logger.instance_variable_get("@sorted_formatters")
+
+    # when given a single formatter values hash
+    Capistrano::Logger.default_formatters = @custom_default_formatter_values.first
+
+    assert_equal @custom_default_formatter_values, Capistrano::Logger.default_formatters
+  end
+
+end

data/test/logger_test.rb

@@ -1,11 +1,12 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/logger'
 require 'stringio'
 
 class LoggerTest < Test::Unit::TestCase
   def setup
     @io = StringIO.new
-    @logger = Capistrano::Logger.new(:output => @io)
+    # Turn off formatting for these tests. Formatting is tested in `logger_formatting_test.rb`.
+    @logger = Capistrano::Logger.new(:output => @io, :disable_formatters => true)
   end
 
   def test_logger_should_use_STDERR_by_default
@@ -13,6 +14,16 @@ class LoggerTest < Test::Unit::TestCase
     assert_equal STDERR, logger.device
   end
 
+  def test_logger_should_have_log_level_0
+    logger = Capistrano::Logger.new
+    assert_equal 0, logger.level
+  end
+
+  def test_logger_should_use_level_form_options
+    logger = Capistrano::Logger.new :level => 4
+    assert_equal 4, logger.level
+  end
+
   def test_logger_should_use_output_option_if_output_responds_to_puts
     logger = Capistrano::Logger.new(:output => STDOUT)
     assert_equal STDOUT, logger.device

data/test/recipes_test.rb

@@ -0,0 +1,25 @@
+require 'utils'
+require 'capistrano/configuration'
+
+class RecipesTest < Test::Unit::TestCase
+
+  def setup
+    @config = Capistrano::Configuration.new
+    @config.stubs(:logger).returns(stub_everything)
+  end
+
+  def test_current_releases_does_not_cause_error_on_dry_run
+    @config.dry_run = true
+    @config.load 'deploy'
+    @config.load do
+      set :application, "foo"
+      task :dry_run_test do
+        fetch :current_release
+      end
+    end
+
+    assert_nothing_raised do
+      @config.dry_run_test
+    end
+  end
+end

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 { |o| "app2.capistrano.test" })
+    assert_equal 2, role.servers.size
+    role.clear
+    assert role.servers.empty?
+  end
+end

data/test/server_definition_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/server_definition'
 
 class ServerDefinitionTest < Test::Unit::TestCase
@@ -63,6 +63,19 @@ class ServerDefinitionTest < Test::Unit::TestCase
     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")
     s2 = server("www.capistrano.test", :user => "jamis", :port => 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