wixgem 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcab5b805971c3bd561d29a61cdb4e65df483482
-  data.tar.gz: cc14dbc41912184286544ce90319ada1ab3829cb
+  metadata.gz: 534047f23141f404ce3310c55db3c599157cbeb7
+  data.tar.gz: 7574488f9c177562ad081f4fad69e88b8b13e95f
 SHA512:
-  metadata.gz: 16c8423f29f4b45b5f4ba5007a2c8f2d5e7084eca375cd3928774085b540cfb29bfa5f174c36f1467c2e1b7008c6031b7793f5231e41fc0ddc3887b4c17cc22e
-  data.tar.gz: a402219a160d556a391be7912be1b4f6da0a8d45254a37444238eefaa034361f5b2897c8e0aef870e525a11b0524b199ddb215b3b58e390435a62d7bbf0d9f0f
+  metadata.gz: 373487b87ce98a131e59aa09fcbc8f0fb08a058816805299ebb6b0b1fe57c3ae24ca688bb9cc24f837b919bd2f9ba4f3ebd89d02062640d3b2e3d74807affed1
+  data.tar.gz: 6f1444e90174f06dd96aa70f5713502710783dadd00cecb4acd915992298d054108b50b72a5be5be0ea4e828a3cfbcbe9bd7a0ad42e414cca3a3c095bdb559b8

data/lib/wixgem.rb

@@ -46,7 +46,6 @@ class Wix
 
 	  raise 'Hash must have a version key if the hash has a :remove_existing_products key' unless(input.has_key?(:version))
 	  raise 'Hash must have an upgrade_code key if the hash has a :remove_existing_products key' unless(input.has_key?(:upgrade_code))
-
 	
 	  upgrade = product[0].add_element 'Upgrade', { 'Id' => input[:upgrade_code] }
 	  upgrade.add_element 'UpgradeVersion', { 'Minimum' => input[:version], 'OnlyDetect'=>'yes', 'Property'=>'NEWPRODUCTFOUND' }
@@ -106,6 +105,9 @@ class Wix
     files = input
 	files = input[:files] if(input.kind_of?(Hash))
 	
+	raise 'No files were given to wixgem' if(files.length == 0)
+	
+	missing_files = []
 	files.each do |file| 
 	  if(File.file?(file))
    	    install_path = file
@@ -116,17 +118,27 @@ class Wix
    	    install_path = "#{directory}/#{install_path}"
 		FileUtils.mkpath(File.dirname(install_path)) unless(Dir.exists?(File.dirname(install_path)))
 		FileUtils.cp(file, install_path)
+	  elsif(!File.exists?(file))
+	    missing_files.insert(missing_files.length, file)
 	  end
 	end
+	
+	if(missing_files.length > 0)
+	  missing_files_str = ''
+	  missing_files.each { |f| msg = "#{missing_files_str}, #{f}" }
+	  raise "Missing files: #{missing_files_str}" 
+	end
   end
 
   def self.create_wxs_file(wxs_file, input, ext)
-  	@debug = input[:debug] if(!@debug && input.kind_of?(Hash) && input.has_key?(:debug))
-
     template_option = "-template product"
 	template_option = "-template module" unless(ext == ".msi")
+
+	wix_cmd = "\"#{install_path}/bin/heat.exe\" dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\""
+	wix_cmd = wix_cmd.gsub(/-srd/, '-svb6 -srd') if(input.kind_of?(Hash) && input.has_key?(:has_vb6_files))
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds", 'w') { |f| f.puts wix_cmd } if(@debug)
 	
-	stdout = %x[\"#{install_path}/bin/heat.exe\" dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\"]
+	stdout = %x[#{wix_cmd}]
 	raise "#{stdout}\nFailed to generate .wxs file" unless(File.exists?(wxs_file))
 		
 	product_name = File.basename(wxs_file, '.wxs')
@@ -170,18 +182,24 @@ class Wix
   end
 
   def self.create_output(wxs_file, output)
-    wixobj_file = "#{File.basename(wxs_file)}.wixobj"
+    wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
-	stdout = %x[\"#{install_path}\\bin\\candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"]
+	wix_cmd = "\"#{install_path}\\bin\\candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\""
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds", 'a') { |f| f.puts wix_cmd } if(@debug)
+	stdout = %x[#{wix_cmd}]
 	raise "#{stdout}\nFailed to generate .wixobj file" unless(File.exists?(wixobj_file))
 
-    stdout = %x[\"#{install_path}\\bin\\light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"]
+	wix_cmd = "\"#{install_path}\\bin\\light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\""
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds", 'a') { |f| f.puts wix_cmd } if(@debug)
+    stdout = %x[#{wix_cmd}]	
 	raise "#{stdout}\nFailed to generate #{output} file" unless(File.exists?(output))
   end
 
   def self.apply_wix_template(output, input, template)
     raise 'WIX path is not set!' if(install_path.nil?)
- 
+
+  	@debug = input[:debug] if(!@debug && input.kind_of?(Hash) && input.has_key?(:debug))
+	
 	ext = File.extname(output)
   	basename = File.basename(output, ext)
 	FileUtils.rm(output) if(File.exists?(output))
@@ -195,8 +213,13 @@ class Wix
 	  Dir.chdir(dir) do |current_dir|
 		create_wxs_file(wxs_file, input, ext)
 	    create_output(wxs_file, output_absolute_path)
+
+	    if(@debug)
+	      FileUtils.cp("#{wxs_file}", "#{output_absolute_path}.wxs") 
+		  wix_cmds_file = "#{File.basename(wxs_file,'.wxs')}.wix_cmds"
+		  FileUtils.cp(wix_cmds_file, "#{File.dirname(output_absolute_path)}/#{wix_cmds_file}")
+	    end
 	  end
-	  FileUtils.cp("#{dir}/#{wxs_file}", "#{output_absolute_path}.wxs") if(@debug)
     end
 	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
 	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))

data/spec/installation_spec.rb

@@ -38,14 +38,22 @@ describe 'Wixgem' do
   describe 'Packaging excptions' do 
     exception_test_arguments = {
       test1: ['test/wixgem_install_test1.msi', nil],
-      test1: ['test/wixgem_install_test1.msi', []],
-      test2: ['test/wixgem_install_test1.msi', ['does_not_exist.txt']]
+      test2: ['test/wixgem_install_test1.msi', []],
+      test3: ['test/wixgem_install_test1.msi', ['does_not_exist.txt']]
     }
   
     exception_test_arguments.each { |key, value|
-	  it "should raise an exception" do
+	  it "#{key} should raise an exception" do
 	    expect { Wix.make_installation(value[0], value[1]) }.to raise_error
 	  end
     }
   end	
+  
+  describe 'includding vb6 files' do 
+	it "the wix's heat command should contain the -svb6 flag" do
+      Wix.make_installation('test/wixgem_install_vb6_files.msi', {manufacturer: 'musco', has_vb6_files: true, files: ['rakefile.rb'], debug: true})
+	  wix_cmd_text = File.read('test/wixgem_install_vb6_files.wix_cmds')
+	  expect(wix_cmd_text.include?('-svb6')).to eq(true)
+	end
+  end	
 end

metadata

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