capistrano 2.0.0 → 2.15.2

data/test/cli/execute_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/execute'
 
 class CLIExecuteTest < Test::Unit::TestCase
@@ -15,7 +15,7 @@ class CLIExecuteTest < Test::Unit::TestCase
   def setup
     @cli = MockCLI.new
     @logger = stub_everything
-    @config = stub(:logger => @logger)
+    @config = stub(:logger => @logger, :debug= => nil, :dry_run= => nil, :preserve_roles= => nil)
     @config.stubs(:set)
     @config.stubs(:load)
     @config.stubs(:trigger)
@@ -129,4 +129,4 @@ class CLIExecuteTest < Test::Unit::TestCase
     MockCLI.expects(:parse).with(ARGV).returns(cli)
     MockCLI.execute
   end
-end
+end

data/test/cli/help_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/help'
 
 class CLIHelpTest < Test::Unit::TestCase
@@ -33,7 +33,7 @@ class CLIHelpTest < Test::Unit::TestCase
 
   def test_execute_requested_actions_with_tasks_should_call_task_list
     @cli.options[:tasks] = true
-    @cli.expects(:task_list).with(:config)
+    @cli.expects(:task_list).with(:config, true)
     @cli.expects(:explain_task).never
     @cli.execute_requested_actions(:config)
     assert !@cli.called_original
@@ -57,13 +57,38 @@ class CLIHelpTest < Test::Unit::TestCase
     expected_max_len = 80 - 3 - MockCLI::LINE_PADDING
     task_list = [task("c"), task("g", "c:g"), task("b", "c:b"), task("a")]
     task_list.each { |t| t.expects(:brief_description).with(expected_max_len).returns(t.fully_qualified_name) }
-  
+
     config = mock("config")
     config.expects(:task_list).with(:all).returns(task_list)
     @cli.stubs(:puts)
     @cli.task_list(config)
   end
 
+  def test_task_list_should_query_tasks_with_pattern
+    expected_max_len = 80 - 3 - MockCLI::LINE_PADDING
+    task_list = [task("g", "c:g"), task("b", "c:b")]
+    task_list.each { |t| t.expects(:brief_description).with(expected_max_len).returns(t.fully_qualified_name)}
+
+    config = mock("config")
+    config.expects(:task_list).with(:all).once.returns(task_list)
+
+    @cli.stubs(:puts)
+    @cli.task_list(config, "c")
+  end
+
+  def test_task_list_should_query_for_all_tasks_when_pattern_doesnt_match
+    expected_max_len = 80 - 3 - MockCLI::LINE_PADDING
+    task_list = [task("g", "c:g"), task("b", "c:b")]
+    task_list.each { |t| t.expects(:brief_description).with(expected_max_len).returns(t.fully_qualified_name) }
+
+    config = mock("config")
+    config.expects(:task_list).with(:all).times(2).returns(task_list)
+
+    @cli.stubs(:warn)
+    @cli.stubs(:puts)
+    @cli.task_list(config, "z")
+  end
+
   def test_task_list_should_never_use_less_than_MIN_MAX_LEN_chars_for_descriptions
     @ui.stubs(:output_cols).returns(20)
     t = task("c")
@@ -133,7 +158,8 @@ class CLIHelpTest < Test::Unit::TestCase
 
   private
 
-    def task(name, fqn=name, desc="a description")
-      stub("task", :name => name, :fully_qualified_name => fqn, :description => desc)
-    end
-end
+  def task(name, fqn=name, desc="a description")
+    stub("task", :name => name, :fully_qualified_name => fqn, :description => desc)
+  end
+
+end

data/test/cli/options_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/options'
 
 class CLIOptionsTest < Test::Unit::TestCase
@@ -23,7 +23,25 @@ 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!
+    assert @cli.options[:debug]
+  end
+
+  def test_parse_options_with_n_should_set_dry_run_option
+    @cli.args << "-n"
+    @cli.parse_options!
+    assert @cli.options[:dry_run]
+  end
+
+  def test_parse_options_with_dry_run_should_set_dry_run_option
+    @cli.args << "--dry-run"
+    @cli.parse_options!
+    assert @cli.options[:dry_run]
+  end
+
   def test_parse_options_with_e_should_set_explain_option
     @cli.args << "-e" << "sample"
     @cli.parse_options!
@@ -75,18 +93,102 @@ class CLIOptionsTest < Test::Unit::TestCase
     assert_equal 0, @cli.options[:verbose]
   end
 
+  def test_parse_options_with_r_should_set_preserve_roles_option
+    @cli.args << "-r"
+    @cli.parse_options!
+    assert @cli.options[:preserve_roles]
+  end
+
+  def test_parse_options_with_preserve_roles_should_set_preserve_roles_option
+    @cli.args << "--preserve-roles"
+    @cli.parse_options!
+    assert @cli.options[:preserve_roles]
+  end
+
   def test_parse_options_with_S_should_set_pre_vars
     @cli.args << "-S" << "foo=bar"
     @cli.parse_options!
     assert_equal "bar", @cli.options[:pre_vars][:foo]
   end
 
+  def test_S_should_coerce_digits_to_integers
+    @cli.args << "-S" << "foo=1234"
+    @cli.parse_options!
+    assert_equal 1234, @cli.options[:pre_vars][:foo]
+  end
+
+  def test_S_should_treat_quoted_integers_as_string
+    @cli.args << "-S" << "foo=\"1234\""
+    @cli.parse_options!
+    assert_equal "1234", @cli.options[:pre_vars][:foo]
+  end
+
+  def test_S_should_treat_digits_with_dot_as_floating_point
+    @cli.args << "-S" << "foo=3.1415"
+    @cli.parse_options!
+    assert_equal 3.1415, @cli.options[:pre_vars][:foo]
+  end
+
+  def test_S_should_treat_true_as_boolean_true
+    @cli.args << "-S" << "foo=true"
+    @cli.parse_options!
+    assert_equal true, @cli.options[:pre_vars][:foo]
+  end
+
+  def test_S_should_treat_false_as_boolean_false
+    @cli.args << "-S" << "foo=false"
+    @cli.parse_options!
+    assert_equal false, @cli.options[:pre_vars][:foo]
+  end
+
+  def test_S_should_treat_nil_as_nil
+    @cli.args << "-S" << "foo=nil"
+    @cli.parse_options!
+    assert_equal nil, @cli.options[:pre_vars][:foo]
+  end
+
   def test_parse_options_with_s_should_set_vars
     @cli.args << "-s" << "foo=bar"
     @cli.parse_options!
     assert_equal "bar", @cli.options[:vars][:foo]
   end
 
+  def test_s_should_coerce_digits_to_integers
+    @cli.args << "-s" << "foo=1234"
+    @cli.parse_options!
+    assert_equal 1234, @cli.options[:vars][:foo]
+  end
+
+  def test_s_should_treat_quoted_integers_as_string
+    @cli.args << "-s" << "foo=\"1234\""
+    @cli.parse_options!
+    assert_equal "1234", @cli.options[:vars][:foo]
+  end
+
+  def test_s_should_treat_digits_with_dot_as_floating_point
+    @cli.args << "-s" << "foo=3.1415"
+    @cli.parse_options!
+    assert_equal 3.1415, @cli.options[:vars][:foo]
+  end
+
+  def test_s_should_treat_true_as_boolean_true
+    @cli.args << "-s" << "foo=true"
+    @cli.parse_options!
+    assert_equal true, @cli.options[:vars][:foo]
+  end
+
+  def test_s_should_treat_false_as_boolean_false
+    @cli.args << "-s" << "foo=false"
+    @cli.parse_options!
+    assert_equal false, @cli.options[:vars][:foo]
+  end
+
+  def test_s_should_treat_nil_as_nil
+    @cli.args << "-s" << "foo=nil"
+    @cli.parse_options!
+    assert_equal nil, @cli.options[:vars][:foo]
+  end
+
   def test_parse_options_with_T_should_set_tasks_option_and_set_verbose_off
     @cli.args << "-T"
     @cli.parse_options!
@@ -96,7 +198,7 @@ class CLIOptionsTest < Test::Unit::TestCase
 
   def test_parse_options_with_V_should_show_version_and_exit
     @cli.args << "-V"
-    @cli.expects(:puts).with { |s| s.include?(Capistrano::Version::STRING) }
+    @cli.expects(:puts).with { |s| s.include?(Capistrano::Version.to_s) }
     @cli.expects(:exit).raises(ExitException)
     assert_raises(ExitException) { @cli.parse_options! }
   end
@@ -171,7 +273,8 @@ class CLIOptionsTest < Test::Unit::TestCase
     assert_equal "world", ENV["HELLO"]
     assert_equal "value", ENV["ANOTHER"]
   ensure
-    ENV["HELLO"] = ENV["ANOTHER"] = nil
+    ENV.delete("HELLO")
+    ENV.delete("ANOTHER")
   end
 
   def test_remaining_args_should_be_added_to_actions_list
@@ -179,7 +282,7 @@ class CLIOptionsTest < Test::Unit::TestCase
     @cli.parse_options!
     assert_equal %w(something else), @cli.args
   ensure
-    ENV["HELLO"] = nil
+    ENV.delete("HELLO")
   end
 
   def test_search_for_default_recipe_file_should_look_for_Capfile
@@ -223,4 +326,4 @@ class CLIOptionsTest < Test::Unit::TestCase
     MockCLI.expects(:new).with(%w(a b c)).returns(cli)
     assert_equal cli, MockCLI.parse(%w(a b c))
   end
-end
+end

data/test/cli/ui_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../utils"
+require "utils"
 require 'capistrano/cli/ui'
 
 class CLIUITest < Test::Unit::TestCase
@@ -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/cli_test.rb

@@ -1,16 +1,16 @@
-require "#{File.dirname(__FILE__)}/utils"
+require "utils"
 require 'capistrano/cli'
 
 class CLI_Test < Test::Unit::TestCase
   def test_options_ui_and_help_modules_should_integrate_successfully_with_configuration
-    cli = Capistrano::CLI.parse(%w(-T))
+    cli = Capistrano::CLI.parse(%w(-T -x -X))
     cli.expects(:puts).at_least_once
     cli.execute!
   end
 
   def test_options_and_execute_modules_should_integrate_successfully_with_configuration
     path = "#{File.dirname(__FILE__)}/fixtures/cli_integration.rb"
-    cli = Capistrano::CLI.parse(%W(-q -f #{path} testing))
+    cli = Capistrano::CLI.parse(%W(-x -X -q -f #{path} testing))
     config = cli.execute!
     assert config[:testing_occurred]
   end