@@ -1,5 +1,7 @@ == (unreleased) +* Convert arguments to -s and -S into integers, booleans, etc. based on whether the arguments appear to be those types [Jamis Buck] + * Add descriptions of -n and -d to the verbose help text [Jamis Buck] * Make rollbacks work with processes that need the current directory to be valid in order to restart properly (e.g. mongrel_rails) [Jamis Buck] CHANGELOG.rdoc @@ -124,6 +124,8 @@ module Capistrano option_parser.parse!(args) + coerce_variable_types! + # if no verbosity has been specified, be verbose options[:verbose] = 3 if !options.has_key?(:verbose) @@ -186,6 +188,26 @@ module Capistrano "/" end + def coerce_variable_types! + [:pre_vars, :vars].each do |collection| + options[collection].keys.each do |key| + options[collection][key] = coerce_variable(options[collection][key]) + end + end + end + + def coerce_variable(value) + case value + when /^"(.*)"$/ then $1 + when /^'(.*)'$/ then $1 + when /^\d+$/ then value.to_i + when /^\d+\.\d*$/ then value.to_f + when "true" then true + when "false" then false + when "nil" then nil + else value + end + end end end end lib/capistrano/cli/options.rb @@ -99,12 +99,84 @@ class CLIOptionsTest < Test::Unit::TestCase 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! test/cli/options_test.rb 1a87270a3abc119ee7512e15691d294615bebd0d Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/bd3819766178e18e9287b95586098d2bc804f6df bd3819766178e18e9287b95586098d2bc804f6df 2008-08-21T20:14:27-07:00 2008-08-21T20:14:27-07:00 Auto-convert arguments to -S and -s to integer, boolean, etc. if they look convertable c46aa61b706baf33f9300cdc6c760bfd59096c55 Jamis Buck jamis@37signals.com