rexec 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e811d7d75e4759902a1c69dc41abd0c71b31c86f
-  data.tar.gz: 6bbc0bf83c1fed8e566d31ecefd3a2210989e813
+  metadata.gz: 37a6927e5affd75981f84d8e7a728d78146bc3e7
+  data.tar.gz: 0918b351565eeefe516e75512e93eb2a84af45ba
 SHA512:
-  metadata.gz: e832c5874f56ff603431ebd9d3f2aa5fcfa29cf20a31dd44ebc3240cb01cb71202fac639aa0d3ada607ae37e366654163bc2d9095038968ff2c130fcd12de03e
-  data.tar.gz: 5e7d867d3b05be1642c78768d1d765d10d01b70f06c028c0ed24b74848abf82b4f086203edb469c0e4ca8b0081ae6fa28288680f15358862febe394f2470f611
+  metadata.gz: b8303a4be5df0e6584b78b79ee0ec1d50260fc7a6150d0e3625f9a83bebcc96b221b8c3e5e615c44993195fa26fabac8cd6d105b46988c07be448d83eade5f2a
+  data.tar.gz: f43d7a09bd0d34fd6a6d82da32e38e25d4c5aa922f2118800dec78304199a75cf654f49acc427a4df5cb1e6c2426c0b96281408ef134735d4398fab84a3cd057

data/lib/rexec/daemon/controller.rb

@@ -188,17 +188,19 @@ module RExec
 				Process.kill("INT", pid)
 				sleep 0.1
 
+				sleep 1 if ProcessFile.running(daemon)
+
 				# Kill/Term loop - if the daemon didn't die easily, shoot
 				# it a few more times.
 				attempts = 5
 				while ProcessFile.running(daemon) and attempts > 0
-					sig = (attempts < 2) ? "KILL" : "TERM"
+					sig = (attempts >= 2) ? "KILL" : "TERM"
 
 					puts "Sending #{sig} to pid #{pid}...".color(:red)
 					Process.kill(sig, pid)
 
-					sleep 1
 					attempts -= 1
+					sleep 1
 				end
 
 				# If after doing our best the daemon is still running (pretty odd)...

data/lib/rexec/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module RExec
-	VERSION = "1.6.0"
+	VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rexec
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler