kameleon-builder 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65da9e8e38e49cbcc45af782e207462e37e18ec1
-  data.tar.gz: 1ad935fc3207a7a26940bf46b5f43956389829ab
+  metadata.gz: d24c2bbdf9e6c88d1e2d4d573210b1c8414c2af8
+  data.tar.gz: 00379931012e6056b8cdcf89c196f60e02e3984a
 SHA512:
-  metadata.gz: 238d2ddf1bc6b0c901837163cecdebb475a9e1ee680ce22197a43038bf49f6c27d9dcf518a0be2ac976331bf8449934bff637af82b71fae5b864cfafb504bfc4
-  data.tar.gz: ed9e26c4420b36ae280249a067157546ae1ee9695b1691da99c041acd3728d860a73c5d7bddf226d074680b5230b489ddc4d7ac20bb0da2bfd18cbf81e3fbaeb
+  metadata.gz: 20f79f9f06cfc7975a4dce207b07c037ed3ceebc9e6c3571e671ba48335b8608c9abc37d9899f03ea3444227b31384e625cf8d157bde0d7eb490b3b904a80516
+  data.tar.gz: dec068dcdcd64c17d00a04d5378226e4036e761fd9c66d172d13859c600e63f1d3594eca6352724bb9d39c0cc15d2f77a9fa81b69ae18b073df22e8e0ede9fcd

data/CHANGELOG.rst

@@ -1,6 +1,21 @@
 Kameleon CHANGELOG
 ==================
 
+version 2.5.0
+-------------
+
+Released on Jan 27th 2015
+
+- Allowed user to get custom shell environement by adding shell script
+- Added option ``--verbose`` to allow user debugging
+- Added option ``--from-cache`` to the ``kameleon info`` subcommand
+- Enabled bash xtrace in verbose mode
+- Checked appropriate proxy cache server start
+- Fixed recipe path in proxy cache metadata
+- Forced proxy cache to use IPv4
+- Improved UI with more color and less output messages
+
+
 version 2.4.0
 -------------
 

data/contrib/kameleon_bashrc.sh

@@ -145,11 +145,11 @@ function __download {
     if which wget >/dev/null; then
         wget --retry-connrefused --progress=bar:force "$1" -O "$2" 2>&1
     else
-        fail "wget is missing, trying with curl..."
+        echo "wget is missing, trying with curl..."
         if which curl >/dev/null; then
             curl -# -L --retry 999 --retry-max-time 0 "$1" -o "$2" 2>&1
         else
-            fail "curl is missing, trying with python..."
+            echo "curl is missing, trying with python..."
             if which python >/dev/null; then
                 python -c "
 import sys

data/contrib/kameleon_exec_cmd.sh

@@ -1,18 +1,24 @@
 #!/usr/bin/env bash
 
-ROOT_DIRECTORY=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
+set -o errexit
+set -o pipefail
+
+__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) %>"
+    <% if Kameleon.env.debug %>set +x<% end %>
+    (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
+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) %>"
+echo <%= Shellwords.escape(cmd.value) %> >> "${__ROOT_DIRECTORY__}/<%= File.basename(@bash_history_file) %>"
+
+<% if Kameleon.env.debug %>set -o xtrace <% end %>
 
 <%= cmd.value %>

data/lib/kameleon/cli.rb

@@ -62,8 +62,7 @@ module Kameleon
                                   "To see all templates, run the command "\
                                   "`kameleon template ls`"
         else
-          files2copy = tpl.base_recipes_files + tpl.files + tpl.data
-          files2copy.each do |path|
+          tpl.all_files.each do |path|
             relative_path = path.relative_path_from(Kameleon.env.repositories_path)
             dst = File.join(Kameleon.env.workspace, relative_path)
             copy_file(path, dst)
@@ -100,8 +99,10 @@ module Kameleon
 
     class_option :color, :type => :boolean, :default => Kameleon.default_values[:color],
                  :desc => "Enables colorization in output"
+    class_option :verbose, :type => :boolean, :default => Kameleon.default_values[:verbose],
+                 :desc => "Enables verbose output for kameleon users"
     class_option :debug, :type => :boolean, :default => Kameleon.default_values[:debug],
-                 :desc => "Enables debug output"
+                 :desc => "Enables debug output for kameleon developpers"
     class_option :script, :type => :boolean, :default => Kameleon.default_values[:script],
                  :desc => "Never prompts for user intervention",
                  :aliases => "-s"
@@ -150,8 +151,7 @@ module Kameleon
                                 "To see all templates, run the command "\
                                 "`kameleon templates`"
       else
-        files2copy = tpl.base_recipes_files + tpl.files + tpl.data
-        files2copy.each do |path|
+        tpl.all_files.each do |path|
           relative_path = path.relative_path_from(Kameleon.env.repositories_path)
           dst = File.join(Kameleon.env.workspace, relative_path)
           copy_file(path, dst)
@@ -170,11 +170,25 @@ module Kameleon
       end
     end
 
-    desc "info [RECIPE_PATH]", "Display detailed information about a recipe"
+    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)
+    method_option :from_cache, :type => :string ,
+                  :default => nil,
+                  :desc => "Get info from a persistent cache tar file (ignore recipe path)"
+
+    def info(recipe_path=nil)
+      if recipe_path.nil? && !options[:from_cache].nil?
+        unless File.file?(options[:from_cache])
+          raise CacheError, "The specified cache file "\
+                            "\"#{options[:from_cache]}\" do not exists"
+        end
+        Kameleon.ui.info("Using the cached recipe")
+        @cache = Kameleon::Persistent_cache.instance
+        @cache.cache_path = options[:from_cache]
+        recipe_path =  @cache.get_recipe
+      end
       recipe = Kameleon::Recipe.new(recipe_path)
       recipe.resolve!
       recipe.display_info
@@ -211,6 +225,10 @@ module Kameleon
                   :desc => "Set custom global variables."
     def build(recipe_path=nil)
       if recipe_path.nil? && !options[:from_cache].nil?
+        unless File.file?(options[:from_cache])
+          raise CacheError, "The specified cache file "\
+                            "\"#{options[:from_cache]}\" do not exists"
+        end
         Kameleon.ui.info("Using the cached recipe")
         @cache = Kameleon::Persistent_cache.instance
         @cache.cache_path = options[:from_cache]
@@ -270,7 +288,14 @@ module Kameleon
         Thor::Base.shell = Thor::Shell::Basic
       end
       Kameleon.ui = Kameleon::UI::Shell.new(self.options)
-      Kameleon.ui.level = "debug" if self.options["debug"]
+
+      if (self.options["debug"] or ENV['KAMELEON_DEBUG'])
+        Kameleon.ui.level = "debug"
+      elsif self.options["verbose"]
+        Kameleon.ui.level = "verbose"
+      end
+      Kameleon.ui.verbose("The level of output is set to #{Kameleon.ui.level}")
+
       opts = args[1]
       cmd_name = args[2][:current_command].name
       if opts.include? "--help" or opts.include? "-h"

data/lib/kameleon/context.rb

@@ -5,8 +5,15 @@ module Kameleon
 
     attr_accessor :shell
     attr_accessor :name
+    attr_accessor :cmd
+    attr_accessor :workdir
+    attr_accessor :local_workdir
+    attr_accessor :proxy_cache
+    attr_accessor :env_files
 
-    def initialize(name, cmd, workdir, exec_prefix, local_workdir, kwargs = {})
+
+    def initialize(name, cmd, workdir, exec_prefix, local_workdir, env_files,
+                   kwargs = {})
       @name = name.downcase
       @cmd = cmd
       @workdir = workdir
@@ -15,11 +22,8 @@ module Kameleon
       @proxy_cache = kwargs[:proxy_cache]
       @fail_silently = kwargs.fetch(:fail_silently, true)
       @lazyload = kwargs.fetch(:lazyload, false)
-      @shell = Kameleon::Shell.new(@name,
-                                   @cmd,
-                                   @workdir,
-                                   @local_workdir,
-                                   @proxy_cache)
+      @env_files = env_files
+      @shell = Kameleon::Shell.new(self)
       @already_loaded = false
       Kameleon.ui.debug("Initialize new ctx (#{name})")
 
@@ -61,22 +65,22 @@ module Kameleon
     def log_progress(log_level, msg)
       Kameleon.ui.confirm(msg, false) if log_level == "info"
       Kameleon.ui.error(msg, false) if log_level == "error"
+      Kameleon.ui.verbose msg if log_level == "verbose"
       Kameleon.ui.debug msg if log_level == "debug"
     end
 
     def execute(cmd, kwargs = {})
       load_shell
       cmd_with_prefix = "#{@exec_prefix} #{cmd}"
-      cmd_with_prefix.split( /\r?\n/ ).each {|m| Kameleon.ui.debug "+ #{m}" }
       log_level = kwargs.fetch(:log_level, "info")
       exit_status = @shell.execute(cmd_with_prefix, kwargs) do |out, err|
         do_log(out, log_level) unless out.nil?
         do_log(err, "error") unless err.nil?
       end
-      Kameleon.ui.debug("Exit status : #{exit_status}")
+      Kameleon.ui.verbose("Exit status : #{exit_status}")
       fail ExecError unless exit_status.eql? 0
     rescue ShellError, Errno::EPIPE  => e
-      Kameleon.ui.debug("Shell cmd failed to launch: #{@shell.shell_cmd}")
+      Kameleon.ui.verbose("Shell cmd failed to launch: #{@shell.shell_cmd}")
       raise ExecError, e.message + ". The '#{@name}_context' is inaccessible."
     end
 
@@ -86,8 +90,8 @@ module Kameleon
         tmp = @cache.get_cache_cmd(cmd)
       else
         tmp = Tempfile.new("pipe-#{ Kameleon::Utils.generate_slug(cmd)[0..20] }")
-        Kameleon.ui.debug("Running piped commands")
-        Kameleon.ui.debug("Saving STDOUT from #{@name}_ctx to local file #{tmp.path}")
+        Kameleon.ui.verbose("Running piped commands")
+        Kameleon.ui.verbose("Saving STDOUT from #{@name}_ctx to local file #{tmp.path}")
         execute(cmd, :stdout => tmp)
         tmp.close
       end
@@ -96,7 +100,7 @@ module Kameleon
         @cache.cache_cmd(cmd,tmp.path)
       end
 
-      Kameleon.ui.debug("Forwarding #{tmp.path} to STDIN of #{other_ctx.name}_ctx")
+      Kameleon.ui.verbose("Forwarding #{tmp.path} to STDIN of #{other_ctx.name}_ctx")
       dest_pipe_path = "${KAMELEON_WORKDIR}/pipe-#{ Kameleon::Utils.generate_slug(other_cmd)[0..20] }"
       other_ctx.send_file(tmp.path, dest_pipe_path)
       other_cmd_with_pipe = "cat #{dest_pipe_path} | #{other_cmd} && rm #{dest_pipe_path}"
@@ -136,11 +140,7 @@ module Kameleon
     end
 
     def reload
-      @shell = Kameleon::Shell.new(@name,
-                                   @cmd,
-                                   @workdir,
-                                   @local_workdir,
-                                   @proxy_cache)
+      @shell = Kameleon::Shell.new(self)
       @shell.start
     end
 

data/lib/kameleon/engine.rb

@@ -41,7 +41,7 @@ module Kameleon
         @cache.mode = @options[:enable_cache] ? :build : :from
         @cache.cache_path = @options[:from_cache]
         # I'm passing the Pathname objects
-        @cache.recipe_files = @recipe.files + @recipe.base_recipes_files + @recipe.data
+        @cache.recipe_files = @recipe.all_files
         @cache.recipe_path = @recipe.path
 
         if @recipe.global["in_context"]["proxy_cache"].nil? then
@@ -71,7 +71,8 @@ module Kameleon
 
       Kameleon.ui.debug("Building local context [local]")
       @local_context = Context.new("local", "bash", @cwd, "", @cwd,
-                                   :proxy_cache => "localhost",
+                                   @recipe.env_files,
+                                   :proxy_cache => "127.0.0.1",
                                    :lazyload => false,
                                    :fail_silently => false)
       Kameleon.ui.debug("Building external context [out]")
@@ -80,6 +81,7 @@ module Kameleon
                                  @recipe.global["out_context"]["workdir"],
                                  @recipe.global["out_context"]["exec_prefix"],
                                  @cwd,
+                                 @recipe.env_files,
                                  :proxy_cache => proxy_cache_out,
                                  :lazyload => lazyload,
                                  :fail_silently => fail_silently)
@@ -90,6 +92,7 @@ module Kameleon
                                 @recipe.global["in_context"]["workdir"],
                                 @recipe.global["in_context"]["exec_prefix"],
                                 @cwd,
+                                @recipe.env_files,
                                 :proxy_cache => proxy_cache_in,
                                 :lazyload => lazyload,
                                 :fail_silently => fail_silently)
@@ -162,36 +165,38 @@ module Kameleon
       section.sequence do |macrostep|
         macrostep_time = Time.now.to_i
         if @cache then
-          Kameleon.ui.info("Starting proxy cache server for macrostep '#{macrostep.name}'...")
+          Kameleon.ui.debug("Starting proxy cache server for macrostep '#{macrostep.name}'...")
           # the following function start a polipo web proxy and stops a previous run
           dir_cache = @cache.create_cache_directory(macrostep.name)
-          @cache.start_web_proxy_in(dir_cache)
+          unless @cache.start_web_proxy_in(dir_cache)
+            raise CacheError, "The cache process fail to start"
+          end
         end
         macrostep.sequence do |microstep|
           step_prefix = "Step #{ microstep.order } : "
           Kameleon.ui.info("#{step_prefix}#{ microstep.slug }")
           if @enable_checkpoint
             if microstep.on_checkpoint == "skip"
-              Kameleon.ui.info("--> Skipped")
+              Kameleon.ui.msg("--> Skipped")
               next
             end
             if microstep.in_cache && microstep.on_checkpoint == "use_cache"
-              Kameleon.ui.info("--> Using checkpoint")
+              Kameleon.ui.msg("--> Using checkpoint")
             else
-              Kameleon.ui.info("--> Running the step...")
+              Kameleon.ui.msg("--> Running the step...")
               microstep.commands.each do |cmd|
                 safe_exec_cmd(cmd)
               end
               unless microstep.on_checkpoint == "redo"
                 if checkpoint_enabled?
-                  Kameleon.ui.info("--> Creating checkpoint : #{ microstep.identifier }")
+                  Kameleon.ui.msg("--> Creating checkpoint : #{ microstep.identifier }")
                   create_checkpoint(microstep.identifier)
                 end
               end
             end
           else
             begin
-            Kameleon.ui.info("--> Running the step...")
+            Kameleon.ui.msg("--> Running the step...")
             microstep.commands.each do |cmd|
               safe_exec_cmd(cmd)
             end
@@ -200,8 +205,8 @@ module Kameleon
               breakpoint(nil)
             end
           end
-        Kameleon.ui.info("Step #{macrostep.name} took: #{Time.now.to_i-macrostep_time} secs")
         end
+        Kameleon.ui.info("Step #{macrostep.name} took: #{Time.now.to_i-macrostep_time} secs")
       end
       @cleaned_sections.push(section.name)
     end

data/lib/kameleon/error.rb

@@ -23,4 +23,5 @@ module Kameleon
   class BuildError < Error; status_code(7) ; end
   class AbortError < Error; status_code(8) ; end
   class TemplateNotFound < Error; status_code(9) ; end
+  class CacheError < Error; status_code(10) ; end
 end

data/lib/kameleon/persistent_cache.rb

@@ -1,6 +1,7 @@
 require 'childprocess'
 require 'singleton'
 require 'socket'
+require 'net/http'
 
 module Kameleon
   #This ruby class will control the execution of Polipo web proxy
@@ -17,7 +18,7 @@ module Kameleon
     attr_writer :cache_path
     attr_accessor :mode
     attr_accessor :name
-    attr_accessor :recipe_files # have to check those.
+    attr_accessor :recipe_files # FIXME have to check those.
     attr_accessor :recipe_path
 
     def initialize()
@@ -63,7 +64,7 @@ module Kameleon
       ports.each do |p|
         begin
           port = p
-          tmp = TCPServer.new('localhost', port)
+          tmp = TCPServer.new('127.0.0.1', port)
         rescue
           port =0
         end
@@ -99,13 +100,27 @@ module Kameleon
       directory_name
     end
 
+    def proxy_is_running?()
+      begin
+        res = Net::HTTP.get_response(URI("http://127.0.0.1:#{@polipo_port}/polipo/status"))
+        if not res.body.include? "is on line"
+          Kameleon.ui.debug("The proxy is running but not responding. Server response: #{res.inspect}")
+        else
+          Kameleon.ui.debug("The proxy is responding")
+          return true
+        end
+        return false
+      rescue Exception => e
+        Kameleon.ui.debug("The proxy is not responding. Server response: #{e.message}")
+        return false
+      end
+    end
+
     def start_web_proxy_in(directory)
-      sleep 2 # this is for assuring that the cache is correctly created
-      ## setting current step dir
-      @current_step_dir = directory
       ## This function assumes that the cache directory has already been created by the engine
-      ## Stopping first the previous proxy
-      ## have to check if polipo is running
+
+      # setting current step dir
+      @current_step_dir = directory
       Kameleon.ui.debug("Starting web proxy Polipo in directory #{directory} using port: #{@polipo_port}")
       @polipo_process.stop(0) unless @polipo_process.nil?
       command = ["#{@polipo_path}/polipo", "-c", "/dev/null"]
@@ -115,7 +130,12 @@ module Kameleon
       Kameleon.ui.debug("Starting process '#{command}'")
       @polipo_process = ChildProcess.build(*command)
       @polipo_process.start
-      return true
+      timeout = 0
+      while ( not(proxy_is_running?) and timeout < 5 )
+        sleep 1
+        timeout = timeout + 1
+      end
+      return (@polipo_process.alive? and proxy_is_running?)
     end
 
 
@@ -182,7 +202,12 @@ module Kameleon
         Kameleon.ui.info("Caching recipe")
 
         File.open("#{cache_metadata_dir}/header",'w+') do |f|
-          f.puts({:recipe_path => @recipe_path.basename.to_s}.to_yaml)
+          if recipe_dir.nil?
+            recipe_path = @recipe_path.basename
+          else
+            recipe_path = @recipe_path.relative_path_from(recipe_dir)
+          end
+          f.puts({:recipe_path => recipe_path.to_s}.to_yaml)
           f.puts({:date => Time.now.to_i}.to_yaml)
         end
 
@@ -219,11 +244,12 @@ module Kameleon
     end
 
     def get_recipe()
-      cached_recipe=Dir.mktmpdir("cache")
-      execute("tar","-xf #{@cache_path} -C #{cached_recipe} ./recipe ./metadata")
+      extract_path = File.join(Kameleon.env.build_path, File.basename(@cache_path, ".*"))
+      FileUtils.mkdir_p extract_path
+      execute("tar","-xf #{@cache_path} -C #{extract_path} ./recipe ./metadata")
       Kameleon.ui.info("Getting cached recipe")
-      recipe_header = YAML::load(File.read(File.join(cached_recipe,"metadata","header")))
-      recipe_file = File.join(cached_recipe,"recipe",recipe_header[:recipe_path])
+      recipe_header = YAML::load(File.read(File.join(extract_path,"metadata","header")))
+      recipe_file = File.join(extract_path,"recipe",recipe_header[:recipe_path])
       return recipe_file
     end
 

data/lib/kameleon/recipe.rb

@@ -15,7 +15,8 @@ module Kameleon
     attr_accessor :metainfo
     attr_accessor :files
     attr_accessor :base_recipes_files
-    attr_accessor :data
+    attr_accessor :data_files
+    attr_accessor :env_files
 
     def initialize(path, kwargs = {})
       @path = Pathname.new(File.expand_path(path))
@@ -36,10 +37,11 @@ module Kameleon
       }
       @aliases = {}
       @checkpoint = nil
-      @files = []
-      Kameleon.ui.debug("Initialize new recipe (#{path})")
+      @step_files = []
+      Kameleon.ui.verbose("Initialize new recipe (#{path})")
       @base_recipes_files = [@path]
-      @data = []
+      @data_files = []
+      @env_files = []
       @steps_dirs = []
       load! :strict => false
     end
@@ -67,7 +69,7 @@ module Kameleon
 
     def load!(kwargs = {})
       # Find recipe path
-      Kameleon.ui.debug("Loading #{@path}")
+      Kameleon.ui.verbose("Loading #{@path}")
       fail RecipeError, "Could not find this following recipe : #{@path}" \
          unless File.file? @path
       yaml_recipe = YAML.load_file @path
@@ -92,6 +94,8 @@ module Kameleon
       resolved_global = @global.merge YAML.load(resolved_global)
       # Loads aliases
       load_aliases(yaml_recipe)
+      # Load env files
+      load_env_files(yaml_recipe)
       # Loads checkpoint configuration
       load_checkpoint_config(yaml_recipe)
 
@@ -134,7 +138,7 @@ module Kameleon
               end
             end
             if embedded_step
-              Kameleon.ui.debug("Loading embedded macrostep #{name}")
+              Kameleon.ui.verbose("Loading embedded macrostep #{name}")
               macrostep = load_macrostep(nil, name, args, kwargs)
               section.macrosteps.push(macrostep)
               next
@@ -144,16 +148,16 @@ module Kameleon
             dir_to_search.each do |dir|
               macrostep_path = Pathname.new(File.join(dir, name + '.yaml'))
               if File.file?(macrostep_path)
-                Kameleon.ui.debug("Loading macrostep #{macrostep_path}")
+                Kameleon.ui.verbose("Loading macrostep #{macrostep_path}")
                 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: " \
+                @step_files.push(macrostep_path)
+                Kameleon.ui.verbose("Macrostep '#{name}' found in this path: " \
                                   "#{macrostep_path}")
                 loaded = true
                 break
               else
-                Kameleon.ui.debug("Macrostep '#{name}' not found in this path: " \
+                Kameleon.ui.verbose("Macrostep '#{name}' not found in this path: " \
                               "#{macrostep_path}")
               end
             end
@@ -161,7 +165,7 @@ module Kameleon
           end
         end
       end
-      Kameleon.ui.debug("Loading recipe metadata")
+      Kameleon.ui.verbose("Loading recipe metadata")
       @metainfo = {
         "description" => Utils.extract_meta_var("description", @recipe_content)
       }
@@ -191,7 +195,7 @@ module Kameleon
         end
       end
       yaml_recipe.keys.each do |key|
-        if ["aliases", "checkpoint"].include? key
+        if ["aliases", "checkpoint", "env"].include? key
           base_yaml_recipe[key] = yaml_recipe[key]
         elsif ["export", "bootstrap", "setup"].include? key
           base_section = base_yaml_recipe.fetch(key, [])
@@ -224,13 +228,13 @@ module Kameleon
         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}")
+            Kameleon.ui.verbose("Loading aliases #{path}")
             @aliases.merge!(YAML.load_file(path))
-            @files.push(path)
+            @step_files.push(path)
             return path
           end
         end
-        fail RecipeError, "Aliases file for recipe '#{path}' does not exists"
+        fail RecipeError, "Aliases file for recipe '#{@path}' does not exists"
       end
       if yaml_recipe.keys.include? "aliases"
         aliases = yaml_recipe.fetch("aliases")
@@ -246,6 +250,34 @@ module Kameleon
       end
     end
 
+    def load_env_files(yaml_recipe)
+      def add_env_file(env_file)
+        dir_search = @steps_dirs.map do |steps_dir|
+          File.join(steps_dir, "env")
+        end.flatten
+        dir_search.each do |dir_path|
+          path = Pathname.new(File.join(dir_path, env_file))
+          if File.file?(path)
+            Kameleon.ui.verbose("Adding env file #{path}")
+            @env_files.push(path)
+            return path
+          end
+        end
+        fail RecipeError, "The env file script '#{env_file}' does not exists "\
+                          "in any of these directories: #{dir_search}"
+      end
+      if yaml_recipe.keys.include? "env"
+        env_content = yaml_recipe.fetch("env")
+        if env_content.kind_of? String
+          add_env_file(env_content)
+        elsif env_content.kind_of? Array
+          env_content.each do |env_file|
+            add_env_file(env_file)
+          end
+        end
+      end
+    end
+
     def load_checkpoint_config(yaml_recipe)
       if yaml_recipe.keys.include? "checkpoint"
         checkpoint = yaml_recipe.fetch("checkpoint")
@@ -259,14 +291,14 @@ module Kameleon
           dir_search.each do |dir_path|
             path = Pathname.new(File.join(dir_path, checkpoint))
             if File.file?(path)
-              Kameleon.ui.debug("Loading checkpoint configuration #{path}")
+              Kameleon.ui.verbose("Loading checkpoint configuration #{path}")
               @checkpoint = YAML.load_file(path)
               @checkpoint["path"] = path.to_s
-              @files.push(path)
+              @step_files.push(path)
               break
             end
           end
