kameleon-builder 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff21f86a1671405880c74b610e8df7ecd5790ed
-  data.tar.gz: c85124ab72fa1cee58e53d81538012d086aa0291
+  metadata.gz: ccc3200ef37380cfc64607a6f4db3d7a22e2a285
+  data.tar.gz: 3e5ede0d0a9a0c3dd0e01459df8773bc126f71ef
 SHA512:
-  metadata.gz: 9de3025bb6be69728721a11e7241bb053ee9a4be1ec11fad6111d72960e5ea1c14586c8b2c6823474d9a0845e8636b155ab9b287a5f20dd581ae93607af91127
-  data.tar.gz: 5efd6699c60b3ac112d475405ef6f82482a05a6ec54aa0524b25959f413acdc131eb9d9c926ce8dcc46f5a29053f6b91ad620e1079f6b121dc5bd6d7d7b302d4
+  metadata.gz: 1a3101258ab7114803fd485048cbd4d55512b9c547a391b8fe956b7632498b80d5b8c97096c4547d9472fbe477576279f1684a99d893434ce4af2d5543db9433
+  data.tar.gz: 0426b74c6b0bef35e120643dec1716122d15c26ff23de4e4568b3787a4062e0003e29e95d8dd0aa259f7167131914c3e06f6cd10aebb8ebe50e1054bf1463271

data/.bumpversion.cfg

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

data/.gitignore

@@ -1,3 +1,4 @@
+*.swp
 *.gem
 *.rbc
 .bundle

data/CHANGES

@@ -1,6 +1,13 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.7.5
+-------------
+
+Released on August 31st 2016
+
+- Fix last problem with Kameleon_data_dir (again)
+
 Version 2.7.4
 -------------
 

data/RELEASING.rst

@@ -10,9 +10,11 @@ Then for the actual releasing:
 
   python2 ./scripts/bumpversion.py newversion minor  # 2.6.7 -> 2.7.0.dev
 
-2) [work/commit]
+2) [work/commit] 
+3) **Warning:** Be sure that there is no dirty file (not committed) before
+   doing this.
 
-3) Releasing a new version::
+   Releasing a new version::
 
   python2 ./scripts/bumpversion.py release  # 2.7.0.dev -> 2.7.0 + git tag + changelog
   gem build kameleon-builder.gemspec

data/lib/kameleon/utils.rb

@@ -19,12 +19,14 @@ module Kameleon
       raw.to_s.scan(/\$\$kameleon\_data\_dir\/(.*)/) do |var|
         warn_var(var)
       end
-      reg = %r/\$\$kameleon\_data\_dir|\$\${kameleon\_data\_dir}(.*)/
+      reg = %r/(\$\$kameleon\_data\_dir|\$\${kameleon\_data\_dir})(.*)/
       matches = raw.to_enum(:scan, reg).map { Regexp.last_match }
       matches.each do |m|
         unless m.nil?
-          path = resolve_simple_vars(m[1], yaml_path, initial_variables, kwargs)
+          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

data/tests/recipes/test_recipe.yaml

@@ -33,6 +33,11 @@ global:
 
   version: 12.2
   variant: toto-tata
+
+  uuid: $${kameleon_uuid}
+
+  appliance_filename: $${kameleon_recipe_name}_$${kameleon_short_uuid}
+
 #== Bootstrap the new system and create the 'in_context'
 bootstrap:
   - enable_something
@@ -54,6 +59,14 @@ 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
 
 export:
   - save_appliance:

data/version.txt

@@ -1 +1 @@
-2.7.4
+2.7.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -185,7 +185,6 @@ files:
 - tests/recipes/steps/aliases/defaults.yaml
 - tests/recipes/steps/bootstrap/linux/bootstrap.yaml
 - tests/recipes/steps/checkpoints/test.yaml
-- tests/recipes/steps/data/mydata.txt
 - tests/recipes/steps/enable_something.yaml
 - tests/recipes/steps/export/save_appliance.yaml
 - tests/recipes/steps/local_variables.yaml
@@ -236,7 +235,6 @@ test_files:
 - tests/recipes/steps/aliases/defaults.yaml
 - tests/recipes/steps/bootstrap/linux/bootstrap.yaml
 - tests/recipes/steps/checkpoints/test.yaml
-- tests/recipes/steps/data/mydata.txt
 - tests/recipes/steps/enable_something.yaml
 - tests/recipes/steps/export/save_appliance.yaml
 - tests/recipes/steps/local_variables.yaml

data/tests/recipes/steps/data/mydata.txt

@@ -1 +0,0 @@
-This is DATA!!!