@@ -121,7 +121,7 @@ module Capistrano options[:env] = env unless env.empty? shell = options[:shell] || self[:default_shell] - options[:shell] = shell if shell + options[:shell] = shell unless shell.nil? options end @@ -144,4 +144,4 @@ module Capistrano end end end -end \ No newline at end of file +end lib/capistrano/configuration/actions/invocation.rb @@ -76,6 +76,11 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase assert_equal({:foo => "bar", :shell => "/bin/bash"}, @config.add_default_command_options(:foo => "bar")) end + def test_add_default_command_options_should_use_default_shell_of_false_if_present + @config.set :default_shell, false + assert_equal({:foo => "bar", :shell => false}, @config.add_default_command_options(:foo => "bar")) + end + def test_add_default_command_options_should_use_shell_in_preference_of_default_shell @config.set :default_shell, "/bin/bash" assert_equal({:foo => "bar", :shell => "/bin/sh"}, @config.add_default_command_options(:foo => "bar", :shell => "/bin/sh")) @@ -200,4 +205,4 @@ class ConfigurationActionsInvocationTest < Test::Unit::TestCase c = mock("data", :called => true) Capistrano::Command.expects(:process).with(command, sessions, options).yields(a, b, c) end -end \ No newline at end of file +end test/configuration/actions/invocation_test.rb 1114c00039b55b65b8a527c3ddbcb861d742a99a Ryan McGeary ryanongit@mcgeary.org http://github.com/jamis/capistrano/commit/25764b3aa1c19bdb0a75df7d226ac29960a15452 25764b3aa1c19bdb0a75df7d226ac29960a15452 2008-05-08T07:03:21-07:00 2008-05-08T07:03:21-07:00 Added support for `set :default_shell, false` instead of requiring `default_run_options[:shell] = false` 4b7f5cbc5cf4fb5f18f52a807447e89813b02538 Ryan McGeary ryanongit@mcgeary.org