execute 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792b072f3492decab09d816547b3124be213c101
-  data.tar.gz: ceaecac7539819cc201eec6019027daf36196b36
+  metadata.gz: 7b28878be7892166a674abab1f00bb7919049a43
+  data.tar.gz: 15d599ee83edd61212cb3e29a79d785d598978f5
 SHA512:
-  metadata.gz: fe2fba3aac76f475db3491a01c64df80607e33227902c7ef87bcc13df502b6e8292e4ddf50247aeb132916661b6bf97e5fe194d0616abac7ac55cc0a7f9937b1
-  data.tar.gz: 5d1c9566d177ecab0d016ee47eb990fbdadbfd023496a198d2686ebecde4951a315c47b630dabbaab318ae582438e454555f2f44038badb2bf566d0ba7fd736e
+  metadata.gz: 36578b7eb8ee3e861eba87a16ff8c322fb6d3d644bec4153c75aca919f5a6b7f82677e5527f85f3387531396860c28236a59c255afd78f44b7098afbf8536149
+  data.tar.gz: 6948248f5a73c703543fec42dfdebea68070e280893d3fb19e3f8c5df4509e782d2be043d63fe7f5ae54313bd8d42bf890bd3c1eec9550e29cb69f3fa3bc8412

data/lib/cmd.rb

@@ -1,6 +1,5 @@
 require 'open3'
 require 'sys/proctable'
-require_relative 'IOAdapter.rb'
 
 class CMD < Hash
   private 
@@ -21,45 +20,84 @@ class CMD < Hash
   def self.default_options(hash)
 	hash.each { |key, value| @@default_options[key] = value}
   end
-  
+
   def execute
-    self[:output] = ''
-	self[:error] = ''
+	windows_command(self, self[:command])
+  end
+  
+  def execute_as(username)
+    raise "Unsported 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
+  
+  private
+  def windows_command(hash, cmd)
 	begin
-	  puts self[:command] if(self[:echo_command])
+	  puts cmd if(hash[:echo_command] || hash[:debug])
 		  
 	  output = {output: [], error:  [] }
-	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
+	  Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
 		{:output => stdout,:error => stderr}.each do |key, stream|
 		  Thread.new do
 			until(raw_line = stream.gets).nil? do
 			  output[key] << raw_line
-			  puts raw_line if(self[:echo_output])
+			  puts raw_line if(hash[:echo_output])
 			end
 		  end
 		end
 		wait_thr.join
-	    self[:output] = output[:output].join
-	    self[:error] = output[:error].join
-		self[:exit_code] = wait_thr.value.to_i
+	    hash[:output] = output[:output].join
+	    hash[:error] = output[:error].join
+		hash[: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))
+	  hash[:error] = "#{hash[:error]}\nException: #{e.to_s}"
+	  hash[:exit_code]=1 unless(hash[:exit_code].nil? || (hash[:exit_code] == 0))
 	end
 	
-	if(self[:debug])
-	  puts "command: #{self[:command]}" if(self[:quiet])
-	  puts "output: #{self[:output]}"
-	  puts "error: #{self[:error]}"
-	  puts "exit_code: #{self[:exit_code]}"
+	if(hash[:debug])
+	  puts "command: #{cmd}" if(hash[:quiet])
+	  puts "output: #{hash[:output]}"
+	  puts "error: #{hash[:error]}"
+	  puts "exit_code: #{hash[:exit_code]}"
 	end
 	
-	if((self[:exit_code] != 0) && !self[:ignore_exit_code])
-	  exception_text = "Exit code: #{self[:exit_code]}"
-	  exception_text = "#{exception_text}\n#{self[:error]}"
-	  exception_text = "#{exception_text}\n#{self[:output]}" if(self[:error].empty?)
+	if((hash[:exit_code] != 0) && !hash[:ignore_exit_code])
+	  exception_text = "Exit code: #{hash[:exit_code]}"
+	  exception_text = "#{exception_text}\n#{hash[:error]}"
+	  exception_text = "#{exception_text}\n#{hash[:output]}" if(hash[:error].empty?)
 	  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?)
+	
+	exe = match.named_captures['path']
+	exe = File.basename(exe)
+	#puts "Exe: #{exe}"
+	
+	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?)
+	end
+
+	if(msiexe_pid != 0)
+	  loop do
+	    s = Sys::ProcTable.ps(msiexe_pid)
+		break if(s.nil?)
+		sleep(1)
+	  end
+	end  
+  end 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execute
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: Class wrapper for system commands
 email: KCCKSMarshall@gmail.com
 executables: []
@@ -74,7 +88,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/IOAdapter.rb
 - lib/cmd.rb
 homepage: http://rubygems.org/gems/execute
 licenses:

data/lib/IOAdapter.rb

@@ -1,14 +0,0 @@
-require 'securerandom'
-require 'tempfile'
-class IOAdapter < DelegateClass(IO)
-  attr_accessor :output_buffer
-  def initialize(io)
-    __setobj__(io)
-	@output_buffer = []
-  end
-  
-  def write(string)
-	@output_buffer << string
-	self.__getobj__.write(string)
-  end
-end