wixgem 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6213215965dd51d55d60f45edfe01f68508c189
-  data.tar.gz: dbb87b119d337ff8e771aa253cdf3f44fe66ac70
+  metadata.gz: 8f3a4489747c42dbd44afc6cbe25742033492124
+  data.tar.gz: d7d530793e42c36ccce9e407a0314acdd55c7829
 SHA512:
-  metadata.gz: 1414da1543689ca0af807997460592600ac662d2e6f090dfe36eb331b95213187f169848ba199c5bbd33f7ecb3a3e59cb7fc42ec4caf22f313b1cff96a25288b
-  data.tar.gz: 4faab46486457fc3064d6154c1879e2eef74a35a9a6aa5785ef188358859f8cab3138c527dc646f4e1f1bc179c5783f308b182dccb6db24eddbb9bd9bf97f8f6
+  metadata.gz: a2542ec6030624a69eece1e7d9a0e921ea90319098ea7b0e8dc2d35c4f235a8a16337da915a4b418d57041686aebab08061ce3cbbab50a1274d424d408afae16
+  data.tar.gz: 227d20f4c5597854ea68e6b87ecfcfb8f7c40e2fe25c04bbafa2e7fd6a0686ad71019f362b37ba4c3ea52479fa7759c6f7e6a47e3d9390525cb891bf878588e5

data/lib/wixgem.rb

@@ -153,7 +153,7 @@ class Wix
 
 	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)
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'w') { |f| f.puts wix_cmd } if(@debug)
 	
 	stdout = %x[#{wix_cmd}]
 	raise "#{stdout}\nFailed to generate .wxs file" unless(File.exists?(wxs_file))
@@ -202,12 +202,12 @@ class Wix
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
 	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)
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'a') { |f| f.puts wix_cmd } if(@debug)
 	stdout = %x[#{wix_cmd}]
 	raise "#{stdout}\nFailed to generate .wixobj file" unless(File.exists?(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)
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'a') { |f| f.puts wix_cmd } if(@debug)
     stdout = %x[#{wix_cmd}]	
 	raise "#{stdout}\nFailed to generate #{output} file" unless(File.exists?(output))
   end
@@ -234,14 +234,14 @@ class Wix
 	      create_output(wxs_file, output_absolute_path)
 		ensure
 	      if(@debug)
-	        FileUtils.cp("#{wxs_file}", "#{output_absolute_path}.wxs") if(File.exists?(wxs_file))
-		    wix_cmds_file = "#{File.basename(wxs_file,'.wxs')}.wix_cmds"
-		    FileUtils.cp(wix_cmds_file, "#{File.dirname(output_absolute_path)}/#{wix_cmds_file}") if(File.exists?(wix_cmds_file))
+	        FileUtils.cp(wxs_file, "#{output_absolute_path}.wxs") if(File.exists?(wxs_file))
+		    wix_cmds_file = "#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt"
+		    FileUtils.cp(wix_cmds_file, "#{output_absolute_path}.wix_cmds.txt") if(File.exists?(wix_cmds_file))
 	      end
 		end
 	  end
 		    
-	  FileUtils.mv('installation_files.txt', "#{File.dirname(output_absolute_path)}/#{File.basename(wxs_file,'.wxs')}_paths.txt") if(File.exists?('installation_files.txt'))
+	  FileUtils.mv('installation_files.txt', "#{output_absolute_path}_paths.txt") if(File.exists?('installation_files.txt'))
 	end
 	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
 	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))

data/spec/installation_spec.rb

@@ -49,10 +49,10 @@ describe 'Wixgem' do
     }
   end	
   
-  describe 'includding vb6 files' do 
+  describe 'including 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')
+	  wix_cmd_text = File.read('test/wixgem_install_vb6_files.msi.wix_cmds.txt')
 	  expect(wix_cmd_text.include?('-svb6')).to eq(true)
 	end
   end	

data/spec/mergemodule_spec.rb

@@ -13,7 +13,8 @@ describe 'Wixgem' do
       test1: ['test/wixgem_merge_test1.msm', ['rakefile.rb']],
 	  test2: ['test/wixgem_merge_test2.msm', {files: ['Gemfile']}],
 	  test3: ['test/wixgem_merge_test3.msm', ['rakefile.rb', 'Gemfile']],
-	  test4: ['test/wixgem_merge_test4.msm', Dir.glob("test_files/**/*")]
+	  test4: ['test/wixgem_merge_test4.msm', Dir.glob("test_files/**/*")],
+	  test5: ['test/wixgem_merge_test5.msm', {debug: true, files: Dir.glob("test_files/**/*")}]
     }
   
     test_arguments.each { |key, value| 
@@ -32,6 +33,14 @@ describe 'Wixgem' do
 	  it "should install and uninstall: #{install_file}" do
 	    test_install(key, install_file, value[1]) 
 	  end
+	  
+	  it "should produce the debug files" do
+	    if(key == :test5)
+	      expect(File.exists?("#{value[0]}.wxs")).to be(true)
+	      expect(File.exists?("#{value[0]}.wix_cmds.txt")).to be(true)
+	      expect(File.exists?("#{value[0]}_paths.txt")).to be(true)
+		end
+     end
     }
   end  
   

metadata

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