wixgem 0.107.0 → 0.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4df5be0ad2b518b79605ff0df4352189113f98f04151cdaa67cd872a6bb9be6
-  data.tar.gz: 13415131c4b51d1587e536fe17aebf41e6195104ab375f219384b1582d5ca041
+  metadata.gz: 80493efcc975680f41a21d0196dedde83e90a2447b1bdf6eebf1ffdb1de1b49d
+  data.tar.gz: 7e1508dcaad2346044f97601ea8b754e043fb02fd9e350ad607289063e7660eb
 SHA512:
-  metadata.gz: a2425b542ace8a5b0260713b345f435d26c87c200a46a14023b17d02391909070da6b62263c1e01e16c9fe9ce187ce8299cd83c7a4ef0ba6794fd70002d11e4b
-  data.tar.gz: 6dd5953c029b3c504881f1b4b5f92ffb6b5e1fffa85e427c4dbe0d5814652bc813799882415409569cd777dd7a4401c5af565c8513629b8c5c41ed307f0db06c
+  metadata.gz: 399c34135782d39b0cb839c308e4acef986d7126701a57d2d1bc02d7118733dc1e7fa5ee98845e0b863856e711a7f9d56e2d16b6866e49fea2df3ab1e2ea18d7
+  data.tar.gz: 4644152e7d05ce0919685405043838caedc3f978e985ebcff47e25d739ccbf5197e818fdbbcb0a31b8dd96ef5543e5c35ef59ccf753b137a3ba0e25ab49b4f92

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.107.0
+  version: 0.108.0
 platform: ruby
 authors:
 - Kevin Marshall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2021-03-24 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: []
@@ -148,7 +148,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 +163,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.3
+signing_key:
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset
 test_files: []