zashoku 1.5.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 770d3ee1cf2f87e16048ee6b4e85c5386396ac57
-  data.tar.gz: 4eba5da2106507d67008149dd0ed87538dd3e8e0
+  metadata.gz: e0db9aff8e20d948bbfeedb2ee251d30d586b9d6
+  data.tar.gz: d0af382c8c4f81b56d75ef9a91ac3c56abc797be
 SHA512:
-  metadata.gz: 8be103708b5a862b9c26200c18c3eff09eab154efe10f7fd88b9bc7a704ee4997b148cd624aee1105cb6fdb2562b0d3841c1a3e4b76e2f4cb8ebcf02adf91698
-  data.tar.gz: 1aeec1a3e41021aa32d36d0e88536680df6ca666e343d1c0f8551961049d1740e147b0fb6d2d37eb7e1ec57316a1f72e6f7a5026b25e2144978a7318d58e43ad
+  metadata.gz: c6014610f36f4840174e2de7417a3020dd4905219fc0e6de60170227ac5fb1482115175a61db0a0c2523936aa091fd06a450c7f541abcd2487ff2a68c7c30c3a
+  data.tar.gz: f6c68b7a354a964f85834e33a76c9ef8134c9f30aff28b0ad8c9d27e2752e3d5d757b540595e23748b8b3dc2b1a2798ddeacd4b8e680a0f1fa0b8ef66d415120

data/lib/constants.rb

@@ -3,7 +3,7 @@
 require_relative 'core/util/util'
 
 module Zashoku
-  Version = [1, 5, 5].freeze
+  Version = [1, 6, 0].freeze
 
   Root    = File.expand_path('../', __dir__)
 
@@ -46,4 +46,6 @@ module Zashoku
   LoadPaths = [
     File.join(Zashoku::CConf[:app][:root], 'modules')
   ].freeze
+
+  EOF = 'ZASHOKU_EOF'
 end

data/lib/core/net/client.rb

@@ -9,10 +9,13 @@ module Zashoku
     class Client
       attr_accessor :callbacks
 
+      BSIZE = 1000000
+
       def initialize(host, port)
         @host, @port = host, port
         @socket = connect(@host, @port)
         @alive = true
+        @blocked = false
 
         @timeout = 2
 
@@ -112,6 +115,26 @@ module Zashoku
         }
       end
 
+      def command_to_file(file, msg, args = {})
+        return unless alive?
+        Zashoku.logger.info('stopping client threads from command_to_file')
+        stop_threads
+        @semaphore.synchronize {
+          payload = { 'msg' => msg, 'raw' => true }.merge(args)
+          @socket.puts(JSON.generate(payload))
+          f = File.open(file, 'w')
+          f.sync = true
+          loop do
+            d = @socket.gets(Zashoku::EOF, BSIZE)
+            f.print(d)
+            break if d.length < BSIZE
+          end
+          f.close
+        }
+        Zashoku.logger.info('re-starting client threads from command_to_file')
+        start_threads
+      end
+
       def pump_commands!
         loop do
           begin
@@ -143,8 +166,6 @@ module Zashoku
         lost_connection
       rescue IOError
         Util.alert("error: socket#{@socket}")
-        #binding.pry
-        #exit
       end
 
       def dispatch_events!

data/lib/core/net/server.rb

@@ -43,7 +43,13 @@ module Zashoku
             end
           begin
             response = @handler.call(message)
-            client.puts JSON.generate(response: response)
+            client.puts(
+              if message['raw']
+                response + Zashoku::EOF
+              else
+                JSON.generate(response: response)
+              end
+            )
           rescue Errno::EPIPE
             break
           else

data/lib/core/view.rb

@@ -247,6 +247,7 @@ module Zashoku
         @attributes
       )
 
+      return if @items.empty?
       @items_formatted = Zashoku::Formatter.items(get_format, @items)
     end
 

data/lib/daemon.rb

@@ -16,7 +16,7 @@ require_relative 'core/module'
 module Zashoku
 
   class<<self
-    attr_accessor :controllers
+    attr_accessor :controllers, :server
     def command(message)
       Zashoku.logger.debug("command got #{message}")
       message = message.keys.map(&:to_sym).zip(message.values).to_h
@@ -27,7 +27,12 @@ module Zashoku
         else
           nil
         end
-      Zashoku::Util.encode_object(obj)
+      if message[:raw]
+        Zashoku.logger.info('responding with unencoded object')
+        obj
+      else
+        Zashoku::Util.encode_object(obj)
+      end
     end
   end
 

data/lib/viewer.rb

@@ -33,9 +33,12 @@ module Zashoku
 
       if /^remote::.*/.match?(message[:mod])
         message[:mod] = message[:mod].gsub('remote::', '')
-        Zashoku.logger.debug("sending message #{message}")
-        msg = Zashoku::Util.decode_object(client.command('fwd', message))
-        msg
+        Zashoku.logger.debug("sending remote message #{message}")
+        if message[:to_file]
+          client.command_to_file(message[:to_file], 'fwd', message)
+        else
+          Zashoku::Util.decode_object(client.command('fwd', message))
+        end
       else
         modules[message[:mod]].send(message[:meth], *message[:args])
       end
@@ -188,9 +191,9 @@ module Zashoku
       return builtin_command(*cmd.split) if COMMANDS.key?(cmd.split.first)
       raise "no such command" if cmd.split.length == 1
       command(*cmd.split) unless cmd.empty?
-    rescue StandardError => e
-      Zashoku.logger.error("#{cmd.split} raised an error '#{e}'")
-      Util.alert("Error: #{e}")
+    #rescue StandardError => e
+    #  Zashoku.logger.error("#{cmd.split} raised an error '#{e}'")
+   #   Util.alert("Error: #{e}")
     end
 
     def search(*)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses