wixgem 0.111.0 → 0.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acbf145ad790fe0b0faabf479d25e3837f65700d477e93a910d6efcd9f77e04d
-  data.tar.gz: cbc834eebb2e65b249f157edf7ebe065548d3cbd26d0968b2bc0ca672e14494e
+  metadata.gz: 61691800908ea58cafe48e3d64dd94792c57313ece6b300aec171a9a3e99e2bc
+  data.tar.gz: 17927fee159af1eac9a74c0cde74251e671c99ddde31239e773393f3e9899826
 SHA512:
-  metadata.gz: 69a025c6eef3598dbf2dba9f68265aa05c04f75af7f92c6af48929860781b9519e65b1bcad5d1824785428b3796a92fd8287f99be637758252234b9f984394e2
-  data.tar.gz: c27dba3df585bc4b46de25be5dd988eeb07c3f73f18537ce40e65d84b30131550d80a1de9864272f29754b5a7336d0bbc746a4511cb0ef36efb43725cfd389f6
+  metadata.gz: 84b6754b8743ed00ff0fed0c25e2675d9c35b48746deb1b851732234646baa7961accce9a362610849fe89c6815079654be12c1cf673477c53616156d6efc023
+  data.tar.gz: 0eddcdf7dabaf88114d0ea472c96364dc56500e84827becccbef9e7ce87d3eb528660b39c14e65ed977aff531991ab8351221d62f100dff88b835125fefe4973

data/lib/file.rb

@@ -2,7 +2,7 @@ require 'win32ole'
 
 class File
   def self.read_only?(path)
-    raise "'#{path}' does not exist" unless(File.exists?(path))
+    raise "'#{path}' does not exist" unless(File.exist?(path))
 	
 	  fso = WIN32OLE.new('Scripting.FileSystemObject')
     raise 'Failed to create Scripting.FileSystemObject' if(fso.nil?)

data/lib/registry_key.rb

@@ -19,8 +19,8 @@ class RegistryKey
 		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)
+	#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'
@@ -30,12 +30,13 @@ class RegistryKey
 		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['Id'] = "RegistryKey_#{SecureRandom.uuid.gsub(/-/,'')}"
 		component.attributes['Directory'] = 'INSTALLDIR'
-	else
-		puts "component: #{registry_keys_component.to_s}"
-	end
-		
+	#else
+		#puts "component: #{registry_keys_component.to_s}"
+	#	component = registry_keys_component[0]
+	#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

data/lib/service.rb

@@ -14,7 +14,7 @@ class Service
     raise "Service hash is required to have a :name key" unless(@hash[:service].has_key?(:name))
 
     service_exe = @hash[:service_exe]
-    raise "Service #{file} does not exist" unless(File.exists?(service_exe))
+    raise "Service #{file} does not exist" unless(File.exist?(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)

data/lib/shortcut.rb

@@ -11,7 +11,7 @@ class Shortcut
   end
   
   def create(xml_doc)
-	  raise "Shortcut #{@file} does not exist" unless(File.exists?(@file))
+	  raise "Shortcut #{@file} does not exist" unless(File.exist?(@file))
 	
 	  file_elements = REXML::XPath.match(xml_doc, "//File[@Source='.\\#{@file.gsub(/\//,'\\')}']")
 	  raise "Shortcut #{@file} does not match a 'File' element with a 'Source' attribute in the wix generated wix file" if(file_elements.length == 0)

data/lib/wixgem.rb

@@ -197,7 +197,7 @@ class Wix
 	
 	  install_files.each do |file| 
 	    absolute_path = file
-	    absolute_path = "#{input[:original_pwd]}/#{file}" unless(File.exists?(file))
+	    absolute_path = "#{input[:original_pwd]}/#{file}" unless(File.exist?(file))
 
 	    if(File.read_only?(absolute_path))
 	      install_path = ".\\#{self.modify_file_path(input, file).gsub(/\//,'\\')}"
@@ -295,7 +295,7 @@ class Wix
 
 	missing_files = []
 	files.each do |file| 
-	  if(File.exists?(file))
+	  if(File.exist?(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) }
@@ -303,9 +303,9 @@ class Wix
 		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.mkpath(File.dirname(install_path)) unless(Dir.exist?(File.dirname(install_path)))
 		FileUtils.cp(file, install_path, preserve: true)
-	  elsif(!File.exists?(file))
+	  elsif(!File.exist?(file))
 	    missing_files.insert(missing_files.length, file)
 	  end
 	end
@@ -327,7 +327,7 @@ class Wix
 	  files.reject! { |f| ingore_files.include?(f) }
 
 	  files.each do |file| 
-	    if(File.exists?(file))
+	    if(File.exist?(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) }
@@ -390,7 +390,7 @@ class Wix
   def self.execute_heat(input, cmd_line_options)	
 	wix_install_path=install_path.gsub(/\\/,'/');
 	wix_bin_dir = "#{wix_install_path}/bin"
-	wix_bin_dir = "#{wix_install_path}/tools" unless(Dir.exists?(wix_bin_dir))
+	wix_bin_dir = "#{wix_install_path}/tools" unless(Dir.exist?(wix_bin_dir))
 
 	heat_cmd = Execute.new("\"#{wix_bin_dir}/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
 	heat_cmd.execute	
@@ -561,8 +561,8 @@ class Wix
 	
 	wix_install_path=install_path.gsub(/\\/,'/');
 	wix_bin_dir = "#{wix_install_path}/bin"
-	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))
+	wix_bin_dir = "#{wix_install_path}/tools" unless(Dir.exist?(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.exist?(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 })
@@ -590,11 +590,11 @@ class Wix
 	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
 	start_logger if(@debug)
 	
-	FileUtils.mkpath(File.dirname(output)) unless(Dir.exists?(File.dirname(output)))
+	FileUtils.mkpath(File.dirname(output)) unless(Dir.exist?(File.dirname(output)))
 	
 	ext = File.extname(output)
   	basename = File.basename(output, ext)
-	FileUtils.rm(output) if(File.exists?(output))
+	FileUtils.rm(output) if(File.exist?(output))
  
 	output_absolute_path = File.absolute_path(output)
 	input[:original_pwd] = Dir.pwd
@@ -615,13 +615,13 @@ class Wix
 		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?)
+	    FileUtils.cp("#{dir}/#{wxs_file}", "#{output_absolute_path}.wxs") if(File.exist?("#{dir}/#{wxs_file}") && @debug)
+	    File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug & !@logger.nil?)
 	  end	  
 	end
 	
 	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
-	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))
+	FileUtils.rm(pdb_file) if(File.exist?(pdb_file))
 	
 	end_logger if(@debug)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.111.0
+  version: 0.113.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -131,8 +131,6 @@ 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
@@ -147,7 +145,7 @@ files:
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses:
-- Apache 2.0
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -164,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset