kameleon-builder 2.7.8 → 2.8.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c03a70b40c25d12a99cecfb09a0f7baa8df33721
4
- data.tar.gz: f2499c4e117e56cf66f1aa259cbd5e88e112710c
3
+ metadata.gz: 7a1cedb45115be7f297f4fa1ce91317044f471e0
4
+ data.tar.gz: bff616a9050536f66d9fbd8da0a4878e32906b04
5
5
  SHA512:
6
- metadata.gz: 0bfab071d823a57d8f7571ac5d0daf07945ef1614324a2ffdb6c07aeab12a73f6edc22098eab0533923d4e7692c74feca435e74edaa0699a2c291b5bd666cb6c
7
- data.tar.gz: dca0358d427d8f135463b9fae64f53293319673878329103f6cd49715961428ba2da2bbe49e12ca32e598063ba85da07726b3eadf310c5ae7a7e99be773f6ab1
6
+ metadata.gz: 52bcf2e7b9a5db08402d5d33d89f866f47511b459629f77afe3650aa6235b6989cc434cf5425a8f8af3a9d98f8b78f8455c04d9f470b7b8be9d285a4cd3d2e61
7
+ data.tar.gz: 1cacc98e8c4cd83c01574578e168add311746008a883ec2cd383fdf26f58944cb8247487684cd27d23159a20939e8e0ecbc4480a328b8f739162dba5a774bd06
data/.bumpversion.cfg CHANGED
@@ -1,7 +1,7 @@
1
1
  [bumpversion]
2
2
  commit = True
3
3
  tag = True
4
- current_version = 2.7.8
4
+ current_version = 2.8.1
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/CHANGES CHANGED
@@ -1,6 +1,18 @@
1
1
  Kameleon CHANGELOG
2
2
  ==================
3
3
 
4
+ Version 2.8.1
5
+ -------------
6
+
7
+ - Manage problem with gem update
8
+
9
+ Version 2.8.0
10
+ -------------
11
+
12
+ Released on September 05th 2016
13
+
14
+ - Add the possibility to overload extend with backend
15
+
4
16
  Version 2.7.8
5
17
  -------------
6
18
 
data/lib/kameleon/cli.rb CHANGED
@@ -60,9 +60,10 @@ module Kameleon
60
60
  tpl = RecipeTemplate.new(template_path)
61
61
  tpl.resolve! :strict => false
62
62
  rescue
63
- raise TemplateNotFound, "Template '#{template_name}' not found. " \
64
- "To see all templates, run the command "\
65
- "`kameleon template list`"
63
+ raise if Kameleon.ui.level("verbose")
64
+ raise TemplateNotFound, "Template '#{template_name}' invalid (try" \
65
+ " --verbose) or not found. To see all templates, run the command "\
66
+ "`kameleon template list`"
66
67
  else
67
68
  tpl.all_files.each do |path|
68
69
  relative_path = path.relative_path_from(Kameleon.env.repositories_path)
@@ -216,6 +216,10 @@ module Kameleon
216
216
  base_recipe_name = yaml_recipe.fetch("extend", "")
217
217
  return yaml_recipe if base_recipe_name.empty?
218
218
 
219
+ # resolve variable in extends to permit backend selection
220
+ base_recipe_name = Utils.resolve_simple_vars_once(
221
+ base_recipe_name, Utils.overload_merge(load_global(yaml_recipe, path), @cli_global))
222
+
219
223
  ## check that the recipe has not already been loaded
220
224
  base_recipe_name << ".yaml" unless base_recipe_name.end_with? ".yaml"
221
225
  base_recipe_path = File.join(File.dirname(path), base_recipe_name)
data/version.txt CHANGED
@@ -1 +1 @@
1
- 2.7.8
1
+ 2.8.1
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.8
4
+ version: 2.8.1
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-09-01 00:00:00.000000000 Z
15
+ date: 2016-09-06 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: childprocess