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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722bbe7392f4e212bfec90cb14b45fec754f448a65352017a6dad9282ae96dcd
-  data.tar.gz: 6400ff88ed63a22ef2994a64f2629a8392069b4e8432b10b2756b6a5efcc3e98
+  metadata.gz: bec433a6d77acb748b0d67e1714c443cccfb7b83b3e00299ebf649428a98c539
+  data.tar.gz: de5617823a9151fa11fa5ab27a5a68b94cb487793ec74296b18b50a26e7dbef2
 SHA512:
-  metadata.gz: f4ae55930d0fa02ee4e498f86e91a66ed212a1f95d74ece93d9f0329b7436f182be1141521142fe5637b4e604ebd42a655fb96cad7cbaf92afdc59b355b0f192
-  data.tar.gz: f70edcb894a056f4d4f3790926515608d62ada8e035bbcd658a343dc5506e88869a3fcc5673b67546b305dac7f7c5a40246ae5927e754400f2562316ba1d70ac
+  metadata.gz: 34ca6d791c39d8b2c7c11cfad40f03a8e7c2ee1c555629be94ce8e92f36802037c346221b3a191e9e887bb30abb4ee1935660f182a5fd047ca5a7a1470f4bcbe
+  data.tar.gz: ff0e30b332e34263cddeb026610e46bf233f14077e9cc17dd8a2d99d22e48b336b7c19acdbba9baa3a57c1566b019e49b06ee4abfcdabb0e096532b9fca9d135

data/lib/cfhighlander.dsl.base.rb

@@ -14,7 +14,7 @@ module Cfhighlander
         if @config.nil?
           raise StandardError, "#{self} no config!"
         end
-        return @config["#{method}"] unless @config["#{method}"].nil?
+        # return @config["#{method}"] unless @config["#{method}"].nil?
         raise StandardError, "#{self} Unknown method or variable #{method} in Cfhighlander template"
       end
 

data/lib/cfhighlander.dsl.template.rb

@@ -458,7 +458,6 @@ def CfhighlanderTemplate(&block)
   instance.name = @template.template_name
   instance.instance_eval(&block)
 
-
   # load sub-components
   instance.loadComponents
 

data/lib/cfhighlander.model.component.rb

@@ -107,7 +107,15 @@ module Cfhighlander
 
         # 1st pass - parse the file
         @component_files << @highlander_dsl_path
-        @highlander_dsl = eval(File.read(@highlander_dsl_path), binding)
+
+        cfhl_script = ''
+        @config.each do |key, val|
+          cfhl_script += ("\n#{key} = #{val.inspect}\n")
+        end
+        cfhl_script += File.read(@highlander_dsl_path)
+
+        @highlander_dsl = eval(cfhl_script, binding)
+
         # set version if not defined
         @highlander_dsl.ComponentVersion(@version) unless @version.nil?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.1529990899
+  version: 0.3.0.alpha.1530585444
 platform: ruby
 authors:
 - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline