riser 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef14df0b3e4899c0d573754bdc7071bd88ee89103d51d51d547a200bf9d305a5
-  data.tar.gz: f3784e9ec64b88fe4ca68a51ceeffba1af2ba1c4e6fa464a555a76da27c6c98f
+  metadata.gz: b9ae7fbe0d87eb7546bcd3df41adb101c0c66bb964e07de7d3658cf63d397562
+  data.tar.gz: 288ab38bbd42a41f31a399f12289adf4cdc8ad700ac649a09fea2ec593a2b4f3
 SHA512:
-  metadata.gz: 190ba65ce5b250938ebd92ae5cebf8a96b2995a19221e8c8a39ad2024e18f7c24f1cb07570d2c2c60374363572c79083a2ca50d16fb503581192c1b0ee142142
-  data.tar.gz: 97f9c5de7034224540e9c4e118e45a6d99179a143d2cd2ce375f0e4cf53a8c0a641b5ec1a43667da71ad75709a16395059ff69019c8a86f971862f941dbe1ace
+  metadata.gz: 98f72efdfda6c5eee8e7adcb0b3a0d5d6ceca0df6f73b1bd544b3eae535f62e671b76a29074bd60c9992943852e89d294e02b38788496e97bf0f66c276462dd4
+  data.tar.gz: e8f52a3f99f42d6bb4e7c05a260165a82d4712669490f9717c95e87639af9551c3aa0288102a813a212897d0f6f8b83465255d0eebdda89f69ead6d7e7757795

data/lib/riser.rb

@@ -4,6 +4,7 @@ require 'riser/version'
 
 module Riser
   autoload :AcceptTimeout, 'riser/server'
+  autoload :CompatibleStringIO, 'riser/compat'
   autoload :DRbServiceCall, 'riser/services'
   autoload :DRbServiceServer, 'riser/services'
   autoload :DRbServices, 'riser/services'

data/lib/riser/compat.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+require 'stringio'
+
+module Riser
+  # to use `StringIO' as mock in unit test.  this module provides the
+  # refinement to add missing `IO' methods to `StringIO'.
+  module CompatibleStringIO
+    refine StringIO do
+      def to_io
+        self
+      end
+
+      def to_i
+        -1
+      end
+
+      def wait_readable(timeout_seconds)
+        ! eof?
+      end
+    end
+  end
+end
+
+# Local Variables:
+# mode: Ruby
+# indent-tabs-mode: nil
+# End:

data/lib/riser/poll.rb

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 
 require 'io/wait'
+require 'stringio'
 
 module Riser
   class ReadPoll
+    using CompatibleStringIO
+
     def initialize(read_io)
       @read_io = read_io
       reset_timer

data/lib/riser/services.rb

@@ -215,9 +215,8 @@ module Riser
         rescue DRb::DRbConnError
           if (Time.now - t0 >= timeout_seconds) then
             raise
-          else
-            sleep(dt)
           end
+          sleep(dt)
           retry
         end
       end

data/lib/riser/stream.rb

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 
+require 'digest'
+
 module Riser
   class Stream
+    using CompatibleStringIO
+
     def initialize(io)
       @io = io
     end
@@ -74,36 +78,46 @@ module Riser
   end
 
   class LoggingStream < Stream
+    using CompatibleStringIO
+
+    def self.make_tag(io)
+      hex = Digest::SHA256.hexdigest(io.to_s)[0, 7]
+      fd = io.to_io.to_i
+      "[#{hex},#{fd}]"
+    end
+
     def initialize(io, logger)
       super(io)
       @logger = logger
+      @tag = self.class.make_tag(io)
+      @logger.debug("#{@tag} start") if @logger.debug?
     end
 
     def gets
       line = super
-      @logger.info("r #{line.inspect}") if @logger.info?
+      @logger.info("#{@tag} r #{line.inspect}") if @logger.info?
       line
     end
 
     def read(size)
       data = super
-      @logger.info("r #{data.inspect}") if @logger.info?
+      @logger.info("#{@tag} r #{data.inspect}") if @logger.info?
       data
     end
 
     def readpartial(maxlen, outbuf=nil)
       data = super
-      @logger.info("r #{data.inspect}") if @logger.info?
+      @logger.info("#{@tag} r #{data.inspect}") if @logger.info?
       data
     end
 
     def write(message)
-      @logger.info("w #{message.inspect}") if @logger.info?
+      @logger.info("#{@tag} w #{message.inspect}") if @logger.info?
       super
     end
 
     def close
-      @logger.info('close') if @logger.info?
+      @logger.info("#{@tag} close") if @logger.info?
       super
     end
   end

data/lib/riser/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module Riser
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end
 
 # Local Variables:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - example/simple_services.rb
 - example/simple_tls.rb
 - lib/riser.rb
+- lib/riser/compat.rb
 - lib/riser/daemon.rb
 - lib/riser/poll.rb
 - lib/riser/resource.rb