cangrejo 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1552f977b329faa5f23355229c7c2ef0b85e40d
-  data.tar.gz: 5de51c9b1ba59ae7865e6623ad2857989725bd1b
+  metadata.gz: 9abef7ab7ea42eed000aebdc1935b7e615c6bd26
+  data.tar.gz: c4cbbfc74975a149136a57edb9d888073008cd97
 SHA512:
-  metadata.gz: c1bd5f81ad96ef9590e40d69574a5b48cd16b8dcc1a5e0255ab627b8b515d44ee613957a1d9988e63bd1530ce9be925a1c055fcacabafd42af02339cac3e1c65
-  data.tar.gz: 17d427f19cdabf44bc96e28de729089a0d38bda71f8dfa9af83ffe124bd0079c3475f35a7434409301a84371b1cfca1586850c91b4c72e179228797b3c3ca610
+  metadata.gz: 920d3b2b113c1c6d69354462e74493bfe941af3cd4b4438fda0129db07409d8d5cbc00383d39a5aab9a4b71dfbf1f41d8bed40b76e9b6da15bd7ab8893c30bc9
+  data.tar.gz: 4b3c05243deb477f1458aa7434f1210f7efd2da5d30ead60db3429b3344f95782c53b7a370914352bb354c7fc145a757174acc7e4909697465ea0d03f6f4d856

data/lib/cangrejo/support/launcher.rb

@@ -1,7 +1,11 @@
+require 'timeout'
+
 module Cangrejo
   module Support
     class Launcher
 
+      KILL_TIMEOUT = 5.0
+
       def initialize(_path, _options=nil)
         @path = _path
         @options = _options || []
@@ -20,10 +24,7 @@ module Cangrejo
       end
 
       def kill
-        unless @pid.nil?
-          Process.kill 'INT', @pid
-          Process.wait @pid, Process::WNOHANG
-        end
+        safe_kill @pid unless @pid.nil?
       end
 
     private
@@ -39,6 +40,19 @@ module Cangrejo
       def wait_for_socket
         sleep 0.1 while not File.exist? @socket_file
       end
+
+      def safe_kill _pid
+        begin
+          Timeout.timeout(KILL_TIMEOUT) do
+            Process.kill 'INT', _pid
+            Process.wait _pid
+          end
+        rescue Timeout::Error
+          Process.kill 9, _pid
+          Process.wait _pid # prevent zombies!
+        end
+      end
+
     end
   end
 end

data/lib/cangrejo/version.rb

@@ -1,3 +1,3 @@
 module Cangrejo
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cangrejo
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client