Changeset 9025

Timestamp:

03/14/08 03:20:08 (4 months ago)

Author:

minam

Message:

Ensure that the default run options are mixed into the command options when executing a command from the cap shell (closes #11348)

Files:

• tools/capistrano/CHANGELOG (modified) (1 diff)
• tools/capistrano/lib/capistrano/shell.rb (modified) (1 diff)
• tools/capistrano/test/shell_test.rb (modified) (1 diff)

tools/capistrano/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure that the default run options are mixed into the command options when executing a command from the cap shell [Ken Collins]
-
-* Added :none SCM module for deploying a specific directory's contents [Jamis Buck]

tools/capistrano/lib/capistrano/shell.rb

@@ -170 +170 @@
-        processor = configuration.sudo_behavior_callback(Configuration.default_io_proc)
-        sessions = servers.map { |server| configuration.sessions[server] }
-
+
+
-        previous = trap("INT") { cmd.stop! }
-        cmd.process!

tools/capistrano/test/shell_test.rb

@@ -62 +62 @@
-    assert @shell.read_and_execute
-  end
+  
+  def test_task_command_with_bang_gets_processed_by_exec_tasks
+    while_testing_post_exec_commands do
+      @shell.expects(:read_line).returns("!deploy")
+      @shell.expects(:exec_tasks).with(["deploy"])
+      assert @shell.read_and_execute
+    end
+  end
+  
+  def test_normal_command_gets_processed_by_exec_command
+    while_testing_post_exec_commands do
+      @shell.expects(:read_line).returns("uptime")
+      @shell.expects(:exec_command).with("uptime",nil)
+      @shell.expects(:connect)
+      assert @shell.read_and_execute
+    end
+  end
+  
+  
+  private
+  
+  def while_testing_post_exec_commands(&block)
+    @shell.instance_variable_set(:@mutex,Mutex.new)
+    yield
+  end
+  
-end