wixgem 0.45.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27f9579d36447c61b9a745fc12dc6469a2393a04
-  data.tar.gz: 8ce56124d055525cdd03ad47861a2bd3eb850465
+  metadata.gz: c29e3714b5b5184d848685126bb069df52fee6d8
+  data.tar.gz: 76ed5a633256dab3b533f45f88d404515b7f4b0c
 SHA512:
-  metadata.gz: 39300ba528e86bf2ae372447f1f25cbf59f37d88801d6abe54683a4607d93c0afbbf810df115e727904fa8a6f1b7ee491a65a296de9a16bfaca4e7874ad5945a
-  data.tar.gz: 8c690dac8ad0c982b4e70ff35a1b5b9df035083952baf390cdc5b6efbf0c2273e7f99013a79bde863846c628c26a48b760616fd7c3b58b658dd01a9de830b1fd
+  metadata.gz: b2c61fd4da7e83d8395296c10154420546e02632549d611a973b0d4e58603aa78815eec97cda99454407f98e25bc9807cff9790327aad19c8e50ddd74b24fd13
+  data.tar.gz: 0ee6a7f653f8adf8fd00e071daa362eeb2ead844fe1cf0c8a5695120bbc653138570ed958c4792f130f0165a0cd88826ef54a7b35815fe528cc4c30a8944b9fe

data/lib/command.rb

@@ -4,23 +4,26 @@ require 'hash'
 module Wixgem
 
 class Command < Hash
-  def initialize(cmd)
-   self[:command]=cmd
+  def initialize(cmd, options=nil)
    self[:output] = ''
    self[:error] = ''
    self[:exit_code] = ''
    self[:ignore_exit_code] = false
    self[:debug] = false
+   self[:quiet] = false
+
+   self[:command]=cmd
+   options.each { |key, value| self[key] = value} unless(options.nil?)
   end
   
   def execute
     begin
-	  puts "command: #{self[:command]}" if(self[:debug])
+	  puts self[:command] unless(self[:quiet])
       self[:output],self[:error], self[:exit_code] = Open3.capture3(self[:command])
       self[:exit_code]=self[:exit_code].to_i
 	  
+	  puts self[:output] unless(self[:quiet])
 	  if(self[:debug])
-	    puts "output: #{self[:output]}"
 	    puts "error: #{self[:error]}"
 	    puts "exit_code: #{self[:exit_code]}"
 	  end
@@ -32,7 +35,7 @@ class Command < Hash
 	if((self[:exit_code] != 0) && !self[:ignore_exit_code])
 	  exception_text = self[:error]
 	  exception_text = self[:output] if(self[:error].empty?)
-	  raise "Command exception: #{exception_text}" 
+	  raise exception_text 
 	end
   end
 end

data/lib/wixgem.rb

@@ -138,8 +138,9 @@ class Wix
         if(input.has_key?(:modify_file_paths))
           input[:modify_file_paths].each { |regex, replacement_string| install_path = install_path.gsub(regex, replacement_string) }
         end
+		raise "Invalid relative installation path: #{install_path}" if(install_path.include?(':'))
 
-   	    install_path = "#{directory}/#{install_path}"
+   	    install_path = "#{directory}/#{install_path}"		
 		FileUtils.mkpath(File.dirname(install_path)) unless(Dir.exists?(File.dirname(install_path)))
 		FileUtils.cp(file, install_path)
 	  elsif(!File.exists?(file))
@@ -187,7 +188,7 @@ class Wix
 	cmd = cmd.gsub(/-srd/, '-sreg -srd') if(input.has_key?(:suppress_registry_harvesting) && input[:suppress_registry_harvesting])
 	cmd = cmd.gsub(/-srd/, '-scom -srd') if(input.has_key?(:suppress_COM_elements) && input[:suppress_COM_elements])
 	
-	heat_cmd = Command.new(cmd)
+	heat_cmd = Command.new(cmd, { quiet: true })
 	@logger << "command: #{heat_cmd[:command]}" if(@debug && !@logger.nil?)
 
 	heat_cmd.execute	
@@ -246,7 +247,7 @@ class Wix
   def self.create_output(wxs_file, output)
     wixobj_file = "#{File.basename(wxs_file,'.wxs')}.wixobj"
 	
-	candle_cmd = Command.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"")
+	candle_cmd = Command.new("\"#{install_path}/bin/candle.exe\" -out \"#{wixobj_file}\" \"#{wxs_file}\"", { quiet: true })
 	@logger << "command: #{candle_cmd[:command]}" if(@debug && !@logger.nil?)
 
 	candle_cmd.execute	
@@ -255,7 +256,7 @@ class Wix
 	  @logger << candle_cmd[:output] unless(@logger.nil?)
 	end
 	
-	light_cmd = Command.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"")
+	light_cmd = Command.new("\"#{install_path}/bin/light.exe\" -nologo -out \"#{output}\" \"#{wixobj_file}\"", { quiet: true })
 	@logger << "command: #{light_cmd[:command]}" if(@debug && !@logger.nil?)
 
 	light_cmd.execute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.46.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler