rexec 1.2.6 → 1.3.0

data/lib/rexec/connection.rb

@@ -4,8 +4,61 @@
 # This class 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
@@ -44,8 +97,17 @@ 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.
+		attr :handler, true
+		
+		# The proxy object that will dispatch RPCs.
+		attr :proxy
+
 		# The pipe used for reading data
 		def input
 			@input
@@ -89,7 +151,12 @@ module RExec
 					end
 
 					begin
-						yield object
+						if @handler && Invocation === object
+							result = object.apply(@handler)
+							send_object(Invocation::Result.new(result))
+						else
+							yield object
+						end
 					rescue Exception => ex
 						send_object(ex)
 					end

data/lib/rexec/version.rb

@@ -21,8 +21,8 @@
 module RExec
 	module VERSION
 		MAJOR = 1
-		MINOR = 2
-		TINY  = 6
+		MINOR = 3
+		TINY  = 0
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/test/client.rb

@@ -18,6 +18,14 @@
 # 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

@@ -39,30 +39,43 @@ end
 BOUNCE = "Apples and Oranges"
 
 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|
-      conn.send_object([:bounce, BOUNCE])
-
-      assert_equal BOUNCE, conn.receive_object
-
-      conn.dump_errors
-
-      conn.stop
-    end
-  end
-  
-  def test_result_execution
-    code = Pathname.new(__FILE__).dirname + "./client.rb"
-    
-    conn, pid = RExec::start_server(code.read, COMMAND, :passthrough => [])
-    
-    conn.send_object([:bounce, BOUNCE])
-    assert_equal BOUNCE, conn.receive_object
-    
-    conn.dump_errors
-
-    conn.stop
-  end
+	def test_block_execution
+		code = Pathname.new(__FILE__).dirname + "./client.rb"
+
+		RExec::start_server(code.read, COMMAND) do |conn, pid|
+			conn.send_object([:bounce, BOUNCE])
+
+			assert_equal BOUNCE, conn.receive_object
+
+			conn.dump_errors
+
+			conn.stop
+		end
+	end
+
+	def test_result_execution
+		code = Pathname.new(__FILE__).dirname + "./client.rb"
+
+		conn, pid = RExec::start_server(code.read, COMMAND)
+
+		conn.send_object([:bounce, BOUNCE])
+		assert_equal BOUNCE, conn.receive_object
+
+		conn.dump_errors
+
+		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

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 6
-  version: 1.2.6
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 +12:00
+date: 2011-07-31 00:00:00 +12:00
 default_executable: daemon-exec
 dependencies: []