Merge pull request #254 from dylanahsmith/no-eof-on-sudo

Don't default to closing the input stream when sudo is being used.
capistrano · Aug 20, 2012 · d263896 · d263896
2 parents 3632188 + 51296cb
commit d263896
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/capistrano/configuration/actions/invocation.rb b/lib/capistrano/configuration/actions/invocation.rb
@@ -147,7 +147,9 @@ def invoke_command(cmd, options={}, &block)
         # variable, they will apply for all invocations of #run, #invoke_command,
         # and #parallel.
         def run(cmd, options={}, &block)
-          options = options.merge(:eof => !block_given?) if options[:eof].nil?
+          if options[:eof].nil? && !cmd.include?(sudo)
+            options = options.merge(:eof => !block_given?)
+          end
           block ||= self.class.default_io_proc
           tree = Command::Tree.new(self) { |t| t.else(cmd, &block) }
           run_tree(tree, options)

diff --git a/test/configuration/actions/invocation_test.rb b/test/configuration/actions/invocation_test.rb
@@ -115,6 +115,11 @@ def test_sudo_should_default_to_sudo
     @config.sudo "ls"
   end
 
+  def test_sudo_should_keep_input_stream_open
+    @config.expects(:execute_on_servers).with(:foo => "bar")
+    @config.sudo "ls", :foo => "bar"
+  end
+
   def test_sudo_should_use_sudo_variable_definition
     @config.expects(:run).with("/opt/local/bin/sudo -p 'sudo password: ' ls", {})
     @config.options[:sudo] = "/opt/local/bin/sudo"