frontkick 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76198405d6525369aa2223db8121819a4f29441
-  data.tar.gz: 5595af1cdcf7d519531b2d7d16e08962d527ebb7
+  metadata.gz: 01d81fe27d75745783f882710005259ad6c906be
+  data.tar.gz: faf7d294bc7bda0101193a16c5cb4b4df68eb803
 SHA512:
-  metadata.gz: 6bb73fb14d7d3277b7355687d5ded5d892e5e6d6f2db4f85e647353acde583987634e3ba387e93cba2cbbdcdc7e9cf276cc9fc57e40609fc4975398b8c973c29
-  data.tar.gz: d79066eba2c55dd71e31a8347d5c641338847c2db47025d3a1e0069032ab0979321a4bc38ee82f61a631181d1246f5b35f6d7a9692249714e70707cc27261f66
+  metadata.gz: 515e97ebefd91655e3a0290e18c673a8582bc9bf32a8cdd7d4c1fcd7fe82adab6327bc97563c13b1cd0af411c7dc004e472da8160df9e41db6731174160849c7
+  data.tar.gz: 00251c8ad5cd01d07144bec5e7d8ed4be70c621924cee0b0ed2e9083fdfbeac2c0b3d7a957c46d3b54fdca4c7e2e58763fa02e6e0ddbda49b03a085e464f1772

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.2 (2013/06/23)
+
+Features:
+
+- Support timeout option
+
 # 0.0.1 (2013/06/23)
 
 First Version
+

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/frontkick/command.rb

@@ -1,22 +1,47 @@
 require 'benchmark'
 require 'open3'
 
-module FrontKick
+module Frontkick
   class Command
-    def self.exec(*cmd)
-      stdout = nil
-      stderr = nil
-      exit_code = nil 
+    def self.exec(cmd, opts = {})
+      stdout, stderr, exit_code, duration = nil
+      stdin, out, err, wait_thr, pid = nil
 
-      duration = Benchmark.realtime do
-        Open3.popen3(*cmd) do |stdin, out, err, wait_thr|
-          stdout = out.read
-          stderr = err.read
-          exit_code = wait_thr.value.exitstatus
+      cmd_array = cmd.kind_of?(Array) ? cmd : [cmd]
+      begin
+        timeout(opts[:timeout]) do # nil is for no timeout
+          duration = Benchmark.realtime do
+            stdin, out, err, wait_thr = Open3.popen3(*cmd_array)
+            pid = wait_thr.pid
+            stdout = out.read
+            stderr = err.read
+            exit_code = wait_thr.value.exitstatus
+            process_wait(pid)
+          end
         end
+      rescue Timeout::Error => e
+        Process.kill('SIGINT', pid)
+        exit_code = wait_thr.value.exitstatus
+        process_wait(pid)
+        duration = opts[:timeout]
+        stdout = ""
+        stderr = "pid:#{pid}\tcommand:#{cmd_array.join(' ')} is timeout!"
+      ensure
+        stdin.close unless stdin.nil?
+        out.close unless out.nil?
+        err.close unless err.nil?
+        wait_thr.kill unless wait_thr.stop?
       end
       
       CommandResult.new(stdout, stderr, exit_code, duration)
     end
+
+    def self.process_wait(pid)
+      begin
+        pid, status = Process.waitpid2(pid) # wait child processes finish
+      rescue Errno::ECHILD => e
+        # no child process
+      end
+    end
   end
 end

data/lib/frontkick/command_result.rb

@@ -1,4 +1,4 @@
-module FrontKick
+module Frontkick
   class CommandResult
     attr_accessor :stdout, :stderr, :duration
 

metadata

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