wixgem 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5281b8db4988dd4764f4795e6a341c4a79167f9a
-  data.tar.gz: 838590c87615215884f770c9d8ed2659d11defd3
+  metadata.gz: d95c67cdf3018e6d670322ef4727ac4a7ad674b6
+  data.tar.gz: 81f6738e0e8dc13046af6f0b13f62175db6141ea
 SHA512:
-  metadata.gz: fa3ad152cbc4ac35f9aea401fa965a5e33077f59a4ce0fb8eedde094271e08beecfd35b46aea2ad45f560b14124c436319bff00e1e734005574b564fe169e7b5
-  data.tar.gz: 630116032a25d5304e8260010a6e0ef9a3efc7bcf39f57e269405b83e09ca87ce853b7c9ab6b948ddd39538894865a806048a347ae257f4909c6d82fa99c3c2e
+  metadata.gz: 54cdfbe55af0819b300199229c8b9ef7b06cafd5f32af441ea9bb3e886443f2103bdf4e8a7d56ae1332c4cd745cf09b4536e7ddcd14057d8190918ccd405d28b
+  data.tar.gz: 0b0d4f67df788faec251883cf34bae74dde0d289c4254bc751b43f4af2f2d844c5fbb73b0bc71ff26e2387aa0dedb2f0dc69382a3598e854cc52c75c40519f3d

data/lib/wixgem.rb

@@ -58,6 +58,24 @@ class Wix
 	return xml_doc
   end  
 
+  def self.manage_com_files(xml_doc)
+	component_groups = REXML::XPath.match(xml_doc, '//Wix/Fragment/ComponentGroup')
+	return xml_doc if(component_groups.nil?)
+
+	com_dlls = {}
+	component_groups.each do |component_group|
+ 	  component_group.each_element do |component|
+	    classes = component.get_elements('Class')
+		if((classes.length == 1) && (classes[0].attributes["Context"] == 'InprocServer32'))
+		  files = component.get_elements('File')
+		  files[0].add_attribute('Assembly','.net')
+		end
+	  end
+	end
+	
+	return xml_doc
+  end  
+
   def self.manage_custom_actions(xml_doc, input)
     manufacturer = 'Not Set'
     manufacturer = input[:manufacturer] if(input.kind_of?(Hash) && input.has_key?(:manufacturer))
@@ -68,11 +86,13 @@ class Wix
 	product = REXML::XPath.match(xml_doc, '//Wix/Product')
 	return xml_doc if(product.length == 0)
 	
-	product[0].add_element 'CustomAction', { 'Id' => 'SetTARGETDIR', 'Directory' => 'TARGETDIR', 'Value' => "#{install_path}", 'Return' => 'check'}
+	product[0].add_element 'CustomAction', { 'Id' => 'SetTARGETDIR', 'Property' => 'TARGETDIR', 'Value' => "#{install_path}", 'Return' => 'check'}
 
 	install_execute_sequence = product[0].add_element 'InstallExecuteSequence'
-	custom_action = install_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'After'=>'InstallValidate' }
+	custom_action = install_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostFinalize' }
 
+	admin_execute_sequence = product[0].add_element 'AdminExecuteSequence'
+	custom_action = admin_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostFinalize' }
 	return xml_doc
   end
   
@@ -159,9 +179,10 @@ 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.txt", 'w') { |f| f.puts wix_cmd } if(@debug)
 	
 	stdout = %x[#{wix_cmd}]
+
+	File.open("#{File.basename(wxs_file,'.wxs')}.wix_cmds.txt", 'w') { |f| f.puts wix_cmd } if(@debug)
 	raise "#{stdout}\nFailed to generate .wxs file" unless(File.exists?(wxs_file))
 		
 	product_name = File.basename(wxs_file, '.wxs')
@@ -194,6 +215,7 @@ class Wix
 	xml_doc = REXML::Document.new(wxs_text)
 	xml_doc = manage_custom_actions(xml_doc, input)
 	xml_doc = manage_upgrade(xml_doc,input)
+	xml_doc = manage_com_files(xml_doc)
 	xml_doc = manage_msm_files(xml_doc)
 	
 	File.open(wxs_file, 'w') { |f| f.puts(xml_doc.to_s) }	

data/spec/COM_spec.rb

@@ -0,0 +1,42 @@
+require 'rspec'
+require './lib/wixgem.rb'
+require './spec/wixpath.rb'
+require './WindowsInstaller.rb'
+require 'win32ole'
+
+describe 'Wixgem' do
+  describe 'Installation of a COM object' do
+	it 'should not be able to instance a COM object' do
+	  expect { WIN32OLE.new('COMObject.ComClassExample') }.to raise_error
+	end
+
+	installation_file = 'test/wixgem_com_test.msi'
+	while(WindowsInstaller.installed?(installation_file))
+	  WindowsInstaller.uninstall(installation_file)
+	end
+	
+	it "should create an installation file using: #{installation_file}" do
+      Wix.make_installation(installation_file, { debug: true, files: ['COMObject/bin/Release/COMObject.dll']})
+	  expect(File.exists?(installation_file)).to be(true)	  
+	end
+    
+	WindowsInstaller.install(installation_file)
+
+	it 'should be able to instance a COM object with a GUID' do
+		#object = WIN32OLE.new('{863AEADA-EE73-4f4a-ABC0-3FB384CB41AA}')
+		#expect(object.nil?).to eq(false)
+		#puts "Text: #{object.GetText}"
+		#expect(object.GetText).to eq('Hello World')
+	end
+
+	it 'should be able to instance a COM object with a Program Id' do
+		
+		#object = WIN32OLE.new('COMObject.ComClassExample')
+		#expect(object.nil?).to eq(false)
+		#puts "Text: #{object.GetText}"
+		#expect(object.GetText).to eq('Hello World')
+	end
+	
+	WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))
+  end
+end

data/spec/installation_spec.rb

@@ -3,12 +3,12 @@ require './lib/wixgem.rb'
 require './spec/wixpath.rb'
 require './spec/test_install.rb'
 require './spec/test_files_exist.rb'
-require 'json'
 
 describe 'Wixgem' do
   #Wix.debug = true
   describe 'Installation' do
     test_arguments = {
+      test0: ['wixgem_install_test1.msi', ['rakefile.rb']],
       test1: ['test/wixgem_install_test1.msi', ['rakefile.rb']],
 	  test2: ['test/wixgem_install_test2.msi', {manufacturer: 'musco', files: ['Gemfile']}], 
 	  test3: ['test/wixgem_install_test3.msi', ['rakefile.rb', 'Gemfile']],
@@ -18,7 +18,7 @@ describe 'Wixgem' do
 	  test7: ['test/wixgem_install_test7.msi', {product_name: 'test_productname', files: ['Gemfile']}],
 	  test8: ['test/wixgem_install_test8.msi', {modify_file_paths: {/\Atest_files\// => ''}, files: Dir.glob("test_files/**/*")}]
     }
-
+	
     test_arguments.each { |key, value| 
 	  it "should create an installation file using: #{value[0]}" do
         Wix.make_installation(value[0], value[1])
@@ -48,7 +48,7 @@ describe 'Wixgem' do
 	  end
     }
   end	
-  
+    
   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})
@@ -56,4 +56,5 @@ describe 'Wixgem' do
 	  expect(wix_cmd_text.include?('-svb6')).to eq(true)
 	end
   end	
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - README.md
 - example/rakefile.rb
 - lib/wixgem.rb
+- spec/COM_spec.rb
 - spec/execute.rb
 - spec/installation_spec.rb
 - spec/mergemodule_spec.rb