execute 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28113ced8b010d381572d185379b3bf300d7007
-  data.tar.gz: 0203575907f47275bc2d26627ed8c13b41f6120b
+  metadata.gz: ad3b97e193c7184c2f7a99a50a75fe11f165119e
+  data.tar.gz: 53c7970e467545d6c281e3255accd04bfc4cab40
 SHA512:
-  metadata.gz: d6c48031159ece03e145a8cb034159f917a66b4d7c2577551f99ae78bf8dbd2231ba0e79619e552c9c329072f0511127f5103cc51dd3783291509e36cde40c37
-  data.tar.gz: 459789548b0776501b03faa5845697231059e45825165391c5f10f160f5cb74f5a5a74b45c74a523d8dfea520fc1aedffb8ce2670dcfb6c8f578a2791bbac57e
+  metadata.gz: 9c80ac5d1c8cec9b7899cf738553855c85f078beb1ef6cae10d571f82b292862239ab7a1bab17b6becafd438ab8ec1b0480f8aa95048dc64ed4085a692b645b0
+  data.tar.gz: 69c17292b94cd09b55171ce098f2d820b7e1153c80cb1a56d1580e86ce1d7066e16603788e4bcb98df0f4b07e8e2682f8d21e527ec65f32ddac504ecb2856e60

data/lib/cmd.rb

@@ -25,11 +25,11 @@ class CMD < Hash
 	windows_command(self, self[:command])
   end
   
-#  def execute_as(username)
-#    raise "Unsupported on operating system #{RbConfig::CONFIG["host_os"]}" unless(RbConfig::CONFIG["host_os"].include?("mingw"))
-#    cmd = "runas /noprofile /savecred /user:#{username} \"#{self[:command]}\""
-#	wait_on_spawned_process(cmd) { windows_command(self, cmd) }
-#  end
+  def execute_as(username)
+    raise "Unsupported on operating system #{RbConfig::CONFIG["host_os"]}" unless(RbConfig::CONFIG["host_os"].include?("mingw"))
+    cmd = "runas /noprofile /savecred /user:#{username} \"#{self[:command]}\""
+	wait_on_spawned_process(self,cmd) { windows_command(self, cmd) }
+  end
   
   private
   def windows_command(hash, cmd)
@@ -38,7 +38,8 @@ class CMD < Hash
 		  
 	  output = {output: [], error:  [] }
 	  Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-		{:output => stdout,:error => stderr}.each do |key, stream|
+        hash[:pid] = wait_thr.pid 
+  	    {:output => stdout,:error => stderr}.each do |key, stream|
 		  Thread.new do
 			while wait_thr.alive? do
 			  if(!(char = stream.getc).nil?)
@@ -93,34 +94,37 @@ class CMD < Hash
 	  raise exception_text 
 	end
   end
-    
-  def wait_on_spawned_process(cmd)
-	pre_execute = Sys::ProcTable.ps
-	
-	pre_pids = []
-	pre_execute.each { |ps| pre_pids << ps.pid }
-
-    yield	
 
-	match = cmd.match(/\"(?<path>.+\.exe)/i)
-	return if(match.nil?)
+  def wait_on_spawned_process(hash, cmd)
+	yield	
+	post_execute = Sys::ProcTable.ps
 	
-	exe = match[:path]
-	exe = File.basename(exe)
-	#puts "Exe: #{exe}"
+	child_processes = []
+    post_execute.each { |ps| child_processes << ps.pid if(ps.include?(hash[:pid])) }
 	
-	msiexe_pid = 0
- 	post_execute = Sys::ProcTable.ps
-	post_execute.each do |ps| 
-	  msiexe_pid = ps.pid if((ps.name.downcase == exe.downcase) && pre_pids.index(ps.pid).nil?)
+	trap("INT") do 
+	  child_processes.each do |pid|
+	    s = Sys::ProcTable.ps(pid)
+		begin
+		  if(!s.nil?)
+			out_rd,out_wr = IO.pipe
+			err_rd,err_wr = IO.pipe
+		    system("taskkill /pid #{pid}", :out => out_wr, :err => err_wr)
+		  end
+		rescue Exception => e
+		end
+	  end
+	  exit
 	end
-
-	if(msiexe_pid != 0)
-	  loop do
-	    s = Sys::ProcTable.ps(msiexe_pid)
-		break if(s.nil?)
-		sleep(1)
+	
+	loop do
+	  all_exited = false
+	  child_processes.each do |pid|
+	    s = Sys::ProcTable.ps(pid)
+		all_exited = false unless(s.nil?)
 	  end
-	end  
-  end 
+	  break if(all_exited)
+	  sleep(0.2)
+	end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler