kameleon-builder 2.7.6 → 2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6756bd8febc8f8df6fd15c685eb8c4b20662b38f
-  data.tar.gz: 7333259e498919e6a1ca2da029bd5930c426e298
+  metadata.gz: c5e34e2008d8d28527303ac5b78527a80fc06f96
+  data.tar.gz: 9bc6f0b52f88122fc4d4bd499ab7648c48dac83a
 SHA512:
-  metadata.gz: 99fecf54c7f95c67303cf532b75364b0484df0f88246917918be084296174b0ca839ad5bcc840a30c88d13be1ad185c26b658db8de92178058fa5fe0089f7275
-  data.tar.gz: d0a2fef734d9cfed18e580b6c2fcdf44d7579c1ed6a9365f25aaba80828db8f7d94dda858b550b8861d71465e568d5e084a7c670236785bee5fe04bd3d8faa5f
+  metadata.gz: 259a308508cee87db0640de5ccb7379c74e8b89ddd4ac17ae36aa77902554f89f842dc93b0a945ae9d92462811b1bb106dd7b403ba7f7a8e5c21d61b94303242
+  data.tar.gz: 390e8b95e415327dcfeaa00cf1b2759e8c0858d6974ffb7cff8023e04eb03777aa9c74e01d88cbb79f23ac6bf06769b09f2a59f7317b97030a5ec9043d721297

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,13 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.7.7
+-------------
+
+Released on September 01st 2016
+
+- Add some warning to avoid global CLI option misuse
+
 Version 2.7.6
 -------------
 

data/lib/kameleon/engine.rb

@@ -35,11 +35,11 @@ module Kameleon
 
       if @options[:enable_cache] || @options[:from_cache] then
         if @recipe.global["in_context"]["proxy_cache"].nil? then
-          raise BuildError, "Missing varible for in context 'proxy_cache' when using the option --cache"
+          raise BuildError, "Missing variable for in context 'proxy_cache' when using the option --cache"
         end
 
         if @recipe.global["out_context"]["proxy_cache"].nil? then
-          raise BuildError, "Missing varible for out context 'proxy_cache' when using the option --cache"
+          raise BuildError, "Missing variable for out context 'proxy_cache' when using the option --cache"
         end
         @cache = Kameleon::Persistent_cache.instance
 
@@ -90,8 +90,6 @@ module Kameleon
     def build_contexts
       lazyload = @options.fetch(:lazyload, true)
       fail_silently = @options.fetch(:fail_silently, false)
-      proxy_cache_out = @recipe.global["out_context"]["proxy_cache"]
-      proxy_cache_in = @recipe.global["in_context"]["proxy_cache"]
 
       Kameleon.ui.debug("Building local context [local]")
       @local_context = Context.new("local", "bash", "bash", @cwd, "", @cwd,

data/lib/kameleon/recipe.rb

@@ -32,6 +32,10 @@ module Kameleon
         "export" => Section.new("export"),
       }
       @cli_global = Kameleon.env.global.clone
+      @cli_global.each do |k,v|
+        Kameleon.ui.warn("CLI Global variable override: #{k} => #{v}")
+      end
+
       @global = {
         "kameleon_recipe_name" => @name,
         "kameleon_recipe_dir" => File.dirname(@path),
@@ -114,34 +118,38 @@ module Kameleon
         @global[context_name].merge!(yaml_recipe["global"][context_name])
         yaml_recipe["global"][context_name] = @global[context_name]
         unless yaml_recipe["global"][context_name].keys.include? "interactive_cmd"
-          yaml_recipe["global"][context_name]["interactive_cmd"] = yaml_recipe["global"][context_name]['cmd'] 
+          yaml_recipe["global"][context_name]["interactive_cmd"] = yaml_recipe["global"][context_name]['cmd']
         end
       end
       # Load Global variables
       @global.merge!(yaml_recipe.fetch("global", {}))
       # merge cli variable with recursive variable overload
       @global = Utils.overload_merge(@global, @cli_global)
+
       # Resolve dynamically-defined variables !!
       resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self, kwargs)
       resolved_global = @global.merge YAML.load(resolved_global)
+      Kameleon.ui.debug("Resolved_global: #{resolved_global}")
       # Loads aliases
       load_aliases(yaml_recipe)
       # Load env files
       load_env_files(yaml_recipe)
       # Loads checkpoint configuration
       load_checkpoint_config(yaml_recipe)
-
-      resolved_global['include_steps'] ||= []
-      resolved_global['include_steps'].push ''
-      resolved_global['include_steps'].flatten!
-      resolved_global['include_steps'].compact!
+      include_steps = resolved_global['include_steps']
+      include_steps ||= []
+      include_steps.push ''
+      include_steps.flatten!
+      include_steps.compact!
+      Kameleon.ui.debug("include steps: #{include_steps}")
       @sections.values.each do |section|
         dir_to_search = @steps_dirs.map do |steps_dir|
-          resolved_global['include_steps'].map do |path|
+          include_steps.map do |path|
             [File.join(steps_dir, section.name, path),
               File.join(steps_dir, path)]
           end
         end.flatten.select { |x| File.exists? x }
+        Kameleon.ui.debug("Directory to search for steps:  #{dir_to_search}")
 
         if yaml_recipe.key? section.name
           yaml_section = yaml_recipe.fetch(section.name)
@@ -311,7 +319,7 @@ module Kameleon
           end
         end
         rel_dir_search = dir_search.map do |steps_dir|
-          relative_path = Pathname.new(steps_dir).relative_path_from(Pathname(Dir.pwd)).to_s
+          Pathname.new(steps_dir).relative_path_from(Pathname(Dir.pwd)).to_s
         end.flatten
         fail RecipeError, "File '#{global_file}' not found here #{rel_dir_search}"
       end

data/tests/issue76/fail.yaml

@@ -1,10 +1,10 @@
 global:
     arch: x86_64
-    iso_arch: $$arch
+    iso_arch: $${arch}
     iso_filename: debian-jessie-$${iso_arch}-live.iso 
 
 bootstrap:
     - testbootstrap:
-      - toto: $$arch
+      - toto: $${arch}
       - step:
         - exec_local: echo $iso_filename

data/tests/issue76/ok.yaml

@@ -8,4 +8,4 @@ bootstrap:
     - testbootstrapinline:
       - titi: $arch
       - step:
-        - exec_local: echo $$iso_filename $$titi
+        - exec_local: echo $${iso_filename} $${titi}

data/tests/issue76/steps/testbootstrap.yaml

@@ -1,3 +1,3 @@
 - toto: $${arch}-toto
 - step:
-  - exec_local: echo $$iso_filename $$toto
+  - exec_local: echo $${iso_filename} $${toto}

data/tests/recipes/steps/bootstrap/BSD/bootstrap.yaml

@@ -0,0 +1,3 @@
+- bootstrap:
+  - exec_local: echo BSD
+  - exec_out: echo $include_pkg 

data/tests/recipes/test_recipe.yaml

@@ -12,12 +12,16 @@ aliases: defaults.yaml
 checkpoint: test.yaml
 #== Global variables use by Kameleon engine and the steps
 global:
+
+  include_steps:
+    - $${distrib}
+
   ## User varibales : used by the recipe
   user_name: kameleon_user
-  user_password: $$user_name
+  user_password: $${user_name}
 
   # test overload
-  toto: $$toto tata
+  toto: $${toto} tata
 
   # Distribution
   distrib: linux
@@ -25,7 +29,7 @@ global:
   ## System variables. Required by kameleon engine
   # Include specific steps
   include_steps:
-    - $$distrib
+    - $${distrib}
 
   bootstrap_packages: >
     less vim python
@@ -42,7 +46,7 @@ global:
 bootstrap:
   - enable_something
   - bootstrap:
-    - include_pkg: $$bootstrap_packages
+    - include_pkg: $${bootstrap_packages}
 
 setup:
   - software_install
@@ -53,10 +57,10 @@ setup:
             echo titi
     - do_something_else:
       - exec_local: |
-          echo $$toto $$user_name
+          echo $${toto} $${user_name}
     - test_data:
       - exec_local: cat $${kameleon_data_dir}/mydata.txt
-      - exec_local: cat $$kameleon_data_dir/mydata.txt
+      - exec_local: cat $${kameleon_data_dir}/mydata.txt
   - local_variables
 
   - test_uuid_step:

data/tests/recipes/test_recipe_child.yaml

@@ -8,6 +8,6 @@ setup:
   - inline_step:
     - do_something_else:
       - exec_local: |
-          echo $$toto $$user_name
-          echo $$test_override
+          echo $${toto} $${user_name}
+          echo $${test_override}
 

data/tests/test2/test2.yaml

@@ -1,3 +1,3 @@
 extend: ./test3.yaml
 global:
-  toto: $$toto test $$user_name
+  toto: $${toto} test $${user_name}

data/tests/test2/test_data.yaml

@@ -4,4 +4,4 @@ setup:
   - "@base"
   - test_data:
     - do_test:
-      - exec_local: cat $$kameleon_data_dir/mydata.txt
+      - exec_local: cat $${kameleon_data_dir}/mydata.txt

data/version.txt

@@ -1 +1 @@
-2.7.6
+2.7.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.7
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -183,6 +183,7 @@ files:
 - tests/issue76/ok.yaml
 - tests/issue76/steps/testbootstrap.yaml
 - tests/recipes/steps/aliases/defaults.yaml
+- tests/recipes/steps/bootstrap/BSD/bootstrap.yaml
 - tests/recipes/steps/bootstrap/linux/bootstrap.yaml
 - tests/recipes/steps/checkpoints/test.yaml
 - tests/recipes/steps/enable_something.yaml
@@ -234,6 +235,7 @@ test_files:
 - tests/issue76/ok.yaml
 - tests/issue76/steps/testbootstrap.yaml
 - tests/recipes/steps/aliases/defaults.yaml
+- tests/recipes/steps/bootstrap/BSD/bootstrap.yaml
 - tests/recipes/steps/bootstrap/linux/bootstrap.yaml
 - tests/recipes/steps/checkpoints/test.yaml
 - tests/recipes/steps/enable_something.yaml