wixgem 0.103.0 → 0.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d74b5fb71fcf7c779fa24c77e2d7fa89990f58fe7eebf75c3be102863f4cf80
-  data.tar.gz: 5b246289c5915cd0a7600cb8ef4c083bd1cf2054db337b022bce4f31b243b30a
+  metadata.gz: 80493efcc975680f41a21d0196dedde83e90a2447b1bdf6eebf1ffdb1de1b49d
+  data.tar.gz: 7e1508dcaad2346044f97601ea8b754e043fb02fd9e350ad607289063e7660eb
 SHA512:
-  metadata.gz: 27ee06f5d4205339dd1d9c48f4f2dccb6fac462f783f7d23940d0c97c058e1c37d6c1a6abcbb89f6503e04cfb59ed7be2d352a089ef5577e85768045cb05ad6e
-  data.tar.gz: c62f1d23d1e71865e481e61b26714e0644eb6527ed8298e9207eefd38ec9a6e21eff7e4188b2876d90a6a791c2d95d8b204add6a0d2801a24916dce42fbf6552
+  metadata.gz: 399c34135782d39b0cb839c308e4acef986d7126701a57d2d1bc02d7118733dc1e7fa5ee98845e0b863856e711a7f9d56e2d16b6866e49fea2df3ab1e2ea18d7
+  data.tar.gz: 4644152e7d05ce0919685405043838caedc3f978e985ebcff47e25d739ccbf5197e818fdbbcb0a31b8dd96ef5543e5c35ef59ccf753b137a3ba0e25ab49b4f92

data/lib/service.rb

@@ -22,19 +22,43 @@ class Service
     service_exe_element = file_elements[0]
     service_exe_element.attributes['KeyPath']='yes'
 
-	  create_service_element(service_exe_element)
+	  create_service_element(xml_doc, service_exe_element)
 	
 	  return xml_doc
   end
   
   private
-  def create_service_element(service_exe_element)
+  def create_service_element(xml_doc, service_exe_element)
     parent_element = service_exe_element.parent
     
     service = @hash[:service]
     service_control = {}
     service_control = @hash[:service_control] if(@hash.has_key?(: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')
+
+      user_element = parent_element.add_element 'Util:User'
+ 
+      account = service[:account].gsub(/\\/, '/')
+      if(account.include?('/'))
+        words = account.split('/')
+        user_element.add_attribute('Domain', words[0])
+        
+        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])
+      user_element.add_attribute('CreateUser', 'no')
+      user_element.add_attribute('UpdateIfExists', 'yes')
+
+      service.delete(:logonasservice)
+    end 
     service_element = parent_element.add_element('ServiceInstall')
 
     service_element.attributes['Id'] = "Service_#{SecureRandom.uuid.gsub(/-/,'')}"

data/lib/wixgem.rb

@@ -9,7 +9,6 @@ require_relative 'custom_action.rb'
 require_relative 'temp_directory.rb'
 require_relative 'associate_extension.rb'
 require_relative 'service.rb'
-require_relative 'user.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/
@@ -223,17 +222,6 @@ class Wix
 	  return xml_doc
   end
 
-  def self.manage_users(xml_doc,input)
-	return xml_doc unless(input.has_key?(:users))
-  
-	input[:users].each do |username, user_hash|
-	  user = User.new(username, user_hash)
-	  xml_doc = user.create(xml_doc)
-	end
-  
-	return xml_doc
-  end
-  
   def self.manage_services(xml_doc,input)
 	return xml_doc unless(input.has_key?(:services))
 	  
@@ -293,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) }
@@ -337,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)
@@ -547,7 +535,6 @@ class Wix
 	  xml_doc = manage_binary_table(xml_doc, input)
 	  xml_doc = manage_associate_extensions(xml_doc, input)
 	  xml_doc = manage_services(xml_doc, input)
-	  xml_doc = manage_users(xml_doc, input)
 		
     formatter = REXML::Formatters::Pretty.new(2)
     formatter.compact = true 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.103.0
+  version: 0.108.0
 platform: ruby
 authors:
 - Kevin Marshall
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-17 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: []
@@ -143,13 +143,12 @@ files:
 - lib/service.rb
 - lib/shortcut.rb
 - lib/temp_directory.rb
-- lib/user.rb
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,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: []

data/lib/user.rb

@@ -1,32 +0,0 @@
-require 'rexml/document'
-require 'SecureRandom'
-
-module Wixgem
-
-class User
-  def initialize(name, user_hash)
-    @user_name = name
-    @user_hash = user_hash
-  end
-  def create(xml_doc)
-    wix = REXML::XPath.match(xml_doc, "/Wix")[0]
-    wix.add_attribute('xmlns:Util', 'http://schemas.microsoft.com/wix/UtilExtension')
-
-    match = REXML::XPath.match(xml_doc, "/Wix")
-
-    fragment = match[0].add_element 'Fragment'
-    component_group = fragment.add_element 'ComponentGroup'
-    component_group.add_attribute('Id', "cg_#{SecureRandom.uuid.gsub(/-/,'')}")
-    component = component_group.add_element 'Component'
-    component.add_attribute('Id', "c_#{SecureRandom.uuid.gsub(/-/,'')}")
-    component.add_attribute('Directory', 'INSTALLDIR')
-    
-    user_element = component.add_element 'Util:User'
-    user_element.add_attribute('Id', "user_#{SecureRandom.uuid.gsub(/-/,'')}")
-    user_element.add_attribute('Name', @user_name)
-    @user_hash.each { |attrib, value| user_element.add_attribute(attrib.to_s, value) }
-
-    return xml_doc
-  end
-end
-end