wixgem 0.49.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 061afe43dfa14c1ecd5d5b2a48babc203e36866e
-  data.tar.gz: 4e4593073b5edd42f7535603b5eef5a87cfb1cc3
+  metadata.gz: 85eefebc51d585b590f61f47d2f6d82323b136d1
+  data.tar.gz: 211f7c629cbacaa238283f619785f98193b95492
 SHA512:
-  metadata.gz: aad6ca671d146d3014ceaa699a7e8ed6cf846d315951331fbacf0bb88760083627f92d3d0478109fa87f4ca69749d6560ff63d8a19e130ac4d093c9203f2988d
-  data.tar.gz: 8e2726e75b477f13b12c58f50e2f3d9e95741360c8f9e2c541029857d60f92acca34cd7d7053504291288be24d66d2620ad5bc6cc59c624ba3ced2e6c2ad5118
+  metadata.gz: fc87d1d1d6dde547bd360213898da22842737059e2f3fc5a230f90c3931d16796199ac14f5c377c04857a0906b0e8e4d0c3e0ad145711c20f4138ea0d04c09a3
+  data.tar.gz: 0363a2b4e114e75878531a1dc3a3157ad051ae2e96e1aab5f05e49e3f9a5825e51b6ffa9e2fbf62bd597886f7d7542f852e6ab093c585d9010dead1423877be8

data/lib/wixgem.rb

@@ -154,8 +154,7 @@ class Wix
   
   def self.copy_install_files(directory, input)
 	files = files(input)
-	raise 'No files were given to wixgem' if(files.length == 0)
-	
+
 	missing_files = []
 	files.each do |file| 
 	  if(File.file?(file))
@@ -174,8 +173,10 @@ class Wix
 	end
 
     if(@debug)	
-	  max_path = files.max { |a, b| a.length <=> b.length }
-	  columen_size = max_path.length + 10
+	  if(files.length > 0)
+		max_path = files.max { |a, b| a.length <=> b.length }
+		columen_size = max_path.length + 10
+	  end
 	    
 	  @logger << "------------------------------------ Installation Paths -----------------------------------" unless(@logger.nil?)
 	  @logger << "%-#{columen_size}s %s\n" % ['File path', 'Installation Path']  unless(@logger.nil?)
@@ -188,9 +189,17 @@ class Wix
 	      @logger << "%-#{columen_size}s %s\n" % [file, install_path]  unless(@logger.nil?)
         end
       end
+      
+	  if(input.has_key?(:ignore_files))
+	    @logger << "------------------------------------ ignoring files -----------------------------------" unless(@logger.nil?)
+		input[:ignore_files].each { |file| @logger << file }
+	  end
+	  
 	  @logger << "-------------------------------------------------------------------------------------------" unless(@logger.nil?)
 	end
 
+	raise 'No files were given to wixgem' if(files.length == 0)
+
 	if(missing_files.length > 0)
 	  missing_files_str = ''
 	  missing_files.each { |f| 
@@ -230,7 +239,6 @@ class Wix
 
   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[:debug] = true
 	heat_cmd.execute	
 	log_wix_output(heat_cmd)
   end
@@ -248,6 +256,10 @@ class Wix
 	
 	install_files.reject! { |f| install_ignore_files.include?(f) }
 
+	package_type = 'installation'
+	package_type = 'merge module' if(template_option.include?('module'))
+	raise "At least one file is required to build a #{package_type}" if(install_files.length == 0)
+	
 	directory_fragments = {}
 	wxs_files = {}
 	install_files.each do |file|
@@ -311,7 +323,7 @@ class Wix
   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
@@ -377,8 +389,17 @@ class Wix
 	log_wix_output(light_cmd)
   end
 
+  def self.verify_input_keys(input)
+    if(input.kind_of?(Hash))
+	  [:files,:ignore_files].each { |key| raise "Hash key #{key} cannot be nil" if(input.has_key?(key) && input[key].nil?)}
+	end
+  end
+  
   def self.create_package(output, input)
     raise 'WIX path is not set!' if(install_path.nil?)
+
+	verify_input_keys(input)
+	
 	input = { files: input } unless(input.kind_of?(Hash))
   	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
 
@@ -396,21 +417,22 @@ class Wix
 	#FileUtils.rm_rf(dir) if(Dir.exists?(dir))
 	#FileUtils.mkdir(dir)
 	Dir.mktmpdir do |dir|
-	  copy_install_files(dir, input)
-	  
 	  wxs_file = "#{basename}.wxs"	    
-	  Dir.chdir(dir) do |current_dir|
-	    begin
+	  begin
+		copy_install_files(dir, input)
+	  
+		Dir.chdir(dir) do |current_dir|
 		  create_wxs_file(wxs_file, input, ext)
 	      create_output(wxs_file, output_absolute_path)
-		rescue Exception => e
-		  raise "Wixgem exception: #{e}"
-		ensure
-	      FileUtils.cp(wxs_file, "#{output_absolute_path}.wxs") if(File.exists?(wxs_file) && @debug)
-	      File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug &!@logger.nil?)
 		end
-	  end
+	  rescue Exception => e
+		raise "Wixgem exception: #{e}"
+	  ensure
+	    FileUtils.cp("#{dir}/#{wxs_file}", "#{output_absolute_path}.wxs") if(File.exists?("#{dir}/#{wxs_file}") && @debug)
+	    File.open("#{output_absolute_path}.log", 'w') { |f| f.puts(@logger) } if(@debug &!@logger.nil?)
+	  end	  
 	end
+	
 	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
 	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Kevin Marshall