kameleon-builder 2.2.5 → 2.3.0

data/lib/kameleon/engine.rb

@@ -13,9 +13,9 @@ module Kameleon
       @recipe = recipe
       @cleaned_sections = []
       @cwd = @recipe.global["kameleon_cwd"]
-      @build_recipe_path = File.join(@cwd, "kameleon_build_recipe.yaml")
+      @build_recipe_path = File.join(@cwd, ".build_recipe")
 
-      @recipe.global["persistent_cache"] = @options[:cache] ? "true" : "false"
+      @recipe.global["persistent_cache"] = @options[:enable_cache] ? "true" : "false"
 
       build_recipe = load_build_recipe
       # restore previous build uuid
@@ -24,7 +24,7 @@ module Kameleon
           @recipe.global[key] = build_recipe["global"][key]
         end
       end
-      @enable_checkpoint = @options[:checkpoint]
+      @enable_checkpoint = @options[:enable_checkpoint]
       # Check if the recipe have checkpoint entry
       if @enable_checkpoint && @recipe.checkpoint.nil?
         fail BuildError, "Checkpoint is unavailable for this recipe"
@@ -32,12 +32,12 @@ module Kameleon
 
       @recipe.resolve!
 
-      if @options[:cache] || @options[:from_cache] then
+      if @options[:enable_cache] || @options[:from_cache] then
         @cache = Kameleon::Persistent_cache.instance
         @cache.cwd = @cwd
         @cache.polipo_path = @options[:proxy_path]
         @cache.name = @recipe.name
-        @cache.mode = @options[:cache] ? :build : :from
+        @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
         @cache.recipe_path = @recipe.path
@@ -93,6 +93,12 @@ module Kameleon
                                 :fail_silently => fail_silently)
     end
 
+    def reload_contexts
+      [@local_context, @out_context, @in_context].each do |ctx|
+        ctx.reload if ctx.shell.started?
+      end
+    end
+
     def saving_steps_files
       @recipe.files.each do |file|
         Kameleon.ui.info("File #{file} loaded from the recipe")
@@ -182,13 +188,18 @@ module Kameleon
               end
             end
           else
+            begin
             Kameleon.ui.info("--> Running the step...")
             microstep.commands.each do |cmd|
               safe_exec_cmd(cmd)
             end
+            rescue SystemExit, Interrupt
+              reload_contexts
+              breakpoint(nil)
+            end
           end
-        end
         Kameleon.ui.info("Step #{macrostep.name} took: #{Time.now.to_i-macrostep_time} secs")
+        end
       end
       @cleaned_sections.push(section.name)
     end
@@ -198,7 +209,8 @@ module Kameleon
       begin
         exec_cmd(cmd, kwargs)
         finished = true
-      rescue ExecError
+      rescue SystemExit, Interrupt, ExecError
+        reload_contexts
         finished = rescue_exec_error(cmd)
       end until finished
     end
@@ -350,7 +362,7 @@ module Kameleon
           end
         end
       end
-      @cache.stop_web_proxy if @options[:cache] ## stopping polipo
+      @cache.stop_web_proxy if @options[:enable_cache] ## stopping polipo
     end
 
     def build

data/lib/kameleon/environment.rb

@@ -4,36 +4,37 @@ module Kameleon
   # this environment
   class Environment
 
-    attr_accessor :workspace
-    attr_accessor :templates_path
-    attr_accessor :build_path
-    attr_accessor :cache_path
-    attr_accessor :debug
-
     def script?
       @script
     end
 
     def initialize(options = {})
       # symbolify commandline options
-      options = options.inject({}) {|result,(key,value)| result.update({key.to_sym => value})}
+      options = options.inject({}) {|result,(key, value)| result.update({key.to_sym => value})}
       workspace = File.expand_path(Dir.pwd)
-      templates_path = File.expand_path(options[:templates_path] || Kameleon.default_templates_path)
+      # templates_path = File.expand_path(options[:templates_path] || Kameleon.default_templates_path)
       build_path = File.expand_path(options[:build_path] || File.join(workspace, "build"))
       cache_path = File.expand_path(options[:cache_path] || File.join(build_path, "cache"))
-      options = {
+      repositories_path = File.expand_path(Kameleon.default_values[:repositories_path])
+      env_options = {
         :workspace => Pathname.new(workspace),
-        :templates_path => Pathname.new(templates_path),
+        # :templates_path => Pathname.new(templates_path),
         :build_path => Pathname.new(build_path),
         :cache_path => Pathname.new(cache_path),
+        :repositories_path => Pathname.new(repositories_path),
       }
+      options = Kameleon.default_values.merge(options).merge(env_options)
       Kameleon.ui.debug("Environment initialized (#{self})")
       # Injecting all variables of the options and assign the variables
       options.each do |key, value|
+        self.class.__send__(:attr_accessor, "#{key}")
         instance_variable_set("@#{key}".to_sym, options[key])
         Kameleon.ui.debug("  @#{key} : #{options[key]}")
       end
       @debug = true if ENV['KAMELEON_DEBUG']
+
+      Dir.mkdir(@repositories_path.to_path) unless File.exists?(@repositories_path.to_path)
+
     end
   end
 end

data/lib/kameleon/persistent_cache.rb

@@ -75,7 +75,7 @@ module Kameleon
 
     def check_polipo_binary
 
-      @polipo_path ||= which("polipo")
+      @polipo_path ||= Utils.which("polipo")
 
       if @polipo_path.nil? then
         Kameleon.ui.error("Polipo binary not found, make sure it is in your current PATH")
@@ -236,14 +236,6 @@ module Kameleon
       process.wait
     end
 
-    def which(cmd)
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exe = File.join(path, "#{cmd}")
-        return path if File.executable? exe
-      end
-      return nil
-    end
-
     def common_prefix(paths)
       return '' if paths.empty?
       return paths.first.split('/').slice(0...-1).join('/') if paths.length <= 1

data/lib/kameleon/recipe.rb

@@ -38,6 +38,7 @@ module Kameleon
       @files = []
       Kameleon.ui.debug("Initialize new recipe (#{path})")
       @base_recipes_files = [@path]
+      @steps_dirs = []
       load! :strict => false
     end
 
@@ -48,12 +49,22 @@ module Kameleon
          unless File.file? @path
       yaml_recipe = YAML.load_file @path
       unless yaml_recipe.kind_of? Hash
-        fail RecipeError, "Invalid yaml error"
+        fail RecipeError, "Invalid yaml error : #{@path}"
       end
       # Load entended recipe variables
       yaml_recipe = load_base_recipe(yaml_recipe, @path)
       yaml_recipe.delete("extend")
 
+      # Where we can find steps
+      @steps_dirs = @base_recipes_files.map do |recipe_path|
+        dirname = File.dirname(recipe_path)
+        [ File.expand_path(File.join(dirname, 'steps')),
+          File.expand_path(File.join(dirname, '.steps')),
+          File.expand_path(File.join(dirname, '..', 'steps')),
+          File.expand_path(File.join(dirname, '..', '.steps')),
+        ]
+      end.flatten(1)
+
       # Load Global variables
       @global.merge!(yaml_recipe.fetch("global", {}))
       # Resolve dynamically-defined variables !!
@@ -64,23 +75,17 @@ module Kameleon
       # Loads checkpoint configuration
       load_checkpoint_config(yaml_recipe)
 
-      #Find and load steps
-      steps_dirs = [
-        File.join(File.dirname(@path), 'steps'),
-        File.expand_path(File.join(File.dirname(@path), '..', 'steps')),
-      ]
       resolved_global['include_steps'] ||= []
       resolved_global['include_steps'].push ''
       resolved_global['include_steps'].flatten!
       resolved_global['include_steps'].compact!
       @sections.values.each do |section|
         dir_to_search = resolved_global['include_steps'].map do |path|
-          steps_dirs.map do |steps_dir|
+          @steps_dirs.map do |steps_dir|
             [File.join(steps_dir, section.name, path),
               File.join(steps_dir, path)]
           end
-        end
-        dir_to_search.flatten!
+        end.flatten
         if yaml_recipe.key? section.name
           yaml_section = yaml_recipe.fetch(section.name)
           next unless yaml_section.kind_of? Array
@@ -157,7 +162,7 @@ module Kameleon
          unless File.file? path
       base_yaml_recipe = YAML.load_file base_recipe_path
       unless yaml_recipe.kind_of? Hash
-        fail RecipeError, "Invalid yaml error"
+        fail RecipeError, "Invalid yaml error : #{base_yaml_recipe}"
       end
       base_yaml_recipe.keys.each do |key|
         if ["export", "bootstrap", "setup"].include? key
@@ -186,7 +191,7 @@ module Kameleon
           base_yaml_recipe[key] = base_section.merge(recipe_section)
         end
       end
-      @base_recipes_files.push(Pathname.new(base_recipe_path))
+      @base_recipes_files.push(Pathname.new(File.expand_path(base_recipe_path)))
       return load_base_recipe(base_yaml_recipe, base_recipe_path)
     end
 
@@ -196,11 +201,9 @@ module Kameleon
         if aliases.kind_of? Hash
           @aliases = aliases
         elsif aliases.kind_of? String
-          dir_search = [
-            File.join(File.dirname(@path), "steps", "aliases"),
-            File.join(File.dirname(@path), "..", "steps", "aliases"),
-            File.join(File.dirname(@path), "aliases")
-          ]
+          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)
@@ -210,7 +213,7 @@ module Kameleon
               return path
             end
           end
-          fail RecipeError, "Aliases file '#{path}' does not exists"
+          fail RecipeError, "Aliases file for recipe '#{path}' does not exists"
         end
       end
     end
@@ -222,11 +225,9 @@ module Kameleon
           @checkpoint = checkpoint
           @checkpoint["path"] = @path
         elsif checkpoint.kind_of? String
-          dir_search = [
-            File.join(File.dirname(@path), "steps", "checkpoints"),
-            File.join(File.dirname(@path), "..", "steps", "checkpoints"),
-            File.join(File.dirname(@path), "checkpoints")
-          ]
+          dir_search = @steps_dirs.map do |steps_dir|
+              File.join(steps_dir, "checkpoints")
+          end.flatten
           dir_search.each do |dir_path|
             path = Pathname.new(File.join(dir_path, checkpoint))
             if File.file?(path)
@@ -234,6 +235,7 @@ module Kameleon
               @checkpoint = YAML.load_file(path)
               @checkpoint["path"] = path.to_s
               @files.push(path)
+              break
             end
           end
           fail RecipeError, "Checkpoint configuraiton file '#{path}' " \
@@ -250,6 +252,7 @@ module Kameleon
     def load_macrostep(step_path, name, args)
       if step_path.nil?
         macrostep_yaml = args
+        step_path = @path
       else
         macrostep_yaml = YAML.load_file(step_path)
         # Basic macrostep syntax check
@@ -547,6 +550,28 @@ module Kameleon
       return recipe_hash
     end
 
+    def display_info
+      def prefix
+        Kameleon.ui.shell.say " -> ", :blue
+      end
+      Kameleon.ui.info("Description:")
+      prefix ; Kameleon.ui.info("#{@metainfo['description']}")
+      Kameleon.ui.info("Path:")
+      prefix ; Kameleon.ui.info("#{@path}")
+      Kameleon.ui.info("Parent recipes:")
+      (@base_recipes_files - [@path]).each do |base_recipe_file|
+        prefix ; Kameleon.ui.info("#{base_recipe_file}")
+      end
+      Kameleon.ui.info("Steps:")
+      @files.each do |step|
+        prefix ; Kameleon.ui.info("#{step}")
+      end
+      Kameleon.ui.info("Variables:")
+      @global.each do |key, value|
+        prefix ; Kameleon.ui.info("#{key}: #{value}")
+      end
+    end
+
     def to_array
       array = []
       @sections.values.each do |section|
@@ -558,8 +583,11 @@ module Kameleon
   end
 
   class RecipeTemplate < Recipe
-    def relative_path()
-      @path.relative_path_from(Kameleon.env.templates_path)
+    def relative_path_from_recipe(recipe_path)
+      recipe_path = Pathname.new(recipe_path)
+      relative_path_tpl_repo = @path.relative_path_from(Kameleon.env.repositories_path)
+      absolute_path = Pathname.new(Kameleon.env.workspace).join(relative_path_tpl_repo)
+      return absolute_path.relative_path_from(recipe_path.dirname)
     end
   end
 end

data/lib/kameleon/repository.rb

@@ -0,0 +1,46 @@
+require 'kameleon/utils'
+require 'kameleon/step'
+
+module Kameleon
+
+  class Repository
+    def self.check_git_binary
+      git_path ||= Utils.which("git")
+      if git_path.nil? then
+        raise KameleonError, "git binary not found, make sure it is in your current PATH"
+      end
+    end
+
+    def self.add(name, url, kwargs = {})
+      check_git_binary
+      cmd = ["git", "clone"]
+      if kwargs[:branch]
+        cmd.push("-b", kwargs[:branch])
+      end
+      cmd.push("--", url, File.join(Kameleon.env.repositories_path, name))
+      process = ChildProcess.build(*cmd)
+      process.io.inherit!
+      process.start
+      process.wait
+      process.stop
+    end
+
+    def self.update(name)
+      check_git_binary
+      git_repo = File.join(Kameleon.env.repositories_path, name)
+      cmd = ["git", "--git-dir", File.join(git_repo, ".git"), "--work-tree",
+             git_repo, "pull", "--verbose"]
+      process = ChildProcess.build(*cmd)
+      process.io.inherit!
+      process.start
+      process.wait
+      process.stop
+    end
+
+    def self.list
+      Dir["#{Kameleon.env.repositories_path}/*"].each do |repo_path|
+        Kameleon.ui.info File.basename("#{repo_path}")
+      end
+    end
+  end
+end

data/lib/kameleon/utils.rb

@@ -52,5 +52,54 @@ module Kameleon
       end
     end
 
+    def self.list_recipes(repository_path, kwargs = {})
+      catch_exception = kwargs.fetch(:catch_exception, true)
+      recipes_hash = []
+      recipes_files = get_recipes(repository_path)
+      recipes_files.each do |f|
+        path = f.to_path
+        begin
+        recipe = RecipeTemplate.new(path)
+        name = path.gsub(repository_path.to_path + '/', '').chomp('.yaml')
+        recipes_hash.push({
+          "name" => name,
+          "description" => recipe.metainfo['description'],
+        })
+        rescue => e
+          raise e if Kameleon.env.debug or not catch_exception
+        end
+      end
+      unless recipes_hash.empty?
+        recipes_hash = recipes_hash.sort_by{ |k| k["name"] }
+        name_width = recipes_hash.map { |k| k['name'].size }.max
+        desc_width = Kameleon.ui.shell.terminal_width - name_width - 3
+        desc_width = (80 - name_width - 3) if desc_width < 0
+      end
+      tp(recipes_hash,
+        {"name" => {:width => name_width}},
+        { "description" => {:width => desc_width}})
+    end
+
+    def self.get_recipes(path)
+      path.children.collect do |child|
+        if child.file?
+          if child.extname == ".yaml"
+            unless child.to_path.include? "/steps/" or child.to_path.include? "/.steps/"
+              child
+            end
+          end
+        elsif child.directory?
+          get_recipes(child)
+        end
+      end.select { |x| x }.flatten(1)
+    end
+
+    def self.which(cmd)
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exe = File.join(path, "#{cmd}")
+        return path if File.executable? exe
+      end
+      return nil
+    end
   end
 end

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

@@ -0,0 +1,2 @@
+- bootstrap:
+  - exec_out: echo $include_pkg

data/tests/recipes/steps/checkpoints/test.yaml

@@ -0,0 +1,14 @@
+enabled?:
+  - exec_local: touch $KAMELEON_WORKDIR/list_checkpoint.txt
+
+create:
+  - exec_local: echo @microstep_id | tee -a $KAMELEON_WORKDIR/list_checkpoint.txt
+
+apply:
+  - exec_local: echo @microstep_id
+
+list:
+  - exec_local: cat $KAMELEON_WORKDIR/list_checkpoint.txt
+
+clear:
+  - exec_local: rm -f $KAMELEON_WORKDIR/list_checkpoint.txt