-          fail RecipeError, "Checkpoint configuraiton file '#{path}' " \
+          fail RecipeError, "Checkpoint configuraiton file '#{checkpoint}' " \
                             "does not exists" if @checkpoint.nil?
         end
         (@checkpoint.keys - ["path"]).each do |key|
@@ -342,7 +374,7 @@ module Kameleon
     end
 
     def find_microstep(microstep_name, loaded_microsteps)
-      Kameleon.ui.debug("Looking for microstep #{microstep_name}")
+      Kameleon.ui.verbose("Looking for microstep #{microstep_name}")
       loaded_microsteps.each do |microstep|
         if microstep_name.eql? microstep.name
           return microstep
@@ -352,18 +384,18 @@ module Kameleon
     end
 
     def resolve_data_path(partial_path, step_path)
-      Kameleon.ui.debug("Looking for data '#{partial_path}'")
+      Kameleon.ui.verbose("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
+          Kameleon.ui.verbose("Register data #{real_path}")
+          @data_files.push(real_path) unless @data_files.include? real_path
           return real_path
         end
-        Kameleon.ui.debug("#{real_path} : nonexistent")
+        Kameleon.ui.verbose("#{real_path} : nonexistent")
       end
       fail RecipeError, "Cannot found data '#{partial_path}' unsed in '#{step_path}'"
     end
@@ -591,7 +623,7 @@ module Kameleon
 
     def flatten_data
       files = []
-      @data.each do |d|
+      @data_files.each do |d|
         if d.directory?
           Find.find("#{d}") do |f|
             files.push(Pathname.new(f)) unless File.directory? f
@@ -600,7 +632,7 @@ module Kameleon
           files.push(d)
         end
       end
-      @data = files.uniq
+      @data_files = files.uniq
     end
 
 
@@ -608,11 +640,12 @@ module Kameleon
       recipe_hash = {
         "name" => @name,
         "path" => @path.to_s,
-        "files" => @files.map {|p| p.to_s },
         "base_recipes_files" => @base_recipes_files.map {|p| p.to_s },
+        "step_files" => @step_files.map {|p| p.to_s },
+        "env_files" => @env_files.map {|p| p.to_s },
+        "data_files" => @data_files.map {|p| p.to_s },
         "global" => @global,
         "aliases" => @aliases,
-        "data" => @data,
       }
       recipe_hash["checkpoint"] = @checkpoint unless @checkpoint.nil?
       recipe_hash["steps"] = to_array
@@ -632,11 +665,15 @@ module Kameleon
         prefix ; Kameleon.ui.info("#{base_recipe_file}")
       end
       Kameleon.ui.info("Steps:")
-      @files.each do |step|
+      @step_files.each do |step|
         prefix ; Kameleon.ui.info("#{step}")
       end
       Kameleon.ui.info("Data:")
-      @data.each do |d|
+      @data_files.each do |d|
+        prefix ; Kameleon.ui.info("#{d}")
+      end
+      Kameleon.ui.info("Environment scripts:")
+      @env_files.each do |d|
         prefix ; Kameleon.ui.info("#{d}")
       end
       Kameleon.ui.info("Variables:")
@@ -653,6 +690,10 @@ module Kameleon
       return array
     end
 
+    def all_files
+      return @base_recipes_files + @step_files + @data_files + @env_files
+    end
+
   end
 
   class RecipeTemplate < Recipe

data/lib/kameleon/shell.rb

@@ -12,13 +12,14 @@ module Kameleon
     attr :process
     attr :shell_cmd
 
-    def initialize(context_name, cmd, shell_workdir, local_workdir, proxy_cache)
-      @cmd = cmd.chomp
-      @context_name = context_name
-      @local_workdir = local_workdir
-      @shell_workdir = shell_workdir
-      @proxy_cache = proxy_cache
-      @bash_scripts_dir = File.join(".scripts", @context_name)
+    def initialize(context)
+      @cmd = context.cmd.chomp
+      @context_name = context.name
+      @local_workdir = context.local_workdir
+      @shell_workdir = context.workdir
+      @proxy_cache = context.proxy_cache
+      @env_files = context.env_files
+      @bash_scripts_dir = File.join("kameleon_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")
@@ -113,12 +114,12 @@ module Kameleon
       end
       # Inject sigint handler
       bashrc_content << <<-SCRIPT
-      function save_state_handler {
-        echo "Saved ENV in #{@bash_env_file} file"
-        (comm -3 <(declare | sort) <(declare -f | sort)) > #{@bash_env_file}
-      }
-      trap save_state_handler EXIT
-      SCRIPT
+function save_state_handler {
+  echo "Saved ENV in #{@bash_env_file} file"
+  (comm -3 <(declare | sort) <(declare -f | sort)) > #{@bash_env_file}
+}
+trap save_state_handler EXIT
+SCRIPT
       bashrc = Shellwords.escape(bashrc_content)
       if @shell_workdir
         unless @shell_workdir.eql? "/"
@@ -133,8 +134,21 @@ module Kameleon
       unless change_dir_cmd.nil?
         shell_cmd << "echo #{change_dir_cmd} >> #{@bashrc_file}\n"
       end
-      shell_cmd << "source #{@bashrc_file}\n"
       shell_cmd << "export KAMELEON_WORKDIR=$PWD\n"
+      @env_files.each do |env_file|
+        env_content = <<-SCRIPT
+#====================================================
+# Begin content of user script '#{env_file.basename}'
+#====================================================
+#{File.read(env_file)}
+#====================================================
+# End content of user script '#{env_file.basename}'
+#====================================================
+SCRIPT
+        env_escaped_content = Shellwords.escape(env_content)
+        shell_cmd << "echo #{env_escaped_content} >> #{@bashrc_file}\n"
+      end
+      shell_cmd << "source #{@bashrc_file}\n"
       shell_cmd << "(comm -3 <(declare | sort) <(declare -f | sort)) > #{@bash_env_file}\n"
       shell_cmd
     end

data/lib/kameleon/ui.rb

@@ -43,7 +43,7 @@ module Kameleon
     end
 
     class Shell
-      LEVELS = %w(silent error warn confirm info debug)
+      LEVELS = %w(silent error warn confirm info verbose debug)
 
       attr_accessor :shell
 
@@ -56,6 +56,10 @@ module Kameleon
         tell_me(msg, nil, newline) if level("info")
       end
 
+      def msg(msg, newline = nil)
+        tell_me(msg, :blue, newline) if level("info")
+      end
+
       def confirm(msg, newline = nil)
         tell_me(msg, :green, newline) if level("confirm")
       end
@@ -68,6 +72,10 @@ module Kameleon
         tell_me(msg, :red, newline) if level("error")
       end
 
+      def verbose(msg, newline = nil)
+        tell_me("[info] #{msg}", nil, newline) if level("verbose")
+      end
+
       def debug(msg, newline = nil)
         tell_me("[debug] #{msg}", nil, newline) if level("debug")
       end

data/lib/kameleon/utils.rb

@@ -48,7 +48,7 @@ module Kameleon
         value.gsub!(/\s*[^A-Za-z0-9\.]\s*/, '_')
         value.gsub!(/_+/, "_")
         value.gsub!(/\A[_\.]+|[_\.]+\z/, "")
-        value.chomp("_")
+        value.chomp("_").downcase
     end
 
     def self.extract_meta_var(name, content)

data/tests/recipes/test_recipe.yaml

@@ -7,6 +7,7 @@
 #===============================================================================
 ---
 # Loads some helpful aliases
+extend: ../test2/test2.yaml
 aliases: defaults.yaml
 checkpoint: test.yaml
 #== Global variables use by Kameleon engine and the steps

data/tests/test2/test2.yaml

@@ -0,0 +1,2 @@
+global:
+  toto: tata

data/version.txt

@@ -1 +1 @@
-2.4.0
+2.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -154,6 +154,7 @@ files:
 - tests/recipes/steps/export/save_appliance.yaml
 - tests/recipes/steps/setup/linux/software_install.yaml
 - tests/recipes/test_recipe.yaml
+- tests/test2/test2.yaml
 - tests/test_context.rb
 - tests/test_recipe.rb
 - tests/test_version.rb
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - polipo 1.0.3, or greater
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Kameleon is a tool to build virtual machines from scratch
@@ -192,6 +193,7 @@ test_files:
 - tests/recipes/steps/export/save_appliance.yaml
 - tests/recipes/steps/setup/linux/software_install.yaml
 - tests/recipes/test_recipe.yaml
+- tests/test2/test2.yaml
 - tests/test_context.rb
 - tests/test_recipe.rb
 - tests/test_version.rb