execute 0.1.52 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a15d8efb84c0bca96acd3832af4c228aa810ea
-  data.tar.gz: 9991f75eade05a6952209962673fb70db38c7dca
+  metadata.gz: 5a81a615ca56e62d836536bba6830d919528f28d
+  data.tar.gz: 5c9e5fef10d7dc9ee3525ef034c38036d8b7da86
 SHA512:
-  metadata.gz: 3d965bdfefdb32473e7f59d02b79ac2b09801f9197a0de65aa1cbb3c6e8f3338cdbdeaecd7ca3d59273a060466df9782b39700c77b85c20a64c83372a3228d56
-  data.tar.gz: d5d35ed94ed6a13428434913bd13ccf9fd361ca5e7b3bce4c16a9e41485ce0b65df9b79e477612ebe750f14dc16c366d70ad040534bbaa1e71b1eaf778f12920
+  metadata.gz: ffa7fbb1f77e5ab512bafc105f5ddc830f860cad7c4acbf5cf83a84f49b91899992e7c7544f3f552da857f716a88b2347db54ac182ac82ae2bd2016e7a82fdf6
+  data.tar.gz: 69c962093a87bf7dbed0ec1a1cc7ecde6d3664449c795b67451ce04f5b69a5fbd29e431640a5cb36a0948714c3fa7d13bd3295de466fb9c4707813307c3f46bf

data/lib/cmd.rb

@@ -48,8 +48,9 @@ class CMD < Hash
 	end
 	
 	puts self[:command] if(self[:echo_command] || self[:debug])
-	system  
-    	
+	#call_popen  
+    call_capture
+	
 	if(self[:debug])
 	  puts "command: #{self[:command]}"
 	  puts "output: #{self[:output]}"
@@ -57,7 +58,7 @@ class CMD < Hash
 	  puts "exit_code: #{self[:exit_code]}"
 	end
 	
-	raise TimeoutError.new("Commnad '#{self[:command]}' timed out after #{self[:timeout]} seconds") if(key?(:timed_out) && self[:timeout_raise_error])
+	raise TimeoutError.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 = "Exit code: #{self[:exit_code]}"
@@ -67,7 +68,7 @@ class CMD < Hash
 	end
   end
 
-  def system
+  def call_popen
 	begin
       output = ''
 	  error = ''  
@@ -120,13 +121,57 @@ class CMD < Hash
 	  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
+		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] = ''
+	  elapsed_time = Benchmark.realtime do
+	    self[:output], self[:error], status = Open3.capture3(self[:command])
+	    self[:exit_code] = status.to_i	
+	  end
+	  	
+	  raise TimeoutError.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))
+	ensure
+	  self[:elapsed_time] = elapsed_time unless(elapsed_time.nil?)
+	end
+  end
+  def command_pid
+  	Sys::ProcTable.ps do |p| 
+	  if(p.ppid == $$) 
+		return self[:pid] = p.pid
+	  end
+	end
+
+	raise "Failed to find child process for command: '#{self[:command]}'"
+  end
   def interrupt
-    process = get_child_processes(self[:pid])
+	self[:pid] = command_pid unless(key?(:pid))
+    raise "Do not have a process id for #{self[:pid]}" unless(key?(:pid))
+    processes = get_child_processes(self[:pid])
 	
-	Sys::ProcTable.ps { |p| process << p  if(p.pid == self[:pid]) }
-
-	process.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?) 
+	Process.kill(self[:timeout_signal],self[:pid])
+	sleep(0.1)
+	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 = []

metadata

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