wixgem 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5c540528de805cea615f68dd6c38f700679368a
-  data.tar.gz: c2c46cdad52ae4dd2bac3c80438c224512e0d9d1
+  metadata.gz: 376a8d999276896e4a22446302a584e87df03512
+  data.tar.gz: 0155ff161195f3fda15d0d9afbbdd3a334c22b4e
 SHA512:
-  metadata.gz: ba41ff06f59c8066ec71a7843408ebefe3890c63f45eb1e80fee32258d50777e562729906056f5631367417da7166357d797c202e07599bd9de60d693f685246
-  data.tar.gz: 1388015a04a606547131d0d9d3b4614ed192a3dfd7f9ff65850dba2ec51d774e5035b95b366a424c9f342db66e0d903b3b23e54ca9b2cb3d3986c71c254d7c9c
+  metadata.gz: 781dc60e500e721ea9d095cb3b5684ba29d25fd35ef0545fe975a7e198198c0146baa5d62a032095358feb3b315d2e733b2fab955a471aedd53bec7a1dfb1bc9
+  data.tar.gz: 59b2d7426b082f5f9e85276298ba749902653a63858cdc594604836bad8fa4a315a42b2551c9401205923d263518d637856425eeb066504cc1104878684d759c

data/lib/file.rb

@@ -0,0 +1,12 @@
+require 'fiddle'
+
+class File
+  FILE_ATTRIBUTE_READONLY="0x1".hex		
+  def self.read_only?(path)
+    return false unless(File.exists?(path))
+	kernel32 = Fiddle::Handle.new("kernel32")
+	get_file_attributes = Fiddle::Function.new(kernel32['GetFileAttributesA'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_LONG)
+
+	return ((get_file_attributes.call(path) & FILE_ATTRIBUTE_READONLY) == 1) ? true : false;
+  end
+end

data/lib/wixgem.rb

@@ -3,6 +3,8 @@ require 'tmpdir.rb'
 require 'rexml/document'
 require "#{File.dirname(__FILE__)}/command.rb"
 require 'SecureRandom'
+require 'fiddle'
+require_relative('file.rb')
 
 module Wixgem
 
@@ -126,6 +128,23 @@ class Wix
 	
 	return xml_doc
   end
+
+  def self.manage_read_only_files(xml_doc,input)
+	install_files = files(input)
+	
+	install_files.each do |file| 
+	  absolute_path = file
+	  absolute_path = "#{input[:files_root_dir]}/#{file}" unless(File.exists?(file))
+	  
+	  if(File.read_only?(absolute_path))
+	    install_path = ".\\#{self.modify_file_path(input, file)}"
+		file_elements = REXML::XPath.match(xml_doc, "//File[@Source='#{install_path}']")
+		file_elements[0].attributes['ReadOnly'] = 'yes' if(file_elements.length == 1)
+	  end
+	end
+	
+	return xml_doc
+  end
   
   def self.modify_file_path(input, file)
     return file unless(input.kind_of?(Hash) && input.has_key?(:modify_file_paths))
@@ -139,9 +158,6 @@ class Wix
   def self.files(input)
     files = input
     files = input[:files] if(input.kind_of?(Hash))
-
-    files.each { |file| files.delete(file) if(File.directory?(file)) }
-  
     return files
   end
 
@@ -166,7 +182,7 @@ class Wix
 
    	    install_path = "#{directory}/#{install_path}"		
 		FileUtils.mkpath(File.dirname(install_path)) unless(Dir.exists?(File.dirname(install_path)))
-		FileUtils.cp(file, install_path)
+		FileUtils.cp(file, install_path, { preserve: true })
 	  elsif(!File.exists?(file))
 	    missing_files.insert(missing_files.length, file)
 	  end
@@ -368,6 +384,7 @@ class Wix
 	xml_doc = manage_custom_actions(xml_doc, input)
 	xml_doc = manage_upgrade(xml_doc,input)
 	xml_doc = manage_msm_files(xml_doc)
+	xml_doc = manage_read_only_files(xml_doc,input)
 	
 	File.open(wxs_file, 'w') { |f| f.puts(xml_doc.to_s) }	
     #formatter = REXML::Formatters::Pretty.new(2)
@@ -390,18 +407,17 @@ class Wix
   end
 
   def self.verify_input_keys(input)
-    if(input.kind_of?(Hash))
-	  [:files,:ignore_files].each { |key| raise "Hash key #{key} cannot be nil" if(input.has_key?(key) && input[key].nil?)}
-	end
+	input[:files].reject! { |f| File.directory?(f) }
+
+    [:files,:ignore_files].each { |key| raise "Hash key #{key} cannot be nil" if(input.has_key?(key) && input[key].nil?)}	
   end
   
   def self.create_package(output, input)
     raise 'WIX path is not set!' if(install_path.nil?)
-
-	verify_input_keys(input)
-	
 	input = { files: input } unless(input.kind_of?(Hash))
-  	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
+	verify_input_keys(input)
+	  	
+	@debug = input[:debug] if(!@debug && input.has_key?(:debug))
 
 	start_logger if(@debug)
 	
@@ -412,6 +428,7 @@ class Wix
 	FileUtils.rm(output) if(File.exists?(output))
  
 	output_absolute_path = File.absolute_path(output)
+	input[:files_root_dir] = Dir.pwd
 
 	#dir = './tmp_dir'
 	#FileUtils.rm_rf(dir) if(Dir.exists?(dir))

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: wixgem
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Kevin Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-03-22 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
   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
@@ -81,8 +81,8 @@ files:
 - example/install_files/file1.txt
 - example/rakefile.rb
 - lib/WindowsInstaller.rb
-- lib/WindowsInstaller_hold.rb
 - lib/command.rb
+- lib/file.rb
 - lib/wixgem.rb
 homepage: http://rubygems.org/gems/wixgem
 licenses:
@@ -94,17 +94,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/lib/WindowsInstaller_hold.rb

@@ -1,156 +0,0 @@
-require 'win32ole'
-require 'dev_tasks'
-
-module Wixgem
-
-class WindowsInstaller
-	def self.install(msi_file)
-	  msi_file = msi_file.gsub(/\//, '\\')
-	  raise "#{msi_file} is already installed" if(WindowsInstaller.installed?(msi_file))
-	  execute("msiexec.exe /i #{msi_file}")
-	end
-
-	def self.uninstall(msi_file)
-	  raise "#{msi_file} does not exist!" unless(File.exists?(msi_file))
-	  
-	  info = msi_properties(installer, msi_file)
-	  uninstall_product_code(info['ProductCode'])
-    end
-
-	def self.uninstall_product_name(product_name)
-	  raise "#{product_name} is not installed" unless(product_name_installed?(product_name))
-	  uninstall_product_code(product_code_from_product_name(product_name))
-    end
-	
-	def self.uninstall_product_code(product_code)
-	  raise "#{product_code} is not installed" unless(product_code_installed?(product_code))
-	  execute("msiexec.exe /quiet /x #{product_code}")
-    end
-
-	def self.msi_installed?(msi_file)  
-	  info = msi_properties(msi_file)
-	  return product_code_installed?(info['ProductCode'])
-	end	
-	
-	def self.product_name_installed?(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')	  
-	  installer.Products.each { |prod_code|
-		name = installer.ProductInfo(prod_code, "ProductName")
-		return true if (product_name == name)
-	  }
-	  return false
-	end
-
-	def self.product_code_installed?(product_code)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  installer.Products.each { |installed_product_code| return true if (product_code == installed_product_code) }
-	  return false
-	end
-	
-	def self.product_name_installed_version(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  info = product_info(installer, product_code_from_product_name(product_name, installer))
-	  return info['VersionString']
-	end
-
-    private
-	def self.product_code_from_msi(msi_file, installer = nil)
-	  msi_info = msi_properties(msi_file)
-	  return msi_info['ProductCode']
-	end
-
-	def self.product_code_from_product_name(product_name, installer = nil)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer') if(installer.nil?)
-	  installer.Products.each { |prod_code|
-		name = installer.ProductInfo(prod_code, "ProductName")
-		return prod_code if (product_name == name)
-	  }
-	  raise "Failed to find product code for product: #{product_name}"
-	end
-
-	def self.product_code_properties(product_code, installer = nil)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer') if(installer.nil?)
-	  hash = Hash.new
-	  # known product keywords found on internet.  Would be nice to generate.
-	  %w[Language PackageCode Transforms AssignmentType PackageName InstalledProductName VersionString RegCompany 
-		 RegOwner ProductID ProductIcon InstallLocation InstallSource InstallDate Publisher LocalPackage HelpLink 
-		 HelpTelephone URLInfoAbout URLUpdateInfo InstanceType].sort.each do |prop|
-		value = installer.ProductInfo(product_code, prop)
-		hash[prop] = value unless(value.nil? || value == '')
-	  end
-	  return hash
-	end
-
-	def self.print_properties(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  properties = product_info(installer, product_code(product_name, installer))
-	  properties.each { |id, value| puts "#{id}: #{value}" }
-	end
-
-	def self.msi_records(msi_file)
-	  records = {}
-	  
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  sql_query = "SELECT * FROM `Property`"
-
-	  db = installer.OpenDatabase(msi_file, 0)
-			
-	  view = db.OpenView(sql_query)
-	  view.Execute(nil)
-			
-	  record = view.Fetch()
-	  return '' if(record == nil)
-
-	  while(!record.nil?)
-	    records[record.StringData(1)] = record.StringData(2) 
-		record = view.Fetch()
-	  end
-	  db.ole_free
-	  db = nil
-	  installer.ole_free
-	  installer = nil
-	  
-	  return records
-	end
-	
-	def self.print_msi_records(msi_file)
-	  records = msi_records(msi_file)
-
-	  puts "#{msi_file} Properties:"
-	  records.each do |key,value|
-		puts "#{key}: #{value}"
-	  end
-	end
-	
-	def self.print_product_name(product_name)
-	  installer = WIN32OLE.new('WindowsInstaller.Installer')
-	  # only one session per process!
-	  session = installer.OpenProduct(product_code_from_product_name?(product_name, installer))
-	  db = session.Database
-			
-	  sql_query = "SELECT * FROM `Property`"
-	  view = db.OpenView(sql_query)
-	  view.Execute(nil)
-			
-	  record = view.Fetch()
-	  return '' if(record == nil)
-
-	  puts "Session Properties:"
-	  while(!record.nil?)
-		puts "#{record.StringData(1)}: #{record.StringData(2)}"
-		record = view.Fetch()
-	  end
-	  db.ole_free
-	  db = nil
-	  installer.ole_free
-	  installer = nil
-	  puts ''
-	end	
-
-    def self.execute(cmd)
-      command = Wixgem::Command.new(cmd)
-      command.execute
-    end
-end
-
-end