frontkick 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c05169903b48aeb4fd103f0f8eeac55b2c0b670
-  data.tar.gz: fc7d0c173417b7f3f4c24b0551a35a3b43b7b534
+  metadata.gz: 3514cd020c4022cbe113d670b35b4a2b4112bf68
+  data.tar.gz: 53aa5b300c7c725ad9c00eebf94590c7aa048045
 SHA512:
-  metadata.gz: ea20bd4b9dddee6bb5ab47f43c9334ec0d6ce1cde77a9b6660110ce32351a6bf31f699dd72e5d5d757baa964ff0483606082b61131762e489d0da6132f807963
-  data.tar.gz: 3cd1984f02b98b548190c0a37843c2ceee42ee79ed89149f036f18f376f519c793fbcf0675c028c931b8c015e3883b411804d2a0751f00d2fe3cf8aa9e89782d
+  metadata.gz: 7a91a20a9782fe17a69b09ac0d3e1c09b1a2fa47bc0ce66b1d2498e5ad9fc44faa88e4b6694ad637deacb72d16a0e3cb9159a7bbd46f062c1709ed4e3666a84b
+  data.tar.gz: 630a6f90b0ce7d16f5d07b13e96b89928fe57ea90aecc766727a59279962919e49c1da6847b6d8e893068de43e9576dd98b99588d521b81629cb5f08e327a04e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.8 (2016/01/22)
+
+Fixes:
+
+- Fix kill_child option
+
 # 0.4.7 (2016/01/22)
 
 Enhancements:

data/Gemfile

@@ -2,3 +2,5 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'pry'
+gem 'pry-nav'

data/README.md

@@ -58,9 +58,10 @@ If you prefer to be blocked:
 
 On receiving INT and TERM signal, kill the kicked child process before exiting
 
-    Frontkick.exec("sleep 100", :kill_child => true)
+    Frontkick.exec(["sleep 100"], :kill_child => true)
 
 NOTE: This uses Kernel.trap inside.
+NOTE: Shoud use `[]` form, otherwirse `sh -c 'sleep 100'` is ran, and frotkick kills sh process, but sleep process remains
 
 ### Hint: Redirect stderr to stdout
 

data/lib/frontkick/command.rb

@@ -27,17 +27,14 @@ module Frontkick
             stdin.close
             pid = wait_thr.pid
 
-            trapped_signal = nil
             if opts[:kill_child]
-              trap_signal(pid) {|sig| trapped_signal = sig }
+              trap_signal(pid)
             end
 
             stdout = out_reader.value
             stderr = err_reader.value
             exit_code = wait_thr.value.exitstatus
             process_wait(pid)
-
-            exit_signal(trapped_signal) if trapped_signal
           end
         end
       rescue Frontkick::TimeoutLocal => e
@@ -60,23 +57,14 @@ module Frontkick
 
     def self.trap_signal(pid)
       trap :INT do
-        Process.kill(:INT, pid)
-        yield(:INT)
+        Process.kill(:TERM, pid)
+        process_wait(pid)
+        exit 130
       end
       trap :TERM do
         Process.kill(:TERM, pid)
-        yield(:TERM)
-      end
-    end
-
-    def self.exit_signal(signal)
-      case signal
-      when :INT
-        exit(130)
-      when :TERM
-        exit(143)
-      else
-        raise 'Non supported signal'
+        process_wait(pid)
+        exit 143
       end
     end
 

data/lib/frontkick/version.rb

@@ -1,3 +1,3 @@
 module Frontkick
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frontkick
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Naotoshi Seo