wixgem 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d95c67cdf3018e6d670322ef4727ac4a7ad674b6
-  data.tar.gz: 81f6738e0e8dc13046af6f0b13f62175db6141ea
+  metadata.gz: 1b83dd501d80b926d39330bd5cf856ce566770bf
+  data.tar.gz: bb57aae8fadb5997602880790cd824cce657526f
 SHA512:
-  metadata.gz: 54cdfbe55af0819b300199229c8b9ef7b06cafd5f32af441ea9bb3e886443f2103bdf4e8a7d56ae1332c4cd745cf09b4536e7ddcd14057d8190918ccd405d28b
-  data.tar.gz: 0b0d4f67df788faec251883cf34bae74dde0d289c4254bc751b43f4af2f2d844c5fbb73b0bc71ff26e2387aa0dedb2f0dc69382a3598e854cc52c75c40519f3d
+  metadata.gz: d1bec407aebc0abb64c9a83612881d46de635a03055430b615d846b7c610e8404beebb0e2aaa45de4efb41de4812597869826184444c4846e4fc6a4198904be7
+  data.tar.gz: 5b66b15274997bd4e9197a9697a2c708887eabc55153e5ab6289438a576a1b680b91cb91aca7e52cb97c844be62c0dc6f9dc731186f3f014136ff922afc42044

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/templates/Install.wxs

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Product Id="PRODUCT_CODE" Name="PRODUCT_NAME" Language="1033" Version="VERSION" Manufacturer="MANUFACTURER" UpgradeCode="UPGRADE_CODE">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<Media Id="1" Cabinet="WixgemTest.cab" EmbedCab="yes" />
+		    
+    <!-- Step 1: Define the directory structure -->
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+              INSTALL_DIR
+			</Directory>
+		</Directory>
+
+    <!-- Step 2: Add files to installer package -->
+		<DirectoryRef Id="INSTALLFOLDER">
+			FILES
+		</DirectoryRef>
+
+    <!-- Step 3: Tell Wix to install the files-->
+    <Feature Id="ProductFeature" Title="PRODUCT_NAME Installation" Level="1">
+      COMPONENT_REFS
+    </Feature>
+  </Product>
+</Wix>

data/lib/templates/mergemodule.wxs

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Module Id="MODULE_NAME" Language="1033" Version="VERSION">
+        <Package Id="PRODUCT_CODE" InstallerVersion="200" Manufacturer="MANUFACTURER" />
+        COMPONENT_REFS
+        <Directory Id="TARGETDIR" Name="SourceDir">
+		  <Directory Id="MergeRedirectFolder" />
+		</Directory>
+    </Module>
+    <Fragment>
+        <DirectoryRef Id="MergeRedirectFolder">
+            FILES
+        </DirectoryRef>
+    </Fragment>
+</Wix>

data/lib/wixgem.rb

@@ -48,8 +48,8 @@ class Wix
 	  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' }
-	  upgrade.add_element 'UpgradeVersion', { 'Minimum' => '1.0.0', 'IncludeMinimum'=>'yes','Maximum'=>input[:version],'IncludeMaximum'=>'no','Property'=>'UPGRADEFOUND' }
+	  upgrade.add_element 'UpgradeVersion', { 'Minimum' => input[:version], 'OnlyDetect'=>'yes', 'Property'=>'NEWERVERSIONDETECTED' }
+	  upgrade.add_element 'UpgradeVersion', { 'Minimum' => '0.0.0', 'IncludeMinimum'=>'yes','Maximum'=>input[:version],'IncludeMaximum'=>'no','Property'=>'OLDERVERSIONBEINGUPGRADED' }
 
 	  install_and_execute = REXML::XPath.match(xml_doc, '//Wix/Product/InstallExecuteSequence')
 	  install_and_execute[0].add_element 'RemoveExistingProducts', { 'After'=>'InstallValidate' }

data/spec/COM_spec.rb

@@ -1,42 +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
+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/execute.rb

@@ -1,8 +1,8 @@
-require 'dev_tasks'
-
-def execute(cmd)
-  command = Command.new(cmd)
-  command.execute
-  
-  raise "Failed: #{cmd} Status: #{command[:exit_code]}\nStdout: #{command[:output]}\nStderr: #{command[:error]}" unless(command[:exit_code] == 0)
-end
+require 'dev_tasks'
+
+def execute(cmd)
+  command = Command.new(cmd)
+  command.execute
+  
+  raise "Failed: #{cmd} Status: #{command[:exit_code]}\nStdout: #{command[:output]}\nStderr: #{command[:error]}" unless(command[:exit_code] == 0)
+end

data/spec/multiple_product_installation_spec.rb

@@ -1,71 +1,71 @@
-require 'rspec'
-require './lib/wixgem.rb'
-require './spec/wixpath.rb'
-require './admin.rb'
-require './spec/test_install.rb'
-require './spec/test_files_exist.rb'
-require 'json'
-
-if(admin?)
-describe 'Wixgem' do
-  describe 'Side by side installations' do
-    product1='wixgem_multiple 1.0'
-    product2='wixgem_multiple 1.1'
-    begin
-      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']})
-      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
-	    execute("msiexec.exe /i 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
-	    execute("msiexec.exe /i 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
-	ensure
-  	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product1)}") while(WindowsInstaller.installed?(product1))
-	  raise "Failed to uninstall product #{product1}" if(WindowsInstaller.installed?(product1))
-  	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product2)}") while(WindowsInstaller.installed?(product2))
-	  raise "Failed to uninstall product #{product2}" if(WindowsInstaller.installed?(product2))
-	end
-  end
-
-  describe 'remove previous version' do
-    product1='wixgem_install 1.0'
-    product2='wixgem_install 1.1'
-    begin
-      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']})
-      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
-	    execute("msiexec.exe /i test\\wixgem_install.1.0.0.msi")
-		expect(WindowsInstaller.installed?(product1)).to be(true)
-	  end
-
-      it "should install version 1.1.0" do
-	    execute("msiexec.exe /i 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
-	ensure
-  	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product2)}") while(WindowsInstaller.installed?(product2))
-	  raise "Failed to uninstall product #{product2}" if(WindowsInstaller.installed?(product2))
-	end
-  end
-end
+require 'rspec'
+require './lib/wixgem.rb'
+require './spec/wixpath.rb'
+require './admin.rb'
+require './spec/test_install.rb'
+require './spec/test_files_exist.rb'
+require 'json'
+
+if(admin?)
+describe 'Wixgem' do
+  describe 'Side by side installations' do
+    product1='wixgem_multiple 1.0'
+    product2='wixgem_multiple 1.1'
+    begin
+      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']})
+      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
+	    execute("msiexec.exe /i 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
+	    execute("msiexec.exe /i 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
+	ensure
+  	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product1)}") while(WindowsInstaller.installed?(product1))
+	  raise "Failed to uninstall product #{product1}" if(WindowsInstaller.installed?(product1))
+  	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product2)}") while(WindowsInstaller.installed?(product2))
+	  raise "Failed to uninstall product #{product2}" if(WindowsInstaller.installed?(product2))
+	end
+  end
+
+  describe 'remove previous version' do
+    product1='wixgem_install 1.0'
+    product2='wixgem_install 1.1'
+    begin
+      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']})
+      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
+	    execute("msiexec.exe /i test\\wixgem_install.1.0.0.msi")
+		expect(WindowsInstaller.installed?(product1)).to be(true)
+	  end
+
+      it "should install version 1.1.0" do
+	    execute("msiexec.exe /i 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
+	ensure
+  	  execute("msiexec.exe /quiet /x #{WindowsInstaller.product_code?(product2)}") while(WindowsInstaller.installed?(product2))
+	  raise "Failed to uninstall product #{product2}" if(WindowsInstaller.installed?(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'
 
 Wix.install_path = WIX_PATH 

metadata

@@ -1,62 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 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_tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
     - - '='
@@ -66,7 +66,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
     - - '='
@@ -81,7 +81,13 @@ 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/templates/Install.wxs
+- lib/templates/mergemodule.wxs
 - lib/wixgem.rb
 - spec/COM_spec.rb
 - spec/execute.rb
@@ -106,17 +112,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