guard-unicorn 0.0.2 → 0.0.3

data/lib/guard/unicorn.rb

@@ -27,14 +27,13 @@ module Guard
     # @raise [:task_has_failed] when start has failed
     def start
       info "Starting Unicorn..."
-
       start_unicorn
     end
 
     # Called when `stop|quit|exit|s|q|e + enter` is pressed (when Guard quits).
     # @raise [:task_has_failed] when stop has failed
     def stop
-      info "Stopping everything"
+      info "Stopping Unicorn"
       stop_unicorn
     end
 
@@ -42,7 +41,7 @@ module Guard
     # This method should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
     # @raise [:task_has_failed] when reload has failed
     def reload
-      info "Stopping everything"
+      info "Reloading Unicorn"
       restart_unicorn
     end
 
@@ -88,15 +87,26 @@ module Guard
     def stop_unicorn
       return unless pid
 
-      Process.kill("QUIT", pid) if Process.getpgid(pid) 
+      begin
+        Process.kill("QUIT", pid) if Process.getpgid(pid) 
+
+        # Unicorn won't always shut down right away, so we're waiting for
+        # the getpgid method to raise an Errno::ESRCH that will tell us
+        # the process is not longer active.
+        sleep 1 while Process.getpgid(pid)
+      rescue Errno::ESRCH
+        # Don't do anything, the process does not exist
+      end
     end
 
     def pid
-      return @pid if @pid
-
+      # Favor the pid in the pidfile, since some processes
+      # might daemonize properly and fork twice.
       if File.exists?(@pid_path)
         @pid = File.open(@pid_path) { |f| f.gets.to_i } 
       end
+
+      @pid
     end
 
     def info(msg)

data/lib/guard/unicorn/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module UnicornVersion
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70251660352620 !ruby/object:Gem::Requirement
+  requirement: &70253598121000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251660352620
+  version_requirements: *70253598121000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70251660352160 !ruby/object:Gem::Requirement
+  requirement: &70253598120540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251660352160
+  version_requirements: *70253598120540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70251660351620 !ruby/object:Gem::Requirement
+  requirement: &70253598119960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251660351620
+  version_requirements: *70253598119960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70251660351040 !ruby/object:Gem::Requirement
+  requirement: &70253598119420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251660351040
+  version_requirements: *70253598119420
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70251660350540 !ruby/object:Gem::Requirement
+  requirement: &70253598118920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251660350540
+  version_requirements: *70253598118920
 description: Guard plug-in that allows you to restart Unicorn
 email:
 - andrei@andreimaxim.ro