WindowsInstaller 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31fcaccb5e69f2740c980719dc8e3d6e562a7a2
-  data.tar.gz: 2499e97a98c149a8e5dde4496b72bc5310df87ee
+  metadata.gz: 359306bd86ef11f6e8f78c2b2d6d2420a97e72d0
+  data.tar.gz: bb63a1eafc15aafaa86b4352610d26a5dbdc65c2
 SHA512:
-  metadata.gz: f547f75af0f2f1fec05a38f9f6baf98362d8d59d8edc4c7ceeb049f26f2a3c50367efc0a88679675e3c2856af6d9031972924d9215d7123c693f6d2104e1849c
-  data.tar.gz: 5e5c0cb29ffdd11b546fe351bea8de693a5e304ce57871908d5d864ab978083a81645ac48ae770ef1b8c3ae148296328aa7b3a090f67f21f641cb6beba7359f2
+  metadata.gz: e3d628800ef1b2d8359f2f768fa47aadaabe006958e9f369b7698b7cfab7c7700e531174b9f6beb27eb2c6303a28417f00e5a617fad9d1bb82ee7dfce302fce7
+  data.tar.gz: 290b44b8290aa62f6911b1638de1494ab6f40d604951e58ee526f1178aa9fbd91810def216db3ce8c58e9db831600683127bd8e94dbe57ae5adf0d099ff24684

data/lib/WindowsInstaller.rb

@@ -35,6 +35,7 @@ class WindowsInstaller < Hash
 	cmd = "#{cmd} /i #{msi_file}"
 
 	msiexec(cmd)
+	raise "Failed to install msi_file: #{msi_file}" unless(msi_installed?(msi_file))
   end
 
   def uninstall_msi(msi_file)
@@ -45,14 +46,32 @@ class WindowsInstaller < Hash
   
   def uninstall_product_code(product_code)
     raise "#{product_code} is not installed" unless(product_code_installed?(product_code))
-
+ 
 	cmd = "msiexec.exe"
 	cmd = "#{cmd} #{self[:mode]}" if(has_key?(:mode))
 	cmd = "#{cmd} /x #{product_code}"
 	msiexec(cmd)
+	if(product_code_installed?(product_code))
+	  properties = installed_properties(product_code)
+      raise "Failed to uninstall #{properties['InstalledProductName']} #{properties['VersionString']}" 
+	end
   end
   
   private
+  def installed_properties(product_code)
+    installer = WIN32OLE.new('WindowsInstaller.Installer')
+	
+	hash = Hash.new
+	# known product keywords found on internet.  Would be nice to generate.
+	%w[Language PackageCode Transforms AssignmentType PackageName InstalledProductName VersionString RegCompany 
+	   RegOwner ProductID ProductIcon InstallLocation InstallSource InstallDate Publisher LocalPackage HelpLink 
+	   HelpTelephone URLInfoAbout URLUpdateInfo InstanceType].sort.each do |prop|
+	   value = installer.ProductInfo(product_code, prop)
+	   hash[prop] = value unless(value.nil? || value == '')
+	end
+	return hash
+  end
+ 
   def msi_properties(msi_file)
     raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
 
@@ -82,22 +101,30 @@ class WindowsInstaller < Hash
   end
   
   def msiexec(cmd)
-  	cmd = "runas /noprofile /savecred /user:#{self[:administrative_user]} \"#{cmd}\"" if(self.has_key?(:administrative_user))
-	
     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}\""
+	
 	pre_execute = Sys::ProcTable.ps
 	
-	pre_pids = {}
-	pre_execute.each { |ps| pre_pids[ps.pid] = ps }
+	pre_pids = []
+	pre_execute.each { |ps| pre_pids << ps.pid }
 	
-	command = CMD.new(cmd, cmd_options)
+	command = CMD.new(cmd, options)
 	command.execute
-	
+
 	msiexe_pid = 0
-	post_execute = Sys::ProcTable.ps
+ 	post_execute = Sys::ProcTable.ps
 	post_execute.each do |ps| 
-	  msiexe_pid = ps.pid if((ps.name.downcase == "msiexec.exe") && !pre_pids.has_key?(ps.pid))
+	  msiexe_pid = ps.pid if((ps.name.downcase == "msiexec.exe") && pre_pids.index(ps.pid).nil?)
 	end
 
 	if(msiexe_pid != 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: WindowsInstaller
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Kevin Marshall