wixgem 0.0.13 → 0.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85ca0608a1c377cdb8475522b47ed8753b3194d3
+  data.tar.gz: ddb8f3e03e2fb7c7bc99e311ed4e633e581d79e6
+SHA512:
+  metadata.gz: 72062f7807acd5a2e3fc23168196481279c8741e00cb1b7c89ff69bcee494161b22133e2a198a507031ed0242b75fd5005ab0d3c925f038f858e0f2c5119a1d0
+  data.tar.gz: c98837859540b2eb65136998fc650e63a31508274d6e27693d44091b544828195d65c22d71c89afc414ed10c377053973b70a87bf1aece9d963f61260c0775fd

data/lib/wixgem.rb

@@ -3,15 +3,20 @@ require 'SecureRandom'
 require 'tmpdir.rb'
 
 class Wix
-  def self.install_path=(value)
-    raise "WIX path '#{value}' does not exist" unless(Dir.exists?(value))
-	@install_path = value
+  def self.install_path=(path)
+    @install_path = path
   end
-  
   def self.install_path
-	return @install_path
+    return @install_path
   end
-
+  
+  def self.debug=(bool)
+    @debug = bool
+  end
+  def self.debug
+    return @debug
+  end
+  
   def self.make_mergemodule(output, input)
     gem_dir = File.dirname(__FILE__)
     apply_wix_template(output, input, "#{gem_dir}/templates/mergemodule.wxs")
@@ -22,7 +27,37 @@ class Wix
     apply_wix_template(output, input, "#{gem_dir}/templates/Install.wxs")
   end
   
-  private      
+  private   
+  def self.manage_upgrade(wxs_text, input)
+ 	if(input.kind_of?(Hash) && 
+	   input.has_key?(:remove_existing_products) && 
+	   input[:remove_existing_products])
+
+	  raise 'Hash must have a version key if the hash has a :remove_existing_products key' unless(input.has_key?(:version))
+	  raise 'Hash must have an upgrade_code key if the hash has a :remove_existing_products key' unless(input.has_key?(:upgrade_code))
+	   
+	  upgrade = "
+        <Upgrade Id=\"#{input[:upgrade_code]}\">
+          <UpgradeVersion Minimum=\"#{input[:version]}\"
+                      OnlyDetect='yes'
+                      Property='NEWPRODUCTFOUND' />
+          <UpgradeVersion Minimum='1.0.0'
+                      IncludeMinimum='yes'
+                      Maximum=\"#{input[:version]}\"
+                      IncludeMaximum='no'
+                      Property='UPGRADEFOUND' />
+        </Upgrade>
+		<CustomAction"	  
+	  wxs_text = wxs_text.gsub(/<CustomAction/, upgrade)
+
+	  remove_existing_products = "	<RemoveExistingProducts After='InstallValidate' />
+		</InstallExecuteSequence>"
+	  wxs_text = wxs_text.gsub(/<\/InstallExecuteSequence>/, remove_existing_products)
+	end
+	
+	return wxs_text
+  end  
+  
   def self.manage_msm_files(wxs_text)
 	indent_merge = '			'
 	indent_directory = '		'
@@ -47,7 +82,7 @@ class Wix
 	directory_element = "<Directory Id='TARGETDIR' Name='SourceDir'>\n#{merge_ids}#{indent_directory}</Directory>"
 	wxs_text = wxs_text.gsub('<Directory Id="TARGETDIR" Name="SourceDir" />', directory_element)
 	
-	wxs_text = wxs_text.gsub(/\s+<\/Feature>/, "\n#{merge_refs}</Feature>")
+	wxs_text = wxs_text.gsub(/\s+<\/Feature>/, "\n#{merge_refs}        </Feature>")
 
 	return wxs_text
   end
@@ -58,22 +93,28 @@ class Wix
 	
 	files.each do |file| 
 	  if(File.file?(file))
-	    install_path = "#{directory}/#{file}"
+   	    install_path = file
+        if(input.kind_of?(Hash) && input.has_key?(:modify_install_path))
+          input[:modify_install_path].each { |regex, replacement_string| install_path = install_path.gsub(regex, replacement_string) }
+        end
+
+   	    install_path = "#{directory}/#{install_path}"
 		FileUtils.mkpath(File.dirname(install_path)) unless(Dir.exists?(File.dirname(install_path)))
 		FileUtils.cp(file, install_path)
-#	  else if(!Dir.exists?(file) && !File.exists?(file))
-#	    raise "File: '#{file}' does not exist!"
 	  end
 	end
   end
 
   def self.create_wxs_file(wxs_file, input, ext)
+	@debug = input[:debug] if(input.kind_of?(Hash) && input.has_key?(:debug))
+
     template_option = "-template product"
 	template_option = "-template module" unless(ext == ".msi")
 	
 	stdout = %x[\"#{install_path}/bin/heat.exe\" dir . #{template_option} -cg InstallionFiles -gg -nologo -srd -o  \"#{wxs_file}\"]
 	raise "#{stdout}\nFailed to generate .wxs file" unless(File.exists?(wxs_file))
 	
+	
 	product_name = File.basename(wxs_file, '.wxs')
     product_name = input[:product_name] if(input.kind_of?(Hash) && input.has_key?(:product_name))
 	
@@ -85,6 +126,9 @@ class Wix
 
 	product_code = ''
 	product_code = input[:product_code] if(input.kind_of?(Hash) && input.has_key?(:product_code))
+
+	upgrade_code = ''
+	upgrade_code = input[:upgrade_code] if(input.kind_of?(Hash) && input.has_key?(:upgrade_code))
 	
 	wxs_text = File.read(wxs_file)
 
@@ -96,6 +140,7 @@ class Wix
 
 	wxs_text = wxs_text.gsub(/Version=\"1.0.0.0\"/) { |s| s = "Version=\"#{product_version}\"" } unless(product_version.empty?)
 	wxs_text = wxs_text.gsub(/Product Id=\"[^\"]+\"/) { |s| s = "Product Id=\"#{product_code}\"" } unless(product_code.empty?)
+	wxs_text = wxs_text.gsub(/UpgradeCode=\"[^\"]+\"/) { |s| s = "UpgradeCode=\"#{upgrade_code}\"" } unless(upgrade_code.empty?)
 
 	install_path = '[ProgramFilesFolder][ProductName]'
 	install_path = "[ProgramFilesFolder][Manufacturer]\\[ProductName]" unless(manufacturer == 'Not Set')
@@ -115,6 +160,7 @@ class Wix
 	</Product>"	
 	wxs_text = wxs_text.gsub(/<\/Product>/) { |s| s = custom_action }
 
+	wxs_text = manage_upgrade(wxs_text,input)
 	wxs_text = manage_msm_files(wxs_text)
 		
 	File.open(wxs_file, 'w') { |f| f.puts(wxs_text) }	
@@ -139,8 +185,6 @@ class Wix
  
 	output_absolute_path = File.absolute_path(output)
 
-    #dir = 'tmp_dir'
-	#FileUtils.rm_rf(dir) if(Dir.exists?(dir))
 	Dir.mktmpdir do |dir|
 	  copy_install_files(dir, input)
 	  
@@ -149,6 +193,7 @@ class Wix
 		create_wxs_file(wxs_file, input, ext)
 		create_output(wxs_file, output_absolute_path)
 	  end
+	  FileUtils.cp(wxs_file, output_absolute_path.gsub(ext,'.wxs')) if(@debug)
     end
 	pdb_file = output_absolute_path.gsub(ext,'.wixpdb')
 	FileUtils.rm(pdb_file) if(File.exists?(pdb_file))

metadata

@@ -1,83 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.0.13
-  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dev_tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Simple Ruby interface to facilitate creating and compiling windows
-  installation files with the Wix Toolset.\n\nNote: This gem currently does not handle
-  registration of COM objects or registry entries.'
+description: 'Simple Ruby interface to facilitate creating and compiling windows installation
+  files with the Wix Toolset.\n\nNote: This gem currently does not handle registration
+  of COM objects or registry entries.'
 email: KCCKSMarshall@gmail.com
 executables: []
 extensions: []
@@ -85,33 +76,30 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/templates/Install.wxs
-- lib/templates/mergemodule.wxs
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Ruby interface to facilitate working with Wix Toolset
 test_files: []
 has_rdoc: 

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>