wixgem 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678485dbc753adc3b92f0e69a927797626abd3f0
-  data.tar.gz: 435a5a32bd415d89ee0616a844dd3de646bb8bdc
+  metadata.gz: 6cc49605457da97d26245c8d8d141bae95d2ea6f
+  data.tar.gz: a486cfdb2dfe6f9e7434328ad11c0d587db481b9
 SHA512:
-  metadata.gz: a924e211519f31188cc3763e1f1f0ba0dc063aba8b4697863a9fe58f38e6c0ce5c1f98d2c247c56e62e61b3fe6968d99213795eef6c193d00b8207728697b297
-  data.tar.gz: 96071d10cabcf0a4f536ecaca035de5dd184fd9185492eb0e03f7e56d4067b9e6f241b178fb938421f367ae47a1459ae767f3484397e93f590cac3e5779e3060
+  metadata.gz: f64e9cb3bb1d1092914d3f701889df6cafed615b5aa12d9fed383e23ea0f7881f3574d7ee0c5f159f54614d54b3689d443287751ffcc62bf7bfea0b82e2e062a
+  data.tar.gz: 243e5b1b0526550ba457c63b3228ed236bbde014dd33b0396cd979b57f167be81b090a13ee5df7187f82b20815d4f32058b66bbb411c345c57c8ed27dc0b957f

data/lib/WindowsInstaller.rb

@@ -69,7 +69,6 @@ class WindowsInstaller
 	  raise "Failed to find product code for product: #{product_name}"
 	end
 
-    private
 	def self.product_info(installer, code)
 	  raise 'Windows installer cannot be nil' if(installer.nil?)
 	  hash = Hash.new
@@ -96,13 +95,13 @@ class WindowsInstaller
 	  return hash
 	end
 	
-	public
 	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 = {}
 	  
@@ -164,7 +163,7 @@ class WindowsInstaller
 	end	
 
     def self.execute(cmd)
-      command = Wixgem::Command.new(cmd)
+      command = Wixgem::Command.new(cmd, { quiet: true } )
 	  #command[:debug] = true
       command.execute
     end

data/lib/command.rb

@@ -1,5 +1,4 @@
 require 'open3'
-require 'hash'
 
 module Wixgem
 

data/lib/wixgem.rb

@@ -1,8 +1,8 @@
 require 'fileutils'
-require 'SecureRandom'
 require 'tmpdir.rb'
 require 'rexml/document'
 require "#{File.dirname(__FILE__)}/command.rb"
+require 'SecureRandom'
 
 module Wixgem
 
@@ -29,12 +29,12 @@ class Wix
   
   def self.make_mergemodule(output_file, input)
     gem_dir = File.dirname(__FILE__)
-    apply_wix_template(output_file, input)
+    create_package(output_file, input)
   end
   
   def self.make_installation(output_file, input)
     gem_dir = File.dirname(__FILE__)
-    apply_wix_template(output_file, input)
+    create_package(output_file, input)
   end
   
   private   
@@ -127,8 +127,33 @@ class Wix
 	return xml_doc
   end
   
+  def self.modify_file_path(input, file)
+    return file unless(input.kind_of?(Hash) && input.has_key?(:modify_file_paths))
+  
+    modify_paths = input[:modify_file_paths]
+    modify_paths.each { |regex, replacement_string| file = file.gsub(regex, replacement_string) }
+  
+    return file
+  end
+
+  def self.files(input)
+    files = input
+    files = input[:files] if(input.kind_of?(Hash))
+
+    files.each { |file| files.delete(file) if(File.directory?(file)) }
+  
+    return files
+  end
+
+  def self.ignore_files(input)
+    files = []
+    files = input[:ignore_files] if(input.kind_of?(Hash) && input.has_key?(:ignore_files))
+    
+    return files
+  end
+  
   def self.copy_install_files(directory, input)
-	files = input[:files]
+	files = files(input)
 	raise 'No files were given to wixgem' if(files.length == 0)
 	
 	missing_files = []
@@ -179,24 +204,119 @@ class Wix
 	end
   end
 
-  def self.create_wxs_file(wxs_file, input, ext)
-    template_option = "-template product"
-	template_option = "-template module" unless(ext == ".msi")
-
-	cmd = "\"#{install_path}/bin/heat.exe\" dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\""
-	cmd = cmd.gsub(/-srd/, '-svb6 -srd') if(input.has_key?(:has_vb6_files) && input[:has_vb6_files])
+  def self.log_wix_output(cmd)
+	return unless(@debug && !@logger.nil?)
+	
+	@logger << "----------------------------------------------------------------------------"
+	@logger << cmd
+	
+	if(!cmd[:output].empty?)
+	  @logger << "--------------------------- std output -----------------------------------"
+	  @logger << cmd[:output]
+	end
+	
+	if(!cmd[:error].empty?)
+	  @logger << "--------------------------- std error ------------------------------------"
+	  @logger << cmd[:error]
+	end
+  end
+  
+  def self.modify_heat_commandline(input, cmd)
+  	cmd = cmd.gsub(/-srd/, '-svb6 -srd') if(input.has_key?(:has_vb6_files) && input[:has_vb6_files])
 	cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
 	cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
-	
-	heat_cmd = Command.new(cmd, { quiet: true })
-	@logger << "command: #{heat_cmd[:command]}" if(@debug && !@logger.nil?)
+	return cmd
+  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.execute	
-	if(@debug && !heat_cmd[:output].empty?)
-	  @logger << "--------------------------- Heat output -----------------------------------"  unless(@logger.nil?)
-	  @logger << heat_cmd[:output] unless(@logger.nil?)
+	log_wix_output(heat_cmd)
+  end
+  
+  def self.execute_heat_file(wxs_file, input, template_option)
+	install_files = files(input)
+	modified_paths = []
+    install_files.each { |file| modified_paths << modify_file_path(input, file) }
+	install_files = modified_paths
+	
+	install_ignore_files = ignore_files(input) 
+	modified_paths = []
+    install_ignore_files.each { |file| modified_paths << modify_file_path(input, file) }
+	install_ignore_files = modified_paths
+	
+	install_files.reject! { |f| install_ignore_files.include?(f) }
+
+	directory_fragments = {}
+	wxs_files = {}
+	install_files.each do |file|
+	  windows_path = file.gsub(/\//, '\\')
+	  
+	  filename = wxs_file
+	  if(install_files.index(file) == 0)
+        execute_heat(input, "file \"#{windows_path}\" #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{filename}\"")
+	  else
+		filename = File.basename(wxs_file).gsub('.wxs', "-#{wxs_files.length}.wxs") 
+		execute_heat(input, "file \"#{windows_path}\" -template fragment -gg -nologo -srd -o  \"#{filename}\"")
+		wxs_files[file] = filename
+ 	  end
+
+	  directory_fragments[File.dirname(file)] = "dir#{SecureRandom.uuid.gsub(/-/,'')}"
+	  xml_doc = REXML::Document.new(File.read(filename))
+	  file_elements = REXML::XPath.match(xml_doc, '//Wix/Fragment/DirectoryRef/Component/File')
+	  file_elements[0].attributes['Source'] = "SourceDir\\#{file.gsub(/\//,'\\')}" if(file_elements.length == 1)
+	  file_elements[0].attributes['Id'] = "fil#{SecureRandom.uuid.gsub(/-/,'')}" if(file_elements.length == 1) # Assigning new Id, because the id is somehow generated from the filename. So it is possible for heat to generate duplicate id's
+	  File.open(filename, 'w') { |f| f.puts(xml_doc.to_s) }	
+	end
+	directory_fragments['.'] = 'TARGETDIR'
+	
+	xml_doc = REXML::Document.new(File.read(wxs_file))
+
+	wix_elements = REXML::XPath.match(xml_doc, '//Wix')
+	raise "Invalid wxs file: #{wxs_file}" unless(wix_elements.length == 1)
+	
+	directory_fragments.each do |key, id|
+	  if(key != '.')
+		  fragment_element = wix_elements[0].add_element 'Fragment'
+		  directory_ref_element = fragment_element.add_element 'DirectoryRef', { 'Id' => directory_fragments[File.dirname(key)] }
+		  directory_ref_element.add_element 'Directory', { 'Id' => id, 'Name' => File.basename(key) }
+	  end
+ 	end
+	
+	component_group_element = REXML::XPath.match(xml_doc, '//Wix/Fragment/ComponentGroup')
+	raise "Failed to create installation package for file: #{wxs_file}" unless(component_group_element.length == 1)
+
+	wxs_files.each do |file, filename|
+	  xml_fragment_doc = REXML::Document.new(File.read(filename))
+	  component_elements = REXML::XPath.match(xml_fragment_doc, '//Wix/Fragment/DirectoryRef/Component')
+	  
+	  component_elements.each do |component_element| 
+	    component_element.attributes['Id'] = "cmp#{SecureRandom.uuid.gsub(/-/,'')}" # Assigning new Id, because the id is somehow generated from the filename. So it is possible for heat to generate duplicate id's
+	    component_element = component_group_element[0].add_element component_element, { 'Directory' =>  directory_fragments[File.dirname(file)] } 
+      end		
 	end
-			
+
+	formatter = REXML::Formatters::Pretty.new(2)
+	formatter.compact = true # This is the magic line that does what you need!
+	xml_text=''
+	formatter.write(xml_doc, xml_text)
+	File.open(wxs_file, 'w') { |f| f.puts xml_text }
+  end
+  
+  def self.execute_heat_dir(wxs_file, input, template_option)
+	execute_heat(input,"dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\"")
+  end
+  
+  def self.create_wxs_file(wxs_file, input, ext)
+    template_option = "-template product"
+	template_option = "-template module" unless(ext == ".msi")
+	
+	if(input.has_key?(:ignore_files))
+		execute_heat_file(wxs_file, input, template_option)
+	else
+		execute_heat_dir(wxs_file, input, template_option)
+	end
+	
 	product_name = File.basename(wxs_file, '.wxs')
     product_name = input[:product_name] if(input.has_key?(:product_name))
 	
@@ -248,25 +368,15 @@ class Wix
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
 	candle_cmd = Command.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
-	@logger << "command: #{candle_cmd[:command]}" if(@debug && !@logger.nil?)
-
 	candle_cmd.execute	
-	if(@debug && !candle_cmd[:output].empty?)
-	  @logger << "--------------------------- Candle output -----------------------------------"  unless(@logger.nil?)
-	  @logger << candle_cmd[:output] unless(@logger.nil?)
-	end
+	log_wix_output(candle_cmd)
 	
 	light_cmd = Command.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"", { quiet: true })
-	@logger << "command: #{light_cmd[:command]}" if(@debug && !@logger.nil?)
-
 	light_cmd.execute
-	if(@debug && !light_cmd[:output].empty?)
-	  @logger << "--------------------------- Light output -----------------------------------"  unless(@logger.nil?)
-	  @logger << light_cmd[:output]  unless(@logger.nil?)
-	end
+	log_wix_output(light_cmd)
   end
 
-  def self.apply_wix_template(output, input)
+  def self.create_package(output, input)
     raise 'WIX path is not set!' if(install_path.nil?)
 	input = { files: input } unless(input.kind_of?(Hash))
   	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
@@ -281,6 +391,9 @@ class Wix
  
 	output_absolute_path = File.absolute_path(output)
 
+	#dir = './tmp_dir'
+	#FileUtils.rm_rf(dir) if(Dir.exists?(dir))
+	#FileUtils.mkdir(dir)
 	Dir.mktmpdir do |dir|
 	  copy_install_files(dir, input)
 	  

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   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: rspec
   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: dev
   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
@@ -81,7 +81,6 @@ files:
 - example/install_files/file1.txt
 - example/rakefile.rb
 - lib/WindowsInstaller.rb
-- lib/WindowsInstaller_hold.rb
 - lib/command.rb
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
@@ -94,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset

data/lib/WindowsInstaller_hold.rb

@@ -1,156 +0,0 @@
-require 'win32ole'
-require 'dev_tasks'
-
-module Wixgem
-
-class WindowsInstaller
-	def self.install(msi_file)
-	  msi_file = msi_file.gsub(/\//, '\\')
-	  raise "#{msi_file} is already installed" if(WindowsInstaller.installed?(msi_file))
-	  execute("msiexec.exe /i #{msi_file}")
-	end
-
-	def self.uninstall(msi_file)
-	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
-	  
-	  info = msi_properties(installer, 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_properties(msi_file)
-	  return product_code_installed?(info['ProductCode'])
-	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_name_installed_version(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  info = product_info(installer, product_code_from_product_name(product_name, installer))
-	  return info['VersionString']
-	end
-
-    private
-	def self.product_code_from_msi(msi_file, installer = nil)
-	  msi_info = msi_properties(msi_file)
-	  return msi_info['ProductCode']
-	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_code_properties(product_code, installer = nil)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer') 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(product_code, prop)
-		hash[prop] = value unless(value.nil? || value == '')
-	  end
-	  return hash
-	end
-
-	def self.print_properties(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  properties = product_info(installer, product_code(product_name, installer))
-	  properties.each { |id, value| puts "#{id}: #{value}" }
-	end
-
-	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.print_msi_records(msi_file)
-	  records = msi_records(msi_file)
-
-	  puts "#{msi_file} Properties:"
-	  records.each do |key,value|
-		puts "#{key}: #{value}"
-	  end
-	end
-	
-	def self.print_product_name(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  # only one session per process!
-	  session = installer.OpenProduct(product_code_from_product_name?(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)
-      command.execute
-    end
-end
-
-end