kameleon-builder 2.7.4 → 2.7.5

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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.bumpversion.cfg +1 -1
  3. data/.gitignore +1 -0
  4. data/CHANGES +7 -0
  5. data/RELEASING.rst +4 -2
  6. data/lib/kameleon/utils.rb +4 -2
  7. data/tests/recipes/test_recipe.yaml +13 -0
  8. data/version.txt +1 -1
  9. metadata +2 -4
  10. data/tests/recipes/steps/data/mydata.txt +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4ff21f86a1671405880c74b610e8df7ecd5790ed
4
- data.tar.gz: c85124ab72fa1cee58e53d81538012d086aa0291
3
+ metadata.gz: ccc3200ef37380cfc64607a6f4db3d7a22e2a285
4
+ data.tar.gz: 3e5ede0d0a9a0c3dd0e01459df8773bc126f71ef
5
5
  SHA512:
6
- metadata.gz: 9de3025bb6be69728721a11e7241bb053ee9a4be1ec11fad6111d72960e5ea1c14586c8b2c6823474d9a0845e8636b155ab9b287a5f20dd581ae93607af91127
7
- data.tar.gz: 5efd6699c60b3ac112d475405ef6f82482a05a6ec54aa0524b25959f413acdc131eb9d9c926ce8dcc46f5a29053f6b91ad620e1079f6b121dc5bd6d7d7b302d4
6
+ metadata.gz: 1a3101258ab7114803fd485048cbd4d55512b9c547a391b8fe956b7632498b80d5b8c97096c4547d9472fbe477576279f1684a99d893434ce4af2d5543db9433
7
+ data.tar.gz: 0426b74c6b0bef35e120643dec1716122d15c26ff23de4e4568b3787a4062e0003e29e95d8dd0aa259f7167131914c3e06f6cd10aebb8ebe50e1054bf1463271
data/.bumpversion.cfg CHANGED
@@ -1,7 +1,7 @@
1
1
  [bumpversion]
2
2
  commit = True
3
3
  tag = True
4
- current_version = 2.7.4
4
+ current_version = 2.7.5
5
5
  parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
6
6
  serialize =
7
7
  {major}.{minor}.{patch}.{release}
data/.gitignore CHANGED
@@ -1,3 +1,4 @@
1
+ *.swp
1
2
  *.gem
2
3
  *.rbc
3
4
  .bundle
data/CHANGES CHANGED
@@ -1,6 +1,13 @@
1
1
  Kameleon CHANGELOG
2
2
  ==================
3
3
 
4
+ Version 2.7.5
5
+ -------------
6
+
7
+ Released on August 31st 2016
8
+
9
+ - Fix last problem with Kameleon_data_dir (again)
10
+
4
11
  Version 2.7.4
5
12
  -------------
6
13
 
data/RELEASING.rst CHANGED
@@ -10,9 +10,11 @@ Then for the actual releasing:
10
10
 
11
11
  python2 ./scripts/bumpversion.py newversion minor # 2.6.7 -> 2.7.0.dev
12
12
 
13
- 2) [work/commit]
13
+ 2) [work/commit]
14
+ 3) **Warning:** Be sure that there is no dirty file (not committed) before
15
+ doing this.
14
16
 
15
- 3) Releasing a new version::
17
+ Releasing a new version::
16
18
 
17
19
  python2 ./scripts/bumpversion.py release # 2.7.0.dev -> 2.7.0 + git tag + changelog
18
20
  gem build kameleon-builder.gemspec
data/lib/kameleon/utils.rb CHANGED
@@ -19,12 +19,14 @@ module Kameleon
19
19
  raw.to_s.scan(/\$\$kameleon\_data\_dir\/(.*)/) do |var|
20
20
  warn_var(var)
21
21
  end
22
- reg = %r/\$\$kameleon\_data\_dir|\$\${kameleon\_data\_dir}(.*)/
22
+ reg = %r/(\$\$kameleon\_data\_dir|\$\${kameleon\_data\_dir})(.*)/
23
23
  matches = raw.to_enum(:scan, reg).map { Regexp.last_match }
24
24
  matches.each do |m|
25
25
  unless m.nil?
26
- path = resolve_simple_vars(m[1], yaml_path, initial_variables, kwargs)
26
+ path = resolve_simple_vars(m[2], yaml_path, initial_variables, kwargs)
27
27
  resolved_path = recipe.resolve_data_path(path.chomp('"'), yaml_path)
28
+ #require 'pry'
29
+ #binding.pry
28
30
  raw.gsub!(m[0].chomp('"'), "#{resolved_path}")
29
31
  end
30
32
  end
data/tests/recipes/test_recipe.yaml CHANGED
@@ -33,6 +33,11 @@ global:
33
33
 
34
34
  version: 12.2
35
35
  variant: toto-tata
36
+
37
+ uuid: $${kameleon_uuid}
38
+
39
+ appliance_filename: $${kameleon_recipe_name}_$${kameleon_short_uuid}
40
+
36
41
  #== Bootstrap the new system and create the 'in_context'
37
42
  bootstrap:
38
43
  - enable_something
@@ -54,6 +59,14 @@ setup:
54
59
  - exec_local: cat $$kameleon_data_dir/mydata.txt
55
60
  - local_variables
56
61
 
62
+ - test_uuid_resolve:
63
+ - show_uuid:
64
+ - exec_local: echo toto_$${kameleon_uuid}
65
+ - exec_local: echo $${kameleon_short_uuid}
66
+ - exec_local: |
67
+ echo "global uuid: $${toto}_$${kameleon_uuid}"
68
+ - exec_local: echo $${appliance_filename}
69
+ - test_uuid_step
57
70
 
58
71
  export:
59
72
  - save_appliance:
data/version.txt CHANGED
@@ -1 +1 @@
1
- 2.7.4
1
+ 2.7.5
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kameleon-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.4
4
+ version: 2.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Salem Harrache
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2016-08-29 00:00:00.000000000 Z
15
+ date: 2016-08-31 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: childprocess
@@ -185,7 +185,6 @@ files:
185
185
  - tests/recipes/steps/aliases/defaults.yaml
186
186
  - tests/recipes/steps/bootstrap/linux/bootstrap.yaml
187
187
  - tests/recipes/steps/checkpoints/test.yaml
188
- - tests/recipes/steps/data/mydata.txt
189
188
  - tests/recipes/steps/enable_something.yaml
190
189
  - tests/recipes/steps/export/save_appliance.yaml
191
190
  - tests/recipes/steps/local_variables.yaml
@@ -236,7 +235,6 @@ test_files:
236
235
  - tests/recipes/steps/aliases/defaults.yaml
237
236
  - tests/recipes/steps/bootstrap/linux/bootstrap.yaml
238
237
  - tests/recipes/steps/checkpoints/test.yaml
239
- - tests/recipes/steps/data/mydata.txt
240
238
  - tests/recipes/steps/enable_something.yaml
241
239
  - tests/recipes/steps/export/save_appliance.yaml
242
240
  - tests/recipes/steps/local_variables.yaml
data/tests/recipes/steps/data/mydata.txt DELETED
@@ -1 +0,0 @@
1
- This is DATA!!!