spring 0.0.3 → 0.0.4

data/lib/spring.rb

@@ -1,7 +1,6 @@
 require "rbconfig"
 require "socket"
 require "pty"
-require "io/console"
 
 require "spring/version"
 require "spring/sid"
@@ -16,6 +15,8 @@ class Spring
     "-e", "Spring::Server.boot"
   ]
 
+  FORWARDED_SIGNALS = %w(INT QUIT USR1 USR2 INFO)
+
   def self.run(args)
     exit new.run(args)
   end
@@ -58,13 +59,6 @@ class Spring
     server.send_io client
     server.puts rails_env_for(args.first)
 
-    status = server.read(1)
-
-    server.close
-    client.close
-
-    return false unless status == "0"
-
     application.send_io STDOUT
     application.send_io STDERR
     application.send_io stdin_slave
@@ -76,13 +70,25 @@ class Spring
       application.write arg
     end
 
-    # FIXME: receive exit status from server
-    application.read
-    true
+    pid = server.gets.chomp
+
+    # We must not close the client socket until we are sure that the application has
+    # received the FD. Otherwise the FD can end up getting closed while it's in the server
+    # socket buffer on OS X. This doesn't happen on Linux.
+    client.close
+
+    if pid.empty?
+      false
+    else
+      forward_signals(pid.to_i)
+      application.read # FIXME: receive exit status from server
+      true
+    end
   rescue Errno::ECONNRESET
     false
   ensure
     application.close if application
+    server.close if server
   end
 
   private
@@ -97,21 +103,24 @@ class Spring
     end
   end
 
-  # FIXME: need to make special chars (e.g. arrow keys) work
   def stdin_slave
     master, slave = PTY.open
-    master.raw!
 
-    Thread.new {
-      until STDIN.closed?
-        # This makes special chars work, but has some weird side-effects that
-        # I need to figure out.
-        # master.write STDIN.getch
+    # Sadly I cannot find a way to achieve this without shelling out to stty, or
+    # using a C extension library. [Ruby does not have direct support for calling
+    # tcsetattr().] We don't want to use a C extension library so
+    # that spring can be used by Rails in the future.
+    system "stty -icanon -echo"
+    at_exit { system "stty sane" }
 
-        master.write STDIN.read(1)
-      end
-    }
+    Thread.new { master.write STDIN.read(1) until STDIN.closed? }
 
     slave
   end
+
+  def forward_signals(pid)
+    (FORWARDED_SIGNALS & Signal.list.keys).each do |sig|
+      trap(sig) { Process.kill(sig, pid) }
+    end
+  end
 end

data/lib/spring/application.rb

@@ -21,7 +21,9 @@ class Spring
 
       @stdout = IO.new(STDOUT.fileno)
       @stderr = IO.new(STDERR.fileno)
-      @stdin  = IO.new(STDIN.fileno)
+      @stdin  = File.open('/dev/null', 'r')
+
+      STDIN.reopen(@stdin)
     end
 
     def start
@@ -46,17 +48,7 @@ class Spring
     def run
       loop do
         watch_application
-
-        client = manager.recv_io(UNIXSocket)
-
-        # Confirm that we have received the client socket. This is necessary on OS X
-        # to prevent a timing error. The client needs to keep the FD that we are receiving
-        # open until it has been received here. Unlike on Linux, it's not sufficient for
-        # the FD to just be in the socket buffer, it has to actually get received at this
-        # end before it can be closed by the client.
-        manager.puts
-
-        serve client
+        serve manager.recv_io(UNIXSocket)
       end
     end
 
@@ -77,7 +69,13 @@ class Spring
         ActionDispatch::Reloader.cleanup!
         ActionDispatch::Reloader.prepare!
 
-        Process.wait(fork { command.call(args) })
+        pid = fork {
+          IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
+          command.call(args)
+        }
+
+        manager.puts pid
+        Process.wait pid
       end
     ensure
       client.puts

data/lib/spring/application_manager.rb

@@ -29,10 +29,7 @@ class Spring
       @pid
     end
 
-    # The return value of this method indicates whether or not the application
-    # successfully received the client. It might not successfully receive the
-    # client if e.g. the application has an exception during initialization, causing
-    # the application process to die.
+    # Returns the pid of the process running the command, or nil if the application process died.
     def run(client)
       @client = client
 
@@ -49,11 +46,11 @@ class Spring
           start
           child.send_io @client
         end
-
-        child.gets
       end
+
+      child.gets.chomp.to_i # get the pid
     rescue Errno::ECONNRESET, Errno::EPIPE
-      false
+      nil
     ensure
       @client.close
       @client = nil

data/lib/spring/env.rb

@@ -3,6 +3,8 @@ require "spring/sid"
 require "fileutils"
 
 class Spring
+  IGNORE_SIGNALS = %w(INT QUIT)
+
   class Env
     attr_reader :root
 

data/lib/spring/server.rb

@@ -18,9 +18,9 @@ class Spring
     end
 
     def boot
-      # Ignore SIGINT, otherwise the user typing ^C on the command line
-      # will kill the background server.
-      trap("INT", "IGNORE")
+      # Ignore SIGINT and SIGQUIT otherwise the user typing ^C or ^\ on the command line
+      # will kill the server/application.
+      IGNORE_SIGNALS.each { |sig| trap(sig,  "IGNORE") }
 
       set_exit_hook
       write_pidfile
@@ -33,11 +33,7 @@ class Spring
       app_client = client.recv_io
       rails_env  = client.gets.chomp
 
-      if @applications[rails_env].run(app_client)
-        client.write "0"
-      else
-        client.write "1"
-      end
+      client.puts @applications[rails_env].run(app_client)
     end
 
     def set_exit_hook

data/lib/spring/version.rb

@@ -1,3 +1,3 @@
 class Spring
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport