wixgem 0.108.0 → 0.111.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80493efcc975680f41a21d0196dedde83e90a2447b1bdf6eebf1ffdb1de1b49d
-  data.tar.gz: 7e1508dcaad2346044f97601ea8b754e043fb02fd9e350ad607289063e7660eb
+  metadata.gz: acbf145ad790fe0b0faabf479d25e3837f65700d477e93a910d6efcd9f77e04d
+  data.tar.gz: cbc834eebb2e65b249f157edf7ebe065548d3cbd26d0968b2bc0ca672e14494e
 SHA512:
-  metadata.gz: 399c34135782d39b0cb839c308e4acef986d7126701a57d2d1bc02d7118733dc1e7fa5ee98845e0b863856e711a7f9d56e2d16b6866e49fea2df3ab1e2ea18d7
-  data.tar.gz: 4644152e7d05ce0919685405043838caedc3f978e985ebcff47e25d739ccbf5197e818fdbbcb0a31b8dd96ef5543e5c35ef59ccf753b137a3ba0e25ab49b4f92
+  metadata.gz: 69a025c6eef3598dbf2dba9f68265aa05c04f75af7f92c6af48929860781b9519e65b1bcad5d1824785428b3796a92fd8287f99be637758252234b9f984394e2
+  data.tar.gz: c27dba3df585bc4b46de25be5dd988eeb07c3f73f18537ce40e65d84b30131550d80a1de9864272f29754b5a7336d0bbc746a4511cb0ef36efb43725cfd389f6

data/lib/custom_action.rb

@@ -48,8 +48,8 @@ class CustomAction
 	    action.attributes['FileKey'] = file_key
 	  end
 
-		action.attributes['Directory'] = custom_action[:directory] if(custom_action.key?(:directory))
-  	action.attributes['ExeCommand'] = custom_action[:exe_command] if(custom_action.key?(:exe_command))
+	  action.attributes['Directory'] = custom_action[:directory] if(custom_action.key?(:directory))
+  	  action.attributes['ExeCommand'] = custom_action[:exe_command] if(custom_action.key?(:exe_command))
 	  action.attributes['DllEntry'] = custom_action[:dll_entry] if(custom_action.key?(:dll_entry))
 
 	  if(custom_action.key?(:property))

data/lib/registry_key.rb

@@ -0,0 +1,42 @@
+##require 'rexml/document'
+#require 'SecureRandom'
+
+#module Wixgem
+
+# https://support.firegiant.com/hc/en-us/articles/230912127-RegistryKey-and-RegistryValue-elements
+class RegistryKey
+  def initialize(xml_doc, input)
+    @xml_doc = xml_doc
+    @input = input
+  end
+  def add(registry_key)
+    unless(registry_key.key?(:root) && registry_key.key?(:key) && registry_key.key?(:value))
+      raise 'Registry key must have root, key, and value elements' 
+	end
+
+	key_value = registry_key[:value]
+    unless(key_value.key?(:name) || key_value.key?(:value) || key_value.key?(:type))
+		raise 'Registry value must have name, value, and type elements' 
+	end
+
+	registry_keys_component = REXML::XPath.match(@xml_doc, "//Component[@Id='RegistryKeys']")
+	if(registry_keys_component.size == 0)
+		wix_element = REXML::XPath.match(@xml_doc, "/Wix")[0]
+		fragment = wix_element.add_element 'Fragment'
+		component_group = fragment.add_element 'ComponentGroup'
+		component_group.attributes['Id'] = "rk_#{SecureRandom.uuid.gsub(/-/,'')}"
+
+		default_feature = REXML::XPath.match(@xml_doc, '//Wix/Product/Feature')
+		component_ref = default_feature[0].add_element 'ComponentGroupRef', 'Id' => component_group.attributes['Id']
+
+		component = component_group.add_element 'Component'
+		component.attributes['Id'] = 'RegistryKeys'
+		component.attributes['Directory'] = 'INSTALLDIR'
+	else
+		puts "component: #{registry_keys_component.to_s}"
+	end
+		
+	registry_key_element = component.add_element 'RegistryKey', { 'Root' => registry_key[:root], 'Key' => registry_key[:key] }
+	value_element = registry_key_element.add_element 'RegistryValue', { 'Action' => 'write', 'Name' => key_value[:name], 'Value' => key_value[:value], 'Type' => key_value[:type] }
+   end
+end

