hotswap 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4648f76060073d16f095250ed5e638c4150d5094069e839b2bce9b1b471852a
-  data.tar.gz: 592b37ce1c1f4691e9bb74d9606ef7727333a3b65f878ebff906084b9a56168e
+  metadata.gz: 31ba7d63578622f3d225e863e638be171c949af98f6497019a3ce01c7371c71d
+  data.tar.gz: 772a73f952822313044f1a28d1b5013458eafa0685772f97bdefe41372ed933b
 SHA512:
-  metadata.gz: 869189ee05937fab2b970e31b0cbd13c6a0f36d4d127b0dfb664c793ffd1b060d07050ad0563c1cb224c68187bfa178000305c2cb4e85dad1f0e336d842b69ec
-  data.tar.gz: 94f141f2bd7990c6a55a53b01c1491941179453361a014caf91dd2cb83f890026e9898e78b19a8e16f8a8890c175cc298efe1145616900a2eeb9149ffaa503c4
+  metadata.gz: f7c028345800763facf9a6a76c17d34f5b3e8c6aa930778f76f28e731248024a67c9f0b6fba6d548aa6562459c8a2c00d76aa4f4b2d3815fdf87c81e9518e2d1
+  data.tar.gz: e4c172d547d26c443030c720e537f95bfad0232f7a28f72458e8fb367f7b4f1c54d7a840f6c825c1bdf1892690e4e3e1c4e72e3c438b57eafa8ff9513793539f

data/exe/hotswap

@@ -1,29 +1,26 @@
 #!/usr/bin/env ruby
 
 require "socket"
-require "securerandom"
+require "shellwords"
 
-socket_path = ENV.fetch("HOTSWAP_SOCKET", "tmp/sqlite3.sock")
-stderr_socket_path = ENV.fetch("HOTSWAP_STDERR_SOCKET", "tmp/sqlite3.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}"
   exit 1
 end
 
-# Connect stderr socket first (if available) so it's registered before the command runs
+# Connect stderr socket first so it's ready before the command runs
 stderr_sock = nil
-stderr_key = SecureRandom.hex(8)
 if File.exist?(stderr_socket_path)
   stderr_sock = UNIXSocket.new(stderr_socket_path)
-  stderr_sock.write("#{stderr_key}\n")
 end
 
 sock = UNIXSocket.new(socket_path)
 
-# Send command args with stderr key as first line
-args = ARGV.join(" ")
-args += " --stderr-key=#{stderr_key}" if stderr_sock
+# Shell-escape args to preserve spaces in file paths
+args = ARGV.map { |a| Shellwords.escape(a) }.join(" ")
 sock.write(args + "\n")
 
 # Pipe stdin to socket (in background thread)

data/lib/hotswap/cli.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "tempfile"
+require "fileutils"
 require "sqlite3"
 
 module Hotswap
@@ -8,6 +9,19 @@ module Hotswap
       true
     end
 
+    # Thread-safe IO: each connection gets its own IO via thread-local storage
+    # instead of swapping global $stdin/$stdout/$stderr.
+    def self.run(args, stdin: $stdin, stdout: $stdout, stderr: $stderr)
+      Thread.current[:hotswap_stdin] = stdin
+      Thread.current[:hotswap_stdout] = stdout
+      Thread.current[:hotswap_stderr] = stderr
+      start(args)
+    ensure
+      Thread.current[:hotswap_stdin] = nil
+      Thread.current[:hotswap_stdout] = nil
+      Thread.current[:hotswap_stderr] = nil
+    end
+
     desc "cp SRC DST", "Copy a database to/from the running server. Use 'database' to refer to the running database."
     long_desc <<~DESC
       Copy a SQLite database to or from the running server.
@@ -25,12 +39,12 @@ module Hotswap
     def cp(src, dst)
       db_path = Hotswap.database_path
       unless db_path
-        $stderr.write("ERROR: database_path not configured\n")
+        io_err.write("ERROR: database_path not configured\n")
         return
       end
 
       if src == "database" && dst == "database"
-        $stderr.write("ERROR: source and destination can't both be 'database'\n")
+        io_err.write("ERROR: source and destination can't both be 'database'\n")
         return
       end
 
@@ -39,7 +53,7 @@ module Hotswap
       elsif src == "database"
         pull_database(dst, db_path)
       else
-        $stderr.write("ERROR: one of src/dst must be 'database'\n")
+        io_err.write("ERROR: one of src/dst must be 'database'\n")
       end
     end
 
@@ -55,13 +69,17 @@ module Hotswap
 
     desc "version", "Print the hotswap version"
     def version
-      $stdout.write("hotswap #{Hotswap::VERSION}\n")
+      io_out.write("hotswap #{Hotswap::VERSION}\n")
     end
 
     private
 
+    def io_in  = Thread.current[:hotswap_stdin]  || $stdin
+    def io_out = Thread.current[:hotswap_stdout] || $stdout
+    def io_err = Thread.current[:hotswap_stderr] || $stderr
+
     def push_database(src, db_path)
-      input = (src == "-") ? $stdin : File.open(src, "rb")
+      input = (src == "-") ? io_in : File.open(src, "rb")
 
       dir = File.dirname(db_path)
       temp = Tempfile.new(["hotswap", ".sqlite3"], dir)
@@ -73,11 +91,11 @@ module Hotswap
         result = db.execute("PRAGMA integrity_check")
         db.close
         unless result == [["ok"]]
-          $stderr.write("ERROR: integrity check failed\n")
+          io_err.write("ERROR: integrity check failed\n")
           return
         end
 
-        $stderr.write("Swapping database...\n")
+        io_err.write("Swapping database...\n")
 
         Middleware::SWAP_LOCK.synchronize do
           if defined?(ActiveRecord::Base)
@@ -90,9 +108,9 @@ module Hotswap
           ActiveRecord::Base.establish_connection
         end
 
-        $stdout.write("OK\n")
+        io_out.write("OK\n")
       rescue => e
-        $stderr.write("ERROR: #{e.message}\n")
+        io_err.write("ERROR: #{e.message}\n")
       ensure
         input.close if input.is_a?(File)
         temp.unlink if temp && File.exist?(temp.path)
@@ -101,7 +119,7 @@ module Hotswap
 
     def pull_database(dst, db_path)
       unless File.exist?(db_path)
-        $stderr.write("ERROR: database file not found\n")
+        io_err.write("ERROR: database file not found\n")
         return
       end
 
@@ -117,13 +135,13 @@ module Hotswap
         src_db.close
 
         if dst == "-"
-          File.open(temp.path, "rb") { |f| IO.copy_stream(f, $stdout) }
+          File.open(temp.path, "rb") { |f| IO.copy_stream(f, io_out) }
         else
           FileUtils.cp(temp.path, dst)
-          $stderr.write("OK\n")
+          io_err.write("OK\n")
         end
       rescue => e
-        $stderr.write("ERROR: #{e.message}\n")
+        io_err.write("ERROR: #{e.message}\n")
       ensure
         temp.unlink if temp && File.exist?(temp.path)
       end

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", "sqlite3.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", "sqlite3.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

@@ -1,16 +1,19 @@
 require "socket"
+require "shellwords"
 
 module Hotswap
   class SocketServer
     attr_reader :socket_path, :stderr_socket_path
 
+    CONNECTION_TIMEOUT = 10
+
     def initialize(socket_path: Hotswap.socket_path, stderr_socket_path: Hotswap.stderr_socket_path)
       @socket_path = socket_path
       @stderr_socket_path = stderr_socket_path
       @server = nil
       @stderr_server = nil
       @thread = nil
-      @stderr_clients = {}
+      @stderr_client = nil
       @stderr_mutex = Mutex.new
     end
 
@@ -18,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)
 
@@ -30,7 +34,10 @@ module Hotswap
       @server&.close
       @stderr_server&.close
       @thread&.kill
-      @stderr_mutex.synchronize { @stderr_clients.each_value(&:close) rescue nil }
+      @stderr_mutex.synchronize do
+        @stderr_client&.close rescue nil
+        @stderr_client = nil
+      end
       [@socket_path, @stderr_socket_path].each do |path|
         File.delete(path) if path && File.exist?(path)
       end
@@ -45,7 +52,10 @@ module Hotswap
         readable.each do |server|
           client = server.accept
           if server == @stderr_server
-            register_stderr_client(client)
+            @stderr_mutex.synchronize do
+              @stderr_client&.close rescue nil
+              @stderr_client = client
+            end
           else
             Thread.new(client) { |sock| handle_connection(sock) }
           end
@@ -55,57 +65,35 @@ module Hotswap
       # Server was closed, exit gracefully
     end
 
-    def register_stderr_client(client)
-      # stderr client sends its PID on first line so we can match it
-      line = client.gets
-      return client.close unless line
-      key = line.strip
-      @stderr_mutex.synchronize { @stderr_clients[key] = client }
-    end
-
-    def take_stderr_client(key)
-      @stderr_mutex.synchronize { @stderr_clients.delete(key) }
+    def take_stderr_client
+      @stderr_mutex.synchronize do
+        client = @stderr_client
+        @stderr_client = nil
+        client
+      end
     end
 
     def handle_connection(socket)
-      # First line is the command args
+      unless IO.select([socket], nil, nil, CONNECTION_TIMEOUT)
+        socket.write("ERROR: connection timeout\n") rescue nil
+        return
+      end
+
       line = socket.gets
       return unless line
 
-      parts = line.strip.split(/\s+/)
-      # Last part may be --stderr-key=<key>
-      stderr_key = nil
-      parts.reject! do |p|
-        if p.start_with?("--stderr-key=")
-          stderr_key = p.split("=", 2).last
-          true
-        end
-      end
+      parts = Shellwords.split(line.strip)
+      return if parts.empty?
 
-      # Wait briefly for the stderr client to connect
-      stderr_io = nil
-      if stderr_key
-        5.times do
-          stderr_io = take_stderr_client(stderr_key)
-          break if stderr_io
-          sleep 0.01
-        end
-      end
+      # Grab the stderr socket if one is waiting
+      stderr_io = take_stderr_client
 
-      # Wire the socket as stdin/stdout and stderr socket as stderr for the CLI
-      old_stdin = $stdin
-      old_stdout = $stdout
-      old_stderr = $stderr
-      begin
-        $stdin = socket
-        $stdout = socket
-        $stderr = stderr_io || $stderr
-        Hotswap::CLI.start(parts)
-      ensure
-        $stdin = old_stdin
-        $stdout = old_stdout
-        $stderr = old_stderr
-      end
+      Hotswap::CLI.run(
+        parts,
+        stdin: socket,
+        stdout: socket,
+        stderr: stderr_io || $stderr
+      )
     rescue => e
       socket.write("ERROR: #{e.message}\n") rescue nil
     ensure

data/lib/hotswap/version.rb

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

data/lib/hotswap.rb

@@ -15,6 +15,6 @@ module Hotswap
     end
   end
 
-  self.socket_path = "tmp/sqlite3.sock"
-  self.stderr_socket_path = "tmp/sqlite3.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.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Brad Gessler