pigato 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c027e75179b49f887920e909e6fa4d3d2998336
-  data.tar.gz: 059d621ee85c2956532537886eb6aa58fe198c14
+  metadata.gz: 59fe6ec27b63289331f1bcc8dfe5bd56a273861e
+  data.tar.gz: d196156fb32ed9b50337a1e6b7d2af5d2aaaa5f2
 SHA512:
-  metadata.gz: 9020e44ea14d0019ea231ab0e9e8135235764b07f57aa3af13144cc8ea10aa45f9b9d4a417258cc1060855cc868ef641231af0bb4181d0200a17043fa06d4eda
-  data.tar.gz: 7874b6aa9f9c1aa280f48e7de899570abe370992d784c8c889c914b4e0ceb8804aef26a5998713944671c3a8ebd95497dc2845ef9b6f51d50d78e4270c85bd47
+  metadata.gz: c9c083863c48629c7b74f878af92f9b81d5a5aba14f9c585293a53cad91208baec1db9cc6d9064f20c05db2465ff9d2af0d67dea2e4e5c57eaba03238aceb3c0
+  data.tar.gz: 7a6065cba43176980abb835ee529e4199e82e38ea89628cf995c29587aaab01c10b9fa3385dd7b689d7e828df96730e7fe62da2c49389a9cc3ad5ca7a7c65d42

data/examples/client.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
-require "pigato"
+require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 
 client = PigatoClient.new('tcp://localhost:55555')
 requests = 10

data/lib/pigato/client.rb

@@ -1,71 +1,64 @@
-module Pigato
-  class Client
-    include MDP
+require "json"
+require "ffi-rzmq"
 
-    attr_accessor :timeout
+class PigatoClient
 
-    def initialize broker
-      @broker = broker
-      @context = ZMQ::Context.new(1)
-      @client = nil
-      @poller = ZMQ::Poller.new
-      @timeout = 2500
+  def initialize broker
+    @broker = broker
+    @context = ZMQ::Context.new(1)
+    @client = nil
+    @poller = ZMQ::Poller.new
 
-      reconnect_to_broker
-    end
-
-    def send service, request, timeout = 2500
-      request = [request.to_json]
+    reconnect_to_broker
+  end
 
-      rid = 'RID' + (rand() * 1000000).to_s
-      # Prefix request with protocol frames
-      # Frame 0: empty (REQ emulation)
-      # Frame 1: "MDPCxy" (six bytes, MDP/Client x.y)
-      # Frame 2: Service name (printable string)
-      request = [MDP::C_CLIENT, MDP::W_REQUEST, service, rid].concat(request)
-      @client.send_strings request
+  def send service, request, timeout = 2500
+    request = [request.to_json]
 
-      res = Array.new
-      res << rid
+    rid = 'RID' + (rand() * 1000000).to_s
+    request = [Pigato::C_CLIENT, Pigato::W_REQUEST, service, rid].concat(request)
+    @client.send_strings request
 
-      data = Array.new
-      while 1 do
-        chunk = _recv(timeout)
-        data << chunk[4]
-        break if chunk[0] == MDP::W_REPLY
-      end
+    res = Array.new
+    res << rid
 
-      res << data
-      res
+    data = Array.new
+    while 1 do
+      chunk = _recv(timeout)
+      data << chunk[4]
+      break if chunk[0] == Pigato::W_REPLY
     end
 
-    def _recv timeout
-      items = @poller.poll(timeout)
-      if items
-        messages = []
-        @client.recv_strings messages
+    res << data
+    res
+  end
 
-        # header
-        if messages.shift != MDP::C_CLIENT
-          raise RuntimeError, "Not a valid MDP message"
-        end
+  def _recv timeout
+    items = @poller.poll(timeout)
+    if items
+      messages = []
+      @client.recv_strings messages
 
-        return messages
+      # header
+      if messages.shift != Pigato::C_CLIENT
+        raise RuntimeError, "Not a valid Pigato message"
       end
 
-      nil
+      return messages
     end
 
-    def reconnect_to_broker
-      if @client
-        @poller.deregister @client, ZMQ::DEALER
-      end
+    nil
+  end
 
-      @client = @context.socket ZMQ::DEALER
-      @client.setsockopt ZMQ::LINGER, 0
-      @client.setsockopt ZMQ::IDENTITY, "C" + (rand() * 10).to_s
-      @client.connect @broker
-      @poller.register @client, ZMQ::POLLIN
+  def reconnect_to_broker
+    if @client
+      @poller.deregister @client, ZMQ::DEALER
     end
+
+    @client = @context.socket ZMQ::DEALER
+    @client.setsockopt ZMQ::LINGER, 0
+    @client.setsockopt ZMQ::IDENTITY, "C" + (rand() * 10).to_s
+    @client.connect @broker
+    @poller.register @client, ZMQ::POLLIN
   end
 end

data/lib/pigato/proto.rb

@@ -1,17 +1,10 @@
-module PIGATO
-  module PROTO
-    #  This is the version of MDP/Client we implement
-    C_CLIENT = "C"
-
-    #  This is the version of MDP/Worker we implement
-    W_WORKER = "W"
-
-    #  MDP/Server commands, as strings
-    W_READY        =  "1"
-    W_REQUEST      =  "2"
-    W_REPLY        =  "3"
-    W_HEARTBEAT    =  "4"
-    W_DISCONNECT   =  "5"
-    W_REPLY_PARTIAL   =  "6"
-  end
+module Pigato
+  C_CLIENT = "C"
+  W_WORKER = "W"
+  W_READY        =  "1"
+  W_REQUEST      =  "2"
+  W_REPLY        =  "3"
+  W_HEARTBEAT    =  "4"
+  W_DISCONNECT   =  "5"
+  W_REPLY_PARTIAL   =  "6"
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/pigato.rb

@@ -1,7 +1,3 @@
-require "json"
-require "ffi-rzmq"
-require "pigato/version"
-require "pigato/proto.rb"
-
-module Pigato
-end
+require_relative "pigato/version.rb"
+require_relative "pigato/proto.rb"
+require_relative "pigato/client.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paolo Ardoino