wixgem 0.39.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c89818c1c48db5d1e36616d422791c5dd534ba4
-  data.tar.gz: a3b12d1375c4151ef0ea3a86456fb6c53d5bc701
+  metadata.gz: 53d5561b7f79f736e50eecf763a51183da7c0997
+  data.tar.gz: 8d79cd0de6f4a946b455e655f23ba5e7a7026e71
 SHA512:
-  metadata.gz: 54975b44b8b308db7e5b907e8d8b0ffe75f93be6b97c078b2a93f2a22acec30e42fdba28abbe6ab8d51e7fcb5f3b631a546c27f1c65cb613d85052496b65f1c8
-  data.tar.gz: 16366f73265b45acc76e9b1736120914264555afee9a9b4f429b9cdb163ab0e74d06864e05245f2a149d2e2ecbafad1357ec3c783fbf53eb42c18a3ff1a8216b
+  metadata.gz: a1db621649fc003d17e08cdc79d981019cc91a3b6821abc51a0f88acd939fed00edb7f8dc5f316a6dca21a42f92c93c2e71c21e311ffa013e75f9e3db57e5802
+  data.tar.gz: 0cc002163c565419c6c0f5b28b87e2809b29848bcace63ffb84ba77d9e637f230ec03505ee4de6576273677a4122102410a9cf21136ff95d2c764a4b553f4fd3

data/README.md

@@ -14,6 +14,7 @@ The [WiX Toolset](http://wixtoolset.org) must be installed.
 require 'wixgem'
 	
 WIX_TOOLSET_ROOT='path to root of Wix toolset'
+Wixgem::Wix.install_path = WIX_TOOLSET_ROOT
 Wixgen::Wix.make_installation('Product.msi', ['rakefile.rb']])
 
 Wixgen::Wix.make_installation('Product.msi', {product_name: 'productname',
@@ -30,6 +31,7 @@ Wixgen::Wix.make_installation('Product.msi', {modify_file_paths: {/\Atest_files\
 require 'wixgem'
 	
 WIX_TOOLSET_ROOT='path to root of Wix toolset'
+Wixgem::Wix.install_path = WIX_TOOLSET_ROOT
 Wixgen::Wix.make_mergemodule('Product.msi', ['rakefile.rb']])
 
 ```
@@ -56,7 +58,9 @@ small set of optional arguments allowing the developer to customize the generate
 * **all_users**: String value perUser or perMachine. The default is perUser.
 * **debug**: Boolean value. If debug is true the Product's wxs file and a log file are copied
              to the same directory as the output msi file. This can help trouble shoot the 
-			 installation.            
+			 installation.      
+* **suppress_registry_harvesting** Suppress registry harvesting. Can fix the Runtime Error E6034.		 
+* **suppress_COM_elements** Suppress COM elements.
 
 ## License
 Copyright 2013-2014 Kevin Marshall

data/{spec → lib}/WindowsInstaller.rb

@@ -1,46 +1,52 @@
 require 'win32ole'
-require 'dev_tasks'
+require File.dirname(__FILE__) + '/command.rb'
 
+module Wixgem
 class WindowsInstaller
-	def self.installed?(msi_product_code_or_product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	def self.install(msi_file)
+	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
+	  msi_file = msi_file.gsub(/\//, '\\')
+	  raise "#{msi_file} is already installed" if(WindowsInstaller.msi_installed?(msi_file))
+	  execute("msiexec.exe /i #{msi_file}")
+	end
+
+	def self.uninstall(msi_file)
+	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
 	  
-	  value = msi_product_code_or_product_name
-	  if(File.exists?(value))
-        records = msi_records(value)
-		value = records['ProductCode']
-	  end
+	  info = msi_records(msi_file)
+	  uninstall_product_code(info['ProductCode'])
+    end
 
+	def self.uninstall_product_name(product_name)
+	  raise "#{product_name} is not installed" unless(product_name_installed?(product_name))
+	  uninstall_product_code(product_code_from_product_name(product_name))
+    end
+	
+	def self.uninstall_product_code(product_code)
+	  raise "#{product_code} is not installed" unless(product_code_installed?(product_code))
+	  execute("msiexec.exe /quiet /x #{product_code}")
+    end
+
+	def self.msi_installed?(msi_file)  
+	  info = msi_records(msi_file)
+	  result = product_code_installed?(info['ProductCode'])
+	  return result
+	end	
+	
+	def self.product_name_installed?(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')	  
 	  installer.Products.each { |prod_code|
 		name = installer.ProductInfo(prod_code, "ProductName")
-		return true if (value == name)
-		return true if (value == prod_code)
+		return true if (product_name == name)
 	  }
 	  return false
 	end
 
-	def self.install(msi)
-	  msi = msi.gsub(/\//, '\\')
-	  raise "#{msi} is already installed" if(WindowsInstaller.installed?(msi))
-	  execute("msiexec.exe /i #{msi}")
-	end
-
-	def self.uninstall(msi_product_code_or_product_name)
-	  value = msi_product_code_or_product_name
-	  if(File.exists?(value))
-		value = value.gsub(/\//, '\\')
-	    execute("msiexec.exe /quiet /x #{value}") 
-		return
-	  end
-	  
+	def self.product_code_installed?(product_code)
 	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  installer.Products.each { |prod_code|
-		name = installer.ProductInfo(prod_code, "ProductName")
-		value = prod_code if (value == name)
-	  }
-	  
-	  execute("msiexec.exe /quiet /x #{value}")
-    end
+	  installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
+	  return false
+	end
 	
 	def self.product_code_installed?(product_code)
 	  installer = WIN32OLE.new('WindowsInstaller.Installer')
@@ -48,13 +54,13 @@ class WindowsInstaller
 	  return false
 	end
 	
-	def self.version(product_name)
+	def self.version_from_product_name(product_name)
 	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  info = product_info(installer, product_code(product_name, installer))
+	  info = product_info(installer, product_code_from_product_name(product_name, installer))
 	  return info['VersionString']
 	end
 
-	def self.product_code(product_name, installer = nil)
+	def self.product_code_from_product_name(product_name, installer = nil)
 	  installer = WIN32OLE.new('WindowsInstaller.Installer') if(installer.nil?)
 	  installer.Products.each { |prod_code|
 		name = installer.ProductInfo(prod_code, "ProductName")
@@ -93,17 +99,17 @@ class WindowsInstaller
 	public
 	def self.dump_info(product_name)
 	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  properties = product_info(installer, product_code(product_name, installer))
+	  properties = product_info(installer, product_code_from_product_name(product_name, installer))
 	  properties.each { |id, value| puts "#{id}: #{value}" }
 	end
 
-	def self.msi_records(msi)
+	def self.msi_records(msi_file)
 	  records = {}
 	  
 	  installer = WIN32OLE.new('WindowsInstaller.Installer')
 	  sql_query = "SELECT * FROM `Property`"
 
-	  db = installer.OpenDatabase(msi, 0)
+	  db = installer.OpenDatabase(msi_file, 0)
 			
 	  view = db.OpenView(sql_query)
 	  view.Execute(nil)
@@ -159,7 +165,8 @@ class WindowsInstaller
 
     def self.execute(cmd)
       command = Wixgem::Command.new(cmd)
+	  #command[:debug] = true
       command.execute
     end
 end
-
+end

data/lib/WindowsInstaller_hold.rb

@@ -0,0 +1,156 @@
+require 'win32ole'
+require 'dev_tasks'
+
+module Wixgem
+
+class WindowsInstaller
+	def self.install(msi_file)
+	  msi_file = msi_file.gsub(/\//, '\\')
+	  raise "#{msi_file} is already installed" if(WindowsInstaller.installed?(msi_file))
+	  execute("msiexec.exe /i #{msi_file}")
+	end
+
+	def self.uninstall(msi_file)
+	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
+	  
+	  info = msi_properties(installer, msi_file)
+	  uninstall_product_code(info['ProductCode'])
+    end
+
+	def self.uninstall_product_name(product_name)
+	  raise "#{product_name} is not installed" unless(product_name_installed?(product_name))
+	  uninstall_product_code(product_code_from_product_name(product_name))
+    end
+	
+	def self.uninstall_product_code(product_code)
+	  raise "#{product_code} is not installed" unless(product_code_installed?(product_code))
+	  execute("msiexec.exe /quiet /x #{product_code}")
+    end
+
+	def self.msi_installed?(msi_file)  
+	  info = msi_properties(msi_file)
+	  return product_code_installed?(info['ProductCode'])
+	end	
+	
+	def self.product_name_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.product_code_installed?(product_code)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
+	  return false
+	end
+	
+	def self.product_name_installed_version(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  info = product_info(installer, product_code_from_product_name(product_name, installer))
+	  return info['VersionString']
+	end
+
+    private
+	def self.product_code_from_msi(msi_file, installer = nil)
+	  msi_info = msi_properties(msi_file)
+	  return msi_info['ProductCode']
+	end
+
+	def self.product_code_from_product_name(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
+
+	def self.product_code_properties(product_code, installer = nil)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer') 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(product_code, prop)
+		hash[prop] = value unless(value.nil? || value == '')
+	  end
+	  return hash
+	end
+
+	def self.print_properties(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_file)
+	  records = {}
+	  
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  sql_query = "SELECT * FROM `Property`"
+
+	  db = installer.OpenDatabase(msi_file, 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.ole_free
+	  db = nil
+	  installer.ole_free
+	  installer = nil
+	  
+	  return records
+	end
+	
+	def self.print_msi_records(msi_file)
+	  records = msi_records(msi_file)
+
+	  puts "#{msi_file} Properties:"
+	  records.each do |key,value|
+		puts "#{key}: #{value}"
+	  end
+	end
+	
+	def self.print_product_name(product_name)
+	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  # only one session per process!
+	  session = installer.OpenProduct(product_code_from_product_name?(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.ole_free
+	  db = nil
+	  installer.ole_free
+	  installer = nil
+	  puts ''
+	end	
+
+    def self.execute(cmd)
+      command = Wixgem::Command.new(cmd)
+      command.execute
+    end
+end
+
+end

data/lib/wixgem.rb

@@ -1,7 +1,5 @@
 require 'fileutils'
 require 'SecureRandom'
-require 'logging'
-require 'tempfile'
 require 'tmpdir.rb'
 require 'rexml/document'
 require "#{File.dirname(__FILE__)}/command.rb"
@@ -41,15 +39,11 @@ class Wix
   
   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
+    @logger = []
   end
 
   def self.end_logger
     @logger = nil
-	@log_file = nil
   end
   
   def self.manage_upgrade(xml_doc, input)
@@ -150,18 +144,18 @@ class Wix
 	  max_path = files.max { |a, b| a.length <=> b.length }
 	  columen_size = max_path.length + 10
 	    
-	  @logger.debug "------------------------------------ Installation Paths -----------------------------------"
-	  @logger.debug "%-#{columen_size}s %s\n" % ['File path', 'Installation Path']
+	  @logger << "------------------------------------ Installation Paths -----------------------------------" unless(@logger.nil?)
+	  @logger << "%-#{columen_size}s %s\n" % ['File path', 'Installation Path']  unless(@logger.nil?)
 	  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
-	      @logger.debug "%-#{columen_size}s %s\n" % [file, install_path]
+	      @logger << "%-#{columen_size}s %s\n" % [file, install_path]  unless(@logger.nil?)
         end
       end
-	  @logger.debug "-------------------------------------------------------------------------------------------"
+	  @logger << "-------------------------------------------------------------------------------------------" unless(@logger.nil?)
 	end
 
 	if(missing_files.length > 0)
@@ -182,15 +176,17 @@ class Wix
 	template_option = "-template module" unless(ext == ".msi")
 
 	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))
+	cmd = cmd.gsub(/-srd/, '-svb6 -srd') if(input.has_key?(:has_vb6_files) && input[:has_vb6_files])
+	cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
+	cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
 	
 	heat_cmd = Command.new(cmd)
-	@logger.debug "command: #{heat_cmd[:command]}" if(@debug)
+	@logger << "command: #{heat_cmd[:command]}" if(@debug && !@logger.nil?)
 
 	heat_cmd.execute	
 	if(@debug && !heat_cmd[:output].empty?)
-	  @logger.debug "--------------------------- Heat output -----------------------------------"
-	  @logger.debug heat_cmd[:output] 
+	  @logger << "--------------------------- Heat output -----------------------------------"  unless(@logger.nil?)
+	  @logger << heat_cmd[:output] unless(@logger.nil?)
 	end
 			
 	product_name = File.basename(wxs_file, '.wxs')
@@ -240,21 +236,21 @@ class Wix
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
 	candle_cmd = Command.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"")
-	@logger.debug "command: #{candle_cmd[:command]}" if(@debug)
+	@logger << "command: #{candle_cmd[:command]}" if(@debug && !@logger.nil?)
 
 	candle_cmd.execute	
 	if(@debug && !candle_cmd[:output].empty?)
-	  @logger.debug "--------------------------- Candle output -----------------------------------"
-	  @logger.debug candle_cmd[:output] 
+	  @logger << "--------------------------- Candle output -----------------------------------"  unless(@logger.nil?)
+	  @logger << candle_cmd[:output] unless(@logger.nil?)
 	end
 	
 	light_cmd = Command.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"")
-	@logger.debug "command: #{light_cmd[:command]}" if(@debug)
+	@logger << "command: #{light_cmd[:command]}" if(@debug && !@logger.nil?)
 
 	light_cmd.execute
 	if(@debug && !light_cmd[:output].empty?)
-	  @logger.debug "--------------------------- Light output -----------------------------------"
-	  @logger.debug light_cmd[:output] 
+	  @logger << "--------------------------- Light output -----------------------------------"  unless(@logger.nil?)
+	  @logger << light_cmd[:output]  unless(@logger.nil?)
 	end
   end
 
@@ -285,7 +281,7 @@ class Wix
 		  raise "Wixgem exception: #{e}"
 		ensure
 	      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)
+	      File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug &!@logger.nil?)
 		end
 	  end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,21 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -94,22 +80,10 @@ files:
 - example/install_files/directory/file2.txt
 - example/install_files/file1.txt
 - example/rakefile.rb
+- lib/WindowsInstaller.rb
+- lib/WindowsInstaller_hold.rb
 - lib/command.rb
 - lib/wixgem.rb
-- spec/COM_spec.rb
-- spec/WindowsInstaller.rb
-- spec/command_spec.rb
-- spec/installation_spec.rb
-- spec/mergemodule_spec.rb
-- spec/multiple_product_installation_spec.rb
-- spec/test_files_exist.rb
-- spec/test_install.rb
-- spec/wixpath.rb
-- test_files/32145.txt
-- test_files/8.0/File With Space.txt
-- test_files/9.0/File With Space.txt
-- test_files/9.0/test_files/a_file.txt
-- test_files/File-With-Hyphen.txt
 homepage: http://rubygems.org/gems/wixgem
 licenses:
 - Apache 2.0

data/spec/COM_spec.rb

@@ -1,56 +0,0 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.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
-	    expect { WIN32OLE.new('COMObject.ComClassExample') }.to raise_error
-	  end
-
-	  installation_file = 'test\\wixgem_com_test.msi'	
-	  File.delete(installation_file) if(File.exists?(installation_file))
-	  WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))	     
-
-	  installation_hash = { debug: true, all_users: 'perMachine', files: ['COMObject/bin/Release/COMObject.dll']}
-	  it "should create an installation file using: #{installation_file}" do
-       Wixgem::Wix.make_installation(installation_file, installation_hash)
-	   expect(File.exists?(installation_file)).to be(true)	  
-	  end
-    
-	  # 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)
-		# 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)
-		# expect(object.GetText).to eq('Hello World')
-	  # end
-	
-	  it 'should uninstall' do
-	    WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))	     
-	    expect(WindowsInstaller.installed?(installation_file)).to be(false)	 		
-	  end
-	  
-	  it 'should cleanup the generaged msi file' do
-	  end
-    end
-  end
-end

data/spec/command_spec.rb

@@ -1,18 +0,0 @@
-require 'rspec'
-require './lib/command.rb'
-
-describe 'Command' do
-  it 'should be able to execute: dir' do
-    cmd = Wixgem::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 = Wixgem::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

@@ -1,59 +0,0 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.rb'
-require './spec/test_install.rb'
-require './spec/test_files_exist.rb'
-
-describe 'Wixgem' do
-  #Wixgem::Wix.debug = true
-  describe 'Installation' do
-    test_arguments = {
-      test0: ['wixgem_install_test1.msi', ['rakefile.rb']],
-      test1: ['test/wixgem_install_test1.msi', ['rakefile.rb']],
-	  test2: ['test/wixgem_install_test2.msi', {manufacturer: 'musco', files: ['Gemfile']}], 
-	  test3: ['test/wixgem_install_test3.msi', ['rakefile.rb', 'Gemfile']],
-	  test4: ['test/wixgem_install_test4.msi', {version: '1.1.2.3', files: ['Gemfile']}],
-	  test5: ['test/wixgem_install_test5.msi', {product_code: '{4528ae5a-c7fa-40a6-a70e-ac8135f1114c}', files: ['Gemfile']}],
-	  test6: ['test/wixgem_install_test6.msi', {upgrade_code: '{1d5df00a-c18d-4897-95e6-8c936dd19647}', files: ['Gemfile']}],
-	  test7: ['test/wixgem_install_test7.msi', {product_name: 'test_productname', files: ['Gemfile']}],
-	  test8: ['test/wixgem_install_test8.msi', {modify_file_paths: {/\Atest_files\// => ''}, files: Dir.glob("test_files/**/*")}]
-    }
-	
-    test_arguments.each { |key, value| 
-	  File.delete(value[0]) if(File.exists?(value[0]))
-	
-	  it "should create an installation file using: #{value[0]}" do
-        Wixgem::Wix.make_installation(value[0], value[1])
-	    expect(File.exists?(value[0])).to be(true)	  
-	  end
-    
-	  it "should install and uninstall: #{value[0]}" do
-	    execute = "test_files_exist('#{value[0]}', #{value[1]})"
-	    execute = value[2] if(value.length == 3)
-	    test_install(key, value[0], value[1], execute) 
-	  end
-    }
-  end
-  
-  describe 'Packaging excptions' do 
-    exception_test_arguments = {
-      test1: ['test/wixgem_install_test1.msi', nil],
-      test2: ['test/wixgem_install_test1.msi', []],
-      test3: ['test/wixgem_install_test1.msi', ['does_not_exist.txt']]
-    }
-  
-    exception_test_arguments.each { |key, value|
-	  it "#{key} should raise an exception" do
-	    expect { Wixgem::Wix.make_installation(value[0], value[1]) }.to raise_error
-	  end
-    }
-  end	
-    
-  describe 'including vb6 files' do 
-	it "the wix's heat command should contain the -svb6 flag" do
-      Wixgem::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	
-end

data/spec/mergemodule_spec.rb

@@ -1,76 +0,0 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.rb'
-require './spec/test_install.rb'
-require './spec/WindowsInstaller.rb'
-require './admin.rb'
-
-describe 'Wixgem' do
-  describe 'Merge Module' do    
-    test_arguments = {
-      test1: ['test/wixgem_merge_test1.msm', ['rakefile.rb']],
-	  test2: ['test/wixgem_merge_test2.msm', {files: ['Gemfile']}],
-	  test3: ['test/wixgem_merge_test3.msm', ['rakefile.rb', 'Gemfile']],
-	  test4: ['test/wixgem_merge_test4.msm', Dir.glob("test_files/**/*")],
-	  test5: ['test/wixgem_merge_test5.msm', {debug: true, files: Dir.glob("test_files/**/*")}]
-    }
-  
-    test_arguments.each { |key, value| 
-	  File.delete(value[0]) if(File.exists?(value[0]))
-
-	  it "should create merge module: #{value[0]}" do
-	    Wixgem::Wix.make_mergemodule(value[0], value[1])
-	    raise "#{key}: #{value[0]} does not exist" unless(File.exists?(value[0]))
-	  end
-	
-	  install_file = value[0].gsub(/msm/) { |s| s = 'msi' }
-	  it "should be able to create an installation file using: #{value[0]}" do
-         Wixgem::Wix.make_installation(install_file, ["#{value[0]}"])
-	  
-	    expect(File.exists?(install_file)).to be(true)
-	  end 
-    
-	  it "should install and uninstall: #{install_file}" do
-	    test_install(key, install_file, value[1]) 
-	  end
-	  
-	  it "should produce the debug files" do
-	    if(key == :test5)
-	      expect(File.exists?("#{value[0]}.wxs")).to be(true)
-	      expect(File.exists?("#{value[0]}.log")).to be(true)
-		end
-     end
-    }
-  end  
-  
-  if(admin?)
-    describe 'Multiple merge Module' do 
-      msi_file='test\\wixgem_multiple_merge_test1.msi'
-      merge1='test\\wixgem_multiple_merge_test1.msm'
-      merge2='test\\wixgem_multiple_merge_test2.msm'
-      it "should be able to create two merge modules" do  
-        Wixgem::Wix.make_mergemodule(merge1, ['rakefile.rb'])
-	    expect(File.exists?(merge1)).to be(true)
-        Wixgem::Wix.make_mergemodule(merge2, ['Gemfile'])
-	    expect(File.exists?(merge2)).to be(true)
-      end 
-		
-      it "should be able to create an installation file using: #{msi_file}" do
-        Wixgem::Wix.make_installation(msi_file, [merge1, merge2])
-	    expect(File.exists?(msi_file)).to be(true)
-      end 
-	
-      it "should install contents of merge module" do
-	    begin
-	      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
-	      WindowsInstaller.uninstall(msi_file)
-	    end
-      end 
-	end
-  end
-end

data/spec/multiple_product_installation_spec.rb

@@ -1,67 +0,0 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.rb'
-require './spec/WindowsInstaller.rb'
-require './admin.rb'
-
-if(admin?)
-describe 'Wixgem' do
-  describe 'Side by side installations' do
-    product1='wixgem_multiple 1.0'
-    product2='wixgem_multiple 1.1'
-      
-	Wixgem::Wix.make_installation("test/wixgem_multiple.1.0.0.msi", {version: '1.0.0.0', product_name: product1, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['Gemfile']})
-    Wixgem::Wix.make_installation("test/wixgem_multiple.1.1.0.msi", {version: '1.1.0.0', product_name: product2, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['rakefile.rb']})
-
-    it "should install version 1.0.0" do
-	  WindowsInstaller.install('test\\wixgem_multiple.1.0.0.msi')
-      expect(WindowsInstaller.installed?(product1)).to be(true)
-	  expect(WindowsInstaller.version(product1)).to eq('1.0.0.0')
-	end
-
-    it "should install version 1.1.0" do
-	  WindowsInstaller.install('test\\wixgem_multiple.1.1.0.msi')
-	  expect(WindowsInstaller.installed?(product2)).to be(true)
-	  expect(WindowsInstaller.version(product2)).to eq('1.1.0.0')
-	end
-	  
-	it "version 1.0.0 should still be installed" do
-	  expect(WindowsInstaller.installed?(product1)).to be(true)
-	end
-
-	it "product codes for version 1.0.0 and 1.0.0 should be different" do
-	  expect(WindowsInstaller.product_code(product1)).not_to eq(WindowsInstaller.product_code(product2))
-	end
-
-	it "Should be able to uninstall both products" do
-  	  WindowsInstaller.uninstall(product1)
-	  WindowsInstaller.uninstall(product2) 
-	end
-  end
-
-  describe 'remove previous version' do
-    product1='wixgem_install 1.0'
-    product2='wixgem_install 1.1'
-    Wixgem::Wix.make_installation("test/wixgem_install.1.0.0.msi", {version: '1.0.0.0', product_name: product1, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['Gemfile']})
-    Wixgem::Wix.make_installation("test/wixgem_install.1.1.0.msi", {version: '1.1.0.0', product_name: product2, remove_existing_products: true, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['rakefile.rb']})
-
-    it "should install version 1.0.0" do
-	  WindowsInstaller.install('test\\wixgem_install.1.0.0.msi')
-	  expect(WindowsInstaller.installed?(product1)).to be(true)
-	end
-
-    it "should install version 1.1.0" do
-	  WindowsInstaller.install('test\\wixgem_install.1.1.0.msi')
-	  expect(WindowsInstaller.installed?(product2)).to be(true)
-	end
-	  
-	it "the version 1.0.0 should have been uninstalled" do
-      expect(WindowsInstaller.installed?(product1)).to be(false)
-	end
-	
-	it "should be able to uninstall #{product2}" do
-  	  WindowsInstaller.uninstall(product2) 
-	end
-  end
-end
-end

data/spec/test_files_exist.rb

@@ -1,35 +0,0 @@
-def files(data)
-  files = data
-  if(data.kind_of?(Hash))
-    files = data[:files] 
-  
-    if(data.has_key?(:modify_file_paths))
-      modify_paths = data[:modify_file_paths]
-      files.each_index do |index|
-	    file_path = files[index]
-	    modify_paths.each { |regex, replacement_string| file_path = file_path.gsub(regex, replacement_string) }
-	    files[index] = file_path
-	  end
-    end
-  end
-  return files
-end
-
-def test_files_exist(msi_file, data)
-  files = files(data)
-
-  product_name = File.basename(msi_file, File.extname(msi_file))
-  product_name = data[:product_name] if(data.kind_of?(Hash) && data.has_key?(:product_name))
-
-  manufacturer = ''
-  manufacturer = data[:manufacturer] if(data.kind_of?(Hash) && data.has_key?(:manufacturer))
- 
-  relative_install_dir = product_name
-  raise "#{name}: relative_install_dir should be set to the product name" if(relative_install_dir.length == 0)
-  relative_install_dir = "#{manufacturer}/#{relative_install_dir}" if(manufacturer.length > 0)
- 
-  files.each { |file| 
-    full_path = "C:/Program Files (x86)/#{relative_install_dir}/#{file}"
-	raise "#{full_path} not installed." unless(File.exists?(full_path))
-  }
-end

data/spec/test_install.rb

@@ -1,66 +0,0 @@
-require './spec/WindowsInstaller.rb'
-
-require './admin.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.has_key?(:product_name))
-  
-  return product_name
-end
-
-def test_msi(msi_file, arg2)
-  product_name = get_product_name(msi_file, arg2)
-	
-  msi_info = WindowsInstaller.msi_records(msi_file)
-  #puts msi_info.to_s
-  
-  if(arg2.has_key?(:product_name))
-    raise "ProductName is #{msi_info['ProductName']} expected #{product_name}" unless(product_name == msi_info['ProductName'])
-  end
-
-  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.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.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.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)
-  
-  msi_info = WindowsInstaller.msi_records(msi_file)
-  product_name = msi_info['ProductName']
-	
-  if(admin?)
-	while(WindowsInstaller.installed?(product_name))
-	  WindowsInstaller.uninstall(product_name)
-	end
-    raise "#{name}: Uninstall #{product_name} before running tests" if(WindowsInstaller.installed?(product_name))
-    
-	begin
-	  WindowsInstaller.install(msi_file)			
-	  raise "#{name}: Product name #{product_name} is not installed" unless(WindowsInstaller.installed?(product_name))
-
-	  eval callback unless(callback == nil)
-	ensure
-	  WindowsInstaller.uninstall(msi_file) if(WindowsInstaller.installed?(product_name))
-	  raise "Failed to uninstall product #{product_name}" if(WindowsInstaller.installed?(product_name))
-	end
-  end
-end

data/spec/wixpath.rb

@@ -1,3 +0,0 @@
-WIX_PATH='E:/Development/dep/OpenSource/WixToolset/3.9'
-
-Wixgem::Wix.install_path = WIX_PATH 

data/test_files/32145.txt

@@ -1 +0,0 @@
-Number File

data/test_files/8.0/File With Space.txt

@@ -1 +0,0 @@
-Test File

data/test_files/9.0/File With Space.txt

@@ -1 +0,0 @@
-Hello World

data/test_files/9.0/test_files/a_file.txt

@@ -1 +0,0 @@
-Test file

data/test_files/File-With-Hyphen.txt

@@ -1 +0,0 @@
-Test it