execute 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e53805a153153e7e3725988c6a5996c39a0bf8f
-  data.tar.gz: ad3c028e120da725a0107b02f58f79e376a0f49e
+  metadata.gz: 38fb4647be1c94c5513f80514adde8b97b618eb9
+  data.tar.gz: 02125021c9178df1f7c4944abdee1cd64c77b19e
 SHA512:
-  metadata.gz: 36063ba89c1baeba1689619cd691c34acf236da671c71dae63745f89fbbdc408d05b6ca6f3f68e8b7ef67fca3e343abe913cd46ed476da0dc626dcf5d87de6ee
-  data.tar.gz: 5e78c0d9cb7304b976a22f3bee9250b3639be08dcd24da132811505ac6b45cfc6540197062107b691a2a3fc179387a2eca77101edd9cbc42354ba2b5fd13b963
+  metadata.gz: f85781a0f832f5bdb25cf4e880dcb659725fd826b1e1d74ca8f32f92a35d47a36212c11bbea3296eb08b9554245a4d567051d591713e11250266285aa4b19995
+  data.tar.gz: 13d94191b6c1cb315871be2a637b0b9a18847e46947a17ce1d4f0e12f48c409df4e298e97cde22a6e12e6facb931303010a4d484bdbfdf13f9caa31f8f9f65b3

data/lib/cmd.rb

@@ -38,14 +38,13 @@ class CMD < Hash
 	  puts "exit_code: #{self[:exit_code]}"
 	end
 	
+	raise TimeoutError.new(self[:command], self[:timeout]) if(key?(:timed_out))
 	if((self[:exit_code] != 0) && !self[:ignore_exit_code])
 	  exception_text = "Exit code: #{self[:exit_code]}"
 	  exception_text = "#{exception_text}\nError: '#{self[:error]}'"
 	  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
@@ -65,7 +64,8 @@ class CMD < Hash
  		      sleep(0.1)
 			  if((Time.now - start_time).to_f > self[:timeout])
 				self[:timed_out] = true
-				wait_thr.kill
+				Process.kill('KILL',wait_thr.pid)
+				sleep(0.1)
 			  end
 			end
 		  end

data/lib/timeout_error.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.39
 platform: ruby
 authors:
 - Kevin Marshall