wixgem 0.4.0 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/wixgem.rb +6 -5
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3511b9c487436ea933475ee17903904ce04e04f3
4
- data.tar.gz: 52c5256ca4b8c5cf606e610b917e4621a1a7a587
3
+ metadata.gz: 87b5b9239b8deb2d505abc875bc635a260751f63
4
+ data.tar.gz: f7e6e92b5ff6ec4165d4541e60b92ed288dcd277
5
5
  SHA512:
6
- metadata.gz: 80f80d2509698e053ae4dedb06ab79637548ce673f8daf672b722efe244c7b8045bd8dc9ed3ab214854fde1a53a30862cd764601f9e1c9db2a4044ffb6fae95e
7
- data.tar.gz: 09d3d6e98c09053a8ab18a444798b323a8a01fb70742d4a23fd247caa231c0d48701e51f179e389321cfd5d5c84b9de356250880e6a2841c3b791302aef949b3
6
+ metadata.gz: b196ad8ebc1954402dd3fadc3db3ab6cee953abe80d6754bd3b8876d7b160f0576c235c70170fa2c1c0d1c83e2a149886256f2a54a6346fef3ee18287b85d582
7
+ data.tar.gz: 148a566456a7af6e6820d1bfa8d21f128a3482a6b1b9d56c97de036ec69caaed7415c9c1438035bfa1c1892226545b83235ed30a0573d9fbf3de2444c60294b2
data/lib/wixgem.rb CHANGED
@@ -34,7 +34,8 @@ class Wix
34
34
 
35
35
  private
36
36
  def self.create_wix_file(wix_file, input, template)
37
- wix_basename = File.basename(wix_file, '.wxs')
37
+ product_name = File.basename(wix_file, '.wxs')
38
+ product_name = input[:product_name] if(input.kind_of?(Hash) && input.has_key?(:product_name))
38
39
  wxs_text = File.read(template)
39
40
 
40
41
  files = input
@@ -42,8 +43,8 @@ class Wix
42
43
 
43
44
  wxs_text = manage_files(wxs_text, files)
44
45
 
45
- wxs_text = wxs_text.gsub(/PRODUCT_NAME/) { |s| s = wix_basename }
46
- wxs_text = wxs_text.gsub(/MODULE_NAME/) { |s| s = wix_basename }
46
+ wxs_text = wxs_text.gsub(/PRODUCT_NAME/) { |s| s = product_name }
47
+ wxs_text = wxs_text.gsub(/MODULE_NAME/) { |s| s = product_name }
47
48
 
48
49
  product_code = "{#{SecureRandom.uuid}}"
49
50
  product_code = input[:product_code] if(input.kind_of?(Hash) && input.has_key?(:product_code))
@@ -59,8 +60,8 @@ class Wix
59
60
 
60
61
  manufacturer = ''
61
62
  manufacturer = input[:manufacturer] if(input.kind_of?(Hash) && input.has_key?(:manufacturer))
62
- dir_xml = "<Directory Id=\"INSTALLFOLDER\" Name=\"#{wix_basename}\" />"
63
- dir_xml = "<Directory Id=\"MUSCOFOLDER\" Name=\"#{manufacturer}\">#{dir_xml}</Directory>" if(manufacturer.length > 0)
63
+ dir_xml = "<Directory Id=\"INSTALLFOLDER\" Name=\"#{product_name}\" />"
64
+ dir_xml = "<Directory Id=\"MANUFACTURERFOLDER\" Name=\"#{manufacturer}\">#{dir_xml}</Directory>" if(manufacturer.length > 0)
64
65
  wxs_text = wxs_text.gsub(/MANUFACTURER/) { |s| s = manufacturer } unless(manufacturer.empty?)
65
66
  wxs_text = wxs_text.gsub(/INSTALL_DIR/) { |s| s = dir_xml }
66
67
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wixgem
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kevin Marshall
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-08 00:00:00.000000000 Z
11
+ date: 2014-01-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: semver
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
143
143
  version: '0'
144
144
  requirements: []
145
145
  rubyforge_project:
146
- rubygems_version: 2.0.2
146
+ rubygems_version: 2.2.1
147
147
  signing_key:
148
148
  specification_version: 4
149
149
  summary: Simple Ruby interface to facilitate working with Wix Toolset