hotswap 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: badcf933f86c51e18eb84dd18518302cf51621e33dc1232385206a1df68d020a
-  data.tar.gz: cf625050bb3be00cca1b23a95a45a6a3230f3a0dd42e1230766bf8b403f847aa
+  metadata.gz: 62ebad7db344b7fe9207d272654825ec184edcc6a975beca1b69da0fd28d6464
+  data.tar.gz: ae90b89e45240eeb3ff82e367b397ca72583a479e4f6e8e44266380f72e10e06
 SHA512:
-  metadata.gz: a37c15429bc4bf308c122e3eca1258b4916e897cb77f7518e21f6f84f8880c25603340f61f406ede9e628c4aefbfbcd0a40e1259e5d5d0d6990bffdb203b19c1
-  data.tar.gz: 86bcd2d70ffc9ce32513c609892f854e822cf9656ed9b4f94a7c7a5e1a6171eed70b5cc29adf00f2948912c064ad0874da84bdc0708eeeab34b536b05b4899ce
+  metadata.gz: 956acefbe39bdaec50029bdddadec4c72deb31c849c09428949990519dfece496db4d6e939086ff5b0e774d7056a59f858e763b63a60b062068ee17571351a18
+  data.tar.gz: 577e3fc013fd8ff08308512ef9a8f999722f4d08f465eb16e99dd088fa569a427f9332800da684e3a5adeaefad992dd9c0840da448feca6baf11bcd488153361

data/exe/hotswap

@@ -3,8 +3,8 @@
 require "socket"
 require "shellwords"
 
-socket_path = ENV.fetch("HOTSWAP_SOCKET", "tmp/hotswap.sock")
-stderr_socket_path = ENV.fetch("HOTSWAP_STDERR_SOCKET", "tmp/hotswap.stderr.sock")
+socket_path = ENV.fetch("HOTSWAP_SOCKET", "tmp/sockets/hotswap.sock")
+stderr_socket_path = ENV.fetch("HOTSWAP_STDERR_SOCKET", "tmp/sockets/hotswap.stderr.sock")
 
 unless File.exist?(socket_path)
   $stderr.puts "ERROR: socket not found at #{socket_path}"
@@ -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,7 @@ require "sqlite3"
 module Hotswap
   class CLI < Thor
     def self.exit_on_failure?
-      true
+      false
     end
 
     # Thread-safe IO: each connection gets its own IO via thread-local storage
@@ -16,6 +16,8 @@ module Hotswap
       Thread.current[:hotswap_stdout] = stdout
       Thread.current[:hotswap_stderr] = stderr
       start(args)
+    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/railtie.rb

@@ -17,13 +17,13 @@ module Hotswap
       if app.config.hotswap.socket_path
         Hotswap.socket_path = app.config.hotswap.socket_path
       else
-        Hotswap.socket_path = File.join(app.root, "tmp", "hotswap.sock")
+        Hotswap.socket_path = File.join(app.root, "tmp", "sockets", "hotswap.sock")
       end
 
       if app.config.hotswap.stderr_socket_path
         Hotswap.stderr_socket_path = app.config.hotswap.stderr_socket_path
       else
-        Hotswap.stderr_socket_path = File.join(app.root, "tmp", "hotswap.stderr.sock")
+        Hotswap.stderr_socket_path = File.join(app.root, "tmp", "sockets", "hotswap.stderr.sock")
       end
     end
 
@@ -31,7 +31,7 @@ module Hotswap
       app.middleware.use Hotswap::Middleware
     end
 
-    initializer "hotswap.socket_server" do
+    server do
       server = Hotswap::SocketServer.new
       server.start
 

data/lib/hotswap/socket_server.rb

@@ -21,6 +21,7 @@ module Hotswap
       cleanup_stale_socket(@socket_path)
       cleanup_stale_socket(@stderr_socket_path)
 
+      FileUtils.mkdir_p(File.dirname(@socket_path))
       @server = UNIXServer.new(@socket_path)
       @stderr_server = UNIXServer.new(@stderr_socket_path)
 

data/lib/hotswap/version.rb

@@ -1,3 +1,3 @@
 module Hotswap
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/hotswap.rb

@@ -15,6 +15,6 @@ module Hotswap
     end
   end
 
-  self.socket_path = "tmp/hotswap.sock"
-  self.stderr_socket_path = "tmp/hotswap.stderr.sock"
+  self.socket_path = "tmp/sockets/hotswap.sock"
+  self.stderr_socket_path = "tmp/sockets/hotswap.stderr.sock"
 end

metadata

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