kameleon-builder 2.2.1 → 2.2.2

data/CHANGELOG.rst

@@ -1,13 +1,22 @@
 Kameleon CHANGELOG
 ==================
 
+version 2.2.2
+-------------
+
+Released on July 23rd 2014
+
+- [core] Added ``-h`` CLI option to print help
+- [core] Added ``--templates-path`` CLI option to set different templates directory
+- [core] Fixed regression about recipe ancestors loading
+
 version 2.2.1
 -------------
 
-Released on July 21st 2014
+Released on July 22nd 2014
 
 - [core] Switch to default yaml parser (psych) and removed syck from dependencies
-
+- [core] Loaded a recipe with all ancestors
 
 version 2.2.0
 -------------

data/lib/kameleon.rb

@@ -15,9 +15,6 @@ module Kameleon
     attr_writer :env
     attr_writer :ui
     attr_writer :source_root
-    attr_writer :templates_path
-    attr_writer :templates_names
-    attr_writer :templates_files
     attr_writer :log_on_progress
 
     # The source root is the path to the root directory of the kameleon gem.
@@ -25,28 +22,8 @@ module Kameleon
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
 
-    def templates_path
-      @templates_path ||= Pathname.new(File.join(source_root, 'templates'))
-    end
-
-    def templates_files
-      if @templates.nil?
-        files = Dir.foreach(templates_path).map do |f|
-          Pathname.new(File.join(templates_path, f)) if f.include?(".yaml")
-        end
-        @templates = files.compact
-      end
-      @templates
-    end
-
-    def templates_names
-      if @templates_names.nil?
-        names = templates_files.map do |f|
-          f.basename(f.extname).to_s
-        end
-        @templates_names = names
-      end
-      @templates_names
+    def default_templates_path
+      File.join(Kameleon.source_root, 'templates')
     end
 
     def env

data/lib/kameleon/cli.rb

@@ -16,6 +16,9 @@ module Kameleon
     map %w(-h --help) => :help
 
     desc "import [TEMPLATE_NAME]", "Imports the given template"
+    method_option :templates_path, :type => :string ,
+                  :default => Kameleon.default_templates_path, :aliases => "-t",
+                  :desc => "Using another templates directory"
     def import(template_name)
       templates_path = Kameleon.env.templates_path
       template_path = File.join(templates_path, template_name) + '.yaml'
@@ -36,6 +39,9 @@ module Kameleon
     end
 
     desc "new [RECIPE_NAME] [TEMPLATE_NAME]", "Creates a new recipe"
+    method_option :templates_path, :type => :string ,
+                  :default => Kameleon.default_templates_path, :aliases => "-t",
+                  :desc => "Using another templates directory"
     def new(recipe_name, template_name)
       if recipe_name == template_name
         fail RecipeError, "Recipe name should be different from template name"
@@ -59,7 +65,7 @@ module Kameleon
           recipe_path = File.join(tmp_dir, recipe_name + '.yaml')
           ## copying recipe
           File.open(recipe_path, 'w+') do |file|
-            extend_erb_tpl = File.join(Kameleon.env.templates_path, "extend.erb")
+            extend_erb_tpl = File.join(Kameleon.default_templates_path, "extend.erb")
             erb = ERB.new(File.open(extend_erb_tpl, 'rb') { |f| f.read })
             result = erb.result(binding)
             file.write(result)
@@ -71,9 +77,12 @@ module Kameleon
     end
 
     desc "templates", "Lists all defined templates"
+    method_option :templates_path, :type => :string ,
+                  :default => Kameleon.default_templates_path, :aliases => "-t",
+                  :desc => "Using another templates directory"
     def templates
       puts "The following templates are available in " \
-                 "#{ Kameleon.templates_path }:"
+                 "#{ Kameleon.env.templates_path }:"
       templates_hash = []
       templates_path = File.join(Kameleon.env.templates_path, "/")
       all_yaml_files = Dir["#{templates_path}**/*.yaml"]
@@ -90,9 +99,11 @@ module Kameleon
           raise e if Kameleon.env.debug
         end
       end
+      unless templates_hash.empty?
       templates_hash = templates_hash.sort_by{ |k| k["name"] }
       name_width = templates_hash.map { |k| k['name'].size }.max
       desc_width = Kameleon.ui.shell.terminal_width - name_width - 3
+      end
       tp(templates_hash,
         {"name" => {:width => name_width}},
         { "description" => {:width => desc_width}})
@@ -195,7 +206,7 @@ module Kameleon
       Kameleon.ui.level = "debug" if self.options["debug"]
       opts = args[1]
       cmd_name = args[2][:current_command].name
-      if opts.include? "--help"
+      if opts.include? "--help" or opts.include? "-h"
         CLI.command_help(Kameleon.ui.shell, cmd_name)
         raise Kameleon::Exit
       end

data/lib/kameleon/environment.rb

@@ -18,17 +18,15 @@ module Kameleon
       # symbolify commandline options
       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)
       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"))
-      defaults = {
+      options = {
         :workspace => Pathname.new(workspace),
-        :templates_path => Kameleon.templates_path,
-        :templates_names => Kameleon.templates_names,
+        :templates_path => Pathname.new(templates_path),
         :build_path => Pathname.new(build_path),
         :cache_path => Pathname.new(cache_path),
-        :script => options[:script],
       }
-      options = defaults.merge(options)
       Kameleon.ui.debug("Environment initialized (#{self})")
       # Injecting all variables of the options and assign the variables
       options.each do |key, value|

data/lib/kameleon/recipe.rb

@@ -46,8 +46,12 @@ module Kameleon
       Kameleon.ui.debug("Loading #{@path}")
       fail RecipeError, "Could not find this following recipe : #{@path}" \
          unless File.file? @path
+      yaml_recipe = YAML.load_file @path
+      unless yaml_recipe.kind_of? Hash
+        fail RecipeError, "Invalid yaml error"
+      end
       # Load entended recipe variables
-      yaml_recipe = load_base_recipe(@path)
+      yaml_recipe = load_base_recipe(yaml_recipe, @path)
       yaml_recipe.delete("extend")
 
       # Load Global variables
@@ -137,12 +141,7 @@ module Kameleon
       }
     end
 
-    def load_base_recipe(path)
-      yaml_recipe = YAML.load_file path
-
-      unless yaml_recipe.kind_of? Hash
-        fail RecipeError, "Invalid yaml error, #{path}"
-      end
+    def load_base_recipe(yaml_recipe, path)
       base_recipe_name = yaml_recipe.fetch("extend", "")
       return yaml_recipe if base_recipe_name.empty?
 
@@ -188,7 +187,7 @@ module Kameleon
         end
       end
       @base_recipes_files.push(Pathname.new(base_recipe_path))
-      return load_base_recipe(base_recipe_path)
+      return load_base_recipe(base_yaml_recipe, base_recipe_path)
     end
 
     def load_aliases(yaml_recipe)

data/version.txt

@@ -1 +1 @@
-2.2.1
+2.2.2

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
+  prerelease: 
 platform: ruby
 authors:
 - Salem Harrache
@@ -11,51 +12,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +69,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -261,26 +268,27 @@ files:
 homepage: http://kameleon.readthedocs.org/
 licenses:
 - GPL-2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Kameleon is a tool to build virtual machines from scratch
 test_files:
 - tests/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1eeb84f0518b9bf6cd2f84f448e0abf99b3384e6
-  data.tar.gz: 1cae83863b12c6fb9ffab9f435c6d8bce27c456a
-SHA512:
-  metadata.gz: 318367937e2f8525195ec158b0217c901ffa95b4c87e5711867e40aad830cec076be5380d94167c2f59a692e3efd355e4f635c328ec1283fa2ed8df22be78c92
-  data.tar.gz: 81e853c7b87824f8d8bccfe5f7bd1ec0e8783e13a4a8a493f2f8ebfb3cdf836b2f26a72651e911705dbbebba8c9212e708aae32c73df9b9ae5927afd7a6f3110