dev 2.0.257 → 2.0.258

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abc575d0261a33e95b19290cf73bc799bb4849e
-  data.tar.gz: cd15b676018cb81d1c6d736c24e7c1b47f56bcc4
+  metadata.gz: 9c5d3d0f0c93b7a5fe47925dd8c48fc4a6b44f9b
+  data.tar.gz: b1234a565c3ff71e0911d80d5266c96810b78df6
 SHA512:
-  metadata.gz: 8f941a74f8891a99ea469d04ebea807e56ea13caf2e6c4ff85d55bc5c69d935efc2e9b705b0bdfead23e212119c9c2cf2228e2be88eb0bba22c9c42ab7d474ed
-  data.tar.gz: f2763abae0b51cebc149e88edf79ccf59f6d08dd697eb31e9a924fbb790a7c9eb68b245cb60cb57af88b0c01ba62a7e2bf05c391be0fe0c070639f250b279f68
+  metadata.gz: 3b460ee9b9f6876449bb36f05211cf9c9dcf8bb91f8b9f3eac0390b1324cf20fd608b154999df81b7f560895eb129746433fa50a2d11adb564e37117c0cfc57f
+  data.tar.gz: f77051c7b994dc2d5af89590f4541bc5715f31b4f15d572b70139449bd61fc83b55dafaee886259f7b831a5d552980982f1ee0885cc831858b1d7a94c012445a

data/lib/apps/wix.rb

@@ -7,11 +7,13 @@ class Wix
 	def self.get_build_commands wxs_file
       build_commands=nil
       if(File.exists?(wxs_file))
+            ext='msi'
+            ext='exe' if(IO.read(wxs_file).include?('<Bundle'))
       	build_commands=Array.new if build_commands.nil?
       	build_commands << "candle #{wxs_file} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
 
       	if(defined?(VERSION))
-      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.#{ext} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
       	else
       		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
       	end

data/lib/base/environment.rb

@@ -46,6 +46,16 @@ class Environment < Hash
 	 return machine.strip
   end
 
+  def self.remove directory
+    if(File.exists?(directory))
+      begin
+        FileUtils.rm_rf directory
+        FileUtils.rm_r directory
+      rescue
+      end
+    end
+  end
+
   def self.user
   	return ENV['USER'] if !ENV['USER'].nil?  #on Unix
     ENV['USERNAME']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.257
+  version: 2.0.258
 platform: ruby
 authors:
 - Lou Parslow