WindowsInstaller 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263813c44d8184bca0115159ffb4ad73f6529a44
-  data.tar.gz: dad9edce61a9a16ee539e2b0547eb577d65ea631
+  metadata.gz: ad91de66d76881675a1be9601c6d237bfafe58a0
+  data.tar.gz: dea6ee339c0deaf36d9c51a5e348630c49f4e04d
 SHA512:
-  metadata.gz: 260adc1c0dde5c539a7de4fa1e023660518113e8058d4f05951e4389f2c381b8cfa410af9abc228a9eb9e5a98a1d1fb42f9309838714ea5fb1dd5befc7d49c4a
-  data.tar.gz: 0cfd39a486d7071cb8800684c1507e8de303516919e88ea366de0e5a2978238ed36d77acee3882bcfac9cafdcf8de2e0fd34aeece8fe86cd36fab24a6901ed55
+  metadata.gz: 6416653a2488548c9933db8098f0fd917f8cdeb178ed66929dcd39450b13b3115d4998ba959581d5b817c5dc3f55d7386975bac2e97f572c6d41ef2fec39ce86
+  data.tar.gz: 29c07858abdbcd44a8e062f0d2a81b62597858dacb07fcec25535f5dac26cb15e5e9ffc81a7696571d325dae4b317b74bfab0cee45ca00efa07081b16b39f818

data/lib/WindowsInstaller.rb

@@ -9,11 +9,11 @@ class WindowsInstaller < Hash
     @@default_options.each { |key, value| self[key] = value }
     options.each { |key, value| self[key] = value}
 
-	@installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  @installer = WIN32OLE.new('WindowsInstaller.Installer')
   end
   
   def self.default_options(hash) 
-	hash.each { |key,value| @@default_options[key] = value }
+	  hash.each { |key,value| @@default_options[key] = value }
   end
   
   def msi_installed?(msi_file)
@@ -22,15 +22,15 @@ class WindowsInstaller < Hash
   end
 
   def product_installed?(product_name)
-	product_code = installed_get_product_code(product_name)
+	  product_code = installed_get_product_code(product_name)
     return false if(product_code.empty?)
 	
-	return product_code_installed?(product_code)
+	  return product_code_installed?(product_code)
   end
   
   def product_code_installed?(product_code)
-	@installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
-	return false
+	  @installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
+	  return false
   end
   
   def install_msi(msi_file)
@@ -38,12 +38,12 @@ class WindowsInstaller < Hash
 
     msi_file = File.absolute_path(msi_file).gsub(/\//, '\\')
 
-	cmd = "msiexec.exe"
-	cmd = "#{cmd} #{self[:mode]}" if(has_key?(:mode))
-	cmd = "#{cmd} /i #{msi_file}"
+	  cmd = "msiexec.exe"
+	  cmd = "#{cmd} #{self[:mode]}" if(has_key?(:mode))
+	  cmd = "#{cmd} /i #{msi_file}"
 
-	msiexec(cmd)
-	raise "Failed to install msi_file: #{msi_file}" unless(msi_installed?(msi_file))
+	  msiexec(cmd)
+	  raise "Failed to install msi_file: #{msi_file}" unless(msi_installed?(msi_file))
   end
 
   def uninstall_msi(msi_file)
@@ -55,20 +55,20 @@ class WindowsInstaller < Hash
   def uninstall_product(product_name)
     raise StandardError.new("Product '#{product_name}' is not installed") unless(product_installed?(product_name))
 	
-	product_code = installed_get_product_code(product_name)
-	uninstall_product_code(product_code)		
+	  product_code = installed_get_product_code(product_name)
+	  uninstall_product_code(product_code)		
   end
   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)
+	  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
   end
   
   def msi_properties(msi_file)
@@ -78,51 +78,51 @@ class WindowsInstaller < Hash
 	  
     sql_query = "SELECT * FROM `Property`"
 
-	db = @installer.OpenDatabase(msi_file, 0)
-	view = db.OpenView(sql_query)
-	view.Execute(nil)
+	  db = @installer.OpenDatabase(msi_file, 0)
+	  view = db.OpenView(sql_query)
+	  view.Execute(nil)
 			
-	record = view.Fetch()
-	return nil if(record == nil)
-
-	while(!record.nil?)
-	  properties[record.StringData(1)] = record.StringData(2) 
 	  record = view.Fetch()
-	end
-	db.ole_free
-	db = nil
+	  return nil if(record == nil)
 
-	return properties
+	  while(!record.nil?)
+	    properties[record.StringData(1)] = record.StringData(2) 
+	    record = view.Fetch()
+	  end
+	  db.ole_free
+	  db = nil
+
+	  return properties
   end
   
   def installation_properties(product_name_or_product_code)	
     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_name = product_name_or_product_code
+	    product_code = installed_get_product_code(product_name)
+	    return nil if(product_code == '')
 	  
-	  properties = installed_properties(product_code)
-	end
+	    properties = installed_properties(product_code)
+	  end
 	
-	return nil if(properties.nil?)
+	  return nil if(properties.nil?)
 	
-	upgrade_code = get_upgrade_code(product_code)
-	properties['UpgradeCode'] = upgrade_code unless(upgrade_code.nil?)
+	  upgrade_code = get_upgrade_code(product_code)
+	  properties['UpgradeCode'] = upgrade_code unless(upgrade_code.nil?)
 	
     return properties
   end
   
   def installed_products
     products = []
-	@installer.Products.each { |installed_product_code| products << installed_product_code }
-	return products
+	  @installer.Products.each { |installed_product_code| products << installed_product_code }
+	  return products
   end
   
   def product_codes(upgrade_code)
-	upgrade_codes = get_upgrade_codes
-	return (upgrade_codes.key?(upgrade_code)) ? upgrade_codes[upgrade_code] : []
+	  upgrade_codes = get_upgrade_codes
+	  return (upgrade_codes.key?(upgrade_code)) ? upgrade_codes[upgrade_code] : []
   end
   
   private
@@ -132,98 +132,101 @@ class WindowsInstaller < Hash
     @installer.Products.each do |product_code|
       name = @installer.ProductInfo(product_code, "ProductName")
       return product_code if (product_name == name)
-	end
+	  end
 		
     return ''
   end
 
   def installed_properties(product_code)	
-	return nil if(!product_code_installed?(product_code))
+	  return nil if(!product_code_installed?(product_code))
 	
-	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
-	hash['ProductCode'] = product_code
-	return hash
+	  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
+	  hash['ProductCode'] = product_code
+	  return hash
   end
 
   def get_upgrade_codes
     upgrade_codes = {}  
-	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) 
-
-		upgrade_codes[upgrade_code] ||= []
-		upgrade_codes[upgrade_code] << prod.ProductCode
+	  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) 
+
+		    upgrade_codes[upgrade_code] ||= []
+		    upgrade_codes[upgrade_code] << prod.ProductCode
+	    end
 	  end
-	end
-	return upgrade_codes
+		
+		return upgrade_codes
   end
   
   def get_upgrade_code(product_code)  
-	return nil if(!product_code_installed?(product_code))
-	upgrade_codes = get_upgrade_codes
-	upgrade_codes.each do |upgrade_code, product_codes|
-	  product_codes.each { |pc| return upgrade_code if(pc == product_code) }
-	end
-	return nil
+	  return nil if(!product_code_installed?(product_code))
+	  upgrade_codes = get_upgrade_codes
+	  upgrade_codes.each do |upgrade_code, product_codes|
+	    product_codes.each { |pc| return upgrade_code if(pc == product_code) }
+	  end
+	  return nil
   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 = Execute.new(cmd, cmd_options)
-	  command.execute
-	end
+	  if(self.has_key?(:administrative_user))
+	    msiexec_admin(cmd, cmd_options)
+	  else
+	    command = Execute.new(cmd, cmd_options)
+	    command.execute
+	  end
   end
   
   def msiexec_admin(cmd, options)
     cmd = "runas /noprofile /savecred /user:#{self[:administrative_user]} \"#{cmd}\""
-	command = Execute.new(cmd, options)
-	wait_on_spawned(cmd) { cmd.execute }
+	  command = Execute.new(cmd, options)
+	  wait_on_spawned(cmd) { cmd.execute }
   end
   
   def wait_on_spawned_process(cmd)
-	pre_execute = Sys::ProcTable.ps
+	  pre_execute = Sys::ProcTable.ps
 	
-	pre_pids = []
-	pre_execute.each { |ps| pre_pids << ps.pid }
+	  pre_pids = []
+	  pre_execute.each { |ps| pre_pids << ps.pid }
 
-    yield	
+      yield	
 
-	exe = cmd[:command].match(/\\(?<path>.+\.exe)/i).named_captures['path']
-	exe = File.basename(exe)
-	#puts "Exe: #{exe}"
+	    exe = cmd[:command].match(/\\(?<path>.+\.exe)/i).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  
+	    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: WindowsInstaller
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Class wrapper for Microsoft Windows WindowsInstaller object