foreign_actor 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89faf69adf1dbaed27a5e726224118e05995d944
-  data.tar.gz: 02c59476de4b3a665af6ff3e13c983b5a3d3e59a
+  metadata.gz: 0520969e30d46a49a78358cdc8e89cdac4d98883
+  data.tar.gz: 377f120fabe7cbf6513886d393999301f56e8a1a
 SHA512:
-  metadata.gz: c32ee1ebe1b59b8402e1f85a80996ae71d6526e8d859178fd515eaff21f58094854e0a467b5b5e49ab1ec3bb41de9e0f0235ca5b42fa6148eb87fd4769b6070e
-  data.tar.gz: e4ce0debaf34f31ad5a6870f0f19537cbdceb4eb5b33ff5c95d34bdfb8c75c89448512a3d0f844018a7a9bffebab150b5ff94ed016bd978b79b8149142c55782
+  metadata.gz: 4a9763c1da67226679b5a4364f3d6ebda857a50899737d9288a33dd4c7ef647c9050bf1b21625050b19985cb632f890a9c51a4182a3e60eec63aed4c848dc509
+  data.tar.gz: 55f9997d7a41f5f5613b901ac73a434fc86f620f10c84867044af394f27eaadb58699587027c6a6f9ba929c148e05c6f2260f8eddf53e63cd8c3405bf3703924

data/Gemfile

@@ -4,6 +4,10 @@ gemspec
 
 gem 'rake'
 
+# gem 'ffi-rzmq', github: 'chuckremes/ffi-rzmq'
+# gem 'ffi-rzmq', path: '/Users/schmurfy/Dev/personal/forks/ffi-rzmq'
+# gem 'ffi-rzmq-core', github: 'chuckremes/ffi-rzmq-core'
+
 group(:doc) do
   gem 'tilt'
 end

data/bin/puppetmaster.rb

@@ -3,17 +3,17 @@ require 'ffi-rxs'
 
 class PuppetMaster
   def initialize(workers_endpoint, client_endpoint)
-    @context = XS::Context.new
+    @context = ZMQ::Context.new
     @source_id = nil
     
-    @workers_socket = @context.socket(XS::XREQ)
-    @clients_socket = @context.socket(XS::XREP)
+    @workers_socket = @context.socket(ZMQ::XREQ)
+    @clients_socket = @context.socket(ZMQ::XREP)
     
     @workers_socket.bind(workers_endpoint)
     @clients_socket.bind(client_endpoint)
     
-    @control_socket_srv = @context.socket(XS::PAIR)
-    @control_socket_cl = @context.socket(XS::PAIR)
+    @control_socket_srv = @context.socket(ZMQ::PAIR)
+    @control_socket_cl = @context.socket(ZMQ::PAIR)
     
     addr = "inproc://ctrl"
     @control_socket_srv.bind(addr)
@@ -25,7 +25,7 @@ class PuppetMaster
     trap('INT'){ @control_socket_cl.send_string('') }
     trap('TERM'){ @control_socket_cl.send_string('') }
     
-    poller = XS::Poller.new
+    poller = ZMQ::Poller.new
     poller.register_readable(@workers_socket)
     poller.register_readable(@clients_socket)
     # control socket
@@ -57,11 +57,11 @@ class PuppetMaster
         @source_id = msg.shift
         
         # send to the other side
-        handle_xs_err(@workers_socket, :send_string, msg[0], XS::DONTWAIT)
+        handle_xs_err(@workers_socket, :send_string, msg[0], ZMQ::DONTWAIT)
         
       else
-        handle_xs_err(@clients_socket, :send_string, @source_id, XS::DONTWAIT | XS::SNDMORE)
-        handle_xs_err(@clients_socket, :send_string, msg[0], XS::DONTWAIT)
+        handle_xs_err(@clients_socket, :send_string, @source_id, ZMQ::DONTWAIT | ZMQ::SNDMORE)
+        handle_xs_err(@clients_socket, :send_string, msg[0], ZMQ::DONTWAIT)
         
       end
     end
@@ -73,7 +73,7 @@ private
     parts = []
     loop do
       data = ""
-      if s.recv_string(data, XS::DONTWAIT) == -1
+      if s.recv_string(data, ZMQ::DONTWAIT) == -1
         raise "error while reading socket: #{}"
       end
       parts << data
@@ -88,8 +88,8 @@ private
   
   def handle_xs_err(s, method, *args)
     rc = s.send(method, *args)
-    unless XS::Util.resultcode_ok?(rc)
-      raise "error: #{method}: #{XS::Util.error_string}"
+    unless ZMQ::Util.resultcode_ok?(rc)
+      raise "error: #{method}: #{ZMQ::Util.error_string}"
     end
   end
   

data/bin/router

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'ffi-rxs'
+require 'ffi-rzmq'
 require 'yaml'
 
-context = XS::Context.new
-poller = XS::Poller.new
+context = ZMQ::Context.new
+poller = ZMQ::Poller.new
 
 path = nil
 
@@ -29,8 +29,8 @@ Pipe = Struct.new(:front, :back) do
 end
 
 conf.each do |name, paths|
-  frontend = context.socket(XS::XREP)
-  backend = context.socket(XS::XREQ)
+  frontend = context.socket(ZMQ::XREP)
+  backend = context.socket(ZMQ::XREQ)
 
   frontend.bind(paths['front'])
   backend.bind(paths['back'])
@@ -54,7 +54,7 @@ loop do
         loop do
           socket.recv_string(message = "")
           more = socket.more_parts?
-          p.back.send_string(message, more ? XS::SNDMORE : 0)
+          p.back.send_string(message, more ? ZMQ::SNDMORE : 0)
           break unless more
         end
         next
@@ -63,7 +63,7 @@ loop do
         loop do
           socket.recv_string(message = "")
           more = socket.more_parts?
-          p.front.send_string(message, more ? XS::SNDMORE : 0)
+          p.front.send_string(message, more ? ZMQ::SNDMORE : 0)
           break unless more
         end
         next

data/example/Procfile

@@ -1,2 +1,2 @@
-master: ruby ../bin/router
+master: bundle exec ruby ../bin/router
 worker: ruby worker.rb

data/foreign_actor.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ForeignWorker::VERSION
   
-  gem.add_dependency 'ffi-rxs',   '~> 1.2.1'
+  gem.add_dependency 'ffi-rzmq',   '~> 1.0.3'
+  
   gem.add_dependency 'celluloid', '~> 0.15.0'
   gem.add_dependency 'msgpack',   '~> 0.5.4'
 end

data/lib/foreign_actor/client.rb

@@ -72,10 +72,10 @@ module ForeignActor
     def initialize(endpoint, request_timeout = nil, reactor_name = :xs_reactor)
       @reactor_name = reactor_name
       @request_timeout = request_timeout
-      @socket = Actor[@reactor_name].socket(XS::XREQ)
+      @socket = Actor[@reactor_name].socket(ZMQ::XREQ)
       rc = @socket.connect(endpoint)
-      unless XS::Util.resultcode_ok?(rc)
-        raise IOError, "connect failed: #{XS::Util.error_string}"
+      unless ZMQ::Util.resultcode_ok?(rc)
+        raise IOError, "connect failed: #{ZMQ::Util.error_string}"
       end
 
     end

data/lib/foreign_actor/reactor.rb

@@ -9,14 +9,14 @@ module ForeignActor
     StopLoop = Class.new(RuntimeError)
     
     def initialize(context = nil, poller = nil, timers = nil)
-      @context = context || XS::Context.new
-      @poller = poller || XS::Poller.new
+      @context = context || ZMQ::Context.new
+      @poller = poller || ZMQ::Poller.new
       @waiting_readables = {}
       @servers = {}
       @timers = timers || Timers.new
       
-      @control_socket_srv = @context.socket(XS::PAIR)
-      @control_socket_cl = @context.socket(XS::PAIR)
+      @control_socket_srv = @context.socket(ZMQ::PAIR)
+      @control_socket_cl = @context.socket(ZMQ::PAIR)
       @control_messages = Array.new
       
       addr = "inproc://ctrl"
@@ -77,10 +77,10 @@ module ForeignActor
     end
     
     def serve_actor(endpoint, actor_or_name)
-      s = socket(XS::XREP)
+      s = socket(ZMQ::XREP)
       rc = s.connect(endpoint)
-      unless XS::Util.resultcode_ok?(rc)
-        raise IOError, "connect failed: #{XS::Util.error_string}"
+      unless ZMQ::Util.resultcode_ok?(rc)
+        raise IOError, "connect failed: #{ZMQ::Util.error_string}"
       end
       
       if @servers.has_key?(s)
@@ -107,8 +107,8 @@ module ForeignActor
       end
       
       rc = @poller.poll(wait_time)
-      unless XS::Util.resultcode_ok?(rc)
-        raise IOError, "libxs poll error: #{XS::Util.error_string}"
+      unless ZMQ::Util.resultcode_ok?(rc)
+        raise IOError, "libxs poll error: #{ZMQ::Util.error_string}"
       end
       
       @poller.readables.each do |s|
@@ -237,7 +237,7 @@ module ForeignActor
       parts = []
       loop do
         data = ""
-        if s.recv_string(data, XS::DONTWAIT) == -1
+        if s.recv_string(data, ZMQ::DONTWAIT) == -1
           raise "error while reading socket: #{}"
         end
         parts << data
@@ -249,16 +249,16 @@ module ForeignActor
     
     def send_msg(s, *parts)
       parts[0...-1].each do |m|
-        handle_xs_err(s, :send_string, m, XS::DONTWAIT | XS::SNDMORE)
+        handle_xs_err(s, :send_string, m, ZMQ::DONTWAIT | ZMQ::SNDMORE)
       end
       
-      handle_xs_err(s, :send_string, parts[-1], XS::DONTWAIT)
+      handle_xs_err(s, :send_string, parts[-1], ZMQ::DONTWAIT)
     end
     
     def handle_xs_err(s, method, *args)
       rc = s.send(method, *args)
-      unless XS::Util.resultcode_ok?(rc)
-        raise "error: #{method}: #{XS::Util.error_string}"
+      unless ZMQ::Util.resultcode_ok?(rc)
+        raise "error: #{method}: #{ZMQ::Util.error_string}"
       end
     end
     

data/lib/foreign_actor/version.rb

@@ -1,3 +1,3 @@
 module ForeignWorker
-  VERSION = "0.0.4"
+  VERSION = "1.0.0"
 end

data/lib/foreign_actor.rb

@@ -1,4 +1,4 @@
-require 'ffi-rxs'
+require 'ffi-rzmq'
 require 'celluloid'
 
 require_relative 'foreign_actor/version'

data/specs/unit/reactor_spec.rb

@@ -2,16 +2,16 @@ require File.expand_path('../../spec_helper', __FILE__)
 
 describe 'Reactor' do
   before do
-    # @poller = stub('XS::Poller')
-    # @context = stub('XS::Context')
+    # @poller = stub('ZMQ::Poller')
+    # @context = stub('ZMQ::Context')
     @timers = Timers.new
   end
   
   # should "initialize everything" do
   #   # create control sockets
   #   @ctrl = [stub('ServerCtrl'), stub('ClientCtrl')]
-  #   @context.expects(:socket).with(XS::PAIR).returns(@ctrl[1])
-  #   @context.expects(:socket).with(XS::PAIR).returns(@ctrl[0])
+  #   @context.expects(:socket).with(ZMQ::PAIR).returns(@ctrl[1])
+  #   @context.expects(:socket).with(ZMQ::PAIR).returns(@ctrl[0])
     
   #   @ctrl[0].expects(:bind)
   #   @ctrl[1].expects(:connect)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreign_actor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi-rxs
+  name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Distributed Actors