kameleon-builder 2.1.1 → 2.1.3

data/lib/kameleon/recipe.rb

@@ -14,9 +14,9 @@ module Kameleon
     attr_accessor :checkpoint_path
     attr_accessor :metainfo
 
-    def initialize(path)
+    def initialize(path, kwargs = {})
       @logger = Log4r::Logger.new("kameleon::[kameleon]")
-      @path = Pathname.new(path)
+      @path = Pathname.new(File.expand_path(path))
       @name = (@path.basename ".yaml").to_s
       @recipe_content = File.open(@path, 'r') { |f| f.read }
       @sections = {
@@ -39,10 +39,10 @@ module Kameleon
       @files = []
       @logger.debug("Initialize new recipe (#{path})")
       @base_recipes_files = [@path]
-      load!
+      load! kwargs
     end
 
-    def load!
+    def load!(kwargs = {})
       # Find recipe path
       @logger.debug("Loading #{@path}")
       fail RecipeError, "Could not find this following recipe : #{@path}" \
@@ -58,9 +58,8 @@ module Kameleon
       # Load Global variables
       @global.merge!(yaml_recipe.fetch("global", {}))
       # Resolve dynamically-defined variables !!
-      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, :strict => false)
+      resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, kwargs)
       @global.merge! YAML.load(resolved_global)
-
       # Loads aliases
       load_aliases(yaml_recipe)
       # Loads checkpoint configuration

data/lib/kameleon/utils.rb

@@ -2,7 +2,6 @@ module Kameleon
   module Utils
 
     def self.resolve_vars(raw, yaml_path, initial_variables, kwargs = {})
-      strict = kwargs.fetch('strict', true)
       raw.to_s.gsub(/\$\$\{[a-zA-Z0-9\-_]+\}|\$\$[a-zA-Z0-9\-_]+/) do |var|
         # remove the dollars
         if var.include? "{"
@@ -14,11 +13,11 @@ module Kameleon
         if initial_variables.has_key? strip_var
           value = initial_variables[strip_var]
         else
-          if strict
-            fail RecipeError, "#{yaml_path}: variable #{var} not found in local or global" \
+          if kwargs.fetch(:strict, true)
+            fail RecipeError, "#{yaml_path}: variable #{var} not found in local or global"
           end
         end
-        return $` + resolve_vars(value.to_s + $', yaml_path, initial_variables)
+        return $` + resolve_vars(value.to_s + $', yaml_path, initial_variables, kwargs)
       end
     end
 

data/templates/{old-debian7.yaml → debian7-chroot.yaml}

@@ -2,7 +2,7 @@
 # vim: softtabstop=2 shiftwidth=2 expandtab fenc=utf-8 cc=81 tw=80
 #==============================================================================
 #
-# DESCRIPTION: [deprecated] Build a debian wheezy appliance using chroot and qemu-nbd.
+# DESCRIPTION: Build a debian wheezy appliance using chroot and qemu-nbd.
 #
 #==============================================================================
 

data/version.txt

@@ -1 +1 @@
-2.1.1
+2.1.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -227,10 +227,31 @@ files:
 - docs/README.md
 - docs/make.bat
 - docs/source/_static/.gitignore
+- docs/source/_static/centos.png
+- docs/source/_static/debian.png
 - docs/source/_static/kameleon-logo.png
 - docs/source/_static/kameleon-logo.xcf
 - docs/source/_static/kameleon-long.png
+- docs/source/_static/ubuntu.png
+- docs/source/_themes/sphinx_rtd_theme/__init__.py
+- docs/source/_themes/sphinx_rtd_theme/breadcrumbs.html
+- docs/source/_themes/sphinx_rtd_theme/footer.html
+- docs/source/_themes/sphinx_rtd_theme/layout.html
+- docs/source/_themes/sphinx_rtd_theme/layout_old.html
+- docs/source/_themes/sphinx_rtd_theme/search.html
+- docs/source/_themes/sphinx_rtd_theme/searchbox.html
+- docs/source/_themes/sphinx_rtd_theme/static/css/badge_only.css
+- docs/source/_themes/sphinx_rtd_theme/static/css/theme.css
+- docs/source/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
+- docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
+- docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
+- docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
+- docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
+- docs/source/_themes/sphinx_rtd_theme/static/js/theme.js
+- docs/source/_themes/sphinx_rtd_theme/theme.conf
+- docs/source/_themes/sphinx_rtd_theme/versions.html
 - docs/source/aliases.rst
+- docs/source/atlas_debian_g5k.yaml
 - docs/source/checkpoint.rst
 - docs/source/commands.rst
 - docs/source/conf.py
@@ -242,9 +263,12 @@ files:
 - docs/source/getting_started.rst
 - docs/source/grid5000_tutorial.rst
 - docs/source/index.rst
+- docs/source/install_atlas.yaml
+- docs/source/install_hpl.yaml
 - docs/source/installation.rst
 - docs/source/persistent_cache.rst
 - docs/source/recipe.rst
+- docs/source/tau_install.yaml
 - docs/source/tau_install_g5k.yaml
 - docs/source/use_cases.rst
 - docs/source/workspace.rst
@@ -286,6 +310,7 @@ files:
 - templates/archlinux-desktop.yaml
 - templates/archlinux.yaml
 - templates/debian-testing.yaml
+- templates/debian7-chroot.yaml
 - templates/debian7-desktop.yaml
 - templates/debian7-g5k.yaml
 - templates/debian7-kameleon.yaml
@@ -296,7 +321,6 @@ files:
 - templates/fedora-rawhide.yaml
 - templates/fedora20-desktop.yaml
 - templates/fedora20.yaml
-- templates/old-debian7.yaml
 - templates/steps/aliases/defaults.yaml
 - templates/steps/bootstrap/archlinux/arch_bootstrap.yaml
 - templates/steps/bootstrap/archlinux/install_bootloader.yaml