rexec 1.4.0 → 1.4.1

data/lib/rexec/connection.rb

@@ -39,7 +39,9 @@ module RExec
 		def initialize(input, output, error = nil)
 			@input = input
 			@output = output
+
 			@running = true
+			@exceptions = :send
 
 			@error = error
 
@@ -50,6 +52,9 @@ module RExec
 		# The object that will handle remote proxy invocations.
 		attr :handler, true
 		
+		# Whether to send exceptions across the wire, or handle normally (e.g. print to stdout):
+		attr :exceptions, true
+		
 		# The proxy object that will dispatch RPCs.
 		attr :proxy
 
@@ -98,7 +103,11 @@ module RExec
 					begin
 						yield object
 					rescue Exception => ex
-						send_object(ex)
+						if @exceptions == :send
+							send_object(ex)
+						else
+							raise
+						end
 					end
 				end
 			end

data/lib/rexec/server.rb

@@ -84,11 +84,11 @@ module RExec
 			Task.open(command, options) do |task|
 				conn = Connection.build(task, options, &send_code)
 
-				yield conn, task
-
-				conn.stop
-				task.stop
-				task.wait
+				begin
+					yield conn, task
+				ensure
+					conn.stop
+				end
 			end
 		else
 			task = Task.open(command, options)

data/lib/rexec/task.rb

@@ -287,12 +287,17 @@ module RExec
 				if command.respond_to? :call
 					command.call
 				elsif Array === command
+					command = command.dup
+					
 					# If command is a Pathname, we need to convert it to an absolute path if possible,
 					# otherwise if it is relative it might cause problems.
 					if command[0].respond_to? :realpath
 						command[0] = command[0].realpath
 					end
 					
+					# exec expects an array of Strings:
+					command.collect! { |item| item.to_s }
+					
 					exec *command
 				else
 					if command.respond_to? :realpath
@@ -310,9 +315,17 @@ module RExec
 			if block_given?
 				begin
 					yield task
+					
+					# Close all input pipes if not done already.
 					task.close_input
+					
+					# The task has stopped if task.wait returns correctly.
 					return task.wait
+				rescue Interrupt
+					# If task.wait is interrupted, we should also interrupt the child process
+					task.kill
 				ensure
+					# Print out any remaining data from @output or @error
 					task.close
 				end
 			else
@@ -320,7 +333,7 @@ module RExec
 			end
 		end
 
-		def initialize(input, output, error, pid) # :nodoc:
+		def initialize(input, output, error, pid)
 			@input = input
 			@output = output
 			@error = error

data/lib/rexec/version.rb

@@ -22,7 +22,7 @@ module RExec
 	module VERSION
 		MAJOR = 1
 		MINOR = 4
-		TINY  = 0
+		TINY  = 1
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/test/interrupt.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+begin
+	sleep 100
+rescue Interrupt
+	puts "Caught Interrupt"
+end

data/test/server_test.rb

@@ -35,7 +35,7 @@ class ServerTest < Test::Unit::TestCase
     connection_started = false
     object_received = false
 
-    RExec::start_server(code.read, "ruby", :passthrough => []) do |conn, pid|
+    RExec::start_server(code.read, "ruby", :passthrough => []) do |conn, task|
       connection_started = true
       conn.send_object([:bounce, sobj])
 
@@ -66,7 +66,7 @@ class ServerTest < Test::Unit::TestCase
 
     test_obj = [1, 2, 3, 4, "five"]
 
-    RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => []) do |conn, pid|
+    RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => []) do |conn, task|
       connection_started = true
       conn.send_object([:bounce, test_obj])
 
@@ -84,7 +84,7 @@ class ServerTest < Test::Unit::TestCase
 
     test_obj = [1, 2, 3, 4, "five"]
 
-    conn, pid = RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => [])
+    conn, task = RExec::start_server(code.read, "/bin/sh -c ruby", :passthrough => [])
     conn.send_object([:bounce, test_obj])
 
     assert_equal test_obj, conn.receive_object

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rexec
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Samuel Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: []
 
 description: 
@@ -45,6 +45,7 @@ files:
 - test/client.rb
 - test/daemon.rb
 - test/daemon_test.rb
+- test/interrupt.rb
 - test/listing_example.rb
 - test/remote_server_test.rb
 - test/server_test.rb