data/lib/wixgem.rb

@@ -6,6 +6,7 @@ require 'SecureRandom'
 require_relative 'file.rb'
 require_relative 'shortcut.rb'
 require_relative 'custom_action.rb'
+require_relative 'registry_key.rb'
 require_relative 'temp_directory.rb'
 require_relative 'associate_extension.rb'
 require_relative 'service.rb'
@@ -134,13 +135,22 @@ class Wix
 
   def self.manage_custom_actions(xml_doc, input)
     custom_actions = CustomAction.new(xml_doc, input)
-	  return xml_doc if(input[:custom_actions].nil?)
+	return xml_doc if(input[:custom_actions].nil?)
 		
-	  input[:custom_actions].each { |ca| custom_actions.add(ca) } if(input.key?(:custom_actions))
+	input[:custom_actions].each { |ca| custom_actions.add(ca) }
 
-	  return xml_doc
+	return xml_doc
   end
-  
+
+  def self.manage_registry_keys(xml_doc, input)
+	return xml_doc if(input[:set_registry_keys].nil?)
+
+	registry_keys = RegistryKey.new(xml_doc, input)
+	input[:set_registry_keys].each { |rk| registry_keys.add(rk) }
+
+    return xml_doc
+  end
+ 
   def self.manage_associate_extensions(xml_doc, input)
     return xml_doc unless(input.key?(:extensions))
 
@@ -270,7 +280,7 @@ class Wix
     files = input
     files = input[:files] if(input.kind_of?(Hash))
 		
-		return files
+	return files
   end
 
   def self.ignore_files(input)
@@ -410,7 +420,7 @@ class Wix
 	  
 	    filename = wxs_file
 	    if(install_files.index(file) == 0)
-        execute_heat(input, "file \"#{windows_path}\" -v #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{filename}\"")
+        execute_heat(input, "file \"#{windows_path}\" -v #{template_option} -cg InstallationFiles -gg -nologo -srd -o  \"#{filename}\"")
 	    else
 		    filename = File.basename(wxs_file).gsub('.wxs', "-#{wxs_files.length}.wxs") 
 		    execute_heat(input, "file \"#{windows_path}\" -v -template fragment -gg -nologo -srd -o  \"#{filename}\"")
@@ -461,7 +471,7 @@ class Wix
   end
   
   def self.execute_heat_dir(wxs_file, input, template_option)
-	  execute_heat(input,"dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\"")
+	  execute_heat(input,"dir . #{template_option} -cg InstallationFiles -gg -nologo -srd -o  \"#{wxs_file}\"")
   end
   
   def self.create_wxs_file(wxs_file, input, ext)
@@ -527,6 +537,7 @@ class Wix
 	  xml_doc = manage_win10_crt(xml_doc, input)
 	  #xml_doc = manage_ui(xml_doc, input)
 	  xml_doc = manage_custom_actions(xml_doc, input)
+	  xml_doc = manage_registry_keys(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)
@@ -553,7 +564,6 @@ class Wix
 	wix_bin_dir = "#{wix_install_path}/tools" unless(Dir.exists?(wix_bin_dir))
 	raise "Unable to locate candle.exe. Expecting to have a sub directory bin or tools in the wix installtion directory: #{wix_install_path}" unless(Dir.exists?(wix_bin_dir))
 	
-
 	ext_args = "-ext WixUtilExtension -ext WixNetfxExtension -ext WixUIExtension"
 	candle_cmd = Execute.new("\"#{wix_bin_dir}/candle.exe\" #{ext_args} -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
 	candle_cmd.execute	
@@ -604,6 +614,7 @@ class Wix
 	  rescue Exception => e
 		raise e
 	  ensure
+		puts "debug path: #{output_absolute_path}" if(@debug)
 	    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?)
 	  end	  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.108.0
+  version: 0.111.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -140,6 +140,7 @@ files:
 - lib/associate_extension.rb
 - lib/custom_action.rb
 - lib/file.rb
+- lib/registry_key.rb
 - lib/service.rb
 - lib/shortcut.rb
 - lib/temp_directory.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset