ruby-cli-daemon 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a6d3c7d2c60a46410e956b907597e743cd1358cf6ea479bb472b3fe150f52f
-  data.tar.gz: a65afda0b9ba23674c2a575126241be29dea66026a6fcfdaa3c3593666718a8c
+  metadata.gz: f8c5509e29395a1de3c0f720971cb4a645cd6c4d5801cb876eaaf224c40a699a
+  data.tar.gz: '0659e79f4e92b56d5a27832321d2ac7b9f40fb5c59a84391689a340661f67900'
 SHA512:
-  metadata.gz: 116a867d73b9bae3d739cfc89383bf3507ab77c22ca77e6c64f9695075c79ce079c0a45edf4a0668a3469a8efc5cf897f7466cc8b9bc9e06a114b2331427ee9c
-  data.tar.gz: 1a49ca90bc902b26b9abb39e230e612091e78037c1339cb65ac3c3c035e778def57ada09f7cccedc26aa845f96abac5e86af67491fa7750140fc8a9122b22a08
+  metadata.gz: aa4a1dbf9d6ba2eb48bf9778d05dafebe699b2304b4a218d4dd935f814dd4b8a16c66256e818b0f16efa45ddb0a91a0f57865d637f990d2c30fcf17baef4683e
+  data.tar.gz: 97c2e4082bc8f967810738ca4790a828dec80c1c1247ebfc2012ded362d5f3332491d027db27a6ef3e917d3c13514ac46dcd76858d3a86478bded5cd688b55d6

data/bin/ruby-sli-daemon.sh

@@ -11,7 +11,7 @@ stop)
 -v|--version)
   exec ruby -r$lib/ruby_cli_daemon/version.rb -e "puts RubyCliDaemon::VERSION"
   ;;
--h|--help)
+""|-*)
   echo "Usage:"
   echo "  ruby-cli-daemon <ruby-executable> [arg]*"
   echo "    Start or use background worker to execute command"
@@ -23,7 +23,11 @@ stop)
   echo "Options:"
   echo "  -v / --version     Show version"
   echo "  -h / --help        Show this help"
-  exit
+  if [[ "$1" = "-h" || "$1" = "--help" ]]; then
+    exit 0
+  else
+    exit 1
+  fi
   ;;
 esac
 
@@ -37,10 +41,10 @@ log=${TMPDIR}ruby_cli_daemon.log
 # spawn new daemon if none exists
 if [[ ! -e $socket ]]; then
   # absolute executable so a single gem install is enough for all rubies
-  nohup ruby -r$lib/ruby_cli_daemon.rb -rbundler/setup -e RubyCliDaemon.start\ \"$socket\",\ \"$executable\" 0<&- &>$log &
+  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) || (echo "Failed to start worker, check $log" && false) # fail fast when worker failed
+    kill -0 $(jobs -p) &>/dev/null || (cat $log && false) # fail fast when worker failed
   done
 fi
 

data/lib/ruby_cli_daemon/version.rb

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

data/lib/ruby_cli_daemon.rb

@@ -13,8 +13,8 @@ module RubyCliDaemon
     end
 
     def start(socket, executable)
-      server = create_socket(socket)
       path = preload_gem(executable)
+      server = create_socket(socket) # do this last, it signals we are ready
 
       loop do
         return unless (command = wait_for_command(server))
@@ -39,15 +39,46 @@ module RubyCliDaemon
 
     private
 
-    # preload the libraries we'll need to speed up execution
+    # preload the libraries we'll need, to speed up execution
+    # first try with bundler and then without
     def preload_gem(executable)
-      spec = Gem.loaded_specs.each_value.detect { |s| s.executables.include?(executable) }
-      path = spec.bin_file executable
-      require spec.name
+      name, path = fork_with_return do
+        require "bundler/setup"
+        find_gem_spec(executable)
+      end
+
+      if name
+        require "bundler/setup"
+      else
+        name, path = find_gem_spec(executable)
+        raise "No gem with executable #{executable} found" unless name
+      end
+
+      require name
       GC.start # https://bugs.ruby-lang.org/issues/15878
       path
     end
 
+    def find_gem_spec(executable)
+      spec = Gem::Specification.detect { |s| s.executables.include?(executable) }
+      [spec.name, spec.bin_file(executable)] if spec # need something we can send out from fork
+    end
+
+    def fork_with_return
+      read, write = IO.pipe
+      Process.wait(fork do
+        read.close
+        begin
+          Marshal.dump(yield, write)
+        rescue StandardError => e
+          Marshal.dump(e, write)
+        end
+      end)
+      write.close
+      result = Marshal.load(read)
+      result.is_a?(StandardError) ? raise(result) : result
+    end
+
     def wait_for_command(server)
       return unless IO.select([server], nil, nil, TIMEOUT)
       connection = server.accept

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cli-daemon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -39,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Preforking daemon that makes all ruby binaries faster