wixgem 0.107.0 → 0.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4df5be0ad2b518b79605ff0df4352189113f98f04151cdaa67cd872a6bb9be6
-  data.tar.gz: 13415131c4b51d1587e536fe17aebf41e6195104ab375f219384b1582d5ca041
+  metadata.gz: 10e61c62d03979266feff1ade5dcef49603123b87b8fa6e6103466783c9ef203
+  data.tar.gz: 3ceb485b6e95b995d43d09e53fa89738a533d70ac1b3bec2d5390f8c3b5954ea
 SHA512:
-  metadata.gz: a2425b542ace8a5b0260713b345f435d26c87c200a46a14023b17d02391909070da6b62263c1e01e16c9fe9ce187ce8299cd83c7a4ef0ba6794fd70002d11e4b
-  data.tar.gz: 6dd5953c029b3c504881f1b4b5f92ffb6b5e1fffa85e427c4dbe0d5814652bc813799882415409569cd777dd7a4401c5af565c8513629b8c5c41ed307f0db06c
+  metadata.gz: 36d3b66c9e9a27ab5850bbc429a3f8e6148915bf9df77a612dbc797cc01ee872fccdc4f942a6c75b8eeb368713e32ecdf09bdd54f73a1027ff993d0e59f5e4dc
+  data.tar.gz: ece434c79d788ee69e20df13ce90cf31d7224db1c7fab0ad66381de28e3210125efb7ba50965965b5f8e00f18bc91273f0f26b508da2009ba1c1ceb1aabaa96d

data/lib/registry_entries.rb

@@ -0,0 +1,68 @@
+class RegistryEntries
+  def initialize(hash)
+	  @hash = hash
+  end
+
+  def create_key(xml_doc)
+    raise "RegistryEntry hash is required to have a :root key" unless(@hash.has_key?(:root))
+    raise "RegistryEntry hash is required to have a :path key" unless(@hash.has_key?(:path))
+    raise "RegistryEntry hash is required to have a :key key" unless(@hash.has_key?(:key))
+    raise "Key hash is required to have a :name key" unless(@hash[:key].has_key?(:name))
+    raise "Key hash is required to have a :value key" unless(@hash[:value].has_key?(:name))
+    raise "Key hash is required to have a :value key" unless(@hash[:value_type].has_key?(:name))
+
+    service_exe = @hash[:service_exe]
+    raise "Service #{file} does not exist" unless(File.exists?(service_exe))
+    
+    file_elements = REXML::XPath.match(xml_doc, "//File[@Source='.\\#{service_exe.gsub(/\//,'\\')}']")
+    raise "Service #{@file} does not match a 'File' element with a 'Source' attribute in the wix generated wix file" if(file_elements.length == 0)
+      
+    service_exe_element = file_elements[0]
+    service_exe_element.attributes['KeyPath']='yes'
+
+	  create_service_element(xml_doc, service_exe_element)
+	
+	  return xml_doc
+  end
+
+  def set(xml_doc, input)
+    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/registry_key.rb

@@ -0,0 +1,81 @@
+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) || custom_action.key?(:property) || custom_action.key?(:directory))
+      raise 'Currently, only supported custom actions work with installed executable, binary key, property, or directory' 
+	  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))
+		
+	  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, '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
+
+		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))
+	    raise "Custom action property '#{custom_action[:property]} must have a value!" unless(custom_action.key?(:value))
+	    action.attributes.delete('ExeCommand')
+	    action.attributes.delete('Return')
+	    action.attributes['Property'] = custom_action[:property]
+	    action.attributes['Value'] = custom_action[:value]	  
+	  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/service.rb

@@ -37,7 +37,7 @@ class Service
 
     if(service.key?(:logonasservice))
       raise ':logonasservice requires an :account element' unless(service.key?(:account))
-      
+
       wix = REXML::XPath.match(xml_doc, "/Wix")[0]
       wix.add_attribute('xmlns:Util', 'http://schemas.microsoft.com/wix/UtilExtension')
 
@@ -50,6 +50,7 @@ class Service
         
         account = words[1]
       end
+
       user_element.attributes['Id'] = "logon_as_service_#{SecureRandom.uuid.gsub(/-/,'')}"
       user_element.add_attribute('Name', account)
       user_element.add_attribute('LogonAsService', service[:logonasservice])
@@ -57,7 +58,6 @@ class Service
       user_element.add_attribute('UpdateIfExists', 'yes')
 
       service.delete(:logonasservice)
-      service.delete(:domain) if(service.key?(:domain))
     end 
     service_element = parent_element.add_element('ServiceInstall')
 

data/lib/wixgem.rb

@@ -281,43 +281,43 @@ class Wix
   end
   
   def self.copy_install_files(directory, input)
-	  files = files(input)
+	files = files(input)
 
-	  missing_files = []
-	  files.each do |file| 
-	    if(File.file?(file))
+	missing_files = []
+	files.each do |file| 
+	  if(File.exists?(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
-		    raise "Invalid relative installation path: #{install_path}" if(install_path.include?(':'))
+		raise "Invalid relative installation path: #{install_path}" if(install_path.include?(':'))
 
    	    install_path = "#{directory}/#{install_path}"		
-		    FileUtils.mkpath(File.dirname(install_path)) unless(Dir.exists?(File.dirname(install_path)))
-		    FileUtils.cp(file, install_path, { preserve: true })
-	    elsif(!File.exists?(file))
-	      missing_files.insert(missing_files.length, file)
-	    end
+		FileUtils.mkpath(File.dirname(install_path)) unless(Dir.exists?(File.dirname(install_path)))
+		FileUtils.cp(file, install_path, preserve: true)
+	  elsif(!File.exists?(file))
+	    missing_files.insert(missing_files.length, file)
 	  end
+	end
 
     if(@debug)	
-	    if(files.length > 0)
-			  max_path = files.max { |a, b| a.length <=> b.length }
-			  columen_size = max_path.length + 10
-		  end
+	  if(files.length > 0)
+		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
+	  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) }
+	  @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))
+	  files.each do |file| 
+	    if(File.exists?(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) }
@@ -325,22 +325,22 @@ class Wix
 	        @logger << "%-#{columen_size}s %s\n" % [file, install_path]  unless(@logger.nil?)
         end
       end	  
-	    @logger << "-------------------------------------------------------------------------------------------" unless(@logger.nil?)
-	  end
+	  @logger << "-------------------------------------------------------------------------------------------" unless(@logger.nil?)
+	end
 
-	  raise 'No files were given to wixgem' if(files.length == 0)
+	raise 'No files were given to wixgem' if(files.length == 0)
 
-	  if(missing_files.length > 0)
-	    missing_files_str = ''
-	    missing_files.each { |f| 
-	      if(missing_files_str.empty?)
-	        missing_files_str = f 
-		    else
-	        missing_files_str = "#{missing_files_str}, #{f}" 
-		    end
-	    }
-	    raise "Wixgem missing files: #{missing_files_str}" 
-	  end
+	if(missing_files.length > 0)
+	  missing_files_str = ''
+	  missing_files.each { |f| 
+	    if(missing_files_str.empty?)
+	      missing_files_str = f 
+		else
+	      missing_files_str = "#{missing_files_str}, #{f}" 
+		end
+	  }
+	  raise "Wixgem missing files: #{missing_files_str}" 
+    end
   end
 
   def self.modify_binary_files(input)
@@ -410,7 +410,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 +461,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)
@@ -553,7 +553,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	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.107.0
+  version: 0.110.0
 platform: ruby
 authors:
 - Kevin Marshall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dev
+  name: raykit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: Simple Ruby interface to facilitate creating and compiling windows installation
   files with the Wix Toolset.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -140,6 +140,8 @@ files:
 - lib/associate_extension.rb
 - lib/custom_action.rb
 - lib/file.rb
+- lib/registry_entries.rb
+- lib/registry_key.rb
 - lib/service.rb
 - lib/shortcut.rb
 - lib/temp_directory.rb
@@ -148,7 +150,7 @@ homepage: http://rubygems.org/gems/wixgem
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,8 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset
 test_files: []