wixgem 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ef7554d4e1d1d816c7161eddb90c0cc8efc435
-  data.tar.gz: 77fced7ea571cdeaa0735693e9668e91c14627b4
+  metadata.gz: 199cdfc908570d35b411d9508b2ad2224142de9a
+  data.tar.gz: dcc5ea6e1aadde2eafa23d3d547fa9b3e9a01f22
 SHA512:
-  metadata.gz: 0cec8674e90cb6746de6338d4c04496639178f936e065d55dafa7fd8c8d46c49474633b8ad2531c0e3fc6ea831b881546fa15f434f281a95114b701acddf5d2e
-  data.tar.gz: 5df9d716aae5d5d5cc20c593d6b1f748db6705877c888e9bd606b9366ed4ed60b383504cdee12021808d6daa560cb7c5b6aaecf203c51e9583c61ea6b9e4719e
+  metadata.gz: 7481a4a2d30f885efdcb9e6c891fa722171ffe16367dfcd185ab313092fc97974294c5aca4ee65d386cbbc9c2915944165fbb685ffaf47373e5b9cd059b4acc6
+  data.tar.gz: 2b2dbfbcadc32ee1623f2cbb277275890256d0dac7ea16903104b12aa676ba2117684f5d9ba883e24c7ba531528eb8953cd628f53512b5c6e4faf960f81c10f4

data/example/install_files/directory/file2.txt

@@ -0,0 +1 @@
+Hello World

data/example/install_files/file1.txt

@@ -0,0 +1 @@
+Hello World

data/lib/wixgem.rb

@@ -87,12 +87,17 @@ class Wix
 	product[0].add_element 'CustomAction', { 'Id' => 'SetTARGETDIR', 'Property' => 'TARGETDIR', 'Value' => "#{install_path}", 'Execute' => 'firstSequence', 'Return' => 'check'}
 
 	install_execute_sequence = product[0].add_element 'InstallExecuteSequence'
-	#custom_action = install_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostFinalize' }
 	custom_action = install_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
 
+	install_ui_sequence = product[0].add_element 'InstallUISequence'
+	custom_action = install_ui_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
+	
 	admin_execute_sequence = product[0].add_element 'AdminExecuteSequence'
-	#custom_action = admin_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostFinalize' }
 	custom_action = admin_execute_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
+
+	admin_ui_sequence = product[0].add_element 'AdminUISequence'
+	custom_action = admin_ui_sequence.add_element 'Custom', { 'Action' => 'SetTARGETDIR', 'Before'=>'CostInitialize' }
+
 	return xml_doc
   end
   

data/spec/COM_spec.rb

@@ -1,61 +1,58 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.rb'
-require './spec/WindowsInstaller.rb'
-require './spec/test_files_exist.rb'
-require 'win32ole'
-require './admin.rb'
-
-# Unfortunately, I am unable to automate testing of the COM installation.  What I do not understand is I am unable to 
-# script this COM msi. If I attempt to script the COM msi, the COM dll is never installed. I am speculating, the custom action 
-# for the TARGETDIR is not functioning. If I use the mouse to double click on the msi, the privileges are raised to 
-# administrative privileges the COM object is correctly installed. Don't understand the difference.
-
-if(admin? && false)
-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
-	
-	installation_hash = { debug: true, all_users: 'perMachine', files: ['COMObject/bin/Release/COMObject.dll']}
-	it "should create an installation file using: #{installation_file}" do
-      Wixgem::Wix.make_installation(installation_file, installation_hash)
-	  expect(File.exists?(installation_file)).to be(true)	  
-	end
-    
-	it 'should install' do
-	  WindowsInstaller.install(installation_file)
-	  expect(WindowsInstaller.installed?(installation_file)).to be(true)
-	end
-
-	it 'should have installed the COMObject.dll' do
-      test_files_exist(installation_file, installation_hash)
-	end
-	
-	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
-	
-	it 'should uninstall' do
-	  WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))	     
-	  expect(WindowsInstaller.installed?(installation_file)).to be(false)	  
-	end
-  end
-end
-end
+require 'rspec'
+require './lib/wixgem.rb'
+require './spec/wixpath.rb'
+require './spec/WindowsInstaller.rb'
+require './spec/test_files_exist.rb'
+require 'win32ole'
+require './admin.rb'
+
+# Don't understand why I cannot get this test to work
+
+if(admin?)
+  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'	
+	  File.delete(installation_file) if(File.exists?(installation_file))
+	  WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))	     
+
+	  installation_hash = { debug: true, all_users: 'perMachine', files: ['COMObject/bin/Release/COMObject.dll']}
+	  it "should create an installation file using: #{installation_file}" do
+       Wixgem::Wix.make_installation(installation_file, installation_hash)
+	   expect(File.exists?(installation_file)).to be(true)	  
+	  end
+    
+	  # it 'should install' do
+	   # WindowsInstaller.install(installation_file)
+	   # expect(WindowsInstaller.installed?(installation_file)).to be(true)
+	  # end
+
+ 	  # it 'should have installed the COMObject.dll' do
+        # test_files_exist(installation_file, installation_hash)
+	  # end
+	
+	  # 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)
+		# 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)
+		# expect(object.GetText).to eq('Hello World')
+	  # end
+	
+	  it 'should uninstall' do
+	    WindowsInstaller.uninstall(installation_file) if(WindowsInstaller.installed?(installation_file))	     
+	    expect(WindowsInstaller.installed?(installation_file)).to be(false)	 		
+	  end
+	  
+	  it 'should cleanup the generaged msi file' do
+	  end
+    end
+  end
+end

data/spec/WindowsInstaller.rb

@@ -2,16 +2,25 @@ require 'win32ole'
 require 'dev_tasks'
 
 class WindowsInstaller
-	def self.installed?(product_name)
+	def self.installed?(msi_product_code_or_product_name)
 	  installer = WIN32OLE.new('WindowsInstaller.Installer')
+	  
+	  value = msi_product_code_or_product_name
+	  if(File.exists?(value))
+        records = msi_records(value)
+		value = records['ProductCode']
+	  end
+
 	  installer.Products.each { |prod_code|
 		name = installer.ProductInfo(prod_code, "ProductName")
-		return true if (product_name == name)
+		return true if (value == name)
+		return true if (value == prod_code)
 	  }
 	  return false
 	end
 
 	def self.install(msi)
+	  msi = msi.gsub(/\//, '\\')
 	  raise "#{msi} is already installed" if(WindowsInstaller.installed?(msi))
 	  execute("msiexec.exe /i #{msi}")
 	end
@@ -19,6 +28,7 @@ class WindowsInstaller
 	def self.uninstall(msi_product_code_or_product_name)
 	  value = msi_product_code_or_product_name
 	  if(File.exists?(value))
+		value = value.gsub(/\//, '\\')
 	    execute("msiexec.exe /quiet /x #{value}") 
 		return
 	  end
@@ -105,7 +115,9 @@ class WindowsInstaller
 	    records[record.StringData(1)] = record.StringData(2) 
 		record = view.Fetch()
 	  end
+	  db.ole_free
 	  db = nil
+	  installer.ole_free
 	  installer = nil
 	  
 	  return records
@@ -138,7 +150,9 @@ class WindowsInstaller
 		puts "#{record.StringData(1)}: #{record.StringData(2)}"
 		record = view.Fetch()
 	  end
+	  db.ole_free
 	  db = nil
+	  installer.ole_free
 	  installer = nil
 	  puts ''
 	end	

data/spec/installation_spec.rb

@@ -20,6 +20,8 @@ describe 'Wixgem' do
     }
 	
     test_arguments.each { |key, value| 
+	  File.delete(value[0]) if(File.exists?(value[0]))
+	
 	  it "should create an installation file using: #{value[0]}" do
         Wixgem::Wix.make_installation(value[0], value[1])
 	    expect(File.exists?(value[0])).to be(true)	  
@@ -31,8 +33,6 @@ describe 'Wixgem' do
 	    test_install(key, value[0], value[1], execute) 
 	  end
     }
-
-    test_arguments.each { |key, value| FileUtils.rm(value[0]) if(File.exists?(value[0])) }  
   end
   
   describe 'Packaging excptions' do 

data/spec/mergemodule_spec.rb

@@ -16,6 +16,8 @@ describe 'Wixgem' do
     }
   
     test_arguments.each { |key, value| 
+	  File.delete(value[0]) if(File.exists?(value[0]))
+
 	  it "should create merge module: #{value[0]}" do
 	    Wixgem::Wix.make_mergemodule(value[0], value[1])
 	    raise "#{key}: #{value[0]} does not exist" unless(File.exists?(value[0]))

data/spec/multiple_product_installation_spec.rb

@@ -1,67 +1,67 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.rb'
-require './spec/WindowsInstaller.rb'
-require './admin.rb'
-
-if(admin?)
-describe 'Wixgem' do
-  describe 'Side by side installations' do
-    product1='wixgem_multiple 1.0'
-    product2='wixgem_multiple 1.1'
-      
-	Wixgem::Wix.make_installation("test/wixgem_multiple.1.0.0.msi", {version: '1.0.0.0', product_name: product1, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['Gemfile']})
-    Wixgem::Wix.make_installation("test/wixgem_multiple.1.1.0.msi", {version: '1.1.0.0', product_name: product2, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['rakefile.rb']})
-
-    it "should install version 1.0.0" do
-	  WindowsInstaller.install('test\\wixgem_multiple.1.0.0.msi')
-      expect(WindowsInstaller.installed?(product1)).to be(true)
-	  expect(WindowsInstaller.version(product1)).to eq('1.0.0.0')
-	end
-
-    it "should install version 1.1.0" do
-	  WindowsInstaller.install('test\\wixgem_multiple.1.1.0.msi')
-	  expect(WindowsInstaller.installed?(product2)).to be(true)
-	  expect(WindowsInstaller.version(product2)).to eq('1.1.0.0')
-	end
-	  
-	it "version 1.0.0 should still be installed" do
-	  expect(WindowsInstaller.installed?(product1)).to be(true)
-	end
-
-	it "product codes for version 1.0.0 and 1.0.0 should be different" do
-	  expect(WindowsInstaller.product_code(product1)).not_to eq(WindowsInstaller.product_code(product2))
-	end
-
-	it "Should be able to uninstall both products" do
-  	  WindowsInstaller.uninstall(product1)
-	  WindowsInstaller.uninstall(product2) 
-	end
-  end
-
-  describe 'remove previous version' do
-    product1='wixgem_install 1.0'
-    product2='wixgem_install 1.1'
-    Wixgem::Wix.make_installation("test/wixgem_install.1.0.0.msi", {version: '1.0.0.0', product_name: product1, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['Gemfile']})
-    Wixgem::Wix.make_installation("test/wixgem_install.1.1.0.msi", {version: '1.1.0.0', product_name: product2, remove_existing_products: true, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['rakefile.rb']})
-
-    it "should install version 1.0.0" do
-	  WindowsInstaller.install('test\\wixgem_install.1.0.0.msi')
-	  expect(WindowsInstaller.installed?(product1)).to be(true)
-	end
-
-    it "should install version 1.1.0" do
-	  WindowsInstaller.install('test\\wixgem_install.1.1.0.msi')
-	  expect(WindowsInstaller.installed?(product2)).to be(true)
-	end
-	  
-	it "the version 1.0.0 should have been uninstalled" do
-      expect(WindowsInstaller.installed?(product1)).to be(false)
-	end
-	
-	it "should be able to uninstall #{product2}" do
-  	  WindowsInstaller.uninstall(product2) 
-	end
-  end
-end
+require 'rspec'
+require './lib/wixgem.rb'
+require './spec/wixpath.rb'
+require './spec/WindowsInstaller.rb'
+require './admin.rb'
+
+if(admin?)
+describe 'Wixgem' do
+  describe 'Side by side installations' do
+    product1='wixgem_multiple 1.0'
+    product2='wixgem_multiple 1.1'
+      
+	Wixgem::Wix.make_installation("test/wixgem_multiple.1.0.0.msi", {version: '1.0.0.0', product_name: product1, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['Gemfile']})
+    Wixgem::Wix.make_installation("test/wixgem_multiple.1.1.0.msi", {version: '1.1.0.0', product_name: product2, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['rakefile.rb']})
+
+    it "should install version 1.0.0" do
+	  WindowsInstaller.install('test\\wixgem_multiple.1.0.0.msi')
+      expect(WindowsInstaller.installed?(product1)).to be(true)
+	  expect(WindowsInstaller.version(product1)).to eq('1.0.0.0')
+	end
+
+    it "should install version 1.1.0" do
+	  WindowsInstaller.install('test\\wixgem_multiple.1.1.0.msi')
+	  expect(WindowsInstaller.installed?(product2)).to be(true)
+	  expect(WindowsInstaller.version(product2)).to eq('1.1.0.0')
+	end
+	  
+	it "version 1.0.0 should still be installed" do
+	  expect(WindowsInstaller.installed?(product1)).to be(true)
+	end
+
+	it "product codes for version 1.0.0 and 1.0.0 should be different" do
+	  expect(WindowsInstaller.product_code(product1)).not_to eq(WindowsInstaller.product_code(product2))
+	end
+
+	it "Should be able to uninstall both products" do
+  	  WindowsInstaller.uninstall(product1)
+	  WindowsInstaller.uninstall(product2) 
+	end
+  end
+
+  describe 'remove previous version' do
+    product1='wixgem_install 1.0'
+    product2='wixgem_install 1.1'
+    Wixgem::Wix.make_installation("test/wixgem_install.1.0.0.msi", {version: '1.0.0.0', product_name: product1, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['Gemfile']})
+    Wixgem::Wix.make_installation("test/wixgem_install.1.1.0.msi", {version: '1.1.0.0', product_name: product2, remove_existing_products: true, upgrade_code: '{face46ab-74ce-44eb-a2b7-81a8cfad5bab}', files: ['rakefile.rb']})
+
+    it "should install version 1.0.0" do
+	  WindowsInstaller.install('test\\wixgem_install.1.0.0.msi')
+	  expect(WindowsInstaller.installed?(product1)).to be(true)
+	end
+
+    it "should install version 1.1.0" do
+	  WindowsInstaller.install('test\\wixgem_install.1.1.0.msi')
+	  expect(WindowsInstaller.installed?(product2)).to be(true)
+	end
+	  
+	it "the version 1.0.0 should have been uninstalled" do
+      expect(WindowsInstaller.installed?(product1)).to be(false)
+	end
+	
+	it "should be able to uninstall #{product2}" do
+  	  WindowsInstaller.uninstall(product2) 
+	end
+  end
+end
 end

data/spec/test_files_exist.rb

@@ -1,35 +1,35 @@
-def files(data)
-  files = data
-  if(data.kind_of?(Hash))
-    files = data[:files] 
-  
-    if(data.has_key?(:modify_file_paths))
-      modify_paths = data[:modify_file_paths]
-      files.each_index do |index|
-	    file_path = files[index]
-	    modify_paths.each { |regex, replacement_string| file_path = file_path.gsub(regex, replacement_string) }
-	    files[index] = file_path
-	  end
-    end
-  end
-  return files
-end
-
-def test_files_exist(msi_file, data)
-  files = files(data)
-
-  product_name = File.basename(msi_file, File.extname(msi_file))
-  product_name = data[:product_name] if(data.kind_of?(Hash) && data.has_key?(:product_name))
-
-  manufacturer = ''
-  manufacturer = data[:manufacturer] if(data.kind_of?(Hash) && data.has_key?(:manufacturer))
- 
-  relative_install_dir = product_name
-  raise "#{name}: relative_install_dir should be set to the product name" if(relative_install_dir.length == 0)
-  relative_install_dir = "#{manufacturer}/#{relative_install_dir}" if(manufacturer.length > 0)
- 
-  files.each { |file| 
-    full_path = "C:/Program Files (x86)/#{relative_install_dir}/#{file}"
-	raise "#{full_path} not installed." unless(File.exists?(full_path))
-  }
+def files(data)
+  files = data
+  if(data.kind_of?(Hash))
+    files = data[:files] 
+  
+    if(data.has_key?(:modify_file_paths))
+      modify_paths = data[:modify_file_paths]
+      files.each_index do |index|
+	    file_path = files[index]
+	    modify_paths.each { |regex, replacement_string| file_path = file_path.gsub(regex, replacement_string) }
+	    files[index] = file_path
+	  end
+    end
+  end
+  return files
+end
+
+def test_files_exist(msi_file, data)
+  files = files(data)
+
+  product_name = File.basename(msi_file, File.extname(msi_file))
+  product_name = data[:product_name] if(data.kind_of?(Hash) && data.has_key?(:product_name))
+
+  manufacturer = ''
+  manufacturer = data[:manufacturer] if(data.kind_of?(Hash) && data.has_key?(:manufacturer))
+ 
+  relative_install_dir = product_name
+  raise "#{name}: relative_install_dir should be set to the product name" if(relative_install_dir.length == 0)
+  relative_install_dir = "#{manufacturer}/#{relative_install_dir}" if(manufacturer.length > 0)
+ 
+  files.each { |file| 
+    full_path = "C:/Program Files (x86)/#{relative_install_dir}/#{file}"
+	raise "#{full_path} not installed." unless(File.exists?(full_path))
+  }
 end

data/spec/wixpath.rb

@@ -1,3 +1,3 @@
-WIX_PATH='C:/Development/dep/OpenSource/WixToolset/3.9'
+WIX_PATH='E:/Development/dep/OpenSource/WixToolset/3.9'
 
 Wixgem::Wix.install_path = WIX_PATH 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-19 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'
 - !ruby/object:Gem::Dependency
   name: logging
   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
@@ -89,6 +89,10 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- example/example.msi
+- example/example.msm
+- example/install_files/directory/file2.txt
+- example/install_files/file1.txt
 - example/rakefile.rb
 - lib/command.rb
 - lib/wixgem.rb
@@ -116,17 +120,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.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset