execute 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f810d7646d2b721fb71344f109e3243f4f4bc96
-  data.tar.gz: ee1aff1b3da2a980e752161aea388bcd7312c11f
+  metadata.gz: 8092c81d49b0155e507821497351080cd849e2fd
+  data.tar.gz: a7d996ca8087684e3011f54eb7ce5c44b66fc8ad
 SHA512:
-  metadata.gz: 3d5126fa636fc472c350e46137e7c4650d2bdbdf2955eef2b527c1c52d725c89222e1bb0c9937c1304e0d194f4f578462579bc6b0b757b21d76979922304a84b
-  data.tar.gz: 466bc8fb18db1cb87905c1708a9b8db1261e795d7aeca020ea122204df6567894bd3e008e6272722fc7f848fb69c966cead035cc303cf4d6e9e7ef9792581d00
+  metadata.gz: 48009fb0c04c7f0f624444053bb8fc16d80204d5a9d041b2dbe5d4e834f05d4f85d9c8f6d0d3848d6df00428b1634e4f73ce351c89cbae2256e2d65d6e941566
+  data.tar.gz: 0701ebd759826e07725561b604230e45728f57c33acff06294c639e571bc94e2bd97f912f0c021189568d3b9643695e66779aabb5a52ef1d14128e9914774a5b

data/lib/cmd.rb

@@ -22,29 +22,18 @@ class CMD < Hash
   end
 
   def execute
-	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(self,cmd) { windows_command(self, cmd) }
-  end
-  
-  private
-  def windows_command(hash, cmd)
 	begin
-	  puts cmd if(hash[:echo_command] || hash[:debug])
+	  puts self[:command] if(self[:echo_command] || self[:debug])
 		  
 	  output = {output: [], error:  [] }
-	  Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-        hash[:pid] = wait_thr.pid 
+	  Open3.popen3(self[:command]) do |stdin, stdout, stderr, wait_thr|
+        self[: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?)
   			    output[key] << char
-			    putc char if(hash[:echo_output])
+			    putc char if(self[:echo_output])
 			  else
 			    sleep(0.1)
 			  end
@@ -71,60 +60,27 @@ class CMD < Hash
         #end
 		
 		wait_thr.join
-	    hash[:output] = output[:output].join unless(output[:output].empty?)
-	    hash[:error] = output[:error].join unless(output[:error].empty?)
-		hash[:exit_code] = wait_thr.value.to_i
+	    self[:output] = output[:output].join unless(output[:output].empty?)
+	    self[:error] = output[:error].join unless(output[:error].empty?)
+		self[:exit_code] = wait_thr.value.to_i
 	  end
 	rescue Exception => e
-	  hash[:error] = "#{hash[:error]}\nException: #{e.to_s}"
-	  hash[:exit_code]=1 unless(hash[:exit_code].nil? || (hash[:exit_code] == 0))
+	  self[:error] = "#{self[:error]}\nException: #{e.to_s}"
+	  self[:exit_code]=1 unless(self[:exit_code].nil? || (self[:exit_code] == 0))
 	end
 	
-	if(hash[:debug])
-	  puts "command: #{cmd}" if(hash[:quiet])
-	  puts "output: #{hash[:output]}"
-	  puts "error: #{hash[:error]}"
-	  puts "exit_code: #{hash[:exit_code]}"
+	if(self[:debug])
+	  puts "command: #{self[:command]}" if(self[:quiet])
+	  puts "output: #{self[:output]}"
+	  puts "error: #{self[:error]}"
+	  puts "exit_code: #{self[:exit_code]}"
 	end
 	
-	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?)
+	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?)
 	  raise exception_text 
 	end
   end
-
-  def wait_on_spawned_process(hash, cmd)
-	yield	
-	post_execute = Sys::ProcTable.ps
-	
-	child_processes = []
-    post_execute.each { |ps| child_processes << ps.pid if(ps.include?(hash[:pid])) }
-	
-	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
-	
-	loop do
-	  all_exited = true
-	  child_processes.each do |pid|
-	    s = Sys::ProcTable.ps(pid)
-		all_exited = false unless(s.nil?)
-	  end
-	  break if(all_exited)
-	  sleep(0.2)
-	end
-  end
 end

data/lib/cmd_windows.rb

@@ -0,0 +1,44 @@
+require 'open3'
+require 'sys/proctable'
+require_relative ('cmd')
+
+class CMD < Hash
+  def execute_as(username)
+    self[:command] = "runas /noprofile /savecred /user:#{username} \"#{self[:command]}\""
+	wait_on_spawned_process(self) { self.execute }
+  end
+  
+  private
+  def wait_on_spawned_process(cmd)
+	yield	
+	post_execute = Sys::ProcTable.ps
+	
+	child_processes = []
+    post_execute.each { |ps| child_processes << ps.pid if(ps.include?(cmd[:pid])) }
+	
+	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
+	
+	loop do
+	  all_exited = true
+	  child_processes.each do |pid|
+	    s = Sys::ProcTable.ps(pid)
+		all_exited = false unless(s.nil?)
+	  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.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ files:
 - LICENSE
 - README.md
 - lib/cmd.rb
+- lib/cmd_windows.rb
 homepage: http://rubygems.org/gems/execute
 licenses:
 - Apache 2.0