ruby-cli-daemon 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c5509e29395a1de3c0f720971cb4a645cd6c4d5801cb876eaaf224c40a699a
-  data.tar.gz: '0659e79f4e92b56d5a27832321d2ac7b9f40fb5c59a84391689a340661f67900'
+  metadata.gz: bdc9d0158a4c5bda15cffc7fd840f9fb19a78be1d808a7972f86526b99048ac6
+  data.tar.gz: 80fd1f70317d0f821cfd000debbd165c180b8308e8fb55c84bbc2eaeed0bb714
 SHA512:
-  metadata.gz: aa4a1dbf9d6ba2eb48bf9778d05dafebe699b2304b4a218d4dd935f814dd4b8a16c66256e818b0f16efa45ddb0a91a0f57865d637f990d2c30fcf17baef4683e
-  data.tar.gz: 97c2e4082bc8f967810738ca4790a828dec80c1c1247ebfc2012ded362d5f3332491d027db27a6ef3e917d3c13514ac46dcd76858d3a86478bded5cd688b55d6
+  metadata.gz: 84e6f69005593546caee47feafb734c73781c74a690c233f3287b686f5adc1c29d10a517079cd735c00551351b4f8e4d42e54bb068eb3cb8501ca443f7044ff8
+  data.tar.gz: 814b27d01d61f5620846e7b52eb00f6d54bd1d9ce9a1d1cd66aa7e11eedb18e5c89543ca807f9a3def8a2f6ddb12b854a140a5cd2d72edace868a523ac175f8c

data/bin/{ruby-sli-daemon.sh → ruby-cli-daemon.sh}

@@ -35,7 +35,7 @@ executable=$1
 shift
 
 # matching the `stop` pattern so everything can be killed quickly
-socket=${TMPDIR}ruby_cli_daemon/$(basename $PWD)/${executable}
+socket=${TMPDIR}ruby_cli_daemon/$(pwd | md5 | cut -c1-7)/${executable}
 log=${TMPDIR}ruby_cli_daemon.log
 
 # spawn new daemon if none exists
@@ -44,7 +44,7 @@ if [[ ! -e $socket ]]; then
   nohup ruby -r$lib/ruby_cli_daemon.rb -e RubyCliDaemon.start\ \"$socket\",\ \"$executable\" 0<&- &>$log &
   while [ ! -e $socket ]; do
     sleep 0.1
-    kill -0 $(jobs -p) &>/dev/null || (cat $log && false) # fail fast when worker failed
+    kill -0 $(jobs -p) &>/dev/null || (cat $log && rm -f $log && false) # fail fast when worker failed
   done
 fi
 
@@ -55,8 +55,8 @@ stderr="${socket}.err"
 rm -f $status $stdout $stderr # clear previous
 touch $stdout $stderr
 
-# send the command to the daemon
-echo $@ | nc -U $socket
+# 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
 
 # stream output
 tail -f $stdout &

data/lib/ruby_cli_daemon.rb

@@ -9,7 +9,7 @@ module RubyCliDaemon
   class << self
     def install(path)
       File.unlink(path) if File.exist?(path)
-      File.symlink(File.expand_path("../bin/ruby-sli-daemon.sh", __dir__), path)
+      File.symlink(File.expand_path("../bin/ruby-cli-daemon.sh", __dir__), path)
     end
 
     def start(socket, executable)
@@ -18,11 +18,12 @@ module RubyCliDaemon
 
       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
               ARGV.replace(command) # uncovered
               load path # uncovered
             end)
@@ -83,8 +84,9 @@ module RubyCliDaemon
       return unless IO.select([server], nil, nil, TIMEOUT)
       connection = server.accept
       command = connection.gets.shellsplit
+      env = Hash[connection.read.split("--RCD-- ")[1..-1].map { |s| s.split(/ /, 2) }]
       connection.close
-      command
+      [command, env]
     end
 
     def create_socket(socket)

data/lib/ruby_cli_daemon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cli-daemon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -17,14 +17,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- bin/ruby-sli-daemon.sh
+- bin/ruby-cli-daemon.sh
 - lib/ruby_cli_daemon.rb
 - lib/ruby_cli_daemon/version.rb
 homepage: https://github.com/grosser/ruby-cli-daemon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |-
+  To finish the update, run:
+  ruby -rruby_cli_daemon -e "RubyCliDaemon.install '/usr/local/bin/ruby-cli-daemon'"
 rdoc_options: []
 require_paths:
 - lib