WindowsInstaller 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd879c87274fbea755e4c580a96ff78f2d8a394c
-  data.tar.gz: fc5b02582947c81dfe892490ee4cc4970b9913a1
+  metadata.gz: ed4c11b8ab31668f99fdde77e82b442dfdbd85ab
+  data.tar.gz: d9fd41348525b7a3efbc85cb241e513a50ee81fd
 SHA512:
-  metadata.gz: cdacfe3fef17751824e598202fb71ab216188ce7e55f3b33af015183e2c2d1337380fe335e45f82d22c520314782b90452ae42297b02fa7a4b3b4eea7597c625
-  data.tar.gz: eea56240bdecc482e6ae1ca04bc965aac6f884773bb2f0e4b106e93e48fe25ccdb30e9b44aa33c69e48d6881ee3cee527a4a52e159494913c8db8628f8977725
+  metadata.gz: 6ff033255a4bbd424330a44ac16a8cd87e31aa4b9182c312ae99d22e6fc292cc295e5ffccefc3a91c857af7652963a66c19247639c68e2a83269d8104c226cf0
+  data.tar.gz: ed5c94b06dccc63dd6414559930759bbb0c97a932ae59bb9b13b2f5470c15060b8f86e22fd9a8c88852aab80dbd58e9c1a4739ee9d555c4763c938de5f09e8f4

data/lib/WindowsInstaller.rb

@@ -1,6 +1,7 @@
 require 'win32ole'
-require 'cmd'
+require 'cmd_windows'
 require 'sys/proctable'
+require 'tempfile'
 
 class WindowsInstaller < Hash
   @@default_options = {mode: '/passive'}
@@ -14,7 +15,7 @@ class WindowsInstaller < Hash
 	hash.each { |key,value| @@default_options[key] = value }
   end
   
-  def msi_installed?(msi_file)
+  def msi_installed?(msi_file) 
     info = msi_properties(msi_file)
     return product_code_installed?(info['ProductCode'])
   end
@@ -96,50 +97,32 @@ class WindowsInstaller < Hash
 	  
 	installer.ole_free
 	installer = nil
-	  
+
 	return properties
   end
   
-  def msiexec(cmd)
-    cmd_options = { echo_command: false, echo_output: false} unless(self[:debug])
-	if(self.has_key?(:administrative_user))
-	  msiexec_admin(cmd, cmd_options)
-	else
-	  command = CMD.new(cmd, cmd_options)
-	  command.execute
-	end
-  end
-
-  def msiexec_admin(cmd, options)
-    cmd = "runas /noprofile /savecred /user:#{self[:administrative_user]} \"#{cmd}\""
-	command = CMD.new(cmd, options)
-	wait_on_spawned(cmd) { cmd.execute }
+  def msiexec(command)	
+    cmd = CMD.new(command)
+	cmd.execute
   end
   
-  def wait_on_spawned_process(cmd)
-	pre_execute = Sys::ProcTable.ps
-	
-	pre_pids = []
-	pre_execute.each { |ps| pre_pids << ps.pid }
-
-    yield	
+  private
+  def msiexec_block
+    original_value = '0'
+	raise ':administrative_user must be set to setup always_install_elevated priviledges' if(self[:always_installed_elevated] && self.has_key?[:administrative_user])
+	register_reg_file('1') if(self[:always_install_elevated])
+	yield
+	register_reg_file(current_value) if(self[:always_install_elevated])
+  end
 
-	exe = cmd[:command].match(/\\(?<path>.+\.exe)/i).named_captures['path']
-	exe = File.basename(exe)
-	#puts "Exe: #{exe}"
+  def register_reg_file(value)
+	lib_directory = File.dirname(__FILE__)
+	reg_file = File.read("#{lib_directory}/always_install_elevated_template.reg")
+	reg_file=reg_file.gsub(/VALUE/,value)
+	file = Tempfile.new('wininst')
+	file.write(reg_file)
 	
-	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 
+	cmd = CMD.new("#{ENV['SystemRoot']}\\System32\\regedit.exe /s #{file.path}", { echo_command: true })
+	cmd.execute_as(self[:administrative_user])
+  end
 end

metadata

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