io_daemonizer 1 → 5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05df686f5b42a98c8dbacff27b10217d676674fa330598ba54cc22faf039b63a
-  data.tar.gz: 4d85aa2e8ddc312820d2814d772cd1c5ffc5c06b5adf8a8cd9a813ba0d4988de
+  metadata.gz: 80b48adc5074a3057dd995bd6111fffcaecaf14436d94aa781c822eef10fd95b
+  data.tar.gz: 1f816e2e331f8132844a4fcc1a8da7731d4d08d70165f89ac34c3f985a969466
 SHA512:
-  metadata.gz: 867eb556dc205e46c1af6c1e6efaa479ae6f98e6a67d280d8cbda40b20ccb775aabe56d00b9ed30a4890acaf02d739563ee12812f5beadfe27e98cebc00dbb87
-  data.tar.gz: aae1d0c1d888ed618811f9711f70a4481f2f755d636136735860e3b5cb582fd2302b49a5b9eb848760d62521f23a06cc7970686e2cd5a3af3b9c95fccb01a516
+  metadata.gz: f531743fc395f854ed431ee7e2f283a206995df75367fe5fe871d8d7d1e238a482b0baf0ea132c8b384055377169870122e443c2840f51b2da092d25c2472dd2
+  data.tar.gz: fe64289f1d5b86e12f52c157e46cb1d8e5d93ac9f95be18aa46e51f34a81f4a42f77a7ca0d193dc22fca2b0636f4f10349e342a97e6f3c0dd36d783ac1f2ee7b

data/io_daemonizer.rb

@@ -1,51 +1,61 @@
-# io_daemonizer v.1 https://github.com/joeyschoblaska/io_daemonizer
+# io_daemonizer v.5 https://github.com/joeyschoblaska/io_daemonizer
 
 require "shellwords"
 require "socket"
+require "stringio"
 
 class IODaemonizer
-  PORT = ENV["IO_DAEMONIZER_PORT"] || 5289
-
-  def self.wrap(setup: -> {}, run: -> {})
+  def self.wrap(port:, setup:, run:, autostart: true)
     case ARGV[0]
     when "start"
-      puts "starting server... "
-      Daemon.run(setup: setup, run: run)
+      puts "starting server..."
+      Daemon.run(port: port, setup: setup, run: run)
     when "stop"
-      puts "stopping server... "
-      send_request(ARGV)
+      puts "stopping server..."
+      send_request(port: port, args: ARGV)
     else
-      send_request(ARGV)
+      begin
+        send_request(port: port, args: ARGV)
+      rescue Errno::ECONNREFUSED => e
+        raise(e) unless autostart
+        daemon = Daemon.new(port: port, setup: setup, run: run)
+        daemon.setup
+        fork { daemon.start }
+        sleep 0.1
+        send_request(port: port, args: ARGV)
+      end
     end
   rescue Errno::ECONNREFUSED
     puts "server not running or not responding"
   end
 
-  def self.send_request(args)
-    TCPSocket.open("127.0.0.1", PORT) do |socket|
-      socket.write args.shelljoin
+  def self.send_request(port:, args:)
+    TCPSocket.open("127.0.0.1", port) do |socket|
+      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
-    def self.run(setup: -> {}, run: -> {})
-      daemon = new(setup: setup, run: run)
+    def self.run(port:, setup:, run:)
+      daemon = new(port: port, setup: setup, run: run)
       daemon.setup
       daemon.start
     end
 
-    def initialize(setup: -> {}, run: -> {})
+    def initialize(port:, setup:, run:)
+      @port = port
       @setup = setup
       @run = run
       @context = Object.new
@@ -56,7 +66,7 @@ class IODaemonizer
     end
 
     def start
-      @server = TCPServer.open("127.0.0.1", PORT)
+      @server = TCPServer.open("127.0.0.1", @port)
       Process.daemon(true)
       read_socket(@server.accept) until @server.closed?
     end
@@ -64,14 +74,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: '5'
 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.