WindowsInstaller 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50168f29934c54d5055263e042a07814d3479e2f
-  data.tar.gz: 6497bc6f5c0d0be1059fa99bc0c3c7b69c10527a
+  metadata.gz: b7fd5c6b3bb1348c6ed0594ed92209a7d62f7c15
+  data.tar.gz: f86696a2ac7e66865941c57b829f501b23080d5d
 SHA512:
-  metadata.gz: 5098c0504690cdb14bfb61d53bad1222db49012239cb5d2fbe2c0e643c178889c601f9f4bfd5723e24003a8bf6261f406d60c21115e4cb42f294ea20994753e2
-  data.tar.gz: 490ad8022478cc9661e7a6f138b9acfd206789f4800552a6f951937a93e764889a1222ac5a017ffcfc5842f3c01d1ea001928130ef010d14f42fd41467d430a9
+  metadata.gz: c9087e8ff74556064ec00d6efd9ebd9a34b4c966db06c97b3611733894fdbfa6edb5f83d0d60dfbb37b76362b2cd0af5f4e05995537de3e0ea8ede5c8148829b
+  data.tar.gz: b70351ba9c03a8426ef253e7191ee0779eef319a024958b7eae8b3fa368de21849ee340fabc3b79b61da855cc436540348acaa2ff8c45f75d78f1e338bcfecd0

data/lib/WindowsInstaller.rb

@@ -96,13 +96,22 @@ class WindowsInstaller < Hash
   end
   
   def installation_properties(product_name_or_product_code)	
-    properties = installed_properties(product_name_or_product_code)  
-    return properties unless(properties.nil?)
+    product_code = product_name_or_product_code
+    properties = installed_properties(product_code)
+    if(properties.nil?)
+	  product_name = product_name_or_product_code
+	  product_code = installed_get_product_code(product_name)
+	  return nil if(product_code == '')
 	  
-	product_code = installed_get_product_code(product_name_or_product_code)
-	return nil if(product_code == '')
+	  properties = installed_properties(product_code)
+	end
+	
+	return nil if(properties.nil?)
 	
-	return installed_properties(product_code)
+	upgrade_code = get_upgrade_code(product_code)
+	properties['UpgradeCode'] = upgrade_code unless(upgrade_code.nil?)
+	
+    return properties
   end
   
   private
@@ -132,6 +141,28 @@ class WindowsInstaller < Hash
 	return hash
   end
 
+  def get_upgrade_code(product_code)  
+	return nil if(!product_code_installed?(product_code))
+    
+	property_value = @installer.ProductsEx('','',7).each do |prod|
+	  begin
+	    local_pkg = prod.InstallProperty('LocalPackage')
+	  rescue
+	    next
+	  end
+	  db = @installer.OpenDataBase(local_pkg, 0)
+	  query = 'SELECT `Value` FROM `Property` WHERE `Property` = \'UpgradeCode\''
+	  view = db.OpenView(query)
+	  view.Execute
+	  record = view.Fetch
+	  unless(record.nil?)
+	    upgrade_code = record.StringData(1) 
+	    return upgrade_code if(prod.ProductCode == product_code)
+	  end
+	end
+	return nil
+  end
+  
   def msiexec(cmd)
     cmd_options = { echo_command: false, echo_output: false} unless(self[:debug])
 	if(self.has_key?(:administrative_user))
@@ -141,7 +172,7 @@ class WindowsInstaller < Hash
 	  command.execute
 	end
   end
-
+  
   def msiexec_admin(cmd, options)
     cmd = "runas /noprofile /savecred /user:#{self[:administrative_user]} \"#{cmd}\""
 	command = CMD.new(cmd, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: WindowsInstaller
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler