zashoku 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e3775fdccdd11934891cf0ecb6dc26970861c2
-  data.tar.gz: 2bb3b8ec31b215d353b0fd89a22609a9eac5f952
+  metadata.gz: 4b38b01607becd9fbceb6ec5d902059d5b22f29a
+  data.tar.gz: e2d8222914a822df86ad5dcf772877ac1fde6df2
 SHA512:
-  metadata.gz: 553deb8cd3b0b929aa9eb43f776150e8df4e8ac80f06b51d56ff17710e4b6845cf73f956c947a16485b44ab1da6cbbc7b261155a773b215b13d6e36963f3c588
-  data.tar.gz: 5995692a530495950f408e6b2aba395e3211b0c50c03a110209efce88e5fb568b2b20c416f14396fdbb7930b63fb143f385908a7e9b9200aa90eb01af769fc54
+  metadata.gz: c50fcc76e4107834a702498aff84c43829642392b5cc88ee1c539a52825ef54ca154c86c70d1a1f073387ff717a722eb933320bb096408d1ac4b1787e4cd14f7
+  data.tar.gz: b51019385ccd1ce8fd7672bc8394b1b33471005e7040068b910fab1650602c223b8a8ff608203dbf358a57e432182bc287b90f61506da0cf813bce67d7481eae

data/lib/constants.rb

@@ -3,7 +3,7 @@
 require_relative 'core/util/util'
 
 module Zashoku
-  Version = [1, 7, 0].freeze
+  Version = [1, 7, 1].freeze
 
   Root    = File.expand_path('../', __dir__)
 
@@ -40,6 +40,9 @@ module Zashoku
         'map_key'       => :map_key,
         'search'        => :search,
         'zv'            => :print_version
+      },
+      net: {
+        bsize: 4096
       }
     }
   }.freeze

data/lib/core/net/client.rb

@@ -9,8 +9,6 @@ module Zashoku
     class Client
       attr_accessor :callbacks
 
-      BSIZE = 1000000
-
       def initialize(host, port)
         @host, @port = host, port
         @socket = connect(@host, @port)
@@ -135,15 +133,15 @@ module Zashoku
           Zashoku::Util.alert("opened file #{file}")
           f.sync = true
           Zashoku::Util.alert('waiting for server...')
-          l = @socket.gets(Zashoku::EOF).split(Zashoku::EOF).first.to_i
-          Zashoku::Util.alert("got length #{l}")
-          r = 0
+          #l = @socket.gets(Zashoku::EOF).split(Zashoku::EOF).first.to_i
+          #Zashoku::Util.alert("got length #{l}")
+          #r = 0
           loop do
-            d = @socket.gets(Zashoku::EOF, BSIZE)
+            d = @socket.gets(Zashoku::EOF, Zashoku::CConf[:core][:net][:bsize])
             dl = d.length
             f.print(d)
-            Zashoku::Util.alert( "file #{((r += dl) / Float(l) * 100).round}% buffered" )
-            break if dl < BSIZE
+            #Zashoku::Util.alert( "file #{((r += dl) / Float(l) * 100).round}% buffered" )
+            break if dl < Zashoku::CConf[:core][:net][:bsize]
           end
           f.close
         }

data/lib/core/net/server.rb

@@ -52,13 +52,13 @@ module Zashoku
           begin
             response = @handler.call(message)
             Zashoku.logger.debug("sending message to #{client}")
-            client.c.puts(
-              if message['raw']
-                response.length.to_s + Zashoku::EOF + response + Zashoku::EOF
-              else
-                JSON.generate(response: response)
-              end
-            )
+            if message['raw']
+              #client.c.puts response.stat.size.to_s + Zashoku::EOF
+              client.c.puts(response.gets(Zashoku::CConf[:core][:net][:bsize])) until response.eof?
+              client.c.puts Zashoku::EOF
+            else
+              client.c.puts(JSON.generate(response: response))
+            end
           rescue Errno::EPIPE
             break
           else

data/lib/daemon.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'logger'
 require 'socket'
 require 'thread'
+require 'stringio'
 
 require_relative 'core/controller'
 require_relative 'core/config/daemon_config'
@@ -28,8 +29,12 @@ module Zashoku
           nil
         end
       if message[:raw]
-        Zashoku.logger.info('responding with unencoded object')
-        obj
+        Zashoku.logger.info('responding with unencoded stream')
+        if obj.respond_to?(:gets)
+          obj
+        else
+          StringIO.new(obj.to_s)
+        end
       else
         Zashoku::Util.encode_object(obj)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - annacrombie