rexec 1.3.0 → 1.4.0

data/lib/rexec.rb

@@ -19,7 +19,6 @@
 # THE SOFTWARE.
 
 require 'rexec/version'
-require 'rexec/connection'
 require 'rexec/server'
 require 'rexec/priviledges'
 require 'rexec/to_cmd'

data/lib/rexec/connection.rb

@@ -1,64 +1,12 @@
 # Copyright (c) 2007, 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
 # Released under the MIT license. Please see LICENSE.txt for license details.
 
-# This class is as small and independant as possible as it will get sent to clients for execution.
+# This code is as small and independant as possible as it will get sent to clients for execution.
 
 require 'thread'
 require 'monitor'
 
 module RExec
-	
-	# A wrapper for sending method invocations over a Connection
-	class Invocation
-		def initialize(name, arguments)
-			@name = name
-			@arguments = arguments
-		end
-
-		def apply(object)
-			object.send(@name, *@arguments)
-		end
-		
-		class Result
-			def initialize(value)
-				@value = value
-			end
-			
-			attr :value
-		end
-	end
-
-	# A proxy class to create and send Invocation objects via a Connection, and receive a result.
-	class Proxy
-		def initialize(connection)
-			@connection = connection
-			
-			@method_mutex = Mutex.new
-		end
-
-		def method_missing(name, *arguments)
-			invocation = Invocation.new(name, arguments)
-			result = nil
-
-			# Connection provides no transaction support. This means that
-			# if multiple threads are sending and receiving arbirary objects
-			# via the connection, the Proxy object may fail due to out of 
-			# line objects.
-			@method_mutex.synchronize do
-				# Send the invocation.
-				@connection.send_object(invocation)
-
-				# Wait for the result.
-				result = @connection.receive_object
-			end
-			
-			if Invocation::Result === result
-				return result.value
-			else
-				raise InvalidResponse.new("Invalid response received: #{result}")
-			end
-		end
-	end
 
 	# This class represents an abstract connection to another ruby process. The interface does not impose
 	# any structure on the way this communication link works, except for the fact you can send and receive
@@ -97,9 +45,6 @@ module RExec
 
 			@receive_mutex = Mutex.new
 			@send_mutex = Mutex.new
-
-			@proxy = Proxy.new(self)
-			@handler = nil
 		end
 
 		# The object that will handle remote proxy invocations.
@@ -151,12 +96,7 @@ module RExec
 					end
 
 					begin
-						if @handler && Invocation === object
-							result = object.apply(@handler)
-							send_object(Invocation::Result.new(result))
-						else
-							yield object
-						end
+						yield object
 					rescue Exception => ex
 						send_object(ex)
 					end

data/lib/rexec/server.rb

@@ -72,24 +72,29 @@ module RExec
 		options[:passthrough] = :err unless options[:passthrough]
 
 		send_code = Proc.new do |cin|
-			cin.puts(CONNECTION_CODE)
-			cin.puts(CLIENT_CODE)
+			unless options[:raw]
+				cin.puts(CONNECTION_CODE)
+				cin.puts(CLIENT_CODE)
+			end
+			
 			cin.puts(code)
 		end
 
 		if block_given?
-			Task.open(command, options) do |process|
-				conn = Connection.build(process, options, &send_code)
+			Task.open(command, options) do |task|
+				conn = Connection.build(task, options, &send_code)
+
+				yield conn, task
 
-				yield conn, process.pid
-				
 				conn.stop
+				task.stop
+				task.wait
 			end
 		else
-			process = Task.open(command, options)
-			conn = Connection.build(process, options, &send_code)
+			task = Task.open(command, options)
+			conn = Connection.build(task, options, &send_code)
 
-			return conn, process.pid
+			return conn, task
 		end
 	end
 end

data/lib/rexec/version.rb

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

data/test/client.rb

@@ -18,14 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module RemoteProxy
-	def self.foo
-		return :bar
-	end
-end
-
-$connection.handler = RemoteProxy
-
 $connection.run do |object|
   case(object[0])
   when :bounce

data/test/remote_server_test.rb

@@ -42,7 +42,7 @@ class RemoteServerTest < Test::Unit::TestCase
 	def test_block_execution
 		code = Pathname.new(__FILE__).dirname + "./client.rb"
 
-		RExec::start_server(code.read, COMMAND) do |conn, pid|
+		RExec::start_server(code.read, COMMAND) do |conn, task|
 			conn.send_object([:bounce, BOUNCE])
 
 			assert_equal BOUNCE, conn.receive_object
@@ -56,7 +56,7 @@ class RemoteServerTest < Test::Unit::TestCase
 	def test_result_execution
 		code = Pathname.new(__FILE__).dirname + "./client.rb"
 
-		conn, pid = RExec::start_server(code.read, COMMAND)
+		conn, task = RExec::start_server(code.read, COMMAND)
 
 		conn.send_object([:bounce, BOUNCE])
 		assert_equal BOUNCE, conn.receive_object
@@ -65,17 +65,5 @@ class RemoteServerTest < Test::Unit::TestCase
 
 		conn.stop
 	end
-	
-	def test_proxy
-		code = Pathname.new(__FILE__).dirname + "./client.rb"
-
-		conn, pid = RExec::start_server(code.read, COMMAND)
-
-		assert_equal conn.proxy.foo, :bar
-
-		conn.dump_errors
-
-		conn.stop
-	end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rexec
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 +12:00
-default_executable: daemon-exec
+date: 2011-08-08 00:00:00 Z
 dependencies: []
 
 description: 
@@ -51,7 +51,6 @@ files:
 - test/task.rb
 - test/task_test.rb
 - README.md
-has_rdoc: yard
 homepage: http://www.oriontransfer.co.nz/gems/rexec
 licenses: []
 
@@ -61,23 +60,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: RExec (Remote Execution) is a tool to facilitate communicating to another ruby process and executing code.