distributor 0.5.1 → 0.6.0

data/lib/distributor/client.rb

@@ -68,6 +68,11 @@ class Distributor::Client
     @handlers[id] = handler
   end
 
+  def socket(path, &handler)
+    id = command("socket", "path" => path)
+    @handlers[id] = handler
+  end
+
   def tunnel(port, &handler)
     id = command("tunnel", "port" => port)
     @handlers[id] = handler

data/lib/distributor/server.rb

@@ -30,10 +30,14 @@ class Distributor::Server
 
       dequeue_json do |data|
         case command = data["command"]
+        when "socket" then
+          path = data["path"]
+          ch = socket(path)
+          ack data["id"], "ch" => ch, "path" => path
         when "tunnel" then
           port = (data["port"] || ENV["PORT"] || 5000).to_i
           ch = tunnel(port)
-          @multiplexer.output 0, Distributor::OkJson.encode({ "id" => data["id"], "command" => "ack", "ch" => ch, "port" => port })
+          ack data["id"], "ch" => ch, "port" => port
         when "close" then
           @multiplexer.close data["ch"]
         when "run" then
@@ -46,6 +50,10 @@ class Distributor::Server
     end
   end
 
+  def ack(id, options={})
+    @multiplexer.output 0, Distributor::OkJson.encode(options.merge({ "id" => id, "command" => "ack" }))
+  end
+
   def run(command)
     ch = @multiplexer.reserve
 
@@ -70,13 +78,9 @@ class Distributor::Server
     ch
   end
 
-  def tunnel(port)
-    ch = @multiplexer.reserve
-
-    tcp = TCPSocket.new("localhost", port)
-
+  def handle_socket(ch, socket)
     # handle data incoming from process
-    @connector.handle(tcp) do |io|
+    @connector.handle(socket) do |io|
       begin
         @multiplexer.output(ch, io.readpartial(4096))
       rescue EOFError
@@ -88,12 +92,22 @@ class Distributor::Server
     # handle data incoming on the multiplexer
     @connector.handle(@multiplexer.reader(ch)) do |input_io|
       data = input_io.readpartial(4096)
-      tcp.write data
+      socket.write data
     end
 
     ch
   end
 
+  def socket(path)
+    ch = @multiplexer.reserve
+    handle_socket ch, UNIXSocket.new(path)
+  end
+
+  def tunnel(port)
+    ch = @multiplexer.reserve
+    handle_socket ch, TCPSocket.new("localhost", port)
+  end
+
   def command(command, data={})
     data["id"] ||= @multiplexer.generate_id
     data["command"] = command

data/lib/distributor/version.rb

@@ -1,5 +1,5 @@
 module Distributor
 
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 
 end

metadata

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