WindowsInstaller 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4c11b8ab31668f99fdde77e82b442dfdbd85ab
-  data.tar.gz: d9fd41348525b7a3efbc85cb241e513a50ee81fd
+  metadata.gz: 4b02f7b76db9098d099061851306f4e8b2281d72
+  data.tar.gz: 95c25ad242617d7e9bc91dd07a45e924e0765dc7
 SHA512:
-  metadata.gz: 6ff033255a4bbd424330a44ac16a8cd87e31aa4b9182c312ae99d22e6fc292cc295e5ffccefc3a91c857af7652963a66c19247639c68e2a83269d8104c226cf0
-  data.tar.gz: ed5c94b06dccc63dd6414559930759bbb0c97a932ae59bb9b13b2f5470c15060b8f86e22fd9a8c88852aab80dbd58e9c1a4739ee9d555c4763c938de5f09e8f4
+  metadata.gz: 8d49221e68bc561f5f56c0f79d61554ac88e105928b209b2c4e1892a386d3147099a78fb4952df958e3f57bb3822cfe1a16edcf31f1968e3f926ac663fc7c986
+  data.tar.gz: 048f2955c009333b2e10a2b1fe2b18eea04ba467d673f820a3bb9950e5fedd7afee1fdbcd7303d62024f63f16032084be19c2d66e837931c28f93ae4a1600fb7

data/lib/WindowsInstaller.rb

@@ -1,7 +1,6 @@
 require 'win32ole'
-require 'cmd_windows'
+require 'cmd'
 require 'sys/proctable'
-require 'tempfile'
 
 class WindowsInstaller < Hash
   @@default_options = {mode: '/passive'}
@@ -9,20 +8,28 @@ class WindowsInstaller < Hash
   def initialize(options = {})
     @@default_options.each { |key, value| self[key] = value }
     options.each { |key, value| self[key] = value}
+
+	@installer = WIN32OLE.new('WindowsInstaller.Installer')
   end
   
   def self.default_options(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
+
+  def product_installed?(product_name)
+	product_code = installed_get_product_code(product_name)
+    return false if(product_code.empty?)
+	
+	return product_code_installed?(product_code)
+  end
   
   def product_code_installed?(product_code)
-    installer = WIN32OLE.new('WindowsInstaller.Installer')
-	installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
+	@installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
 	return false
   end
   
@@ -58,30 +65,14 @@ class WindowsInstaller < Hash
 	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))
 
     properties = {}
 	  
-    installer = WIN32OLE.new('WindowsInstaller.Installer')
     sql_query = "SELECT * FROM `Property`"
 
-	db = installer.OpenDatabase(msi_file, 0)
+	db = @installer.OpenDatabase(msi_file, 0)
 	view = db.OpenView(sql_query)
 	view.Execute(nil)
 			
@@ -94,35 +85,84 @@ class WindowsInstaller < Hash
 	end
 	db.ole_free
 	db = nil
-	  
-	installer.ole_free
-	installer = nil
 
 	return properties
   end
   
-  def msiexec(command)	
-    cmd = CMD.new(command)
-	cmd.execute
+  def installation_properties(product_name)	
+	product_code = installed_get_product_code(product_name)
+	return nil if(product_code == '')
+	
+	return installed_properties(product_code)
   end
   
   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])
+  def installed_get_product_code(product_name)
+    return '' if(product_name.empty?)
+		
+    @installer.Products.each do |product_code|
+      name = @installer.ProductInfo(product_code, "ProductName")
+      return product_code if (product_name == name)
+	end
+		
+    return ''
   end
 
-  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)
+  def installed_properties(product_code)	
+	return nil if(!product_code_installed?(product_code))
 	
-	cmd = CMD.new("#{ENV['SystemRoot']}\\System32\\regedit.exe /s #{file.path}", { echo_command: true })
-	cmd.execute_as(self[:administrative_user])
+	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 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 }
+  end
+  
+  def wait_on_spawned_process(cmd)
+	pre_execute = Sys::ProcTable.ps
+	
+	pre_pids = []
+	pre_execute.each { |ps| pre_pids << ps.pid }
+
+    yield	
+
+	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  
+  end 
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: WindowsInstaller
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: execute
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Class wrapper for Microsoft Windows WindowsInstaller object
@@ -88,7 +88,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - lib/WindowsInstaller.rb
-homepage: http://rubygems.org/gems/execute
+homepage: http://rubygems.org/gems/WindowsExecute
 licenses:
 - Apache 2.0
 metadata: {}
@@ -98,19 +98,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Class wrapper for Microsoft Windows WindowsInstaller object
 test_files: []
-has_rdoc: