kameleon-builder 2.3.5 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ea210f8c92d3cd72c918c27a6dcbee74d846ebf
-  data.tar.gz: 752f7e7eb4ce29d5523eadb1aae91f9b78b32585
+  metadata.gz: 65da9e8e38e49cbcc45af782e207462e37e18ec1
+  data.tar.gz: 1ad935fc3207a7a26940bf46b5f43956389829ab
 SHA512:
-  metadata.gz: d551b0e06eff56805b1b341061b7503c20f65904798a04f695c782d187a1a3d8c7598aee365ae5d5fa308b215127633a0b1d640e1b448e88036f71922762b94e
-  data.tar.gz: 04166cc72eba05897f6441716169ceb16feab23be9418e963dc726662d80cbf3354ae9e9b699b85363594d9bd3becea0af7f82f9cfcb22bc1effb991422e4089
+  metadata.gz: 238d2ddf1bc6b0c901837163cecdebb475a9e1ee680ce22197a43038bf49f6c27d9dcf518a0be2ac976331bf8449934bff637af82b71fae5b864cfafb504bfc4
+  data.tar.gz: ed9e26c4420b36ae280249a067157546ae1ee9695b1691da99c041acd3728d860a73c5d7bddf226d074680b5230b489ddc4d7ac20bb0da2bfd18cbf81e3fbaeb

data/.env

@@ -13,7 +13,7 @@ QEMU_MONITOR_PORT=11023
 
 
 function kameleon {
-    BUNDLE_GEMFILE=$ROOT_PROJECT/Gemfile bundle exec kameleon $@
+    BUNDLE_GEMFILE=$ROOT_PROJECT/Gemfile bundle exec kameleon "$@"
 }
 
 function devrun_chroot_clean() {

data/CHANGELOG.rst

@@ -1,6 +1,18 @@
 Kameleon CHANGELOG
 ==================
 
+version 2.4.0
+-------------
+
+Released on Dec 23rd 2014
+
+- Supported recipe attached data
+- Introduced a new shell command execution mechanism, to prevent kameleon from waiting forever if the command act weird (Fixed #39)
+- Improved the customization of steps with inheritance
+- Allowed to set global variables from cli during build using ``--global key:value ..``
+- Moved repository command to the upper level (``kameleon repository``)
+
+
 version 2.3.5
 -------------
 

data/contrib/kameleon_bashrc.sh

@@ -8,6 +8,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 mkdir -p $(dirname <%= @bash_history_file %>) ; touch "<%= @bash_history_file %>"
 mkdir -p $(dirname <%= @bash_env_file %>) ; touch "<%= @bash_env_file %>"
+mkdir -p $(dirname <%= @bash_status_file %>) ; touch "<%= @bash_status_file %>"
 
 source /etc/bash.bashrc 2> /dev/null
 
@@ -21,6 +22,8 @@ function fail {
     false
 }
 
+export -f fail
+
 ## aliases
 if [ -t 1 ] ; then
 # restore previous env
@@ -186,6 +189,8 @@ print('\n')
     fi
 }
 
+export -f __download
+
 function __find_linux_boot_device() {
     local PDEVICE=`stat -c %04D /boot`
     for file in $(find /dev -type b 2>/dev/null) ; do
@@ -197,3 +202,5 @@ function __find_linux_boot_device() {
     done
     echo "$ROOTDEVICE"
 }
+
+export -f __find_linux_boot_device

data/contrib/kameleon_exec_cmd.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+ROOT_DIRECTORY=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
+
+function save_env {
+    # Save environment
+    (comm -3 <(declare | sort) <(declare -f | sort)) > "$ROOT_DIRECTORY/<%= File.basename(@bash_env_file) %>"
+}
+
+trap 'save_env' INT TERM EXIT
+
+# Load environment
+source "$ROOT_DIRECTORY/<%= File.basename(@bash_env_file) %>" 2> /dev/null || true
+
+# Log cmd
+echo <%= Shellwords.escape(cmd.value) %> >> "$ROOT_DIRECTORY/<%= File.basename(@bash_history_file) %>"
+
+<%= cmd.value %>

data/contrib/kameleon_exec_cmd_wrapper.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+ROOT_DIRECTORY=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
+
+function post_exec_wrapper {
+    echo $? > "$ROOT_DIRECTORY/<%= File.basename(@bash_status_file) %>"
+    # Print end flags
+    echo -n <%= cmd.end_err %> 1>&2
+    echo -n <%= cmd.end_out %>
+}
+
+function pre_exec_wrapper {
+    # Print begin flags
+    echo -n <%= cmd.begin_err %> 1>&2
+    echo -n <%= cmd.begin_out %>
+}
+
+trap 'post_exec_wrapper' INT TERM EXIT
+
+## Started
+pre_exec_wrapper
+bash --rcfile "<%= @bashrc_file %>" <%= File.join(@bash_scripts_dir, "#{cmd}.sh" ) %>

data/lib/kameleon.rb

@@ -9,6 +9,7 @@ require 'childprocess'
 require 'pathname'
 require 'table_print'
 require 'yaml'
+require 'find'
 
 require 'kameleon/ui'
 

data/lib/kameleon/cli.rb

@@ -56,12 +56,13 @@ module Kameleon
         end
         begin
           tpl = RecipeTemplate.new(template_path)
+          tpl.resolve!
         rescue
           raise TemplateNotFound, "Template '#{template_name}' not found. " \
                                   "To see all templates, run the command "\
                                   "`kameleon template ls`"
         else
-          files2copy = tpl.base_recipes_files + tpl.files
+          files2copy = tpl.base_recipes_files + tpl.files + tpl.data
           files2copy.each do |path|
             relative_path = path.relative_path_from(Kameleon.env.repositories_path)
             dst = File.join(Kameleon.env.workspace, relative_path)
@@ -71,6 +72,9 @@ module Kameleon
       end
 
       desc "info [TEMPLATE_NAME]", "Display detailed information about a template"
+      method_option :global, :type => :hash ,
+                    :default => {},  :aliases => "-g",
+                    :desc => "Set custom global variables."
       def info(template_name)
         Kameleon.env.root_dir = Kameleon.env.repositories_path
         template_path = File.join(Kameleon.env.repositories_path, template_name)
@@ -78,6 +82,7 @@ module Kameleon
           template_path = template_path + '.yaml'
         end
         tpl = RecipeTemplate.new(template_path)
+        tpl.resolve!
         tpl.display_info
       end
       map %w(-h --help) => :help
@@ -89,6 +94,7 @@ module Kameleon
   class Main < Thor
     include Thor::Actions
 
+    register CLI::Repository, 'repository', 'repository', 'Manages set of remote git repositories'
     # register CLI::Recipe, 'recipe', 'recipe', 'Manages the local recipes'
     register CLI::Template, 'template', 'template', 'Lists and imports templates'
 
@@ -138,12 +144,13 @@ module Kameleon
 
       begin
         tpl = Kameleon::RecipeTemplate.new(template_path)
+        tpl.resolve!
       rescue
         raise TemplateNotFound, "Template '#{template_name}' not found. " \
                                 "To see all templates, run the command "\
                                 "`kameleon templates`"
       else
-        files2copy = tpl.base_recipes_files + tpl.files
+        files2copy = tpl.base_recipes_files + tpl.files + tpl.data
         files2copy.each do |path|
           relative_path = path.relative_path_from(Kameleon.env.repositories_path)
           dst = File.join(Kameleon.env.workspace, relative_path)
@@ -164,8 +171,12 @@ module Kameleon
     end
 
     desc "info [RECIPE_PATH]", "Display detailed information about a recipe"
+    method_option :global, :type => :hash ,
+                  :default => {},  :aliases => "-g",
+                  :desc => "Set custom global variables."
     def info(recipe_path)
       recipe = Kameleon::Recipe.new(recipe_path)
+      recipe.resolve!
       recipe.display_info
     end
 
@@ -195,7 +206,9 @@ module Kameleon
     method_option :proxy_path, :type => :string ,
                   :default => nil,
                   :desc => "Full path of the proxy binary to use for the persistent cache."
-
+    method_option :global, :type => :hash,
+                  :default => {}, :aliases => "-g",
+                  :desc => "Set custom global variables."
     def build(recipe_path=nil)
       if recipe_path.nil? && !options[:from_cache].nil?
         Kameleon.ui.info("Using the cached recipe")

data/lib/kameleon/engine.rb

@@ -40,7 +40,8 @@ module Kameleon
         @cache.name = @recipe.name
         @cache.mode = @options[:enable_cache] ? :build : :from
         @cache.cache_path = @options[:from_cache]
-        @cache.recipe_files = @recipe.files + @recipe.base_recipes_files# I'm passing the Pathname objects
+        # I'm passing the Pathname objects
+        @cache.recipe_files = @recipe.files + @recipe.base_recipes_files + @recipe.data
         @cache.recipe_path = @recipe.path
 
         if @recipe.global["in_context"]["proxy_cache"].nil? then

data/lib/kameleon/environment.rb

@@ -23,6 +23,7 @@ module Kameleon
         :cache_path => Pathname.new(cache_path),
         :repositories_path => Pathname.new(repositories_path),
         :root_dir => Pathname.new(workspace),
+        :global => options.fetch(:global, {}),
       }
       options = Kameleon.default_values.merge(options).merge(env_options)
       Kameleon.ui.debug("Environment initialized (#{self})")

data/lib/kameleon/persistent_cache.rb

@@ -176,7 +176,6 @@ module Kameleon
           all_files = @recipe_files.push(@recipe_path)
           recipe_dir = Pathname.new(common_prefix(all_files))
           cached_recipe_dir = Pathname.new(File.join(@cache_dir,"recipe"))
-       #   binding.pry
           Kameleon::Utils.copy_files(recipe_dir, cached_recipe_dir, all_files)
         end
         ## Saving metadata information

data/lib/kameleon/recipe.rb

@@ -15,7 +15,7 @@ module Kameleon
     attr_accessor :metainfo
     attr_accessor :files
     attr_accessor :base_recipes_files
-
+    attr_accessor :data
 
     def initialize(path, kwargs = {})
       @path = Pathname.new(File.expand_path(path))
@@ -26,6 +26,7 @@ module Kameleon
         "setup" => Section.new("setup"),
         "export" => Section.new("export"),
       }
+      @cli_global = Kameleon.env.global.clone
       @global = {
         "kameleon_recipe_name" => @name,
         "kameleon_recipe_dir" => File.dirname(@path),
@@ -38,6 +39,7 @@ module Kameleon
       @files = []
       Kameleon.ui.debug("Initialize new recipe (#{path})")
       @base_recipes_files = [@path]
+      @data = []
       @steps_dirs = []
       load! :strict => false
     end
@@ -84,8 +86,9 @@ module Kameleon
 
       # Load Global variables
       @global.merge!(yaml_recipe.fetch("global", {}))
+      @global.merge!(@cli_global)
       # Resolve dynamically-defined variables !!
-      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, kwargs)
+      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self, kwargs)
       resolved_global = @global.merge YAML.load(resolved_global)
       # Loads aliases
       load_aliases(yaml_recipe)
@@ -111,10 +114,10 @@ module Kameleon
             embedded_step = false
             # Get macrostep name and arguments if available
             if raw_macrostep.kind_of? String
-              name = raw_macrostep
+              name = Utils.resolve_vars(raw_macrostep, @path, @global, self, kwargs)
               args = nil
             elsif raw_macrostep.kind_of? Hash
-              name = raw_macrostep.keys[0]
+              name = Utils.resolve_vars(raw_macrostep.keys[0], @path, @global, self, kwargs)
               args = raw_macrostep.values[0]
             else
               fail RecipeError, "Malformed yaml recipe in section: "\
@@ -132,7 +135,7 @@ module Kameleon
             end
             if embedded_step
               Kameleon.ui.debug("Loading embedded macrostep #{name}")
-              macrostep = load_macrostep(nil, name, args)
+              macrostep = load_macrostep(nil, name, args, kwargs)
               section.macrosteps.push(macrostep)
               next
             end
@@ -142,11 +145,11 @@ module Kameleon
               macrostep_path = Pathname.new(File.join(dir, name + '.yaml'))
               if File.file?(macrostep_path)
                 Kameleon.ui.debug("Loading macrostep #{macrostep_path}")
-                macrostep = load_macrostep(macrostep_path, name, args)
+                macrostep = load_macrostep(macrostep_path, name, args, kwargs)
                 section.macrosteps.push(macrostep)
                 @files.push(macrostep_path)
                 Kameleon.ui.debug("Macrostep '#{name}' found in this path: " \
-                              "#{macrostep_path}")
+                                  "#{macrostep_path}")
                 loaded = true
                 break
               else
@@ -214,24 +217,31 @@ module Kameleon
     end
 
     def load_aliases(yaml_recipe)
+      def load_aliases_file(aliases_file)
+        dir_search = @steps_dirs.map do |steps_dir|
+          File.join(steps_dir, "aliases")
+        end.flatten
+        dir_search.each do |dir_path|
+          path = Pathname.new(File.join(dir_path, aliases_file))
+          if File.file?(path)
+            Kameleon.ui.debug("Loading aliases #{path}")
+            @aliases.merge!(YAML.load_file(path))
+            @files.push(path)
+            return path
+          end
+        end
+        fail RecipeError, "Aliases file for recipe '#{path}' does not exists"
+      end
       if yaml_recipe.keys.include? "aliases"
         aliases = yaml_recipe.fetch("aliases")
         if aliases.kind_of? Hash
           @aliases = aliases
         elsif aliases.kind_of? String
-          dir_search = @steps_dirs.map do |steps_dir|
-              File.join(steps_dir, "aliases")
-          end.flatten
-          dir_search.each do |dir_path|
-            path = Pathname.new(File.join(dir_path, aliases))
-            if File.file?(path)
-              Kameleon.ui.debug("Loading aliases #{path}")
-              @aliases = YAML.load_file(path)
-              @files.push(path)
-              return path
-            end
+          load_aliases_file(aliases)
+        elsif aliases.kind_of? Array
+          aliases.each do |aliases_file|
+            load_aliases_file(aliases_file)
           end
-          fail RecipeError, "Aliases file for recipe '#{path}' does not exists"
         end
       end
     end
@@ -267,7 +277,7 @@ module Kameleon
       end
     end
 
-    def load_macrostep(step_path, name, args)
+    def load_macrostep(step_path, name, args, kwargs)
       if step_path.nil?
         macrostep_yaml = args
         step_path = @path
@@ -322,6 +332,12 @@ 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
 
@@ -335,6 +351,23 @@ module Kameleon
       return nil
     end
 
+    def resolve_data_path(partial_path, step_path)
+      Kameleon.ui.debug("Looking for data '#{partial_path}'")
+      dir_search = @steps_dirs.map do |steps_dir|
+          File.join(steps_dir, "data")
+      end.flatten
+      dir_search.each do |dir_path|
+        real_path = Pathname.new(File.join(dir_path, partial_path)).cleanpath
+        if real_path.exist?
+          Kameleon.ui.debug("Register data #{real_path}")
+          @data.push(real_path) unless @data.include? real_path
+          return real_path
+        end
+        Kameleon.ui.debug("#{real_path} : nonexistent")
+      end
+      fail RecipeError, "Cannot found data '#{partial_path}' unsed in '#{step_path}'"
+    end
+
     def resolve!
       unless @global.keys.include? "kameleon_uuid"
         kameleon_id = SecureRandom.uuid
@@ -342,7 +375,7 @@ module Kameleon
         @global["kameleon_short_uuid"] = kameleon_id.split("-").last
       end
       # Resolve dynamically-defined variables !!
-      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global)
+      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self)
       @global.merge! YAML.load(resolved_global)
 
       consistency_check
@@ -367,7 +400,7 @@ module Kameleon
       Kameleon.ui.info("Resolving variables")
       @sections.values.each do |section|
         section.macrosteps.each do |macrostep|
-          macrostep.resolve_variables!(@global)
+          macrostep.resolve_variables!(@global, self)
         end
       end
 
@@ -394,6 +427,7 @@ module Kameleon
         end
       end
       calculate_step_identifiers
+      flatten_data
     end
 
     def consistency_check()
@@ -431,7 +465,8 @@ module Kameleon
         @checkpoint[key].each do |cmd|
           cmd.string_cmd = Utils.resolve_vars(cmd.string_cmd,
                                               @checkpoint["path"],
-                                              @global)
+                                              @global,
+                                              self)
         end
       end
     end
@@ -554,6 +589,21 @@ module Kameleon
       end
     end
 
+    def flatten_data
+      files = []
+      @data.each do |d|
+        if d.directory?
+          Find.find("#{d}") do |f|
+            files.push(Pathname.new(f)) unless File.directory? f
+          end
+        else
+          files.push(d)
+        end
+      end
+      @data = files.uniq
+    end
+
+
     def to_hash
       recipe_hash = {
         "name" => @name,
@@ -562,6 +612,7 @@ module Kameleon
         "base_recipes_files" => @base_recipes_files.map {|p| p.to_s },
         "global" => @global,
         "aliases" => @aliases,
+        "data" => @data,
       }
       recipe_hash["checkpoint"] = @checkpoint unless @checkpoint.nil?
       recipe_hash["steps"] = to_array
@@ -584,6 +635,10 @@ module Kameleon
       @files.each do |step|
         prefix ; Kameleon.ui.info("#{step}")
       end
+      Kameleon.ui.info("Data:")
+      @data.each do |d|
+        prefix ; Kameleon.ui.info("#{d}")
+      end
       Kameleon.ui.info("Variables:")
       @global.each do |key, value|
         prefix ; Kameleon.ui.info("#{key}: #{value}")

data/lib/kameleon/shell.rb

@@ -18,15 +18,25 @@ module Kameleon
       @local_workdir = local_workdir
       @shell_workdir = shell_workdir
       @proxy_cache = proxy_cache
-      @bashrc_file = ".kameleon_#{@context_name}_bash_rc"
-      @bash_history_file = ".kameleon_#{@context_name}_bash_history"
-      @bash_env_file = ".kameleon_#{@context_name}_bash_env"
-      @default_bashrc_file = File.join(Kameleon.source_root,
-                                       "contrib", "kameleon_bashrc.sh")
+      @bash_scripts_dir = File.join(".scripts", @context_name)
+      @bashrc_file = File.join(@bash_scripts_dir, "bash_rc")
+      @bash_history_file = File.join(@bash_scripts_dir, "bash_history")
+      @bash_env_file = File.join(@bash_scripts_dir, "bash_env")
+      @bash_status_file = File.join(@bash_scripts_dir, "bash_status")
+      @default_bashrc_file = File.join(Kameleon.source_root, "contrib", "kameleon_bashrc.sh")
+      @cmd_tpl = ERB.new(File.read(File.join(Kameleon.source_root,
+                                                     "contrib",
+                                                     "kameleon_exec_cmd.sh")))
+      @cmd_wrapper_tpl = ERB.new(File.read(File.join(Kameleon.source_root,
+                                                     "contrib",
+                                                     "kameleon_exec_cmd_wrapper.sh")))
+
       if @shell_workdir
+        @bash_scripts_dir = File.join(@shell_workdir, @bash_scripts_dir)
         @bashrc_file = File.join(@shell_workdir, @bashrc_file)
         @bash_history_file = File.join(@shell_workdir, @bash_history_file)
         @bash_env_file = File.join(@shell_workdir, @bash_env_file)
+        @bash_status_file = File.join(@shell_workdir, @bash_status_file)
       end
 
       ## Changing the default bashrc if the cache is activated
@@ -118,7 +128,7 @@ module Kameleon
         change_dir_cmd = Shellwords.escape(change_dir_cmd)
       end
       shell_cmd = "mkdir -p $(dirname #{@bashrc_file})\n"
-      shell_cmd << "echo #{bashrc} > #{@bashrc_file}\n"
+      shell_cmd << "rm $(dirname #{@bashrc_file})/*\n"
       shell_cmd << "echo #{bashrc} > #{@bashrc_file}\n"
       unless change_dir_cmd.nil?
         shell_cmd << "echo #{change_dir_cmd} >> #{@bashrc_file}\n"
@@ -130,19 +140,17 @@ module Kameleon
     end
 
     def send_command cmd
-      shell_cmd = "#{ ECHO_CMD } -n #{ cmd.begin_err } 1>&2\n"
-      shell_cmd << "#{ ECHO_CMD } -n #{ cmd.begin_out }\n"
+      shell_cmd = ""
       unless @sent_first_cmd
         shell_cmd << init_shell_cmd
         @sent_first_cmd = true
       end
-      shell_cmd << "source #{@bash_env_file} 2> /dev/null || true\n"
-      shell_cmd << "KAMELEON_LAST_COMMAND=#{Shellwords.escape(cmd.value)}\n"
-      shell_cmd << "#{ cmd.value }\nexport __exit_status__=$?\n"
-      shell_cmd << "#{ ECHO_CMD } $KAMELEON_LAST_COMMAND >> \"$HISTFILE\"\n"
-      shell_cmd << "(comm -3 <(declare | sort) <(declare -f | sort)) > #{@bash_env_file}\n"
-      shell_cmd << "#{ ECHO_CMD } -n #{ cmd.end_err } 1>&2\n"
-      shell_cmd << "#{ ECHO_CMD } -n #{ cmd.end_out }\n"
+      cmd_content = Shellwords.escape(@cmd_tpl.result(binding))
+      cmd_wrapper_content = Shellwords.escape(@cmd_wrapper_tpl.result(binding))
+      shell_cmd << "mkdir -p $(dirname #{File.join(@bash_scripts_dir, "#{cmd}.sh" )})\n"
+      shell_cmd << "echo #{cmd_content} > #{File.join(@bash_scripts_dir, "#{cmd}.sh" )}\n"
+      shell_cmd << "echo #{cmd_wrapper_content} > #{File.join(@bash_scripts_dir, "#{cmd}_wrapper.sh" )}\n"
+      shell_cmd << "bash #{File.join(@bash_scripts_dir, "#{cmd}_wrapper.sh" )}\n"
       @process.io.stdin.puts shell_cmd
       @process.io.stdin.flush
     end
@@ -222,7 +230,7 @@ module Kameleon
 
     def get_status
       var_name = "__exit_status__"
-      @process.io.stdin << "#{ ECHO_CMD } \"#{ var_name }=${#{ var_name }}\"\n"
+      @process.io.stdin << "#{ ECHO_CMD } \"#{ var_name }=$(cat #{@bash_status_file})\"\n"
       @process.io.stdin.flush
       while((line = @stdout.gets))
         if (m = %r/#{ var_name }\s*=\s*(.*)/.match line)
@@ -321,7 +329,7 @@ module Kameleon
         @value = raw.to_s.strip
         @number = self.class.counter
         @slug = Kameleon::Utils.generate_slug(@value)[0...30]
-        @id = "%d_%d_%d" % [$$, @number, rand(Time.now.usec)]
+        @id = "%d_%d_%d" % [@number, $$, rand(Time.now.usec)]
         @begin_out = "__CMD_OUT_%s_BEGIN__" % @id
         @end_out = "__CMD_OUT_%s_END__" % @id
         @begin_out_pat = %r/#{ Regexp.escape(@begin_out) }(.*)/m
@@ -332,6 +340,10 @@ module Kameleon
         @end_err_pat = %r/(.*)#{ Regexp.escape(@end_err) }/m
         self.class.counter += 1
       end
+
+      def to_s
+        "%05d_#{@slug}" % @number
+      end
     end
 
   end

data/lib/kameleon/step.rb

@@ -168,14 +168,15 @@ module Kameleon
       @init_microsteps = []
     end
 
-    def resolve_variables!(global)
+    def resolve_variables!(global, recipe)
       # Resolve dynamically-defined variables !!
       tmp_resolved_vars = {}
       @variables.clone.each do |key, value|
         yaml_vars = { key => value }.to_yaml.chomp
         yaml_resolved = Utils.resolve_vars(yaml_vars,
                                            @path,
-                                           tmp_resolved_vars.merge(global))
+                                           tmp_resolved_vars.merge(global),
+                                           recipe)
         tmp_resolved_vars.merge! YAML.load(yaml_resolved.chomp)
       end
       @variables.merge! tmp_resolved_vars
@@ -183,7 +184,8 @@ module Kameleon
         m.commands.each do |cmd|
           cmd.string_cmd = Utils.resolve_vars(cmd.string_cmd,
                                               @path,
-                                              global.merge(@variables))
+                                              global.merge(@variables),
+                                              recipe)
         end
       end
     end

data/lib/kameleon/utils.rb

@@ -1,7 +1,26 @@
 module Kameleon
   module Utils
 
-    def self.resolve_vars(raw, yaml_path, initial_variables, kwargs = {})
+
+    def self.resolve_vars(raw, yaml_path, initial_variables, recipe, kwargs = {})
+      raw = resolve_data_dir_vars(raw, yaml_path, initial_variables, recipe, kwargs)
+      return resolve_simple_vars(raw, yaml_path, initial_variables, kwargs)
+    end
+
+    def self.resolve_data_dir_vars(raw, yaml_path, initial_variables, recipe, kwargs)
+      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)
+          resolved_path = recipe.resolve_data_path(path, yaml_path)
+          raw.gsub!(m[0], "\"#{resolved_path}\"")
+        end
+      end
+      return raw
+    end
+
+    def self.resolve_simple_vars(raw, yaml_path, initial_variables, kwargs)
       raw.to_s.gsub(/\$\$\{[a-zA-Z0-9\-_]+\}|\$\$[a-zA-Z0-9\-_]+/) do |var|
         # remove the dollars
         if var.include? "{"
@@ -17,7 +36,7 @@ module Kameleon
             fail RecipeError, "#{yaml_path}: variable #{var} not found in local or global"
           end
         end
-        return $` + resolve_vars(value.to_s + $', yaml_path, initial_variables, kwargs)
+        return $` + resolve_simple_vars(value.to_s + $', yaml_path, initial_variables, kwargs)
       end
     end
 
@@ -29,7 +48,7 @@ module Kameleon
         value.gsub!(/\s*[^A-Za-z0-9\.]\s*/, '_')
         value.gsub!(/_+/, "_")
         value.gsub!(/\A[_\.]+|[_\.]+\z/, "")
-        value
+        value.chomp("_")
     end
 
     def self.extract_meta_var(name, content)

data/version.txt

@@ -1 +1 @@
-2.3.5
+2.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.4.0
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -95,6 +95,8 @@ files:
 - completion/kameleon.bash
 - completion/kameleon.fish
 - contrib/kameleon_bashrc.sh
+- contrib/kameleon_exec_cmd.sh
+- contrib/kameleon_exec_cmd_wrapper.sh
 - contrib/polipo_env.sh
 - contrib/scripts/VirtualBox_deploy.sh
 - contrib/scripts/chroot_env