execute 0.1.69 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20a12fd7eb06ef5c2597c92e16b3f088cac1ad14
-  data.tar.gz: d1abe60ab9891517c11affc13e2a6c6aef52030c
+  metadata.gz: 8d820fe6edcfc7745cd41c4641ee684f3f04189d
+  data.tar.gz: 67bb0788cf8a8b05709f5aa731292907dee027f6
 SHA512:
-  metadata.gz: d6c8410345b477072d3c75e5d5fcfda774c0911714875c23d1d3a7958ce0bc580447ae39918a3d526288ebd7b8bad4698d1efefde496962b5c6ff4b1623b32b0
-  data.tar.gz: d35bd5190bab9d0910de09a48addb84ac9a238633dce1678107d549366f24ae5b5f043f76286ca0492dc82a75bb92bec7bb7af8489fb2c42a1e7d08540c8880d
+  metadata.gz: 7b59ee96cc2838709d35b124c6a8f6e85c645a583b1c1bddd773032a881c89f502012ecc86f7f49a4b3cac0d74be41a0e9c6a27b7114ec9b5b408a50bfaf35e7
+  data.tar.gz: 3d7e5eced8906cae24f7ef5dab897d21790fd8aef4fa870e820849478c135414fa0fbf7836bec9545baf30ed8c3690713462743a0915f1e5cef3cabb881fd67f

data/lib/execute.rb

@@ -85,24 +85,21 @@ class Execute < Hash
 		
 		unless(timeout.nil?)
 		  start_time = Time.now
-		  end_loop = stop_threads
 		  threads << Thread.new do 
 		    begin
-		      while wait_thr.alive? && !end_loop do
+		      while wait_thr.alive? do
 			    if((Time.now - start_time).to_f > timeout)
-				  self[:timed_out] = true
-				  mutex.synchronize { stop_threads = true }
+				  self[:timed_out] = true 
 				  interrupt
-				  Thread.exit
+		          mutex.synchronize {stop_threads = true }
 			    else
 			      sleep(1)
 			      Thread.pass
 			    end
-		        mutex.synchronize { end_loop = stop_threads }
+		        break if(stop_threads)
 			  end
-			rescue Exception => e
+			rescue Exception
 			  mutex.synchronize { stop_threads = true }
-			  Thread.exit			  
 			end
 		  end
         end
@@ -110,30 +107,29 @@ class Execute < Hash
   	    {:output => stdout,:error => stderr}.each do |key, stream|
           threads << Thread.new do		    
 		    begin
-		      end_loop = stop_threads 
 			  last_pass_time = Time.now
-		      while wait_thr.alive? && !end_loop do
-		        unless(stream.closed?)
-			      if((char = stream.getc).nil? || ((Time.now - last_pass_time).to_i > 30))
+		      while wait_thr.alive? do
+			    while !stream.closed? && 
+				      !(char = stream.getc).nil? do
+			      case key
+			        when :output
+			          output << char
+					  putc char if(self[:echo_output])
+			        when :error
+			          error << char
+			      end
+				  
+			      if(wait_thr.alive? && ((Time.now - last_pass_time).to_i > 15))
 					last_pass_time = Time.now
-				    sleep(0.1)
 					Thread.pass
-				  else
-			        case key
-			          when :output
-			            output << char
-					    putc char if(self[:echo_output])
-			          when :error
-			            error << char
-			        end
 				  end
 			    end
-				mutex.synchronize { end_loop = stop_threads }
+				break if(stop_threads)
+				sleep(0.1)
 			  end
-			  mutex.synchronize { stop_threads = true }
+			  mutex.synchronize { stop_threads = true }		      
 			rescue Exception
 			  mutex.synchronize { stop_threads = true }
-			  Thread.exit
 	        end
 		  end
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.69
+  version: 0.1.70
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler