kameleon-builder 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1cedb45115be7f297f4fa1ce91317044f471e0
-  data.tar.gz: bff616a9050536f66d9fbd8da0a4878e32906b04
+  metadata.gz: def867b869a1c6ed76375aebff04d4853b6c2f82
+  data.tar.gz: 3ee480f10fb325ed7a38ba4435276b63c5bba5d1
 SHA512:
-  metadata.gz: 52bcf2e7b9a5db08402d5d33d89f866f47511b459629f77afe3650aa6235b6989cc434cf5425a8f8af3a9d98f8b78f8455c04d9f470b7b8be9d285a4cd3d2e61
-  data.tar.gz: 1cacc98e8c4cd83c01574578e168add311746008a883ec2cd383fdf26f58944cb8247487684cd27d23159a20939e8e0ecbc4480a328b8f739162dba5a774bd06
+  metadata.gz: 259d3652480915e9bf0de35d7ee7f64f98a398076656e349a16a83474d11b89d1e484fafd73be2cebc73ceedba92362567f5ed301c1c2f11c2df7c35fab9046e
+  data.tar.gz: 92a70030504ab7e5156d40058c39b3c9cbed9e86b6a849aeeba077d0e73e4e4decf5808568ce0b204488de1cf9a1f14da5c67971c849774f80d82e567698c593

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.8.1
+current_version = 2.8.2
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}

data/CHANGES

@@ -1,6 +1,13 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.8.2
+-------------
+
+Released on September 06th 2016
+
+- Make kameleon new and template import works
+
 Version 2.8.1
 -------------
 

data/erb/extend.erb

@@ -5,13 +5,21 @@
 # DESCRIPTION: <MY RECIPE DESCRIPTION>
 #
 #==============================================================================
-
 ---
 extend: <%= tpl.relative_path_from_recipe(recipe_path) %>
 
 global:
-    # You can see the base template `<%= tpl.relative_path_from_recipe(recipe_path) %>` to know the
-    # variables that you can override
+<% if Kameleon.env.global["backend"] %>
+  # This is the backend you have imported to switch to an other backend BCKD do:
+  #
+  #   kameleon template import <%= tpl.relative_path_from_recipe(recipe_path) %> --global backend:BCKB
+  #
+  # and update the following variable.
+  backend: <%= Kameleon.env.global["backend"] %>
+<% end %>
+  # To see the variables that you can override, use the following command:
+  #
+  #   kameleon info <%= recipe_name %>
 
 bootstrap:
   - "@base"

data/lib/kameleon/cli.rb

@@ -33,6 +33,7 @@ module Kameleon
       map %w(ls) => :list
     end
 
+
     class Template < Thor
       include Thor::Actions
 
@@ -50,12 +51,19 @@ module Kameleon
       end
 
       desc "import [TEMPLATE_NAME]", "Imports the given template"
+      method_option :global, :type => :hash ,
+                    :default => {},  :aliases => "-g",
+                    :desc => "Set custom global variables."
       def import(template_name)
         Kameleon.env.root_dir = Kameleon.env.repositories_path
         template_path = File.join(Kameleon.env.repositories_path, template_name)
         unless template_name.end_with? '.yaml'
           template_path = template_path + '.yaml'
         end
+        # Manage global as it is not passed to env by default
+        if options[:global]
+           Kameleon.env.global.merge!(options[:global])
+        end
         begin
           tpl = RecipeTemplate.new(template_path)
           tpl.resolve! :strict => false
@@ -83,6 +91,10 @@ module Kameleon
         unless template_name.end_with? '.yaml'
           template_path = template_path + '.yaml'
         end
+        # Manage global as it is not passed to env by default
+        if options[:global]
+           Kameleon.env.global.merge!(options[:global])
+        end
         tpl = RecipeTemplate.new(template_path)
         tpl.resolve! :strict => false
         tpl.display_info(false)
@@ -128,31 +140,36 @@ module Kameleon
     map %w(ls) => :list
 
     desc "new [RECIPE_PATH] [TEMPLATE_NAME]", "Creates a new recipe"
-    def new(recipe_path, template_name)
+    method_option :global, :type => :hash ,
+                  :default => {},  :aliases => "-g",
+                  :desc => "Set custom global variables."
+    def new(recipe_name, template_name)
       Kameleon.env.root_dir = Kameleon.env.repositories_path
       unless template_name.end_with? '.yaml'
         template_name = template_name + '.yaml'
       end
 
-      unless recipe_path.end_with? '.yaml'
-        recipe_path = recipe_path + '.yaml'
+      unless recipe_name.end_with? '.yaml'
+        recipe_name = recipe_name + '.yaml'
       end
 
-      if recipe_path == template_name
+      if recipe_name == template_name
         fail RecipeError, "Recipe path should be different from template name"
       end
 
       template_path = File.join(Kameleon.env.repositories_path, template_name)
 
-      recipe_path = Pathname.new(Kameleon.env.workspace).join(recipe_path).to_s
+      recipe_path = Pathname.new(Kameleon.env.workspace).join(recipe_name).to_s
 
       begin
         tpl = Kameleon::RecipeTemplate.new(template_path)
         tpl.resolve! :strict => false
       rescue
-        raise TemplateNotFound, "Template '#{template_name}' not found. " \
-                                "To see all templates, run the command "\
-                                "`kameleon template list`"
+          raise if Kameleon.ui.level("verbose")
+          raise TemplateNotFound, "Template '#{template_name}' invalid (try" \
+              " --verbose) or not found. To see all templates, run the command "\
+              "`kameleon template list`"
+
       else
         tpl.all_files.each do |path|
           relative_path = path.relative_path_from(Kameleon.env.repositories_path)

data/version.txt

@@ -1 +1 @@
-2.8.1
+2.8.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Salem Harrache