distributor 0.3.0 → 0.4.0

data/lib/distributor/client.rb

@@ -55,15 +55,20 @@ class Distributor::Client
     @multiplexer.output ch, data
   end
 
+  def command(command, data={})
+    data["id"] ||= generate_id
+    data["command"] = command
+    @multiplexer.output 0, Distributor::OkJson.encode(data)
+    data["id"]
+  end
+
   def run(command, &handler)
-    id = generate_id
-    @multiplexer.output 0, Distributor::OkJson.encode({ "id" => id, "command" => "run", "args" => command })
+    id = command("run", "args" => command)
     @handlers[id] = handler
   end
 
   def tunnel(port, &handler)
-    id = generate_id
-    @multiplexer.output 0, Distributor::OkJson.encode({ "id" => id, "command" => "tunnel", "port" => port })
+    id = command("tunnel", "port" => port)
     @handlers[id] = handler
   end
 
@@ -77,7 +82,7 @@ class Distributor::Client
           output.write data
           output.flush
         rescue EOFError
-          @multiplexer.output 0, Distributor::OkJson.encode({ "command" => "close", "ch" => ch })
+          command "close", "ch" => ch
         end
       end
     end

data/lib/distributor/server.rb

@@ -10,6 +10,7 @@ class Distributor::Server
   def initialize(input, output=input)
     @connector   = Distributor::Connector.new
     @multiplexer = Distributor::Multiplexer.new(output)
+    @on_command  = Proc.new {}
 
     # reserve a command channel
     @multiplexer.reserve(0)
@@ -39,7 +40,7 @@ class Distributor::Server
           ch = run(data["args"])
           @multiplexer.output 0, Distributor::OkJson.encode({ "id" => data["id"], "command" => "ack", "ch" => ch })
         else
-          raise "no such command: #{command}"
+          @on_command.call command, data
         end
       end
     end
@@ -92,6 +93,11 @@ class Distributor::Server
 
     ch
   end
+
+  def on_command(&blk)
+    @on_command = blk
+  end
+
   def start
     @multiplexer.output 0, Distributor::OkJson.encode({ "command" => "hello" })
     loop { @connector.listen }

data/lib/distributor/version.rb

@@ -1,5 +1,5 @@
 module Distributor
 
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distributor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70227170941980 !ruby/object:Gem::Requirement
+  requirement: &70192600707700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70227170941980
+  version_requirements: *70192600707700
 description: TCP Multiplexer
 email: ddollar@gmail.com
 executables: []