cfhighlander 0.3.0.alpha.1529990899 → 0.3.0.alpha.1530585444

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 722bbe7392f4e212bfec90cb14b45fec754f448a65352017a6dad9282ae96dcd
4
- data.tar.gz: 6400ff88ed63a22ef2994a64f2629a8392069b4e8432b10b2756b6a5efcc3e98
3
+ metadata.gz: bec433a6d77acb748b0d67e1714c443cccfb7b83b3e00299ebf649428a98c539
4
+ data.tar.gz: de5617823a9151fa11fa5ab27a5a68b94cb487793ec74296b18b50a26e7dbef2
5
5
  SHA512:
6
- metadata.gz: f4ae55930d0fa02ee4e498f86e91a66ed212a1f95d74ece93d9f0329b7436f182be1141521142fe5637b4e604ebd42a655fb96cad7cbaf92afdc59b355b0f192
7
- data.tar.gz: f70edcb894a056f4d4f3790926515608d62ada8e035bbcd658a343dc5506e88869a3fcc5673b67546b305dac7f7c5a40246ae5927e754400f2562316ba1d70ac
6
+ metadata.gz: 34ca6d791c39d8b2c7c11cfad40f03a8e7c2ee1c555629be94ce8e92f36802037c346221b3a191e9e887bb30abb4ee1935660f182a5fd047ca5a7a1470f4bcbe
7
+ data.tar.gz: ff0e30b332e34263cddeb026610e46bf233f14077e9cc17dd8a2d99d22e48b336b7c19acdbba9baa3a57c1566b019e49b06ee4abfcdabb0e096532b9fca9d135
@@ -14,7 +14,7 @@ module Cfhighlander
14
14
  if @config.nil?
15
15
  raise StandardError, "#{self} no config!"
16
16
  end
17
- return @config["#{method}"] unless @config["#{method}"].nil?
17
+ # return @config["#{method}"] unless @config["#{method}"].nil?
18
18
  raise StandardError, "#{self} Unknown method or variable #{method} in Cfhighlander template"
19
19
  end
20
20
 
@@ -458,7 +458,6 @@ def CfhighlanderTemplate(&block)
458
458
  instance.name = @template.template_name
459
459
  instance.instance_eval(&block)
460
460
 
461
-
462
461
  # load sub-components
463
462
  instance.loadComponents
464
463
 
@@ -107,7 +107,15 @@ module Cfhighlander
107
107
 
108
108
  # 1st pass - parse the file
109
109
  @component_files << @highlander_dsl_path
110
- @highlander_dsl = eval(File.read(@highlander_dsl_path), binding)
110
+
111
+ cfhl_script = ''
112
+ @config.each do |key, val|
113
+ cfhl_script += ("\n#{key} = #{val.inspect}\n")
114
+ end
115
+ cfhl_script += File.read(@highlander_dsl_path)
116
+
117
+ @highlander_dsl = eval(cfhl_script, binding)
118
+
111
119
  # set version if not defined
112
120
  @highlander_dsl.ComponentVersion(@version) unless @version.nil?
113
121
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cfhighlander
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0.alpha.1529990899
4
+ version: 0.3.0.alpha.1530585444
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-06-26 00:00:00.000000000 Z
12
+ date: 2018-07-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: highline