execute 0.1.60 → 0.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef06380e0ee0edf326fa8418bc8c2c8b49b646b
-  data.tar.gz: 5e19c0139037ea6b21b88f66b66bc8cf6210913c
+  metadata.gz: c03b6064b5618dfe687c78adc1aafa012c1442ca
+  data.tar.gz: a6af42c420a9a50f1c35e9e3fbe576aa9cefba23
 SHA512:
-  metadata.gz: 235a92e95e683b3c007fe903f7cb3a4bca903897ae321a4e5236a33b7366ead853904e4a89b029f116f13b4080a7b05295827bed4aa8e7135c318767a622e7fb
-  data.tar.gz: 9d43f1145228df94a3ebd8a5197211bf563be3fe96afb533887ae6a37f6f1e580d093d5b260ee689b42b1e3555aeebc0ccb0c15ef8df9570a5e3297e0492ef65
+  metadata.gz: b2dbd1f768929fb92cdd344bc8d57c733e79a2ad964b30c450116a3458e3f1e6c1356894561dca5cb1fdf988199767d8d34ea67ec1a43ca6e49b81b195add165
+  data.tar.gz: 306ae3dda19c7ca8bcfc984963918385c443d7808f27b7687428258cbe0b33b234c831a4f406cf7efc2d760919fca4db43b053fe5f229566f54a37afc7445f1f

data/lib/cmd.rb

@@ -49,8 +49,8 @@ class CMD < Hash
 	end
 	
 	puts self[:command] if(self[:echo_command] || self[:debug])
-	call_popen  
-    #call_capture
+	self[:elapsed_time] = Benchmark.realtime { call_popen }
+	#self[:elapsed_time] = Benchmark.realtime { call_capture }
 	
 	if(self[:debug])
 	  puts "command: #{self[:command]}"
@@ -73,7 +73,6 @@ class CMD < Hash
 	begin
       output = ''
 	  error = ''  
-	  Thread.abort_on_exception = true
 	  mutex = Mutex.new
 	  
 	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
@@ -83,11 +82,10 @@ class CMD < Hash
 		  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
 				interrupt
-				sleep(0.1)
+				Thread.stop
 			  end
 			end
 		  end
@@ -95,18 +93,22 @@ class CMD < Hash
 		
   	    {:output => stdout,:error => stderr}.each do |key, stream|
           Thread.new do			    
-		    while wait_thr.alive? && !key?(:timed_out) do
-		      if(!stream.closed? && !(char = stream.getc).nil?)
-			    case key
-			      when :output
-			        output << char
-					putc char if(self[:echo_output])
-			      when :error
-			        error << char
+		    begin
+		      while wait_thr.alive? && !key?(:timed_out) && !@stop_threads do
+		        unless(stream.closed?)
+			      unless((char = stream.getc).nil?)
+			        case key
+			          when :output
+			            output << char
+					    putc char if(self[:echo_output])
+			          when :error
+			            error << char
+			        end
+				  end
 			    end
-		      else
-		        sleep(0.1)
 			  end
+			rescue IOError
+			  Thread.stop
 	        end
 		  end
 		end
@@ -117,16 +119,12 @@ class CMD < Hash
 		self[:error] = error unless(error.empty?)
 		self[:exit_code] = wait_thr.value.to_i		
 	  end
-	rescue Interrupt => e
-	  interrupt
-	  raise e
 	rescue Exception => e
 	  self[:error] = "#{self[:error]}\nException: #{e.to_s}"
 	  self[:exit_code]=1 unless(self[:exit_code].nil? || (self[:exit_code] == 0))
 	end
   end
   def call_capture
-    elapsed_time = nil
 	begin
       if(key?(:timeout))
 	    start_time = Time.now
@@ -144,10 +142,8 @@ class CMD < Hash
 	  end
 
 	  self[:output] = self[:error] = ''
-	  elapsed_time = Benchmark.realtime do
-	    self[:output], self[:error], status = Open3.capture3(self[:command])
-	    self[:exit_code] = status.to_i	
-	  end
+	  self[:output], self[:error], status = Open3.capture3(self[:command])
+	  self[:exit_code] = status.to_i	
 	  
 	  puts self[:output] if(self[:echo_output] && !self[:output].empty?)
 	  
@@ -155,8 +151,6 @@ class CMD < Hash
 	rescue Exception => e
 	  self[:error] = "#{self[:error]}\nException: #{e.to_s}"
 	  self[:exit_code]=1 unless(!self[:exit_code].nil? || (self[:exit_code] == 0))
-	ensure
-	  self[:elapsed_time] = elapsed_time unless(elapsed_time.nil?)
 	end
   end
   def command_pid
@@ -173,12 +167,12 @@ class CMD < Hash
     raise "Do not have a process id for #{self[:pid]}" unless(key?(:pid))
     processes = get_child_processes(self[:pid])
 	
-	Process.kill(self[:timeout_signal],self[:pid])
-	sleep(0.1)
+	Process.kill(self[:timeout_signal], self[:pid])
+	Process.waitpid(self[:pid]) unless(Sys::ProcTable.ps(self[:pid]).nil?) 
+	
 	processes.each { |p| Process.kill(self[:timeout_signal],p.pid) unless(Sys::ProcTable.ps(p.pid).nil?) }
-	#
-	#Process.waitpid(self[:pid]) unless(Sys::ProcTable.ps(self[:pid]).nil?) 
   end
+
   def get_child_processes(pid)
 	processes = []
 	Sys::ProcTable.ps do |p| 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.60
+  version: 0.1.62
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler