hotswap 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31ba7d63578622f3d225e863e638be171c949af98f6497019a3ce01c7371c71d
-  data.tar.gz: 772a73f952822313044f1a28d1b5013458eafa0685772f97bdefe41372ed933b
+  metadata.gz: 94b316259e5493780b12f54e304280ebf4e32d1635eee5eae41ffdbbe48400ce
+  data.tar.gz: dfa1cc6a8905f93e9b24eb9f6527f97601992b8ee7af6ce7b63ee7ff1b714678
 SHA512:
-  metadata.gz: f7c028345800763facf9a6a76c17d34f5b3e8c6aa930778f76f28e731248024a67c9f0b6fba6d548aa6562459c8a2c00d76aa4f4b2d3815fdf87c81e9518e2d1
-  data.tar.gz: e4c172d547d26c443030c720e537f95bfad0232f7a28f72458e8fb367f7b4f1c54d7a840f6c825c1bdf1892690e4e3e1c4e72e3c438b57eafa8ff9513793539f
+  metadata.gz: 7b93ec7dd2f3d2914ddf0280e79579a1c408975353e10a8fd6679c2eb0deafab1685e5db60ddac443d4da2117088f65017dcffad5e50b6256aea79f4440806aa
+  data.tar.gz: be36ea39ce6ff863689fae39ca946e2b4eb7f33209d65d45d3c824887106bc3f3f4b609db7478197262b153fe4bf48f51d2be98f091e46dec041bc0978ed0d55

data/exe/hotswap

@@ -23,10 +23,15 @@ sock = UNIXSocket.new(socket_path)
 args = ARGV.map { |a| Shellwords.escape(a) }.join(" ")
 sock.write(args + "\n")
 
-# Pipe stdin to socket (in background thread)
-writer = Thread.new do
-  IO.copy_stream($stdin, sock) rescue nil
-  sock.close_write rescue nil
+# Pipe stdin to socket (only if data is being piped in)
+writer = nil
+if !$stdin.tty?
+  writer = Thread.new do
+    IO.copy_stream($stdin, sock) rescue nil
+    sock.close_write rescue nil
+  end
+else
+  sock.close_write
 end
 
 # Pipe stderr socket to local stderr (in background thread)
@@ -40,7 +45,7 @@ end
 # Pipe socket output to stdout
 IO.copy_stream(sock, $stdout) rescue nil
 
-writer.join
+writer&.join
 stderr_reader&.join
 stderr_sock&.close rescue nil
 sock.close rescue nil

data/lib/hotswap/cli.rb

@@ -6,7 +6,18 @@ require "sqlite3"
 module Hotswap
   class CLI < Thor
     def self.exit_on_failure?
-      true
+      false
+    end
+
+    class Shell < Thor::Shell::Basic
+      def initialize(stdout, stderr)
+        super()
+        @_stdout = stdout
+        @_stderr = stderr
+      end
+
+      def stdout = @_stdout
+      def stderr = @_stderr
     end
 
     # Thread-safe IO: each connection gets its own IO via thread-local storage
@@ -15,7 +26,11 @@ module Hotswap
       Thread.current[:hotswap_stdin] = stdin
       Thread.current[:hotswap_stdout] = stdout
       Thread.current[:hotswap_stderr] = stderr
-      start(args)
+
+      args = ["help"] if args.empty?
+      start(args, shell: Shell.new(stdout, stderr))
+    rescue SystemExit
+      # Thor calls exit on errors — catch it so we don't kill the server
     ensure
       Thread.current[:hotswap_stdin] = nil
       Thread.current[:hotswap_stdout] = nil

data/lib/hotswap/version.rb

@@ -1,3 +1,3 @@
 module Hotswap
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotswap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Brad Gessler