wixgem 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b83dd501d80b926d39330bd5cf856ce566770bf
-  data.tar.gz: bb57aae8fadb5997602880790cd824cce657526f
+  metadata.gz: 0ad9f8a4070ee4bddfa138baf13adfa2b6bc74d2
+  data.tar.gz: fd44d0d360a288cc10d5f07e88e77c2017c0591c
 SHA512:
-  metadata.gz: d1bec407aebc0abb64c9a83612881d46de635a03055430b615d846b7c610e8404beebb0e2aaa45de4efb41de4812597869826184444c4846e4fc6a4198904be7
-  data.tar.gz: 5b66b15274997bd4e9197a9697a2c708887eabc55153e5ab6289438a576a1b680b91cb91aca7e52cb97c844be62c0dc6f9dc731186f3f014136ff922afc42044
+  metadata.gz: bb6c4dddc389dee7cdba6d8596a4eb8939c657ce4f11675115cd3f3101543602255032e6c1cb4933b834f2088a58ca0984db62bb41f4a2b199f4dab95c1601a0
+  data.tar.gz: 2c5c97aeb97acb74ed7b37f8121a34c83485bb5fbd662ab35736d6b2fb80283dd41c27cef717ff9e307ac78b3cd680d7451ad66d7dafd5ee455618f7903b94a3

data/lib/command.rb

@@ -0,0 +1,24 @@
+require 'open3'
+require 'hash'
+
+class Command < Hash
+  def initialize(cmd)
+   self[:command]=cmd
+   self[:output] = ''
+   self[:error] = ''
+   self[:exit_code] = ''
+   self[:ignore_exit_code] = false
+  end
+  
+  def execute
+    begin
+      self[:output],self[:error], self[:exit_code] = Open3.capture3(self[:command])
+      self[:exit_code]=self[:exit_code].to_i
+	rescue Exception => e
+	  self[:error] = "Exception: " + e.to_s
+	  self[:exit_code]=1
+	end
+	
+	raise self[:error] unless((self[:exit_code] == 0) || self[:ignore_exit_code])
+  end
+end

data/lib/wixgem.rb

@@ -1,12 +1,17 @@
 require 'fileutils'
 require 'SecureRandom'
+require 'logging'
+require 'tempfile'
 require 'tmpdir.rb'
 require 'rexml/document'
+require "#{File.dirname(__FILE__)}/command.rb"
 
 class Wix
   def self.initialize
     @install_path = ''
 	@debug = false
+	@logger = nil
+	@log_file = nil
   end
   def self.install_path=(path)
     @install_path = path
@@ -33,17 +38,23 @@ class Wix
   end
   
   private   
+  def self.start_logger
+    @logger = ::Logging.logger['Wixgem_logger'] 
+	@log_file = Tempfile.new('wixgem')
+	@logger.add_appenders(Logging.appenders.file(@log_file.path))
+	@logger.level = :debug
+  end
+
+  def self.end_logger
+    @logger = nil
+	@log_file = nil
+  end
+  
   def self.manage_upgrade(xml_doc, input)
 	product = REXML::XPath.match(xml_doc, '//Wix/Product')
 	return xml_doc if(product.length == 0)
 
-    manufacturer = 'Not Set'
-    manufacturer = input[:manufacturer] if(input.kind_of?(Hash) && input.has_key?(:manufacturer))
-	
- 	if(input.kind_of?(Hash) && 
-	   input.has_key?(:remove_existing_products) && 
-	   input[:remove_existing_products])
-
+ 	if(input.has_key?(:remove_existing_products) && input[:remove_existing_products])
 	  raise 'Hash must have a version key if the hash has a :remove_existing_products key' unless(input.has_key?(:version))
 	  raise 'Hash must have an upgrade_code key if the hash has a :remove_existing_products key' unless(input.has_key?(:upgrade_code))
 	
@@ -58,27 +69,9 @@ class Wix
 	return xml_doc
   end  
 
-  def self.manage_com_files(xml_doc)
-	component_groups = REXML::XPath.match(xml_doc, '//Wix/Fragment/ComponentGroup')
-	return xml_doc if(component_groups.nil?)
-
-	com_dlls = {}
-	component_groups.each do |component_group|
- 	  component_group.each_element do |component|
-	    classes = component.get_elements('Class')
-		if((classes.length == 1) && (classes[0].attributes["Context"] == 'InprocServer32'))
-		  files = component.get_elements('File')
-		  files[0].add_attribute('Assembly','.net')
-		end
-	  end
-	end
-	
-	return xml_doc
-  end  
-
   def self.manage_custom_actions(xml_doc, input)
     manufacturer = 'Not Set'
-    manufacturer = input[:manufacturer] if(input.kind_of?(Hash) && input.has_key?(:manufacturer))
+    manufacturer = input[:manufacturer] if(input.has_key?(:manufacturer))
 	
 	install_path = '[ProgramFilesFolder][ProductName]'
 	install_path = "[ProgramFilesFolder][Manufacturer]\\[ProductName]" unless(manufacturer == 'Not Set')
@@ -122,16 +115,14 @@ class Wix
   end
   
   def self.copy_install_files(directory, input)
-    files = input
-	files = input[:files] if(input.kind_of?(Hash))
-	
+	files = input[:files]
 	raise 'No files were given to wixgem' if(files.length == 0)
 	
 	missing_files = []
 	files.each do |file| 
 	  if(File.file?(file))
    	    install_path = file
-        if(input.kind_of?(Hash) && input.has_key?(:modify_file_paths))
+        if(input.has_key?(:modify_file_paths))
           input[:modify_file_paths].each { |regex, replacement_string| install_path = install_path.gsub(regex, replacement_string) }
         end
 
@@ -146,20 +137,21 @@ class Wix
     if(@debug)	
 	  max_path = files.max { |a, b| a.length <=> b.length }
 	  columen_size = max_path.length + 10
-	  File.open('./installation_files.txt', 'w') do |f| 
-	    f.printf("%-#{columen_size}s %s\n" % ['File path', 'Installation Path'])
-	    files.each do |file| 
-	      if(File.file?(file))
-   	        install_path = file
-            if(input.kind_of?(Hash) && input.has_key?(:modify_file_paths))
-              input[:modify_file_paths].each { |regex, replacement_string| install_path = install_path.gsub(regex, replacement_string) }
-            end
-	        f.printf("%-#{columen_size}s %s\n" % [file, install_path])
+	    
+	  @logger.debug "------------------------------------ Installation Paths -----------------------------------"
+	  @logger.debug "%-#{columen_size}s %s\n" % ['File path', 'Installation Path']
+	  files.each do |file| 
+	    if(File.file?(file))
+  	      install_path = file
+          if(input.has_key?(:modify_file_paths))
+            input[:modify_file_paths].each { |regex, replacement_string| install_path = install_path.gsub(regex, replacement_string) }
           end
-		end
-	  end
+	      @logger.debug "%-#{columen_size}s %s\n" % [file, install_path]
+        end
+      end
+	  @logger.debug "-------------------------------------------------------------------------------------------"
 	end
