wixgem 0.103.0 → 0.104.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d74b5fb71fcf7c779fa24c77e2d7fa89990f58fe7eebf75c3be102863f4cf80
-  data.tar.gz: 5b246289c5915cd0a7600cb8ef4c083bd1cf2054db337b022bce4f31b243b30a
+  metadata.gz: c34c2e37847b346835aea3b1dc0acc0d3e510bc2d6166ae9dbaca9b4d1b6dc58
+  data.tar.gz: 27a2dd5f5e44ae283442e6d7186d33d6380f2822371c53108c29bbf6dc392e09
 SHA512:
-  metadata.gz: 27ee06f5d4205339dd1d9c48f4f2dccb6fac462f783f7d23940d0c97c058e1c37d6c1a6abcbb89f6503e04cfb59ed7be2d352a089ef5577e85768045cb05ad6e
-  data.tar.gz: c62f1d23d1e71865e481e61b26714e0644eb6527ed8298e9207eefd38ec9a6e21eff7e4188b2876d90a6a791c2d95d8b204add6a0d2801a24916dce42fbf6552
+  metadata.gz: d3b54177e11699e6c308b9561e6373efb705a38630fe6be8abe949d8c1213acabd3fe06745132ed6f1423e9c9a8e3e152ab38c7e219008cafcdb814ded4daa06
+  data.tar.gz: fe3453ac182dc6233ecc46bd73f5230c0dc5f1aa1446fe6caca806f7036ac1ce0a2c87130c0b44b7287943e8ab348010c4bb4034e6735b3c9964ce004b2fcb6e

data/lib/service.rb

@@ -22,19 +22,31 @@ 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))
+      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'
+      user_element.attributes['Id'] = "logon_as_service_#{SecureRandom.uuid.gsub(/-/,'')}"
+      user_element.add_attribute('Domain', service[:domain]) if(service.key?(:domain))
+      user_element.add_attribute('Name', service[:name])
+      user_element.add_attribute('LogonAsService', service[:logonasservice])
+      user_element.add_attribute('CreateUser', 'no')
+      user_element.add_attribute('UpdateIfExists', 'yes')
+    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))
 	  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.103.0
+  version: 0.104.0
 platform: ruby
 authors:
 - Kevin Marshall
@@ -143,7 +143,6 @@ files:
 - lib/service.rb
 - lib/shortcut.rb
 - lib/temp_directory.rb
-- lib/user.rb
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses:

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