guard-rack 1.2.2 → 1.3.0

data/lib/guard/rack/runner.rb

@@ -1,36 +1,30 @@
 require 'fileutils'
+require 'timeout'
+require 'spoon'
 
 module Guard
   class RackRunner
 
-    MAX_WAIT_COUNT = 10
-
-    attr_reader :options
+    attr_reader :options, :pid
 
     def initialize(options)
       @options = options
     end
 
-    def kill pid
-      system %{kill -INT #{pid}}
-      $?.exitstatus
-    end
-
     def start
       kill_unmanaged_pid! if options[:force_run]
-      run_rack_command!
-      wait_for_pid
+      @pid = run_rack_command!
+      true
     end
 
     def stop
-      # Rely on kill_unmanaged_pid if there's no pid file
-      return true unless File.file?(pid_file)
- 
-      if kill(pid) == 0
-        wait_for_no_pid
-        remove_pid_file
-      else
-        UI.info "Rackup exited with non-zero exit status whilst trying to stop."
+      # Rely on kill_unmanaged_pid if there's no pid
+      return true unless @pid
+
+      exitstatus = kill(@pid)
+      @pid = nil
+      if exitstatus && exitstatus != 0
+        UI.info "Rackup exited with non-zero exit status (#{exitstatus}) whilst trying to stop."
         return false
       end
 
@@ -41,86 +35,72 @@ module Guard
       stop and start
     end
 
-    def build_rack_command
-      rack_options = [
-				options[:config],
-        '--env', options[:environment],
-        '--port', options[:port],
-        '--pid', pid_file
-      ]
-
-      rack_options << '--daemonize' if options[:daemon]
-      rack_options << '--debug' if options[:debugger]
-      rack_options << ["--server",options[:server]] if options[:server]
-
-      %{sh -c 'cd #{Dir.pwd} && rackup #{rack_options.join(' ')} &'}
-    end
-
-    def pid_file
-      File.expand_path(".guard-rack-#{options[:environment]}.pid")
-    end
-
-    def pid
-      File.file?(pid_file) ? File.read(pid_file).to_i : nil
-    end
-
-    def remove_pid_file
-      FileUtils.rm pid_file if File.exist? pid_file
-    end
-
-    def sleep_time
-      options[:timeout].to_f / MAX_WAIT_COUNT.to_f
-    end
-
     private
-    
-    def run_rack_command!
-      system build_rack_command
-    end
 
-    def has_pid?
-      File.file?(pid_file)
-    end
+      def build_rack_command
+        command = %w{rackup}
+        command.push(
+          options[:config],
+          '--env', options[:environment].to_s,
+          '--port', options[:port].to_s
+        )
 
-    def wait_for_pid_action
-      sleep sleep_time
-    end
+        command << '--daemonize' if options[:daemon]
+        command << '--debug' if options[:debugger]
+        command.push("--server", options[:server].to_s) if options[:server]
 
-    def kill_unmanaged_pid!
-      if pid = unmanaged_pid
-        kill pid
-        wait_for_no_pid
-        remove_pid_file
+        command
       end
-    end
 
-    def unmanaged_pid
-      %x{lsof -n -i TCP:#{options[:port]}}.each_line { |line|
-        if line["*:#{options[:port]} "]
-          return line.split("\s")[1].to_i
+      def kill(pid, force = false)
+        result = -1
+
+        UI.debug("Trying to kill Rack (PID #{pid})...")
+        if !force
+          Process.kill("INT", pid)
+          begin
+            Timeout.timeout(options[:timeout]) do
+              _, status = Process.wait2(pid)
+              result = status.exitstatus
+              UI.debug("Killed Rack (Exit status: #{result})")
+            end
+          rescue Timeout::Error
+            UI.debug("Couldn't kill Rack with INT, switching to TERM")
+            force = true
+          end
         end
-      }
-      nil
-    end
 
-    private
+        if force
+          Process.kill("TERM", pid)
+        end
+
+        result
+      end
 
-      def wait_for_pid
-        wait_for_pid_loop
+      def run_rack_command!
+        command = build_rack_command
+        UI.debug("Running Rack with command: #{command.inspect}")
+        spawn(*command)
       end
 
-      def wait_for_no_pid
-        wait_for_pid_loop(false)
+      def spawn(* args)
+        Spoon.spawnp(* args)
       end
 
-      def wait_for_pid_loop(check_for_existince = true)
-        count = 0
-        while !(check_for_existince ? has_pid? : !has_pid?) && count < MAX_WAIT_COUNT
-          wait_for_pid_action
-          count += 1
+      def kill_unmanaged_pid!
+        if pid = unmanaged_pid
+          kill(pid, true)
         end
-        !(count == MAX_WAIT_COUNT)
       end
-      
+
+      def unmanaged_pid
+        %x{lsof -n -i TCP:#{options[:port]}}.each_line { |line|
+          if line["*:#{options[:port]} "]
+            return line.split("\s")[1].to_i
+          end
+        }
+        nil
+      end
+
   end
 end

data/lib/guard/rack/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module RackVersion
-    VERSION = '1.2.2'
+    VERSION = '1.3.0'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rack
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: spoon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: dblock@dblock.org
 executables: []
@@ -201,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3499392218067664332
+      hash: 474712234159174403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: