wixgem 0.66.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afaebdbb46da73a1f4c59778843531925277b5f3
-  data.tar.gz: f413613c8bb0dd16d830627df93110090fcb85ef
+  metadata.gz: 2f903e98ba851435dde4f9a8d002455b1f85341d
+  data.tar.gz: 0579fd5fb3f257d9bf7d172cebd9f2463dc55f99
 SHA512:
-  metadata.gz: 8f14bb7ea14667795dcea1d69a4662ee050966f5d2fec159dd1a786ae56b8a5df1ab3172f74a964999466668f87b1a1c49c856ac7dbc10f67d43f80865508b60
-  data.tar.gz: c82ab664e399cbd331cb214872a0f4e93b85de4d8fdd1f90c7af88ee64d97d8c07b8681892b536dfb418464d5ea167a8ffdad90466f72e363497771b32780f97
+  metadata.gz: 84d696956ef7cb66ee5e711f7ab24b45aa212ccbbdab504a7ef196bc7714b4c4981844b6c350fb7b18e43af74ff38af5c9f30bfaa4f6106839e6059fe417cfde
+  data.tar.gz: 313a096755a6b651314c8e91fbef7dcec01ec7ca616decd5184b5c7bb432733cb4292cb670c60abc1f496a9fcf487c088b49b69804f1502b50ac77f046bc011a

data/README.md

@@ -13,8 +13,6 @@ The [WiX Toolset](http://wixtoolset.org) must be installed.
 ```ruby
 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',
@@ -31,8 +29,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']])
+Wixgen::Wix.make_mergemodule('Product.msm', ['rakefile.rb']])
 
 ```
 An example rakefile.rb is included in the example directory of the gem.
@@ -42,7 +39,7 @@ An example rakefile.rb is included in the example directory of the gem.
 Wixgem will generate an installation or merge module from an array of files. The Wixgem also supports a 
 small set of optional arguments allowing the developer to customize the generated installation file. 
 
-#### Optional input hash arguments
+#### Optional input hash keys
 * **product_name**: String specifing the product name of the installation.
 * **manufacturer**: String specifing the manufacturer of the installation.
 * **version**:      String specifing the version of the installation. i.e. '1.1.0.0'
@@ -53,14 +50,32 @@ small set of optional arguments allowing the developer to customize the generate
 * **modify_file_paths**: A hash of regex objects to replacement string pairs. The regular expressions are applied to
                       the file paths allowing the developer to modify the relative location of the files in the installation.
 * **has_vb6_files**: Required if installation contains any ocx's or dll's compiled with Visual Basic 6.
-* **remove_existing_products**: A boolean value. If the value is true the installation will remove all existing 
-                             installations of the product before installing the product.
+* **remove_existing_products**: A boolean value. If the value is true the installation will remove the previous 
+                                installation of the product before installing the product.
 * **all_users**: String value perUser or perMachine. The default is perUser.
-* **suppress_registry_harvesting** Suppress registry harvesting. Can fix the Runtime Error E6034.		 
+* **suppress_registry_harvesting** Suppress's heat's registry harvesting. Can fix the Runtime Error E6034.		 
 * **suppress_COM_elements** Suppress COM elements.
 * **installer_version** Represents the minimum version of the Windows installer required to install
-                        this package. The default version is 4.0. Other valid versions are 2.0,
-						3.0, 3.5, 4.0, 4.5. 
+                        this package. The default version is 4.5. Other valid versions are 2.0,
+						3.0, 3.5, 4.0, 4.5.
+* **requires_netframework** Tests to see if the require netframework version is installed on the machine. The
+                            associated value specifies the netframework version. The net framework strings can
+                            be found at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html							
+* **binary_table**  Key is associated with an array of hashes specifying a file and a binary key to place into the 
+                    binary table.
+* **custom_actions** Key is associated with an array of hashes specifying the arguments for custom actions.
+* ** shortcuts ** Key is associated with a hash specifying arguments to create shortcuts. Currently, 
+                  the only supported shortcut is a desktop shortcut.
+* ** extensions ** Key is associated with a hash to register executables with extensions.
+* ** com_self_register ** Is a key associated with an array of files com dll's/exe's to mark for self
+                          registration
+* ** ignore_files ** Is a key associated with an array of files to ignore when generating the installation. This
+                     key is useful for having files copied to the installation folder to generating the installation,
+					 but not adding the files to the installation. An example of usage is I had a COM dll causing 
+					 heat some problems, so I needed to add the dependency dll's to the install directory so heat could
+					 harvest the com registry entries, but heat was choking on adding the support dll to the 
+					 installation. Thus, I was able to create a merge module for the COM dll and another merge module for
+					 the supporting dlls.
 * **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. If you are familiar with WiX this can helpful
 			 if there is a problem.      

data/lib/admin.rb

@@ -8,4 +8,4 @@ def admin?
   return true if(cmd[:exit_code] == 0)
   return false
 end
-ENV['HOME'] ||= "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}" if(admin?)
+ENV['HOME'] = ENV['USERPROFILE'] if(admin?)

data/lib/associate_extension.rb

@@ -0,0 +1,46 @@
+class AssociateExtension
+  def initialize(xml_doc)
+    @xml_doc = xml_doc
+  end
+
+  def associate(file, extension)
+    file = file.gsub(/\//,'\\')
+    file_elements = REXML::XPath.match(@xml_doc, "//File[@Source='.\\#{file}']")
+	raise "Unable to find file '#{file}' to associate with extension '#{extension}'" if(file_elements.nil? || file_elements.size != 1)
+
+	file_parent = file_elements[0].parent
+	
+	app=File.basename(file)
+    # App Paths to support Start,Run -> "myapp"
+    #<RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\MyApp.exe" Value="[!MyApp.exe]" Type="string" />
+	file_parent.add_element 'RegistryValue', { 'Root' => 'HKLM', 'Key' => "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\#{app}",
+	                                           'Value' => "[INSTALLDIR]#{file}", 'Type' => 'string' }
+    #<RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\MyApp.exe" Name="Path" Value="[APPLICATIONFOLDER]" Type="string" />
+	file_parent.add_element 'RegistryValue', { 'Root' => 'HKLM', 'Key' => "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\#{app}", 
+	                                           'Name' => 'Path', 'Value' => '[INSTALLDIR]', 'Type' => 'string' }
+
+    # Extend to the "open with" list + Win7 jump menu pinning  
+    #<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\MyApp.exe\SupportedTypes" Name=".xyz" Value="" Type="string" />
+	file_parent.add_element 'RegistryValue', { 'Root' => 'HKLM', 'Key' => "SOFTWARE\\Classes\\Applications\\#{app}\\SupportedTypes", 
+	                                           'Name' => extension, 'Value' => '', 'Type' => 'string' }
+    #<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\MyApp.exe\shell\open" Name="FriendlyAppName" Value="!(loc.ApplicationName)" Type="string" />
+	file_parent.add_element 'RegistryValue', { 'Root' => 'HKLM', 'Key' => "SOFTWARE\\Classes\\Applications\\#{app}\\shell\\open\\command", 
+	                                           'Value' => "[INSTALLDIR]#{file} \"%1\"", 'Type' => 'string' }
+
+    # MyApp.Document ProgID 
+    #<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\MyApp.Document" Name="FriendlyTypeName" Value="!(loc.DescXYZ)" Type="string" />
+	file_parent.add_element 'RegistryValue', { 'Root' => 'HKLM', 'Key' => "SOFTWARE\\Classes\\#{File.basename(app, '.exe')}.Document", 
+	                                           'Name' => 'Aim Project File', 'Value' => "[INSTALLDIR]#{app} \"%1\"", 'Type' => 'string' }
+
+	#<ProgId Id="MyApp.Document" Description="!(loc.DescXYZ)" Icon="filetype.ico" Advertise="yes">
+    #    <Extension Id="xyz">
+    #        <Verb Id="open" Command="!(loc.ExplorerMenuOpenXYZ)" Argument="&quot;%1&quot;" />
+    #        <MIME Advertise="yes" ContentType="application/xyz" Default="yes" />
+    #    </Extension>
+    #</ProgId>
+	prog_id = file_parent.add_element 'ProgId', { 'Id' => "#{File.basename(app, '.exe')}.Document", 'Description' => "Aim project file", 
+	                                              'Advertise' => 'yes'}
+    ext = prog_id.add_element 'Extension', { 'Id' => extension.gsub(/\./, '') }
+	ext.add_element 'Verb', { 'Id' => 'open', 'Command' => "[INSTALLDIR]#{app}", 'Argument' => "\"%1\"" }
+  end
+end

data/lib/custom_action.rb

@@ -0,0 +1,74 @@
+require 'rexml/document'
+require 'SecureRandom'
+
+module Wixgem
+
+class CustomAction
+  def initialize(xml_doc, input)
+    @xml_doc = xml_doc
+    @input = input
+  end
+  def add(custom_action)
+    unless(custom_action.key?(:file) || custom_action.key?(:binary_key))
+      raise 'Currently, only supported custom actions work with installed executable or binary key' 
+	end
+	
+	file_key=nil
+	if(custom_action.key?(:file))
+      install_path = ".\\#{custom_action[:file].gsub(/\//,'\\')}"
+	  file_elements = REXML::XPath.match(@xml_doc, "//File[@Source='#{install_path}']")
+	  raise "Unable to locate installation file '#{custom_action[:file]} for custom action'" if(file_elements.nil? || (file_elements.size == 0))
+	
+	  file_key = file_elements[0].attributes['Id']
+	end
+	
+	id = "ca_#{SecureRandom.uuid.gsub(/-/,'')}"
+	id = custom_action[:id] if(custom_action.key?(:id))
+	
+	cmd_line = ''
+	cmd_line = custom_action[:exe_command] if(custom_action.key?(:exe_command))
+	
+	impersonate = 'yes'
+	impersonate = custom_action[:impersonate] if(custom_action.key?(:impersonate))
+	
+	condition='NOT Installed AND NOT REMOVE'
+	condition='1' if(custom_action.key?(:binary_key))
+	condition = custom_action[:condition] if(custom_action.key?(:condition))
+	
+	execute='deferred'
+	execute = custom_action[:execute] if(custom_action.key?(:execute))
+	
+	ret='check'
+	ret = custom_action[:return] if(custom_action.key?(:return))
+	
+	wix_element = REXML::XPath.match(@xml_doc, "/Wix")[0]
+	fragment = wix_element.add_element 'Fragment'
+	
+	action = fragment.add_element 'CustomAction', { 'Id' => id, 'ExeCommand' =>  cmd_line, 'Impersonate' => impersonate, 'Return' => ret, 'HideTarget' => 'no', 'Execute' => execute }
+	if(custom_action.key?(:binary_key))
+	  action.attributes['BinaryKey'] = custom_action[:binary_key]
+	else
+	  action.attributes['FileKey'] = file_key
+	end
+
+    install_execute_sequence = fragment.add_element 'InstallExecuteSequence'
+
+	custom_action[:before] = 'InstallFinalize' if(!custom_action.key?(:after) && !custom_action.key?(:before))
+	if(custom_action.key?(:after))
+ 	  action = install_execute_sequence.add_element 'Custom', { 'Action' => id, 'After' => custom_action[:after] }
+      action.text = condition
+	else
+ 	  action = install_execute_sequence.add_element 'Custom', { 'Action' => id, 'Before' => custom_action[:before] }
+      action.text = condition
+	end
+	
+	control=nil
+	elements = REXML::XPath.match(@xml_doc, "/Wix/Product")
+	elements = REXML::XPath.match(@xml_doc, "/Wix/Module") if(elements.nil? || elements.size == 0)
+	
+	elements[0].add_element 'CustomActionRef', { 'Id' => id }
+
+  end
+end
+
+end

data/lib/temp_directory.rb

@@ -0,0 +1,18 @@
+require 'securerandom'
+
+#module Wixgem
+
+def temp_directory
+	tmp_file = "#{ENV['TEMP'].gsub(/\\/,'/')}/#{SecureRandom.hex}"
+	FileUtils.mkpath(tmp_file)
+	begin
+		yield tmp_file
+	rescue Exception => e
+	  raise e
+	ensure
+	  sleep(0.1)
+	  FileUtils.rm_rf(tmp_file)
+	end
+end
+
+#end

data/lib/wixgem.rb

@@ -1,14 +1,24 @@
 require 'fileutils'
-require 'tmpdir.rb'
 require 'rexml/document'
 require 'CMD'
 require 'SecureRandom'
-require_relative('file.rb')
-require_relative('shortcut.rb')
+
+require_relative 'file.rb'
+require_relative 'shortcut.rb'
+require_relative 'custom_action.rb'
+require_relative 'temp_directory.rb'
+require_relative 'associate_extension.rb'
+
+# Editor for wix Files WixEdit: http://http://wixedit.sourceforge.net/
+# Full list of Wix editors : http://robmensching.com/blog/posts/2007/11/20/wix-editors/
+# I guess SharpDevelop is good
+
+# Good web page for including the dialog https://www.packtpub.com/books/content/windows-installer-xml-wix-adding-user-interface
 
 module Wixgem
 
 class Wix
+
   @@install_path = ''
   @@install_path = ENV['WIX'] unless(ENV['WIX'].nil?)
 
@@ -50,53 +60,77 @@ class Wix
     @logger = nil
   end
   
+  def self.manage_installdir(xml_doc, input)
+	product_target_elements = REXML::XPath.match(xml_doc, "/Wix/Product/Directory[@Id='TARGETDIR']")
+	if(!product_target_elements.nil? && product_target_elements.size == 1)
+	  targetdir = product_target_elements[0]
+	  installdir = targetdir.add_element 'Directory', { 'Id' => 'ProgramFilesFolder' }
+      installdir = installdir.add_element 'Directory', { 'Id' => "Dir_#{input[:manufacturer]}", 'Name' => input[:manufacturer] } if(input.has_key?(:manufacturer))
+	  installdir = installdir.add_element 'Directory', { 'Id' => 'INSTALLDIR', 'Name' => input[:product_name] }
+	else
+	  module_target_elements = REXML::XPath.match(xml_doc, "/Wix/Module/Directory[@Id='TARGETDIR']")
+	  targetdir = module_target_elements[0]
+	  targetdir.add_element 'Directory', { 'Id' => 'MergeRedirectFolder', 'FileSource' => '.' }
+	end
+	return xml_doc
+  end
+  
+  def self.manage_netframework(xml_doc, input)
+    wix = REXML::XPath.match(xml_doc, "/Wix")[0]
+    add_netfx_namespace = false   
+    if(input.key?(:requires_netframework))
+	  add_netfx_namespace=true
+	  fragment = wix.add_element 'Fragment'
+	  fragment.add_element 'PropertyRef', { 'Id' => input[:requires_netframework] }
+	  condition = fragment.add_element 'Condition', { 'Message' => "This application requires .NET Framework #{input[:requires_netframework]}. Please install the .NET Framework then run this installer again." }
+	  condition.text = "<![CDATA[Installed OR #{input[:requires_netframework]}]]>"
+    end
+	
+	wix.attributes['xmlns:netfx'] = 'https://schemas.microsoft.com/wix/NetFxExtension' if(add_netfx_namespace)
+    return xml_doc 
+  end
+  
+  def self.manage_ui(xml_doc, input)
+    product_elements = REXML::XPath.match(xml_doc, "/Wix/Product")
+
+	return if(product_elements.nil? || product_elements.size != 1)
+	return unless(input.key?(:ui))
+	
+	product = product_elements[0]
+	ui = product.add_element 'UIRef', { 'Id' => input[:ui] }
+	
+    return xml_doc
+  end
+
   def self.manage_upgrade(xml_doc, input)
-	product = REXML::XPath.match(xml_doc, '//Wix/Product')
-	return xml_doc if(product.length == 0)
+	products = REXML::XPath.match(xml_doc, '//Wix/Product')
+	return xml_doc if(products.length == 0)
 
- 	if(input.has_key?(:remove_existing_products) && input[:remove_existing_products])
+ 	if(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))
 	
-	  upgrade = product[0].add_element 'Upgrade', { 'Id' => input[:upgrade_code] }
-	  upgrade.add_element 'UpgradeVersion', { 'Minimum' => input[:version], 'OnlyDetect'=>'yes', 'Property'=>'NEWERVERSIONDETECTED' }
-	  upgrade.add_element 'UpgradeVersion', { 'Minimum' => '0.0.0', 'IncludeMinimum'=>'yes','Maximum'=>input[:version],'IncludeMaximum'=>'no','Property'=>'OLDERVERSIONBEINGUPGRADED' }
-
-	  install_and_execute = REXML::XPath.match(xml_doc, '//Wix/Product/InstallExecuteSequence')
-	  install_and_execute[0].add_element 'RemoveExistingProducts', { 'After'=>'InstallValidate' }
+	  upgrade = products[0].add_element 'MajorUpgrade', { 'AllowDowngrades' => 'yes' }
 	end
 	
 	return xml_doc
   end  
 
   def self.manage_custom_actions(xml_doc, input)
-    # Example custom action
-	#<CustomAction Id='comReg' Directory='INSTALLLOCATION' Execute='deferred' Impersonate='no' ExeCommand='"[NETFRAMEWORK40CLIENTINSTALLROOTDIR]regasm.exe" "[INSTALLLOCATION]EAWordImporter.dll" /codebase' Return='check' />
-
-    manufacturer = 'Default Manufacturer'
-    manufacturer = input[:manufacturer] if(input.has_key?(:manufacturer))
-	
-	install_path = '[ProgramFilesFolder][ProductName]'
-	install_path = "[ProgramFilesFolder][Manufacturer]\\[ProductName]" unless(manufacturer == 'Default Manufacturer')
-
-	product = REXML::XPath.match(xml_doc, '//Wix/Product')
-	return xml_doc if(product.length == 0)
-	
-	product[0].add_element 'SetProperty', { 'Id' => 'ARPINSTALLLOCATION', 'Value' => "#{install_path}", 'After' => 'CostFinalize', 'Sequence' => 'both' }	
-	product[0].add_element 'CustomAction', { 'Id' => 'SetTARGETDIR', 'Property' => 'TARGETDIR', 'Value' => "#{install_path}", 'Execute' => 'firstSequence', 'Return' => 'check'}
+    custom_actions = CustomAction.new(xml_doc, input)
+	return xml_doc if(input[:custom_actions].nil?)
+		
+	input[:custom_actions].each { |ca| custom_actions.add(ca) } if(input.key?(:custom_actions))
 
-	install_execute_sequence = product[0].add_element 'InstallExecuteSequence'
-	custom_action = install_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
+	return xml_doc
+  end
+  
+  def self.manage_associate_extensions(xml_doc, input)
+    return xml_doc unless(input.key?(:extensions))
 
-	install_ui_sequence = product[0].add_element 'InstallUISequence'
-	custom_action = install_ui_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
+	ext = AssociateExtension.new(xml_doc)
+	input[:extensions].each { |exe, file_ext| ext.associate(exe, file_ext) }
 	
-	admin_execute_sequence = product[0].add_element 'AdminExecuteSequence'
-	custom_action = admin_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
-
-	admin_ui_sequence = product[0].add_element 'AdminUISequence'
-	custom_action = admin_ui_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
-
 	return xml_doc
   end
   
@@ -112,7 +146,7 @@ class Wix
 	}
 	return xml_doc if(merge_modules.length == 0)
 	
-	directory_root = REXML::XPath.match(xml_doc, '//Wix/Product/Directory')
+	directory_root = REXML::XPath.match(xml_doc, "//Directory[@Id='INSTALLDIR']")
 	if(directory_root.length == 0)
 		module_root = REXML::XPath.match(xml_doc, '//Wix/Module')
 		raise 'Merge modules can not be added to a merge module' unless(module_root.nil?)
@@ -161,6 +195,30 @@ class Wix
 	return xml_doc
   end
   
+  def self.manage_self_register(xml_doc, input)
+	return xml_doc unless(input.has_key?(:com_self_register))
+	input[:com_self_register].each do |file|
+	  file_elements = REXML::XPath.match(xml_doc, "//File[@Source='.\\#{file.gsub(/\//,'\\')}']")
+	  raise "Unable to find file '#{file}' for self registering" unless (file_elements.length == 1)
+	  file_elements[0].attributes['SelfRegCost'] = '0'
+	end
+
+	return xml_doc
+  end
+  
+  def self.manage_binary_table(xml_doc, input)
+	return xml_doc unless(input.has_key?(:binary_table))
+	wix_element = REXML::XPath.match(xml_doc, "/Wix")[0]
+
+	fragment = wix_element.add_element 'Fragment'
+	input[:binary_table].each { |entry| 
+	  #puts "File: #{entry[:file]}"
+	  binary = fragment.add_element 'Binary', { 'Id' => entry[:id], 'SourceFile' => entry[:file] }
+	}
+
+	return xml_doc
+  end
+
   def self.modify_file_path(input, file)
     return file unless(input.kind_of?(Hash) && input.has_key?(:modify_file_paths))
   
@@ -208,9 +266,17 @@ class Wix
 		max_path = files.max { |a, b| a.length <=> b.length }
 		columen_size = max_path.length + 10
 	  end
-	    
+	  
+	  ingore_files = self.ignore_files(input)
+	  if(input.has_key?(:ignore_files))
+	    @logger << "------------------------------------ ignoring files -----------------------------------" unless(@logger.nil?)
+		input[:ignore_files].each { |file| @logger << file }
+	  end
+
 	  @logger << "------------------------------------ Installation Paths -----------------------------------" unless(@logger.nil?)
 	  @logger << "%-#{columen_size}s %s\n" % ['File path', 'Installation Path']  unless(@logger.nil?)
+	  files.reject! { |f| ingore_files.include?(f) }
+
 	  files.each do |file| 
 	    if(File.file?(file))
   	      install_path = file
@@ -219,13 +285,7 @@ class Wix
           end
 	      @logger << "%-#{columen_size}s %s\n" % [file, install_path]  unless(@logger.nil?)
         end
-      end
-      
-	  if(input.has_key?(:ignore_files))
-	    @logger << "------------------------------------ ignoring files -----------------------------------" unless(@logger.nil?)
-		input[:ignore_files].each { |file| @logger << file }
-	  end
-	  
+      end	  
 	  @logger << "-------------------------------------------------------------------------------------------" unless(@logger.nil?)
 	end
 
@@ -244,6 +304,11 @@ class Wix
 	end
   end
 
+  def self.modify_binary_files(input)
+    return unless(input.key?(:binary_table))
+	input[:binary_table].each { |entry| entry[:file] = File.absolute_path(entry[:file]) }
+  end
+  
   def self.log_wix_output(cmd)
 	return unless(@debug && !@logger.nil?)
 	
@@ -265,6 +330,11 @@ class Wix
   	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])
+	if(input[:msi?])
+	  cmd = cmd.gsub(/-srd/, '-dr INSTALLDIR -srd') 
+	else
+	  cmd = cmd.gsub(/-srd/, '-dr MergeRedirectFolder -srd') 
+	end
 	return cmd
   end
 
@@ -310,9 +380,10 @@ class Wix
 	  file_elements = REXML::XPath.match(xml_doc, '//Wix/Fragment/DirectoryRef/Component/File')
 	  file_elements[0].attributes['Source'] = "SourceDir\\#{file.gsub(/\//,'\\')}" if(file_elements.length == 1)
 	  file_elements[0].attributes['Id'] = "fil#{SecureRandom.uuid.gsub(/-/,'')}" if(file_elements.length == 1) # Assigning new Id, because the id is somehow generated from the filename. So it is possible for heat to generate duplicate id's
+
 	  File.open(filename, 'w') { |f| f.puts(xml_doc.to_s) }	
 	end
-	directory_fragments['.'] = 'TARGETDIR'
+	directory_fragments['.'] = 'INSTALLDIR'
 	
 	xml_doc = REXML::Document.new(File.read(wxs_file))
 
@@ -362,6 +433,7 @@ class Wix
 	end
 	
 	product_name = File.basename(wxs_file, '.wxs')
+	input[:product_name] = product_name unless(input.has_key?(:product_name))
     product_name = input[:product_name] if(input.has_key?(:product_name))
 	
     manufacturer = 'Not Set'
@@ -375,6 +447,9 @@ class Wix
 
 	upgrade_code = ''
 	upgrade_code = input[:upgrade_code] if(input.has_key?(:upgrade_code))
+
+	install_path = '[ProgramFilesFolder][ProductName]'
+	install_path = "[ProgramFilesFolder][Manufacturer]\\[ProductName]" unless(manufacturer == 'Not Set')
 	
 	wxs_text = File.read(wxs_file)
 
@@ -388,36 +463,50 @@ class Wix
 	wxs_text = wxs_text.gsub(/Product Id=\"[^\"]+\"/) { |s| s = "Product Id=\"#{product_code}\"" } unless(product_code.empty?)
 	wxs_text = wxs_text.gsub(/UpgradeCode=\"[^\"]+\"/) { |s| s = "UpgradeCode=\"#{upgrade_code}\"" } unless(upgrade_code.empty?)
 	
+	File.open(wxs_file, 'w') { |f| f.write(wxs_text) }	
+
 	xml_doc = REXML::Document.new(wxs_text)
+	products = REXML::XPath.match(xml_doc, "/Wix/Product")
+	products.each do |product|
+	  product.add_element 'SetProperty', { 'Id' => 'ARPINSTALLLOCATION', 'Value' => "#{install_path}", 'After' => 'CostFinalize', 'Sequence' => 'both' }	
+	end
+	
 	packages = REXML::XPath.match(xml_doc, '//Wix/Product/Package')
 	packages.each do |package| 
 		package.add_attribute('InstallScope', 'perMachine') if(input.has_key?(:all_users))
+		package.add_attribute('InstallScope', input[:install_scope]) if(input.has_key?(:install_scope))
 		package.attributes['InstallerVersion'] = 450
 		package.attributes['InstallerVersion'] = (input[:installer_version]*100).to_i if(input.has_key?(:installer_version))
+	    package.attributes['InstallPrivileges']= input[:install_priviledges] if(input.has_key?(:install_priviledges))
 	end 
 
+	xml_doc = manage_installdir(xml_doc, input)
+	xml_doc = manage_netframework(xml_doc, input)
+	#xml_doc = manage_ui(xml_doc, input)
 	xml_doc = manage_custom_actions(xml_doc, input)
 	xml_doc = manage_upgrade(xml_doc,input)
 	xml_doc = manage_msm_files(xml_doc)
 	xml_doc = manage_read_only_files(xml_doc,input)
 	xml_doc = manage_shortcuts(xml_doc, input)
-	
-	File.open(wxs_file, 'w') { |f| f.puts(xml_doc.to_s) }	
-    #formatter = REXML::Formatters::Pretty.new(2)
-    #formatter.compact = true # This is the magic line that does what you need!
-	#wxs_text = ''
-	#formatter.write(xml, wxs_text)
-	#File.open(wxs_file, 'w') { |f| f.puts(wxs_text) }	
+	xml_doc = manage_self_register(xml_doc, input)
+	xml_doc = manage_binary_table(xml_doc, input)
+	xml_doc = manage_associate_extensions(xml_doc, input)
+		
+    formatter = REXML::Formatters::Pretty.new(2)
+    formatter.compact = true 
+  	File.open(wxs_file, 'w') { |f| formatter.write(xml_doc, f) }	
   end
 
-  def self.create_output(wxs_file, output)
+  def self.create_output(wxs_file, input, output)
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
 	candle_cmd = CMD.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
 	candle_cmd.execute	
 	log_wix_output(candle_cmd)
 	
-	light_cmd = CMD.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"", { quiet: true })
+	cmd_args = "-nologo -out \"#{output}\" \"#{wixobj_file}\""
+    cmd_args = "-ext WixUIExtension -cultures:en-us #{cmd_args}" if(input.key?(:ui))
+	light_cmd = CMD.new("\"#{install_path}/bin/light.exe\" #{cmd_args}", { quiet: true })
 	light_cmd.execute
 	log_wix_output(light_cmd)
   end
@@ -434,7 +523,6 @@ class Wix
 	verify_input_keys(input)
 	  	
 	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
-
 	start_logger if(@debug)
 	
 	FileUtils.mkpath(File.dirname(output)) unless(Dir.exists?(File.dirname(output)))
@@ -445,21 +533,21 @@ class Wix
  
 	output_absolute_path = File.absolute_path(output)
 	input[:original_pwd] = Dir.pwd
+	input[:msi?] = output.include?('.msi')
+		
+	modify_binary_files(input)
 
-	#dir = './tmp_dir'
-	#FileUtils.rm_rf(dir) if(Dir.exists?(dir))
-	#FileUtils.mkdir(dir)
-	Dir.mktmpdir do |dir|
+	temp_directory do |dir|
 	  wxs_file = "#{basename}.wxs"	    
 	  begin
 		copy_install_files(dir, input)
 	  
 		Dir.chdir(dir) do |current_dir|
 		  create_wxs_file(wxs_file, input, ext)
-	      create_output(wxs_file, output_absolute_path)
+	      create_output(wxs_file, input, output_absolute_path)
 		end
 	  rescue Exception => e
-		raise "Wixgem exception: #{e}"
+		raise e
 	  ensure
 	    FileUtils.cp("#{dir}/#{wxs_file}", "#{output_absolute_path}.wxs") if(File.exists?("#{dir}/#{wxs_file}") && @debug)
 	    File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug &!@logger.nil?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.84.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ocra
+  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
@@ -103,12 +117,17 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- example/example.msi
+- example/example.msm
 - example/install_files/directory/file2.txt
 - example/install_files/file1.txt
 - example/rakefile.rb
 - lib/admin.rb
+- lib/associate_extension.rb
+- lib/custom_action.rb
 - lib/file.rb
 - lib/shortcut.rb
+- lib/temp_directory.rb
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses: