kameleon-builder 2.7.0 → 2.7.1

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.7.0
+current_version = 2.7.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}

data/CHANGES

@@ -1,6 +1,11 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.7.1
+-------------
+
+- Non-strictly template variable resolution (Fixed #67)
+
 Version 2.7.0
 -------------
 

data/lib/kameleon/cli.rb

@@ -145,7 +145,7 @@ module Kameleon
 
       begin
         tpl = Kameleon::RecipeTemplate.new(template_path)
-        tpl.resolve!
+        tpl.resolve! :strict => false
       rescue
         raise TemplateNotFound, "Template '#{template_name}' not found. " \
                                 "To see all templates, run the command "\

data/lib/kameleon/recipe.rb

@@ -509,14 +509,14 @@ module Kameleon
       fail RecipeError, "Cannot found data '#{partial_path}' unsed in '#{step_path}'"
     end
 
-    def resolve!
+    def resolve!(kwargs = {})
       unless @global.keys.include? "kameleon_uuid"
         kameleon_id = SecureRandom.uuid
         @global["kameleon_uuid"] = kameleon_id
         @global["kameleon_short_uuid"] = kameleon_id.split("-").last
       end
       # Resolve dynamically-defined variables !!
-      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self)
+      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self, kwargs)
       @global.merge! YAML.load(resolved_global)
 
       consistency_check

data/version.txt

@@ -1 +1 @@
-2.7.0
+2.7.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess