distributor 0.4.0 → 0.4.1

data/lib/distributor/client.rb

@@ -13,6 +13,7 @@ class Distributor::Client
     @processes   = []
     @on_close    = Hash.new { |hash,key| hash[key] = Array.new }
     @on_hello    = []
+    @on_command  = Proc.new {}
     @hookup_lock = Mutex.new
 
     # reserve a command channel
@@ -45,7 +46,7 @@ class Distributor::Client
           @handlers.delete(data["id"])
           @processes << ch
         else
-          raise "no such command: #{command}"
+          @on_command.call(command, data)
         end
       end
     end
@@ -56,7 +57,7 @@ class Distributor::Client
   end
 
   def command(command, data={})
-    data["id"] ||= generate_id
+    data["id"] ||= @multiplexer.generate_id
     data["command"] = command
     @multiplexer.output 0, Distributor::OkJson.encode(data)
     data["id"]
@@ -107,16 +108,16 @@ class Distributor::Client
     @on_hello << blk
   end
 
+  def on_command(&blk)
+    @on_command = blk
+  end
+
   def start
     loop { @connector.listen }
   end
 
 private
 
-  def generate_id
-    id = "#{Time.now.to_f}-#{rand(10000)}"
-  end
-
   def append_json(data)
     @json ||= ""
     @json += data

data/lib/distributor/multiplexer.rb

@@ -45,4 +45,8 @@ class Distributor::Multiplexer
   rescue IOError
   end
 
+  def generate_id
+    id = "#{Time.now.to_f}-#{rand(10000)}"
+  end
+
 end

data/lib/distributor/server.rb

@@ -94,6 +94,13 @@ class Distributor::Server
     ch
   end
 
+  def command(command, data={})
+    data["id"] ||= @multiplexer.generate_id
+    data["command"] = command
+    @multiplexer.output 0, Distributor::OkJson.encode(data)
+    data["id"]
+  end
+
   def on_command(&blk)
     @on_command = blk
   end

data/lib/distributor/version.rb

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

metadata

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