wixgem 0.101.0 → 0.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fff3f2b7853ffbf998291a4f42b17dea04115ed8780547f34d98cc29ed4272
-  data.tar.gz: 3128cf0f064cb38343715c3800b4314411b67ac81e538ac1d4f92eb334aca71d
+  metadata.gz: '08dc56c8d621b528b1cb1ff5c18eec7471636058aef6b6c8f724bb21c1fb0bd7'
+  data.tar.gz: 0ad8339d5922e4cc649e201d8e8e8373b3f4944b9a460159645bc00c95e3dfb0
 SHA512:
-  metadata.gz: 2d15118a3c65ce4a52f380e37bfb31168292b0b0f0591cfd5961013151af9edab44d33e8d08e03f9bf054bbc732053b125e854d17f871485d08292d4c750d825
-  data.tar.gz: 7c9e359a26d982dc88293eada688751ad4e3df3d3746f4df44bc1f409fa5cacbb0a2a22c23b931dd40c86b7ad4e8a9f9f07c53939d8702f84b624d167b6769a9
+  metadata.gz: 7bd086a6983076b63f6dea5335eaa9b6c59fb98445e152c257d15cd2c795ef5dba8044726577654aa6ff00c2cfc67aa036e3398b8b6c24691535db64a40c5453
+  data.tar.gz: 4167b78356007490925eb09e1a08f9218837c575866c1ca68586806762debd9a390e124faf109589895295b40a8654cc949fca386cf0515917c62b7f0aa13157

data/lib/user.rb

@@ -0,0 +1,32 @@
+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

data/lib/wixgem.rb

@@ -79,7 +79,7 @@ class Wix
   def self.manage_netframework(xml_doc, input)
     if(input.key?(:requires_netframework))
 	    wix = REXML::XPath.match(xml_doc, "/Wix")[0]
-	    wix.attributes['xmlns:netfx'] = 'https://schemas.microsoft.com/wix/NetFxExtension'
+	    wix.attributes['xmlns:NetFX'] = 'https://schemas.microsoft.com/wix/NetFxExtension'
 
 	    product = REXML::XPath.match(xml_doc, "/Wix/Product")[0]
 	    product.add_element 'PropertyRef', { 'Id' => input[:requires_netframework] }
@@ -221,7 +221,29 @@ 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))
+	  
+	  input[:services].each do |service_hash|
+	  service = Service.new(service_hash)
+	  xml_doc = service.create(xml_doc)
+	end
+  
+	return xml_doc
+ end
+
   def self.manage_self_register(xml_doc, input)
 	  return xml_doc unless(input.has_key?(:com_self_register))
 	  input[:com_self_register].each do |file|
@@ -522,8 +544,9 @@ class Wix
 	  xml_doc = manage_shortcuts(xml_doc, input)
 	  xml_doc = manage_self_register(xml_doc, input)
 	  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_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 
@@ -542,12 +565,14 @@ 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))
 	
-	candle_cmd = Execute.new("\"#{wix_bin_dir}/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
+
+	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	
 	log_wix_output(candle_cmd)
 	
 	cmd_args = "-nologo -out \"#{output}\" \"#{wixobj_file}\""
-    cmd_args = "-ext WixNetfxExtension -ext WixUIExtension -ext WixUtilExtension -cultures:en-us #{cmd_args}"
+    cmd_args = "#{ext_args} -cultures:en-us #{cmd_args}"
 	light_cmd = Execute.new("\"#{wix_bin_dir}/light.exe\" #{cmd_args}", { quiet: true })
 	light_cmd.execute
 	log_wix_output(light_cmd)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.101.0
+  version: 0.102.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execute
@@ -143,6 +143,7 @@ files:
 - lib/service.rb
 - lib/shortcut.rb
 - lib/temp_directory.rb
+- lib/user.rb
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses: