elrpc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efab0c0a0e44323a1408e6dd439ce0f6c087aae
-  data.tar.gz: a0ebb57366e5e40f414f65add6df27b543c3ffbb
+  metadata.gz: 48893e5e2a5847c1d753cd1c326a6077c194d9d4
+  data.tar.gz: 3322393f7a5c7c6e1dacc395fba4a3a22e906d90
 SHA512:
-  metadata.gz: 6870c906155f3589af3add147590687b8265f8063140267a5d38284d440713194042073488bcf42bc32e63eff035431cb49cba5da24bac5ebbb8d7553ccca718
-  data.tar.gz: 54da2936422b048e6e2d7c97b66ec77a0cf4b19624433f29941f138d4b0100329dae88cf7c5b33c47a37602b0f386acaa5d3b7a849b37d5ffe226fba0e2b4cba
+  metadata.gz: 88ad979dbed7ba14dd573db134784f7bfb76996187bebd5a6e94077f2e4575058baa45a36de6c26db01c2b946beebcd7d9261acfb18c5ba5baa6ce0613c9dd50
+  data.tar.gz: b59eae7fd5c180d6e41a07b3116c3456a4f8936c830e439594070e49819558e693ab7566e7844b15ceca1b84618d6227916482fadc829d2d814d2384dbb64c3c

data/lib/elrpc/version.rb

@@ -1,3 +1,3 @@
 module Elrpc
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/elrpc.rb

@@ -5,7 +5,7 @@ require "socket"
 require "thread"
 require "monitor"
 require "logger"
-require "open3"
+require "timeout"
 
 require "elparser"
 
@@ -55,8 +55,8 @@ module Elrpc
     return client
   end
 
-  def self.start_process(cmd)
-    svr = Service.new(cmd)
+  def self.start_process(cmd, port = nil)
+    svr = Service.new(cmd, port)
     svr.start
     return svr
   end
@@ -67,36 +67,46 @@ module Elrpc
     attr :output
 
     # cmd = ["ruby", "_call.rb"]
-    def initialize(cmd)
+    def initialize(cmd, port)
       @cmd = cmd
+      @port = port
     end
 
     def _start_logger
       return Thread.start do
-        stdout = @io3[1]
-        stderr = @io3[2]
         loop do
-          IO.select([stdout, stderr]).flatten.compact.each do |io|
-            io.each do |line|
-              next if line.nil? || line.empty?
-              @logger.puts(line) if @logger
-            end
-          end
-          break if stdout.eof? && stderr.eof?
+          ret = @io.readline
+          break if ret.nil?
+          @logger.puts(ret) if @logger
         end
       end
     end
 
     def start
-      @io3 = Open3.popen3(*@cmd) # stdin, stdout, stderr, wait_thr
-      @port = @io3[1].readline.to_i
-      @io3[0].close
+      @io = IO.popen(@cmd)
+      if port.nil?
+        @port = @io.readline.to_i
+      end
       @output = nil
       @thread = _start_logger
+      # wait for port
+      timeout(4) do
+        loop do
+          begin
+            socket = TCPSocket.open("127.0.0.1", @port)
+            socket.close
+            #puts("Peer port is OK.")
+            break
+          rescue => e
+            #puts("Peer port is not opened. Try next time...")
+            sleep(0.2)
+          end
+        end
+      end
       @client = Elrpc.start_client(@port)
       return self
     end
-
+    
     def register_method(method)
       @client.register_method(method)
     end
@@ -123,13 +133,6 @@ module Elrpc
 
     def stop
       @client.stop
-      @io3[1].close
-      @io3[2].close
-    end
-
-    def stop_force
-      stop
-      @io3[3].kill
     end
     
   end

data/test/test-epc.rb

@@ -32,15 +32,15 @@ class TestEPC < Test::Unit::TestCase
     end
 
     test "Start server process" do
-      sleep(1)
       sv = nil
       begin
-        timeout(1) do
-          sv = Elrpc.start_process(["ruby",base("_echo.rb")])
+        timeout(5) do
+          sv = Elrpc.start_process(["ruby",base("_echo.rb")], 8888)
           sv.stop
           assert_true(true)
         end
       rescue  => e
+        puts e,e.backtrace
         assert_true(false)
         sv.stop_force if sv
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elrpc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - SAKURAI Masashi