wixgem 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e607976dfdb2697e92af5ceb541d10f1f9b065b
-  data.tar.gz: 99854d223a5b65c2b21ead529d3b67a094cd6336
+  metadata.gz: e6213215965dd51d55d60f45edfe01f68508c189
+  data.tar.gz: dbb87b119d337ff8e771aa253cdf3f44fe66ac70
 SHA512:
-  metadata.gz: 76a190b4c25440043dce9ef932b9be7c9c8953eda2279409c6b794f41f0af2e7b8e9e26f2059aa77b5dd9ff566432d57c4d79fe19e0c2c330aef59c41bbcb5a7
-  data.tar.gz: c62af691b0c5db4cf329795daa77091f28bba4e5919a9c7b83c4cfa9606ccbc62f6c60fe5288c12436378da91673d94580f51f9f5589a05a67efc27a6e142df1
+  metadata.gz: 1414da1543689ca0af807997460592600ac662d2e6f090dfe36eb331b95213187f169848ba199c5bbd33f7ecb3a3e59cb7fc42ec4caf22f313b1cff96a25288b
+  data.tar.gz: 4faab46486457fc3064d6154c1879e2eef74a35a9a6aa5785ef188358859f8cab3138c527dc646f4e1f1bc179c5783f308b182dccb6db24eddbb9bd9bf97f8f6

data/README.md

@@ -3,8 +3,7 @@ Ruby gem to facilitate automate constructing Windows installation files
 with the Wix Toolset.
 
 ## Installation
-Wixgem can be installed by the single command
- gem install wixgem
+Wixgem can be installed by the single command: *gem install wixgem*
 
 ## Example Usage
 #### Dependencies
@@ -31,8 +30,8 @@ require 'wixgem'
 	
 WIX_TOOLSET_ROOT='path to root of Wix toolset'
 Wix.make_mergemodule('Product.msi', ['rakefile.rb']])
-```
 
+```
 An example rakefile.rb is included in the example directory of the gem.
 
 ## Documenation
@@ -49,8 +48,7 @@ small set of optional arguments allowing the developer to customize the generate
                  properly address the upgrade code before shipping the first version of a product.
 * **files**:        A string array of file paths to be added to the installation.
 * **modify_file_paths**: A hash of regex objects to replacement string pairs. The regular expressions are applied to
-                      the file paths having the effect of changing the relative location of the files in the 
-					  installation.
+                      the file paths allowing the developer to modify the relative location of the files in the installation.
 * **has_vb6_files**: Required if installation contains any ocx's or dll's compiled with Visual Basic 6.
 * **remove_existing_products**: A boolean value. If the value is true the installation will remove all existing 
                              installations of the product before installing the product.

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='E:/Development/dep/OpenSource/WixToolset/3.9'
+WIX_PATH='C:/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.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-13 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,13 +81,7 @@ 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/execute.rb
 - spec/installation_spec.rb
@@ -111,17 +105,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

data/lib/templates/Install.wxs

@@ -1,26 +0,0 @@
-<?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

@@ -1,15 +0,0 @@
-<?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>