wixgem 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c840bc7be89ccd3907cd8170f61197534d1d6d
-  data.tar.gz: 5fdb74a08e62361bdbba93f51617e22174d6e7d5
+  metadata.gz: d943092ecd25af3e4a5723cc2a3d0cba86dab548
+  data.tar.gz: b65875ff2e0edc9a9a1945d8da435350da9dabd2
 SHA512:
-  metadata.gz: 3b91f539189b3dcab3d616c619247378b25e381b27641859a439395ea8413ebf692c1867d482e8e23eb5887ab1cde3792b05d19011d9fe60b213e3be7aa57103
-  data.tar.gz: cc1e257c42d35b13c34ff21a1c730991d6ee7719ef90c7a8d0c570ac8aaf5ace8d2ee12d11e1fe907aa88d83da917461f7affd048888c371d54d820fc2b2650e
+  metadata.gz: 84c7cce3863d8103c227149bd401d7635c841d326df5bd1a66ba2f8e474d421a72f18e394fa2d4ff1bce5609e1a8de981c0c745d2001861146908710a938b076
+  data.tar.gz: ae5425297ea707b002229aa9eedd312da4abc7ee97392f7f740baed68a51dad60e61800668d619e8787422652dde4929b6e16c0ee42810a753f71a3973a4c75a

data/spec/COM_spec.rb

@@ -1,61 +1,61 @@
-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'
+
+# 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

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='E:/Development/dep/OpenSource/WixToolset/3.9'
+WIX_PATH='C:/Development/dep/OpenSource/WixToolset/3.9'
 
 Wixgem::Wix.install_path = WIX_PATH 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Kevin Marshall
@@ -14,76 +14,70 @@ dependencies:
   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_tasks
+  name: dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.28
 - !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
@@ -95,10 +89,6 @@ 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
@@ -126,17 +116,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.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset

data/example/install_files/directory/file2.txt

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

data/example/install_files/file1.txt

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