execute 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50979d85b76131a887a010d6c3d166c6d8210d8c
-  data.tar.gz: ae27c5d9262f350ee15f11c2244b685ac22342c9
+  metadata.gz: 9e53805a153153e7e3725988c6a5996c39a0bf8f
+  data.tar.gz: ad3c028e120da725a0107b02f58f79e376a0f49e
 SHA512:
-  metadata.gz: d466768a2f3ba27561e38d55b772ff1f682ee1495462f11dbd34409ce705767dd7dc15c95cca8cbbc5b5656476ce05b8e02825a0926418825711c8f095425d71
-  data.tar.gz: d0a0aba93cd1a5ac38ea6607c0ddbbd27fb191b198dba8aa198f71a97c4ccf1b8f630d2483dbbd5b0ceb45bab0d30e1ed128ddaa4663d0b8d88890223b884295
+  metadata.gz: 36063ba89c1baeba1689619cd691c34acf236da671c71dae63745f89fbbdc408d05b6ca6f3f68e8b7ef67fca3e343abe913cd46ed476da0dc626dcf5d87de6ee
+  data.tar.gz: 5e78c0d9cb7304b976a22f3bee9250b3639be08dcd24da132811505ac6b45cfc6540197062107b691a2a3fc179387a2eca77101edd9cbc42354ba2b5fd13b963

data/lib/cmd.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'sys/proctable'
+require_relative 'timeout_error.rb'
 
 class CMD < Hash
   private 
@@ -43,6 +44,8 @@ class CMD < Hash
 	  exception_text = "#{exception_text}\nOutput: '#{self[:output]}'"
 	  raise StandardError.new(exception_text) 
 	end
+	
+	raise TimedOutError.new(self[:command], self[:timeout]) if(key?(:timed_out))
   end
 
   def system
@@ -54,9 +57,23 @@ class CMD < Hash
 	  
 	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
         self[:pid] = wait_thr.pid 
+		
+		if(key?(:timeout))
+		  start_time = Time.now
+		  Thread.new do
+		    while wait_thr.alive? do
+ 		      sleep(0.1)
+			  if((Time.now - start_time).to_f > self[:timeout])
+				self[:timed_out] = true
+				wait_thr.kill
+			  end
+			end
+		  end
+        end
+		
   	    {:output => stdout,:error => stderr}.each do |key, stream|
           Thread.new do			    
-		    while wait_thr.alive? do
+		    while wait_thr.alive? && !key?(:timed_out) do
 		      if(!(char = stream.getc).nil?)
 			    case key
 			      when :output
@@ -75,9 +92,9 @@ class CMD < Hash
 
 		wait_thr.join
 
-	    self[:output] = output unless(output.empty?)
-	    self[:error] = error unless(error.empty?)
-		self[:exit_code] = wait_thr.value.to_i
+	    self[:output] = output unless(output.empty?)			    
+		self[:error] = error unless(error.empty?)
+		self[:exit_code] = wait_thr.value.to_i		
 	  end
 	rescue Exception => e
 	  self[:error] = "#{self[:error]}\nException: #{e.to_s}"

data/lib/timeout_error.rb

@@ -0,0 +1,5 @@
+class TimedOutError < StandardError
+  def initialize(cmd, seconds)
+    @message = "#{cmd} timed out after #{seconds} seconds"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - README.md
 - lib/cmd.rb
 - lib/cmd_windows.rb
+- lib/timeout_error.rb
 homepage: http://rubygems.org/gems/execute
 licenses:
 - Apache 2.0