kameleon-builder 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc3200ef37380cfc64607a6f4db3d7a22e2a285
-  data.tar.gz: 3e5ede0d0a9a0c3dd0e01459df8773bc126f71ef
+  metadata.gz: 6756bd8febc8f8df6fd15c685eb8c4b20662b38f
+  data.tar.gz: 7333259e498919e6a1ca2da029bd5930c426e298
 SHA512:
-  metadata.gz: 1a3101258ab7114803fd485048cbd4d55512b9c547a391b8fe956b7632498b80d5b8c97096c4547d9472fbe477576279f1684a99d893434ce4af2d5543db9433
-  data.tar.gz: 0426b74c6b0bef35e120643dec1716122d15c26ff23de4e4568b3787a4062e0003e29e95d8dd0aa259f7167131914c3e06f6cd10aebb8ebe50e1054bf1463271
+  metadata.gz: 99fecf54c7f95c67303cf532b75364b0484df0f88246917918be084296174b0ca839ad5bcc840a30c88d13be1ad185c26b658db8de92178058fa5fe0089f7275
+  data.tar.gz: d0a2fef734d9cfed18e580b6c2fcdf44d7579c1ed6a9365f25aaba80828db8f7d94dda858b550b8861d71465e568d5e084a7c670236785bee5fe04bd3d8faa5f

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,14 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.7.6
+-------------
+
+Released on August 31st 2016
+
+- Fix step variable resolution for composed variable (#79), and containing
+  uuid (#90).
+
 Version 2.7.5
 -------------
 

data/lib/kameleon/recipe.rb

@@ -490,12 +490,6 @@ module Kameleon
           loaded_microsteps = strip_microsteps
         end
       end
-      # Resolved neested variables earlier
-      local_variables.each do |k, v|
-        if v.kind_of? String
-          local_variables[k] = Utils.resolve_vars(v, @path, @global, self, kwargs)
-        end
-      end
       return Macrostep.new(name, loaded_microsteps, local_variables, step_path)
     end
 

data/lib/kameleon/utils.rb

@@ -25,8 +25,6 @@ module Kameleon
         unless m.nil?
           path = resolve_simple_vars(m[2], yaml_path, initial_variables, kwargs)
           resolved_path = recipe.resolve_data_path(path.chomp('"'), yaml_path)
-          #require 'pry'
-          #binding.pry
           raw.gsub!(m[0].chomp('"'), "#{resolved_path}")
         end
       end
@@ -84,6 +82,7 @@ module Kameleon
         # check in local vars
         if initial_variables.has_key? strip_var
           value = initial_variables[strip_var]
+          Kameleon.ui.debug("Resolved variable = #{strip_var}: #{value}")
         else
           if kwargs.fetch(:strict, true)
             fail RecipeError, "#{yaml_path}: variable #{var} not found in local or global"

data/tests/recipes/steps/test_uuid_step.yaml

@@ -0,0 +1,12 @@
+- my_uuid: $${kameleon_short_uuid}
+- TEST_VAR: toto_tata
+- version: 12.2
+- variant: toto-tata
+- my_distrib: $${version}-$${variant}
+
+
+- do_bug:
+  - exec_local: |
+      echo my_uuid: $${my_uuid}
+      echo TEST_VAR: $${TEST_VAR}
+      echo $${my_distrib}

data/tests/recipes/test_recipe.yaml

@@ -59,14 +59,8 @@ setup:
       - exec_local: cat $$kameleon_data_dir/mydata.txt
   - local_variables
 
-  - test_uuid_resolve:
-    - show_uuid:
-      - exec_local: echo toto_$${kameleon_uuid}
-      - exec_local: echo $${kameleon_short_uuid}
-      - exec_local: |
-          echo "global uuid: $${toto}_$${kameleon_uuid}"
-      - exec_local: echo $${appliance_filename}
-  - test_uuid_step
+  - test_uuid_step:
+    - my_uuid: $${kameleon_uuid}_$${kameleon_recipe_name}
 
 export:
   - save_appliance:

data/version.txt

@@ -1 +1 @@
-2.7.5
+2.7.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.7.6
 platform: ruby
 authors:
 - Salem Harrache
@@ -189,6 +189,7 @@ files:
 - tests/recipes/steps/export/save_appliance.yaml
 - tests/recipes/steps/local_variables.yaml
 - tests/recipes/steps/setup/linux/software_install.yaml
+- tests/recipes/steps/test_uuid_step.yaml
 - tests/recipes/test_recipe.yaml
 - tests/recipes/test_recipe_child.yaml
 - tests/test2/steps/data/mydata.txt
@@ -239,6 +240,7 @@ test_files:
 - tests/recipes/steps/export/save_appliance.yaml
 - tests/recipes/steps/local_variables.yaml
 - tests/recipes/steps/setup/linux/software_install.yaml
+- tests/recipes/steps/test_uuid_step.yaml
 - tests/recipes/test_recipe.yaml
 - tests/recipes/test_recipe_child.yaml
 - tests/test2/steps/data/mydata.txt