io_daemonizer 1 → 3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05df686f5b42a98c8dbacff27b10217d676674fa330598ba54cc22faf039b63a
-  data.tar.gz: 4d85aa2e8ddc312820d2814d772cd1c5ffc5c06b5adf8a8cd9a813ba0d4988de
+  metadata.gz: 2fe90c198a168ddb60ba8664074e8ba81eb4e08fbfac69e86af72edea74e937f
+  data.tar.gz: a386e4e1e76bbf154944d579d9220a35bfe7123d4725ef20bc22a2c3950a3fd1
 SHA512:
-  metadata.gz: 867eb556dc205e46c1af6c1e6efaa479ae6f98e6a67d280d8cbda40b20ccb775aabe56d00b9ed30a4890acaf02d739563ee12812f5beadfe27e98cebc00dbb87
-  data.tar.gz: aae1d0c1d888ed618811f9711f70a4481f2f755d636136735860e3b5cb582fd2302b49a5b9eb848760d62521f23a06cc7970686e2cd5a3af3b9c95fccb01a516
+  metadata.gz: 2804cf8d50674070fe9bd9c6c8fb951bd6868acd7ee01a3862963b6e22f122ad09ea56113e892e93185a0d2caf58a30dcf24b570bcfbce86db62cc35f0a389d9
+  data.tar.gz: 291594bc93f1a5b269c8a668815ff3bc9f1ebc18cb01c164d014307701e1d72224e89b950b5ef1a4b02b7cdc655a22770ad90fda506b140357be90403d289df7

data/io_daemonizer.rb

@@ -1,7 +1,8 @@
-# io_daemonizer v.1 https://github.com/joeyschoblaska/io_daemonizer
+# io_daemonizer v.3 https://github.com/joeyschoblaska/io_daemonizer
 
 require "shellwords"
 require "socket"
+require "stringio"
 
 class IODaemonizer
   PORT = ENV["IO_DAEMONIZER_PORT"] || 5289
@@ -9,10 +10,10 @@ class IODaemonizer
   def self.wrap(setup: -> {}, run: -> {})
     case ARGV[0]
     when "start"
-      puts "starting server... "
+      puts "starting server..."
       Daemon.run(setup: setup, run: run)
     when "stop"
-      puts "stopping server... "
+      puts "stopping server..."
       send_request(ARGV)
     else
       send_request(ARGV)
@@ -23,19 +24,20 @@ class IODaemonizer
 
   def self.send_request(args)
     TCPSocket.open("127.0.0.1", PORT) do |socket|
-      socket.write args.shelljoin
+      socket.puts args.shelljoin
+      socket.write $stdin.tty? ? "" : $stdin.read
       socket.close_write
       STDOUT.write(socket.read(4096)) until socket.eof?
     end
   end
 
-  def self.redirect(stdout: $stdout, stderr: $stderr)
-    old_stdout, old_stderr = $stdout.dup, $stderr.dup
-    $stdout, $stderr = stdout, stderr
+  def self.redirect(stdin: $stdin, stdout: $stdout, stderr: $stderr)
+    oldin, oldout, olderr = $stdin.dup, $stdout.dup, $stderr.dup
+    $stdin, $stdout, $stderr = stdin, stdout, stderr
 
     yield
   ensure
-    $stdout, $stderr = old_stdout, old_stderr
+    $stdin, $stdout, $stderr = oldin, oldout, olderr
   end
 
   class Daemon
@@ -64,14 +66,17 @@ class IODaemonizer
     private
 
     def read_socket(socket)
-      args = socket.read.shellsplit
+      raw_args, *body = socket.read.lines
+      args = raw_args.shellsplit
 
       if args[0] == "stop"
         @server.close
       else
-        IODaemonizer.redirect(stdout: socket, stderr: socket) do
-          @context.instance_exec args, &@run
-        end
+        IODaemonizer.redirect(
+          stdin: StringIO.new(body.join),
+          stdout: socket,
+          stderr: socket
+        ) { @context.instance_exec args, &@run }
       end
     rescue => e
       socket.write e.inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io_daemonizer
 version: !ruby/object:Gem::Version
-  version: '1'
+  version: '3'
 platform: ruby
 authors:
 - Joey Schoblaska
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Wrap a Ruby script that speaks IO in a daemon so that you only pay the
   startup overhead once.
@@ -37,7 +37,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: IO Daemonizer