execute 0.1.72 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d1f79bc465057309e7d9c2404bd100c4b7aa1f
-  data.tar.gz: 7389d6585865be0fb15455bebdcf63a5351ee6e6
+  metadata.gz: 55471a7bdfc605188b00b9398701e5eb7930ba5a
+  data.tar.gz: 65572161753f59536c950cb281ca4eadf5e7d7ec
 SHA512:
-  metadata.gz: a79946b707b1c0571a95fae17f92477dcb8ed6a86bea62def6c023477b067971c8389abc9c1773b57a40d68d088bc25c5d4bdf187ce5d0b219d6dd317e276219
-  data.tar.gz: b627f683659f1116f36171e06fe3e5dfeed57fa7e1e09f42abcb43081d84a4d19db462d23d0e981640c1f628212f70e0ab42394d8a6ed8bc6e014eec845faeb7
+  metadata.gz: e5dea0908aca1cf83e27a7442cf869ab40e2ed906eec4a7a55c291e742e3c7b68d0e687a46a0698e45099b590d0499176f75c5f0c07356bf482769c57628a3e6
+  data.tar.gz: 2158ac84626394f6a3d7d94bab3dc39335243a499a9bde908fcea1bc4628cfd6a3a486fec2ba2498057fb28d7c7758285019ab01c3dc7a4e628b8e32fda16ef1

data/lib/execute.rb

@@ -3,6 +3,9 @@ require 'sys/proctable'
 require 'timeout'
 require 'benchmark'
 
+class TimeoutException < Exception
+end
+
 class Execute < Hash
   private 
   @@default_options = { echo_command: true, echo_output: true, ignore_exit_code: false, debug: false }
@@ -59,7 +62,7 @@ class Execute < Hash
 	  puts "exit_code: #{self[:exit_code]}"
 	end
 	
-	raise TimeoutError.new("Command '#{self[:command]}' timed out after #{self[:timeout]} seconds") if(key?(:timed_out) && self[:timeout_raise_error])
+	raise TimeoutException.new("Command '#{self[:command]}' timed out after #{self[:timeout]} seconds") if(key?(:timed_out) && self[:timeout_raise_error])
 
 	if((self[:exit_code] != 0) && !self[:ignore_exit_code])
 	  exception_text = "Command: '#{self[:command]}'"
@@ -70,9 +73,9 @@ class Execute < Hash
 	end
   end
 
-  def call_popen
+def call_popen
 	begin
-      output = ''
+    output = ''
 	  error = ''  
 
 	  threads = []
@@ -82,9 +85,9 @@ class Execute < Hash
 	  timeout = self[:timeout] if(key?(:timeout))
 	  
 	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
-        self[:pid] = wait_thr.pid 
+      self[:pid] = wait_thr.pid 
 		
-		unless(timeout.nil?)
+		  unless(timeout.nil?)
 		  start_time = Time.now
 		  threads << Thread.new do 
 		    begin
@@ -104,85 +107,84 @@ class Execute < Hash
 			  mutex.synchronize { stop_threads = true }
 			end
 		  end
-        end
+    end
 		
-  	    {:output => stdout,:error => stderr}.each do |key, stream|
-          threads << Thread.new do		    
-		    begin
-			  last_pass_time = Time.now
+  	{:output => stdout,:error => stderr}.each do |key, stream|
+      threads << Thread.new do		    
+		  	begin
+			  	last_pass_time = Time.now
 		      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
+			    	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
-					Thread.pass
-				  end
+			        if(wait_thr.alive? && ((Time.now - last_pass_time).to_i > 15))
+					      last_pass_time = Time.now
+					      Thread.pass
+				      end
+			      end
+				    break if(stop_threads)
+				    sleep(0.1)
 			    end
-				break if(stop_threads)
-				sleep(0.1)
-			  end
-			  mutex.synchronize { stop_threads = true }		      
-			rescue Exception
-			  mutex.synchronize { stop_threads = true }
-	        end
+			    mutex.synchronize { stop_threads = true }		      
+			  rescue Exception
+			    mutex.synchronize { stop_threads = true }
+	      end
 		  end
 		end
 
-		threads.each { |thr| thr.join }
-		
+		threads.each { |thr| thr.join }		
 	    self[:output] = output unless(output.empty?)			    
-		self[:error] = error unless(error.empty?)
-		self[:exit_code] = wait_thr.value.to_i		
+		  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}"
-      self[:exit_code]=1 unless(self[:exit_code].nil? || (self[:exit_code] == 0))
+    self[:exit_code]=1 unless(self[:exit_code].nil? || (self[:exit_code] == 0))
 	end
-  end
-  def call_capture
+end
+def call_capture
 	begin
-      if(key?(:timeout))
+    if(key?(:timeout))
 	    start_time = Time.now
-		Thread.new do
-		  while !key?(:exit_code) do
-		    sleep(0.1)			  
-			if((Time.now - start_time).to_f > self[:timeout])
-			  self[:timed_out] = true
-			  interrupt
-			  sleep(0.1)
-			  break
-			end
-		  end
-        end
+		  Thread.new do
+		    while !key?(:exit_code) do
+		      sleep(0.1)			  
+			    if((Time.now - start_time).to_f > self[:timeout])
+			      self[:timed_out] = true
+			      interrupt
+			      sleep(0.1)
+			    break
+			    end
+		    end
+      end
 	  end
 
-	  self[:output] = self[:error] = ''
+		self[:output] = self[:error] = ''
 	  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?)
 	  
-	  raise TimeoutError.new("Command '#{self[:command]}' timed out after #{self[:timeout]} seconds") if(key?(:timed_out) && self[:timeout_raise_error])
+	  raise TimeoutException.new("Command '#{self[:command]}' timed out after #{self[:timeout]} seconds") if(key?(:timed_out) && self[:timeout_raise_error])
 	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
+end
   
-  def []=(key,value)
-    mutex = Mutex.new
+def []=(key,value)
+  mutex = Mutex.new
 	mutex.synchronize { super(key, value) }
-  end
+end
 
-  def [](key)
+def [](key)
     value = nil
     mutex = Mutex.new
 	mutex.synchronize { value = super(key) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.72
+  version: 0.1.73
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Class wrapper for system commands