execute 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38fb4647be1c94c5513f80514adde8b97b618eb9
-  data.tar.gz: 02125021c9178df1f7c4944abdee1cd64c77b19e
+  metadata.gz: 061d92584632aa290c94c0b57161ad77951492ea
+  data.tar.gz: b76a1c1fe4ec10e05679e78e94d6c3b8e89cb714
 SHA512:
-  metadata.gz: f85781a0f832f5bdb25cf4e880dcb659725fd826b1e1d74ca8f32f92a35d47a36212c11bbea3296eb08b9554245a4d567051d591713e11250266285aa4b19995
-  data.tar.gz: 13d94191b6c1cb315871be2a637b0b9a18847e46947a17ce1d4f0e12f48c409df4e298e97cde22a6e12e6facb931303010a4d484bdbfdf13f9caa31f8f9f65b3
+  metadata.gz: 20a8bd82b602a3768b7a23e7a8527fca44b240ff5651071ed08839bf1760a64499fb4af2631582237a29856668e21ebc27d464393916bc3e5f6b037c6e8b48c8
+  data.tar.gz: 978cc09e2b15a4315110742343cd3d1ab37e16eab5dfbeae704052d459ccecd7fcb1c467d36885db52b833cae933c34f4e769f99b3c4bc6c9f1803d8085304fe

data/lib/cmd.rb

@@ -12,6 +12,25 @@ class CMD < Hash
    self[:output] = ''
    self[:error] = ''
    
+   #1) SIGHUP       2) SIGINT       3) SIGQUIT      4) SIGILL
+   #5) SIGTRAP      6) SIGABRT      7) SIGBUS       8) SIGFPE
+   #9) SIGKILL     10) SIGUSR1     11) SIGSEGV     12) SIGUSR2
+   #13) SIGPIPE     14) SIGALRM     15) SIGTERM     17) SIGCHLD
+   #18) SIGCONT     19) SIGSTOP     20) SIGTSTP     21) SIGTTIN
+   #22) SIGTTOU     23) SIGURG      24) SIGXCPU     25) SIGXFSZ
+   #26) SIGVTALRM   27) SIGPROF     28) SIGWINCH    29) SIGIO
+   #30) SIGPWR      31) SIGSYS      34) SIGRTMIN    35) SIGRTMIN+1
+   #36) SIGRTMIN+2  37) SIGRTMIN+3  38) SIGRTMIN+4  39) SIGRTMIN+5
+   #40) SIGRTMIN+6  41) SIGRTMIN+7  42) SIGRTMIN+8  43) SIGRTMIN+9
+   #44) SIGRTMIN+10 45) SIGRTMIN+11 46) SIGRTMIN+12 47) SIGRTMIN+13
+   #48) SIGRTMIN+14 49) SIGRTMIN+15 50) SIGRTMAX-14 51) SIGRTMAX-13
+   #52) SIGRTMAX-12 53) SIGRTMAX-11 54) SIGRTMAX-10 55) SIGRTMAX-9
+   #56) SIGRTMAX-8  57) SIGRTMAX-7  58) SIGRTMAX-6  59) SIGRTMAX-5
+   #60) SIGRTMAX-4  61) SIGRTMAX-3  62) SIGRTMAX-2  63) SIGRTMAX-1
+   #64) SIGRTMAX
+   self[:timeout_signal] = 9
+   self[:timeout_raise_error] = true
+   
    @@default_options.each { |key, value| self[key] = value}
    options.each { |key, value| self[key] = value} unless(options.nil?)
    self[:command]=cmd
@@ -38,7 +57,8 @@ class CMD < Hash
 	  puts "exit_code: #{self[:exit_code]}"
 	end
 	
-	raise TimeoutError.new(self[:command], self[:timeout]) if(key?(:timed_out))
+	raise TimeoutError.new(self[:command], self[:timeout]) if(key?(:timed_out) && self[:timeout_raise_error])
+
 	if((self[:exit_code] != 0) && !self[:ignore_exit_code])
 	  exception_text = "Exit code: #{self[:exit_code]}"
 	  exception_text = "#{exception_text}\nError: '#{self[:error]}'"
@@ -64,7 +84,7 @@ class CMD < Hash
  		      sleep(0.1)
 			  if((Time.now - start_time).to_f > self[:timeout])
 				self[:timed_out] = true
-				Process.kill('KILL',wait_thr.pid)
+				interrupt
 				sleep(0.1)
 			  end
 			end
@@ -104,5 +124,12 @@ class CMD < Hash
 	  self[:exit_code]=1 unless(self[:exit_code].nil? || (self[:exit_code] == 0))
 	end
   end
-  # Open3.capture3 hung on runas
+  def interrupt
+    process = []
+	Sys::ProcTable.ps { |p| process << p  if(p.ppid == 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?) 
+  end
 end

metadata

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