-	
+
 	if(missing_files.length > 0)
 	  missing_files_str = ''
 	  missing_files.each { |f| 
@@ -177,28 +169,32 @@ class Wix
     template_option = "-template product"
 	template_option = "-template module" unless(ext == ".msi")
 
-	wix_cmd = "\"#{install_path}/bin/heat.exe\" dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\""
-	wix_cmd = wix_cmd.gsub(/-srd/, '-svb6 -srd') if(input.kind_of?(Hash) && input.has_key?(:has_vb6_files))
+	cmd = "\"#{install_path}/bin/heat.exe\" dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\""
+	cmd = cmd.gsub(/-srd/, '-svb6 -srd') if(input.has_key?(:has_vb6_files))
 	
-	stdout = %x[#{wix_cmd}]
+	heat_cmd = Command.new(cmd)
+	@logger.debug "command: #{heat_cmd[:command]}" if(@debug)
 
-	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'w') { |f| f.puts wix_cmd } if(@debug)
-	raise "#{stdout}\nFailed to generate .wxs file" unless(File.exists?(wxs_file))
-		
+	heat_cmd.execute	
+	if(@debug)
+	  @logger.debug "--------------------------- Heat output -----------------------------------"
+	  @logger.debug heat_cmd[:output] 
+	end
+			
 	product_name = File.basename(wxs_file, '.wxs')
-    product_name = input[:product_name] if(input.kind_of?(Hash) && input.has_key?(:product_name))
+    product_name = input[:product_name] if(input.has_key?(:product_name))
 	
     manufacturer = 'Not Set'
-    manufacturer = input[:manufacturer] if(input.kind_of?(Hash) && input.has_key?(:manufacturer))
+    manufacturer = input[:manufacturer] if(input.has_key?(:manufacturer))
 
 	product_version = ''
-    product_version = input[:version] if(input.kind_of?(Hash) && input.has_key?(:version))
+    product_version = input[:version] if(input.has_key?(:version))
 
 	product_code = ''
-	product_code = input[:product_code] if(input.kind_of?(Hash) && input.has_key?(:product_code))
+	product_code = input[:product_code] if(input.has_key?(:product_code))
 
 	upgrade_code = ''
-	upgrade_code = input[:upgrade_code] if(input.kind_of?(Hash) && input.has_key?(:upgrade_code))
+	upgrade_code = input[:upgrade_code] if(input.has_key?(:upgrade_code))
 	
 	wxs_text = File.read(wxs_file)
 
@@ -213,9 +209,11 @@ class Wix
 	wxs_text = wxs_text.gsub(/UpgradeCode=\"[^\"]+\"/) { |s| s = "UpgradeCode=\"#{upgrade_code}\"" } unless(upgrade_code.empty?)
 	
 	xml_doc = REXML::Document.new(wxs_text)
+	packages = REXML::XPath.match(xml_doc, '//Wix/Product/Package')
+	packages.each { |package| package.add_attribute('InstallScope', 'perMachine') } if(input.has_key?(:all_users))
+
 	xml_doc = manage_custom_actions(xml_doc, input)
 	xml_doc = manage_upgrade(xml_doc,input)
-	xml_doc = manage_com_files(xml_doc)
 	xml_doc = manage_msm_files(xml_doc)
 	
 	File.open(wxs_file, 'w') { |f| f.puts(xml_doc.to_s) }	
@@ -229,21 +227,32 @@ class Wix
   def self.create_output(wxs_file, output)
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
-	wix_cmd = "\"#{install_path}\\bin\\candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\""
-	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'a') { |f| f.puts wix_cmd } if(@debug)
-	stdout = %x[#{wix_cmd}]
-	raise "#{stdout}\nFailed to generate .wixobj file" unless(File.exists?(wixobj_file))
+	candle_cmd = Command.new("\"#{install_path}\\bin\\candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"")
+	@logger.debug "command: #{candle_cmd[:command]}" if(@debug)
+
+	candle_cmd.execute	
+	if(@debug)
+	  @logger.debug "--------------------------- Candle output -----------------------------------"
+	  @logger.debug candle_cmd[:output] 
+	end
+	
+	light_cmd = Command.new("\"#{install_path}\\bin\\light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"")
+	@logger.debug "command: #{light_cmd[:command]}" if(@debug)
 
-	wix_cmd = "\"#{install_path}\\bin\\light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\""
-	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'a') { |f| f.puts wix_cmd } if(@debug)
-    stdout = %x[#{wix_cmd}]	
-	raise "#{stdout}\nFailed to generate #{output} file" unless(File.exists?(output))
+	light_cmd.execute
+	if(@debug)
+	  @logger.debug "--------------------------- Light output -----------------------------------"
+	  @logger.debug light_cmd[:output] 
+	end
   end
 
   def self.apply_wix_template(output, input, template)
     raise 'WIX path is not set!' if(install_path.nil?)
+	input = { files: input } unless(input.kind_of?(Hash))
+  	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
 
-  	@debug = input[:debug] if(!@debug && input.kind_of?(Hash) && input.has_key?(:debug))
+	start_logger if(@debug)
+	
 	FileUtils.mkpath(File.dirname(output)) unless(Dir.exists?(File.dirname(output)))
 	
 	ext = File.extname(output)
@@ -260,18 +269,17 @@ class Wix
 	    begin
 		  create_wxs_file(wxs_file, input, ext)
 	      create_output(wxs_file, output_absolute_path)
+		rescue Exception => e
+		  raise "Wixgem exception: #{e}"
 		ensure
-	      if(@debug)
-	        FileUtils.cp(wxs_file, "#{output_absolute_path}.wxs") if(File.exists?(wxs_file))
-		    wix_cmds_file = "#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt"
-		    FileUtils.cp(wix_cmds_file, "#{output_absolute_path}.wix_cmds.txt") if(File.exists?(wix_cmds_file))
-	      end
+	      FileUtils.cp(wxs_file, "#{output_absolute_path}.wxs") if(File.exists?(wxs_file) && @debug)
+	      FileUtils.cp(@log_file.path, "#{output_absolute_path}.log") if(@debug)
 		end
 	  end
-		    
-	  FileUtils.mv('installation_files.txt', "#{output_absolute_path}_paths.txt") if(File.exists?('installation_files.txt'))
 	end
 	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
 	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))
+	
+	end_logger if(@debug)
   end
 end

data/spec/COM_spec.rb

@@ -1,9 +1,12 @@
 require 'rspec'
 require './lib/wixgem.rb'
 require './spec/wixpath.rb'
-require './WindowsInstaller.rb'
+require './spec/WindowsInstaller.rb'
+require './spec/test_files_exist.rb'
 require 'win32ole'
+require './admin.rb'
 
+if(admin?)
 describe 'Wixgem' do
   describe 'Installation of a COM object' do
 	it 'should not be able to instance a COM object' do
@@ -15,28 +18,39 @@ describe 'Wixgem' do
 	  WindowsInstaller.uninstall(installation_file)
 	end
 	
+	installation_hash = { debug: true, modify_file_paths: {/^.+Release\// => ''}, all_users: 'perMachine', files: ['COMObject/bin/Release/COMObject.dll']}
 	it "should create an installation file using: #{installation_file}" do
-      Wix.make_installation(installation_file, { debug: true, files: ['COMObject/bin/Release/COMObject.dll']})
+      Wix.make_installation(installation_file, installation_hash)
 	  expect(File.exists?(installation_file)).to be(true)	  
 	end
     
-	WindowsInstaller.install(installation_file)
+	it 'should install' do
+	  WindowsInstaller.install(installation_file)
+	  expect(WindowsInstaller.installed?(installation_file)).to be(true)
+	end
 
+	it 'should have installed the COMObject.dll' do
+      test_files_exist(installation_file, installation_hash)
+	end
+	
 	it 'should be able to instance a COM object with a GUID' do
-		#object = WIN32OLE.new('{863AEADA-EE73-4f4a-ABC0-3FB384CB41AA}')
-		#expect(object.nil?).to eq(false)
-		#puts "Text: #{object.GetText}"
-		#expect(object.GetText).to eq('Hello World')
+		object = WIN32OLE.new('{863AEADA-EE73-4f4a-ABC0-3FB384CB41AA}')
+		expect(object.nil?).to eq(false)
+		puts "Text: #{object.GetText}"
+		expect(object.GetText).to eq('Hello World')
 	end
 
-	it 'should be able to instance a COM object with a Program Id' do
-		
-		#object = WIN32OLE.new('COMObject.ComClassExample')
-		#expect(object.nil?).to eq(false)
-		#puts "Text: #{object.GetText}"
-		#expect(object.GetText).to eq('Hello World')
+	it 'should be able to instance a COM object with a Program Id' do		
+		object = WIN32OLE.new('COMObject.ComClassExample')
+		expect(object.nil?).to eq(false)
+		puts "Text: #{object.GetText}"
+		expect(object.GetText).to eq('Hello World')
 	end
 	
-	WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))
+	it 'should uninstall' do
+	  WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))	     
+	  expect(WindowsInstaller.installed?(installation_file)).to be(false)	  
+	end
   end
 end
+end

data/spec/WindowsInstaller.rb

@@ -0,0 +1,139 @@
+require 'win32ole'
+require 'dev_tasks'
+
+class WindowsInstaller
+	def self.installed?(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  installer.Products.each { |prod_code|
+		name = installer.ProductInfo(prod_code, "ProductName")
+		return true if (product_name == name)
+	  }
+	  return false
+	end
+
+	def self.install(msi)
+	  raise "#{msi} is already installed" if(WindowsInstaller.installed?(msi))
+	end
+
+	def self.uninstall(msi)
+	  execute("msiexec.exe /quiet /x #{msi}") if(File.exists?(msi))
+    end
+	
+	def self.product_code_installed?(product_code)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  installer.Products.each { |prod_code| return true if (product_code == prod_code) }
+	  return false
+	end
+	
+	def self.version?(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  info = product_info(installer, product_code?(product_name, installer))
+	  return info['VersionString']
+	end
+
+	def self.product_code?(product_name, installer = nil)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer') if(installer.nil?)
+	  installer.Products.each { |prod_code|
+		name = installer.ProductInfo(prod_code, "ProductName")
+		return prod_code if (product_name == name)
+	  }
+	  raise "Failed to find product code for product: #{product_name}"
+	end
+
+    private
+	def self.product_info(installer, code)
+	  raise 'Windows installer cannot be nil' if(installer.nil?)
+	  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(code, prop)
+		hash[prop] = value unless(value.nil? || value == '')
+	  end
+	  return hash
+	end
+
+	def self.msi_info(installer, msi_file)
+	  raise 'Windows installer cannot be nil' if(installer.nil?)
+	  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(code, prop)
+		hash[prop] = value unless(value.nil? || value == '')
+	  end
+	  return hash
+	end
+	
+	public
+	def self.dump_info(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  properties = product_info(installer, product_code?(product_name, installer))
+	  properties.each { |id, value| puts "#{id}: #{value}" }
+	end
+
+	def self.msi_records(msi)
+	  records = {}
+	  
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  sql_query = "SELECT * FROM `Property`"
+
+	  db = installer.OpenDatabase(msi, 0)
+			
+	  view = db.OpenView(sql_query)
+	  view.Execute(nil)
+			
+	  record = view.Fetch()
+	  return '' if(record == nil)
+
+	  while(!record.nil?)
+	    records[record.StringData(1)] = record.StringData(2) 
+		record = view.Fetch()
+	  end
+	  db = nil
+	  installer = nil
+	  
+	  return records
+	end
+	
+	def self.dump_msi_records(msi)
+	  records = msi_records(msi)
+
+	  puts "#{msi} Properties:"
+	  records.each do |key,value|
+		puts "#{key}: #{value}"
+	  end
+	end
+	
+	def self.dump_product(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  # only one session per process!
+	  session = installer.OpenProduct(product_code?(product_name, installer))
+	  db = session.Database
+			
+	  sql_query = "SELECT * FROM `Property`"
+	  view = db.OpenView(sql_query)
+	  view.Execute(nil)
+			
+	  record = view.Fetch()
+	  return '' if(record == nil)
+
+	  puts "Session Properties:"
+	  while(!record.nil?)
+		puts "#{record.StringData(1)}: #{record.StringData(2)}"
+		record = view.Fetch()
+	  end
+	  db = nil
+	  installer = nil
+	  puts ''
+	end	
+
+    def execute(cmd)
+      command = Command.new(cmd)
+      command.execute
+  
+      raise "Failed: #{cmd} Status: #{command[:exit_code]}\nStdout: #{command[:output]}\nStderr: #{command[:error]}" unless(command[:exit_code] == 0)
+    end
+end

data/spec/command_spec.rb

@@ -0,0 +1,18 @@
+require 'rspec'
+require './lib/command.rb'
+
+describe 'Command' do
+  it 'should be able to execute: dir' do
+    cmd = Command.new('dir')
+	cmd.execute
+	expect(cmd[:output].empty?).to eq(false)
+	expect(cmd[:output].include?('Directory')).to eq(true)
+  end
+
+  it 'should fail executing: isnotacommand' do
+    cmd = Command.new('isnotacommand')	
+	expect { cmd.execute }.to raise_error
+	expect(cmd[:error].include?('No such file or directory')).to eq(true)
+	expect(cmd[:exit_status]).to_not eq(0)
+  end
+end

data/spec/installation_spec.rb

@@ -51,8 +51,8 @@ describe 'Wixgem' do
     
   describe 'including vb6 files' do 
 	it "the wix's heat command should contain the -svb6 flag" do
-      Wix.make_installation('test/wixgem_install_vb6_files.msi', {manufacturer: 'musco', has_vb6_files: true, files: ['rakefile.rb'], debug: true})
-	  wix_cmd_text = File.read('test/wixgem_install_vb6_files.msi.wix_cmds.txt')
+      Wix.make_installation('test/wixgem_install_vb6_files.msi', {debug: true, manufacturer: 'musco', has_vb6_files: true, files: ['rakefile.rb'], debug: true})
+	  wix_cmd_text = File.read('test/wixgem_install_vb6_files.msi.log')
 	  expect(wix_cmd_text.include?('-svb6')).to eq(true)
 	end
   end	

data/spec/mergemodule_spec.rb

@@ -2,7 +2,7 @@ require 'rspec'
 require './lib/wixgem.rb'
 require './spec/wixpath.rb'
 require './spec/test_install.rb'
-require './spec/execute.rb'
+require './spec/WindowsInstaller.rb'
 require './admin.rb'
 
 Wix.debug=true
@@ -37,8 +37,7 @@ describe 'Wixgem' do
 	  it "should produce the debug files" do
 	    if(key == :test5)
 	      expect(File.exists?("#{value[0]}.wxs")).to be(true)
-	      expect(File.exists?("#{value[0]}.wix_cmds.txt")).to be(true)
-	      expect(File.exists?("#{value[0]}_paths.txt")).to be(true)
+	      expect(File.exists?("#{value[0]}.log")).to be(true)
 		end
      end
     }
@@ -63,13 +62,13 @@ describe 'Wixgem' do
 	
       it "should install contents of merge module" do
 	    begin
-	      execute("msiexec.exe /i #{msi_file}")
+	      WindowsInstaller.install(msi_file)
 		
 		  install_dir = "C:/Program Files (x86)/#{File.basename(msi_file, '.msi')}"
 	      expect(File.exists?("#{install_dir}/rakefile.rb")).to be(true)
 	      expect(File.exists?("#{install_dir}/Gemfile")).to be(true)
 	    ensure
-	      execute("msiexec.exe /quiet /x #{msi_file}")
+	      WindowsInstaller.uninstall(msi_file)
 	    end
       end 
 	end

data/spec/multiple_product_installation_spec.rb

@@ -2,9 +2,6 @@ require 'rspec'
 require './lib/wixgem.rb'
 require './spec/wixpath.rb'
 require './admin.rb'
-require './spec/test_install.rb'
-require './spec/test_files_exist.rb'
-require 'json'
 
 if(admin?)
 describe 'Wixgem' do

data/spec/test_install.rb

@@ -1,10 +1,11 @@
-require './WindowsInstaller.rb'
+require './spec/WindowsInstaller.rb'
+
 require './admin.rb'
-require './spec/execute.rb'
+require './lib/command.rb'
 
 def get_product_name(msi_file, arg2)
   product_name = File.basename(msi_file, File.extname(msi_file))
-  product_name = arg2[:product_name] if(arg2.kind_of?(Hash) && arg2.has_key?(:product_name))
+  product_name = arg2[:product_name] if(arg2.has_key?(:product_name))
   
   return product_name
 end
@@ -15,30 +16,32 @@ def test_msi(msi_file, arg2)
   msi_info = WindowsInstaller.msi_records(msi_file)
   #puts msi_info.to_s
   
-  if(arg2.kind_of?(Hash) && arg2.has_key?(:product_name))
+  if(arg2.has_key?(:product_name))
     raise "ProductName is #{msi_info['ProductName']} expected #{product_name}" unless(product_name == msi_info['ProductName'])
   end
 
-  if(arg2.kind_of?(Hash) && arg2.has_key?(:product_code))
+  if(arg2.has_key?(:product_code))
     expected = arg2[:product_code].upcase
 	raise "ProductCode is #{msi_info['ProductCode']} expected #{expected}" unless(expected == msi_info['ProductCode'])
   end
 
-  if(arg2.kind_of?(Hash) && arg2.has_key?(:upgrade_code))
+  if(arg2.has_key?(:upgrade_code))
     expected = arg2[:upgrade_code].upcase
 	raise "UpgradeCode is #{msi_info['UpgradeCode']} expected #{expected}" unless(expected == msi_info['UpgradeCode'])
   end
   
   expected_product_version = '1.0.0.0'
-  expected_product_version = arg2[:version] if(arg2.kind_of?(Hash) && arg2.has_key?(:version))
+  expected_product_version = arg2[:version] if(arg2.has_key?(:version))
   raise "Invalid product version #{msi_info['ProductVersion']}" if(msi_info['ProductVersion'] != expected_product_version)
 
   expected_manufacturer = 'Not Set'
-  expected_manufacturer = arg2[:manufacturer] if(arg2.kind_of?(Hash) && arg2.has_key?(:manufacturer))
+  expected_manufacturer = arg2[:manufacturer] if(arg2.has_key?(:manufacturer))
   raise "Invalid Manufacturer #{msi_info['Manufacturer']}" if(msi_info['Manufacturer'] != expected_manufacturer)
 end
 
 def test_install(name, msi_file, arg2, callback=nil)
+  arg2 = { files: arg2} unless(arg2.kind_of?(Hash))
+  
   msi_file = msi_file.gsub(/\//) { |s| s = '\\' }
 
   test_msi(msi_file, arg2)
@@ -49,19 +52,18 @@ def test_install(name, msi_file, arg2, callback=nil)
 	
   if(admin?)
 	while(WindowsInstaller.installed?(product_name))
-	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product_name)}")
+	  WindowsInstaller.uninstall(product_name)
 	end
     raise "#{name}: Uninstall #{product_name} before running tests" if(WindowsInstaller.installed?(product_name))
     
 	begin
-	  execute("msiexec.exe /i #{msi_file}")
-	  #WindowsInstaller.dump_info(product_name)
+	  WindowsInstaller.install(msi_file)
 			
 	  raise "#{name}: Product name #{product_name} is not installed" unless(WindowsInstaller.installed?(product_name))
 
 	  eval callback unless(callback == nil)
 	ensure
-	  execute("msiexec.exe /quiet /x #{msi_file}") if(WindowsInstaller.installed?(product_name))
+	  WindowsInstaller.uninstall(msi_file) if(WindowsInstaller.installed?(product_name))
 	  raise "Failed to uninstall product #{product_name}" if(WindowsInstaller.installed?(product_name))
 	end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.28
+- !ruby/object:Gem::Dependency
+  name: logging
+  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: Simple Ruby interface to facilitate creating and compiling windows installation
   files with the Wix Toolset.
 email: KCCKSMarshall@gmail.com
@@ -86,11 +100,11 @@ files:
 - example/install_files/directory/file2.txt
 - example/install_files/file1.txt
 - example/rakefile.rb
-- lib/templates/Install.wxs
-- lib/templates/mergemodule.wxs
+- lib/command.rb
 - lib/wixgem.rb
 - spec/COM_spec.rb
-- spec/execute.rb
+- spec/WindowsInstaller.rb
+- spec/command_spec.rb
 - spec/installation_spec.rb
 - spec/mergemodule_spec.rb
 - spec/multiple_product_installation_spec.rb

data/lib/templates/Install.wxs

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="PRODUCT_CODE" Name="PRODUCT_NAME" Language="1033" Version="VERSION" Manufacturer="MANUFACTURER" UpgradeCode="UPGRADE_CODE">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<Media Id="1" Cabinet="WixgemTest.cab" EmbedCab="yes" />
-		    
-    <!-- Step 1: Define the directory structure -->
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
-              INSTALL_DIR
-			</Directory>
-		</Directory>
-
-    <!-- Step 2: Add files to installer package -->
-		<DirectoryRef Id="INSTALLFOLDER">
-			FILES
-		</DirectoryRef>
-
-    <!-- Step 3: Tell Wix to install the files-->
-    <Feature Id="ProductFeature" Title="PRODUCT_NAME Installation" Level="1">
-      COMPONENT_REFS
-    </Feature>
-  </Product>
-</Wix>

data/lib/templates/mergemodule.wxs

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Module Id="MODULE_NAME" Language="1033" Version="VERSION">
-        <Package Id="PRODUCT_CODE" InstallerVersion="200" Manufacturer="MANUFACTURER" />
-        COMPONENT_REFS
-        <Directory Id="TARGETDIR" Name="SourceDir">
-		  <Directory Id="MergeRedirectFolder" />
-		</Directory>
-    </Module>
-    <Fragment>
-        <DirectoryRef Id="MergeRedirectFolder">
-            FILES
-        </DirectoryRef>
-    </Fragment>
-</Wix>

data/spec/execute.rb

@@ -1,8 +0,0 @@
-require 'dev_tasks'
-
-def execute(cmd)
-  command = Command.new(cmd)
-  command.execute
-  
-  raise "Failed: #{cmd} Status: #{command[:exit_code]}\nStdout: #{command[:output]}\nStderr: #{command[:error]}" unless(command[:exit_code] == 0)
-end