wixgem 0.64.0 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64606c985a2b5acc78b072ce7d2fc51df06078d2
-  data.tar.gz: 686826c5f70fe04f73e8dadfd49355a0ee6b22f1
+  metadata.gz: d5ed53abaf6b54b665845c36f28eaa4f2102c02b
+  data.tar.gz: 2d3190c02befcba86c5226c0be1bc67228758ce9
 SHA512:
-  metadata.gz: 519c6ac58af86368b960d34a501fe49656eb111ce001c651a73d52af7c5fc125e767608826ee1e6555fd08d4db67a493936663f508bce1072b026a50359b6c38
-  data.tar.gz: 33659cd17e70a8d4a1fa3e9a1d91e48954aa56b2f57fd16245feec18868e5285efa7f27ccb04642a8c8e3eb0dfa62af7f5ba06c41a112dfe775231187df94af7
+  metadata.gz: b8c552429381777ff6e16a05d63ddbc8498db018565161d049c9f326e61a3346348df94c38abd9f5f9e71ce50f528a76be881de20b2a0d9b63cebaa06b1e9933
+  data.tar.gz: 7e952911a1454bc7be23982120dfd0294c656a6a98c10c8d981ec4ecffaeded81a92e0108ce7e58f3946a2a22209bf75de5d9e648caf369a6762c9c4d476939e

data/example/rakefile.rb

@@ -1,8 +1,6 @@
-require 'wixgem'
+require_relative '../lib/wixgem.rb'
+#require 'wixgem'	Use this require statement when including in a project outside of wixgem
 	
-#Wixgem::Wix.install_path = 'C:\Development\dep\OpenSource\WixToolset\3.9'
-Wixgem::Wix.install_path = '<Path to the root directory of the wix toolset>'
-
 task :create_installation_files do
   FileUtils.mkpath('./install_files/directory')
   sleep(1)
@@ -20,8 +18,7 @@ desc "Generate an installation msi file"
 task :installation => [:mergemodule] do	  
   installation_files = Dir.glob('./example.msm')
   Wixgem::Wix.make_installation("./example.msi",  
-    { upgrade_code: '{a62c35a7-6a6d-4392-822b-f6aca7eef88b}',
-	  files: installation_files } 
+    { upgrade_code: '{a62c35a7-6a6d-4392-822b-f6aca7eef88b}', files: installation_files } 
   )
 end
 

data/lib/admin.rb

@@ -0,0 +1,11 @@
+require 'cmd.rb'
+
+def admin?
+  cmd = CMD.new('net session')
+  cmd[:ignore_exit_code] = true
+  cmd[:quiet] = true
+  cmd.execute
+  return true if(cmd[:exit_code] == 0)
+  return false
+end
+ENV['HOME'] ||= "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}" if(admin?)

data/lib/wixgem.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'tmpdir.rb'
 require 'rexml/document'
-require "#{File.dirname(__FILE__)}/command.rb"
+require 'CMD'
 require 'SecureRandom'
 require_relative('file.rb')
 require_relative('shortcut.rb')
@@ -9,17 +9,19 @@ require_relative('shortcut.rb')
 module Wixgem
 
 class Wix
+  @@install_path = ''
+  @@install_path = ENV['WIX'] unless(ENV['WIX'].nil?)
+
   def self.initialize
-    @install_path = ''
 	@debug = false
 	@logger = nil
 	@log_file = nil
   end
   def self.install_path=(path)
-    @install_path = path
+    @@install_path = path
   end
   def self.install_path
-    return @install_path
+    return @@install_path
   end
   
   def self.debug=(bool)
@@ -267,7 +269,7 @@ class Wix
   end
 
   def self.execute_heat(input, cmd_line_options)		  
-	heat_cmd = Command.new("\"#{install_path}/bin/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
+	heat_cmd = CMD.new("\"#{install_path}/bin/heat.exe\" #{modify_heat_commandline(input, cmd_line_options)}", { quiet: true })
 	heat_cmd.execute	
 	log_wix_output(heat_cmd)
   end
@@ -411,11 +413,11 @@ class Wix
   def self.create_output(wxs_file, output)
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
-	candle_cmd = Command.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
+	candle_cmd = CMD.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
 	candle_cmd.execute	
 	log_wix_output(candle_cmd)
 	
-	light_cmd = Command.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"", { quiet: true })
+	light_cmd = CMD.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"", { quiet: true })
 	light_cmd.execute
 	log_wix_output(light_cmd)
   end
@@ -427,7 +429,7 @@ class Wix
   end
   
   def self.create_package(output, input)
-    raise 'WIX path is not set!' if(install_path.nil?)
+    raise 'WIX path is not set! Install Wixtoolset or assign with Wixgem::Wix.install_path = <path to wix toolset' if(self.install_path.nil?)
 	input = { files: input } unless(input.kind_of?(Hash))
 	verify_input_keys(input)
 	  	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: execute
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: WindowsInstaller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Ruby interface to facilitate creating and compiling windows installation
   files with the Wix Toolset.
 email: KCCKSMarshall@gmail.com
@@ -76,14 +104,13 @@ files:
 - LICENSE
 - README.md
 - example/example.msi
+- example/example.msm
 - example/install_files/directory/file2.txt
 - example/install_files/file1.txt
 - example/rakefile.rb
-- lib/WindowsInstaller.rb
-- lib/command.rb
+- lib/admin.rb
 - lib/file.rb
 - lib/shortcut.rb
-- lib/shortcut.rb.kev
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses:
@@ -105,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset

data/lib/WindowsInstaller.rb

@@ -1,171 +0,0 @@
-require 'win32ole'
-require File.dirname(__FILE__) + '/command.rb'
-
-module Wixgem
-class WindowsInstaller
-	def self.install(msi_file)
-	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
-	  msi_file = msi_file.gsub(/\//, '\\')
-	  raise "#{msi_file} is already installed" if(WindowsInstaller.msi_installed?(msi_file))
-	  execute("msiexec.exe /quiet /i #{msi_file}")
-	end
-
-	def self.uninstall(msi_file)
-	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
-	  
-	  info = msi_records(msi_file)
-	  uninstall_product_code(info['ProductCode'])
-    end
-
-	def self.uninstall_product_name(product_name)
-	  raise "#{product_name} is not installed" unless(product_name_installed?(product_name))
-	  uninstall_product_code(product_code_from_product_name(product_name))
-    end
-	
-	def self.uninstall_product_code(product_code)
-	  raise "#{product_code} is not installed" unless(product_code_installed?(product_code))
-	  execute("msiexec.exe /quiet /x #{product_code}")
-    end
-
-	def self.msi_installed?(msi_file)  
-	  info = msi_records(msi_file)
-	  result = product_code_installed?(info['ProductCode'])
-	  return result
-	end	
-	
-	def self.product_name_installed?(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')	  
-	  installer.Products.each { |prod_code|
-		name = installer.ProductInfo(prod_code, "ProductName")
-		return true if (product_name == name)
-	  }
-	  return false
-	end
-
-	def self.product_code_installed?(product_code)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
-	  return false
-	end
-	
-	def self.product_code_installed?(product_code)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  installer.Products.each { |prod_code| return true if (product_code == prod_code) }
-	  return false
-	end
-	
-	def self.version_from_product_name(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  info = product_info(installer, product_code_from_product_name(product_name, installer))
-	  return info['VersionString']
-	end
-
-	def self.product_code_from_product_name(product_name, installer = nil)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer') if(installer.nil?)
-	  installer.Products.each { |prod_code|
-		name = installer.ProductInfo(prod_code, "ProductName")
-		return prod_code if (product_name == name)
-	  }
-	  raise "Failed to find product code for product: #{product_name}"
-	end
-
-	def self.product_info(installer, code)
-	  raise 'Windows installer cannot be nil' if(installer.nil?)
-	  hash = Hash.new
-	  # known product keywords found on internet.  Would be nice to generate.
-	  %w[Language PackageCode Transforms AssignmentType PackageName InstalledProductName VersionString RegCompany 
-		 RegOwner ProductID ProductIcon InstallLocation InstallSource InstallDate Publisher LocalPackage HelpLink 
-		 HelpTelephone URLInfoAbout URLUpdateInfo InstanceType].sort.each do |prop|
-		value = installer.ProductInfo(code, prop)
-		hash[prop] = value unless(value.nil? || value == '')
-	  end
-	  return hash
-	end
-
-	def self.msi_info(installer, msi_file)
-	  raise 'Windows installer cannot be nil' if(installer.nil?)
-	  hash = Hash.new
-	  # known product keywords found on internet.  Would be nice to generate.
-	  %w[Language PackageCode Transforms AssignmentType PackageName InstalledProductName VersionString RegCompany 
-		 RegOwner ProductID ProductIcon InstallLocation InstallSource InstallDate Publisher LocalPackage HelpLink 
-		 HelpTelephone URLInfoAbout URLUpdateInfo InstanceType].sort.each do |prop|
-		value = installer.ProductInfo(code, prop)
-		hash[prop] = value unless(value.nil? || value == '')
-	  end
-	  return hash
-	end
-	
-	def self.dump_info(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  properties = product_info(installer, product_code_from_product_name(product_name, installer))
-	  properties.each { |id, value| puts "#{id}: #{value}" }
-	end
-
-	private
-	def self.msi_records(msi_file)
-	  records = {}
-	  
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  sql_query = "SELECT * FROM `Property`"
-
-	  db = installer.OpenDatabase(msi_file, 0)
-			
-	  view = db.OpenView(sql_query)
-	  view.Execute(nil)
-			
-	  record = view.Fetch()
-	  return '' if(record == nil)
-
-	  while(!record.nil?)
-	    records[record.StringData(1)] = record.StringData(2) 
-		record = view.Fetch()
-	  end
-	  db.ole_free
-	  db = nil
-	  installer.ole_free
-	  installer = nil
-	  
-	  return records
-	end
-	
-	def self.dump_msi_records(msi)
-	  records = msi_records(msi)
-
-	  puts "#{msi} Properties:"
-	  records.each do |key,value|
-		puts "#{key}: #{value}"
-	  end
-	end
-	
-	def self.dump_product(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  # only one session per process!
-	  session = installer.OpenProduct(product_code?(product_name, installer))
-	  db = session.Database
-			
-	  sql_query = "SELECT * FROM `Property`"
-	  view = db.OpenView(sql_query)
-	  view.Execute(nil)
-			
-	  record = view.Fetch()
-	  return '' if(record == nil)
-
-	  puts "Session Properties:"
-	  while(!record.nil?)
-		puts "#{record.StringData(1)}: #{record.StringData(2)}"
-		record = view.Fetch()
-	  end
-	  db.ole_free
-	  db = nil
-	  installer.ole_free
-	  installer = nil
-	  puts ''
-	end	
-
-    def self.execute(cmd)
-      command = Wixgem::Command.new(cmd, { quiet: true } )
-	  #command[:debug] = true
-      command.execute
-    end
-end
-end

data/lib/command.rb

@@ -1,43 +0,0 @@
-require 'open3'
-
-module Wixgem
-
-class Command < Hash
-  def initialize(cmd, options=nil)
-   self[:output] = ''
-   self[:error] = ''
-   self[:exit_code] = ''
-   self[:ignore_exit_code] = false
-   self[:debug] = false
-   self[:quiet] = false
-
-   self[:command]=cmd
-   options.each { |key, value| self[key] = value} unless(options.nil?)
-  end
-  
-  def execute
-    begin
-	  puts self[:command] unless(self[:quiet])
-      self[:output],self[:error], self[:exit_code] = Open3.capture3(self[:command])
-      self[:exit_code]=self[:exit_code].to_i
-	  
-	  if(self[:debug])
-		puts "command: #{self[:command]}" if(self[:quiet])
-	    puts "output: #{self[:output]}"
-	    puts "error: #{self[:error]}"
-	    puts "exit_code: #{self[:exit_code]}"
-	  end
-	rescue Exception => e
-	  self[:error] = "Exception: " + e.to_s
-	  self[:exit_code]=1
-	end
-	
-	if((self[:exit_code] != 0) && !self[:ignore_exit_code])
-	  exception_text = self[:error]
-	  exception_text = self[:output] if(self[:error].empty?)
-	  raise exception_text 
-	end
-  end
-end
-
-end

data/lib/shortcut.rb.kev

@@ -1,129 +0,0 @@
-require 'rexml/document'
-require 'SecureRandom'
-
-module Wixgem
-
-class Shortcut
-  
-  def initialize(file, hash)
-    @file = file
-	@hash = hash
-  end
-  
-  def create(xml_doc)
-	raise "Shortcut #{@file} does not exist" unless(File.exists?(@file))
-	
-	file_elements = REXML::XPath.match(xml_doc, "//File[@Source='.\\#{@file.gsub(/\//,'\\')}']")
-	raise "Shortcut #{@file} does not match an installation file" if(file_elements.length == 0)
-	
-	case @hash[:directory]
-	when :desktop  
-	  create_file_shortcut(file_elements[0])
-	  xml_doc = create_desktop_folder(xml_doc)
-#	when :start_menu
-#	  program_files_element = create_start_menu_shortcut(xml_doc)
-#	  create_start_menu_item(program_files_element)
-	else
-	  raise 'Support for #{:directory}  shortcut has not been added'	  
-	end
-	
-	return xml_doc
-  end
-  
-  def create_file_shortcut(file_element)
-    shortcut_element = file_element.add_element 'Shortcut'
-	
-	shortcut_element.attributes['Id'] = "Shortcut_#{SecureRandom.uuid.gsub(/-/,'')}"
-	shortcut_element.attributes['Arguments'] = @hash[:arguments] if(@hash.has_key?(:arguments))
-	
-	shortcut_name = File.basename(@file)
-	if(@hash.has_key?(:name))
-	  shortcut_name = @hash[:name] 
-	else
-	  @hash[:name] = shortcut_name
-	end
-	shortcut_element.attributes['Name'] = shortcut_name
-
-	shortcut_element.attributes['Description'] = @hash[:description] if(@hash.has_key?(:description))
-	shortcut_element.attributes['Directory'] = 'DesktopFolder'
-	
-	shortcut_element.attributes['Advertise']="yes"
-	shortcut_element.attributes['Advertise'] = "no" if(@hash.has_key?(:advertise) && !@hash[:advertise])
-	create_icon_element(shortcut_element) if(@hash.has_key?(:icon))
-	
-	return shortcut_element
-  end
-
-  def create_icon_element(shortcut_element)
-    icon_element = shortcut_element.add_element 'Icon'	
-	icon_element.attributes['Id'] = File.basename(@hash[:icon])
-    icon_element.attributes['SourceFile'] = ".\\#{@hash[:icon].gsub(/\//, '\\')}"
-	return icon_element
-  end
-
-  def create_desktop_folder(xml_doc)
-    desktop_elements = REXML::XPath.match(xml_doc, "//DesktopFolder")
-	if(desktop_elements.length == 0)
-      wix_elements = REXML::XPath.match(xml_doc, "//Wix")
-	  fragment_element = wix_elements[0].add_element 'Fragment'
-	  target_dir = fragment_element.add_element 'DirectoryRef', { 'Id' => 'TARGETDIR' }
-	  target_dir.add_element 'Directory', { 'Id' => 'DesktopFolder', 'Name' => 'Desktop' }
-	end
-	return xml_doc
-  end
-
-#  def create_start_menu_shortcut(program_folder_element)
-#    puts "1"
-#    shortcut_element = program_folder_element.add_element 'Shortcut'
-#	
-#	shortcut_element.attributes['Id'] = 'ApplicationStartMenuShortcut'
-#	
-#	shortcut_name = File.basename(@file)
-#	ext = File.extname(@file)
-#	if(@hash.has_key?(:name))
-#	  shortcut_name = @hash[:name] 
-#	else
-#	  shortcut_name = File.basename(shortcut_name, ext) if(ext != '')
-#	  @hash[:name] = shortcut_name
-#	end
-#	shortcut_element.attributes['Name'] = shortcut_name
-
-#    puts "2"
-#	shortcut_element.attributes['Description'] = @hash[:description] if(@hash.has_key?(:description))
-#	shortcut_element.attributes['Target'] = @file
-#
-#    puts "3"
-#	remove_folder_element = program_folder_element.add_element 'RemoveFolder'
-#	remove_folder_element.attributes['Id'] = 'ApplicationProgramsFolder'
-#	remove_folder_element.attributes['On'] = 'uninstall'
-
-#    puts "4"
-#	registry_folder_element = program_folder_element.add_element 'RegistryValue'
-#	remove_folder_element.attributes['Root'] = 'HKCU'
-#	remove_folder_element.attributes['Key'] = "Software\\Microsoft\\#{shortcut_name.gsub(/ /,'')}"
-#	remove_folder_element.attributes['Name'] = 'installed'
-#	remove_folder_element.attributes['Type'] = 'integer'
-#	remove_folder_element.attributes['Value'] = '1'
-#	remove_folder_element.attributes['KeyPath'] = 'yes'
-
-#	return shortcut_element
-#  end
-  
-#  def create_start_menu_component(xml_doc)
-#    app_programs_elements = REXML::XPath.match(xml_doc, "//ApplicationProgramsFolder")
-#	app_programs_element = nil
-#	if(app_programs_elements.length == 0)
-#      wix_elements = REXML::XPath.match(xml_doc, "//Wix")
-#	  fragment_element = wix_elements[0].add_element 'Fragment'
-#	  app_programs_element = fragment_element.add_element 'DirectoryRef', { 'Id' => 'ApplicationProgramsFolder' }
-#	else if(app_programs_elements.length == 1)
-#	  app_programs_element = app_programs_elements[0]
-#	else
-#	  raise "Wix file contains multiple ApplicationProgramsFolder's"
-#	end
-
-#	return app_programs_element.add_element 'Component', { 'Id' => 'ApplicationShortcut', 'Guid' => '{a9e94876-60b5-4038-8baa-ea76a3f9ebe1}' }
-#  end  
-end
-
-#end