ruby-cli-daemon 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ecbd1e3b5a79a58076357cd42643f4c791dfde3d7c18863f907ceb82956e58
-  data.tar.gz: 8ae5d956213df23d0022ac8f8f57a6778fa3988fd9512565008e501f45bc4efd
+  metadata.gz: 28032d96f5467e69e05901a8397137c0706c58d78a0db0da86af3472ae44f80f
+  data.tar.gz: 4b48ce0e2ffe83e286551a211853d6cb81d5a317b86758d0a5f7814444d88b81
 SHA512:
-  metadata.gz: 8305d8f10bc7dd72bab13cbfd371e877d7d80fa4e1451c8dcf68d1e0da47fb69698554981a34be57e2cb17326974748b69fbbf8a44c9ada7eaa45e57f0e87df4
-  data.tar.gz: 8719ebd454a9917ade205b17e2d1422e6fccac6c4264117e8a75235da1d8a674b6b6397ec8063d71fd5d38bba060e591baa9ac2729cb11e27fbce06de3c002d9
+  metadata.gz: cbad1d7fff67fe668a4e3a38b413a7267887abf3cad210f541d063f222809512a7584454546c5ed6301505862708d3437aa1f5e701d01afa83fb33ae4e157ee2
+  data.tar.gz: c10303fb398d4b46429ff1d4353b00be9ad661e2b6aae7e9a189ffed887f2c13834525ae977af3fb3fc9942e5dad383e26c0fedaa9a04f41927b90a8ceb03e67

data/bin/ruby-cli-daemon.sh

@@ -50,23 +50,20 @@ fi
 
 # prepare output so we can start tailing
 status="${socket}.status"
-stdout="${socket}.out"
-stderr="${socket}.err"
-rm -f $status $stdout $stderr # clear previous
-touch $stdout $stderr
+rm -f $status # clear previous
 
-# send the command and parsable env vars to the daemon
-{ echo $@; awk 'BEGIN{for(v in ENVIRON) printf "--RCD-- %s %s", v, ENVIRON[v] }';} | nc -U $socket
+# send IOs / command / env ... TODO: use perl or awk or bash to be faster ... see experiments/send_io.sh
+ruby --disable-gems -rsocket -rshellwords -e "
+  s = UNIXSocket.new('$socket')
+  s.send_io STDOUT
+  s.send_io STDERR
+  s.send_io STDIN
+  s.puts ARGV.shelljoin # as a single line <-> gets
+  s.print ENV.map { |k, v| %(#{k} #{v}) }.join('--RCD--')
+" -- "$@"
 
-# stream output
-tail -f $stdout &
-tail -f $stderr >&2 &
-
-# wait for command to finish, tight loop so we don't lose time
+# wait for command to finish, tight loop so we don't lose time TODO: open another socket to be faster/efficient?
 while [ ! -f $status ]; do sleep 0.02; done
 
-# kill log streamers, they should be done (but not the spawned worker)
-for job in `jobs -p | tail -n2`; do kill $job; done
-
 # replay exit status
 exit "$(cat $status)"

data/lib/ruby_cli_daemon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module RubyCliDaemon
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/ruby_cli_daemon.rb

@@ -17,21 +17,16 @@ module RubyCliDaemon
       server = create_socket(socket) # do this last, it signals we are ready
 
       loop do
-        return unless (command = wait_for_command(server))
-        command, env = command
-        # execute the command in a fork
-        capture :STDOUT, "#{socket}.out" do
-          capture :STDERR, "#{socket}.err" do
-            _, status = Process.wait2(fork do
-              ENV.replace env # uncovered
-              ARGV.replace(command) # uncovered
-              load path # uncovered
-            end)
+        return unless IO.select([server], nil, nil, TIMEOUT)
 
-            # send back response
-            File.write("#{socket}.status", status.exitstatus)
-          end
-        end
+        # execute the gems binary in a fork
+        _, status = Process.wait2(fork do
+          replace_env server # uncovered
+          load path # uncovered
+        end)
+
+        # send back exit status
+        File.write("#{socket}.status", status.exitstatus)
       end
     ensure
       # signal that this program is done so ruby-sli-daemon.sh restarts it
@@ -80,35 +75,22 @@ module RubyCliDaemon
       result.is_a?(StandardError) ? raise(result) : result
     end
 
-    def wait_for_command(server)
-      return unless IO.select([server], nil, nil, TIMEOUT)
-
+    def replace_env(server)
       connection = server.accept
-      command = connection.gets.shellsplit
-
-      env = connection.read.split("--RCD-- ")
-      env.shift
-      env = Hash[env.map { |s| s.split(/ /, 2) }]
-
-      connection.close
-      [command, env]
+      begin
+        STDOUT.reopen connection.recv_io
+        STDERR.reopen connection.recv_io
+        STDIN.reopen connection.recv_io
+        ARGV.replace connection.gets.shellsplit
+        ENV.replace Hash[connection.read.split("--RCD--").map { |s| s.split(/ /, 2) }]
+      ensure
+        connection.close # not sure if this is necessary
+      end
     end
 
     def create_socket(socket)
       FileUtils.mkdir_p(File.dirname(socket))
       UNIXServer.new(socket)
     end
-
-    # StringIO does not work with rubies `system` call that `sh` uses under the hood, so using Tempfile + reopen
-    # https://grosser.it/2018/11/23/ruby-capture-stdout-without-stdout/
-    def capture(stream, path)
-      const = Object.const_get(stream)
-      const.sync = true
-      old_stream = const.dup
-      const.reopen(path)
-      yield
-    ensure
-      const.reopen(old_stream)
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cli-daemon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it