kameleon-builder 2.10.3 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3e726c2e8f9ca4aa09d3e5c6ef46ddc96f76f815ed8d740c431deb7e46f9433
-  data.tar.gz: 2fc324e1b1f507886d628ff27c6daa94ec50ef7e04f57f30af6614f8db7d3f1d
+  metadata.gz: 6efa8300acf90e4c5889f75b3682ff4e2d7e27cedfd1bb4d1856aa45b4c474d4
+  data.tar.gz: 9307cd1aecbd38b8e81b20ef4b6234c246e1eefb0960d316989c56959576fbef
 SHA512:
-  metadata.gz: 83abce13fbf9368ed09392794a572065fc6959ff3071a61d2a4f1231288f2d4ad176d1003d57027320728042de7b8c5a5abf0e068c52c7b203faaae4d29faff7
-  data.tar.gz: c6f6f3bb93d99b960fd1650fb1247d21a5e306c5f334e19bc969a6d2195d3c93fe931de68640c84d87f2e6afc75c36b938c3b490a0aef482e5d66af31ce8cb0e
+  metadata.gz: e9e8fe682ad005bcf49d8845658251b53b626da2759822ee59162372db962fc79e574685e615330dc6d437864477379984a1821953d57cdae9958553b1c2dfd0
+  data.tar.gz: 376ff16804dd6a321401463f37612140d9b9b493e143db623586cb15830817d92095c8809b6c140f47095bab18401cc2e1fa5e50323a6392e61feeb8b83f4e65

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,16 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.10.4
+--------------
+
+Released on May 11th 2020
+
+- Fix support for extend ERB
+- Add the `kameleon template erb` command
+- Fix bash completion
+- Cosmetic code fixes
+
 Version 2.10.3
 --------------
 
@@ -15,6 +25,7 @@ Version 2.10.2
 --------------
 
 Released on April 09th 2020
+
 - Fix cli help for the repository and template sub-commands
 - Add the git remote url and branch to kameleon repo list
 - Add the 'kameleon repository remove' command

data/completion/kameleon.bash

@@ -14,8 +14,8 @@ _kameleon() {
         ((i++))
     done
     if [ "$COMP_CWORD" -eq $((i+1)) ] && kameleon commands | grep -q "${COMP_WORDS[$i]}" ; then
-        if wordlist=$(kameleon ${COMP_WORDS[$i]} commands); then
-            local commands="$(compgen -W "$wordlist" -- "${COMP_WORDS[$((i+1))]}")"
+        if kameleon help | grep -qe "^  kameleon ${COMP_WORDS[$i]}[a-z]* <SUBCOMMAND>"; then
+            local commands="$(compgen -W "$(kameleon ${COMP_WORDS[$i]} commands)" -- "${COMP_WORDS[$((i+1))]}")"
             COMPREPLY=( $commands $projects )
         fi
     fi

data/erb/userconf.yaml.erb

@@ -1,5 +1,6 @@
 ---
 repositories_path: <%= Kameleon.default_values[:repositories_path] %>
+extend_yaml_erb: <%= Kameleon.default_values[:extend_yaml_erb] %>
 script: <%= Kameleon.default_values[:script] %>
 color: <%= Kameleon.default_values[:color] %>
 debug: <%= Kameleon.default_values[:debug] %>

data/kameleon-builder.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
                      'Cristan Ruiz',
                      'Pierre Neyron',
                      'Bruno Bzeznik']
-  s.email         = ['salem.harrache@inria.fr',
-                     'michael.mercier@inria.fr',
-                     'cristian.ruiz@imag.fr',
+  s.email         = ['salem@harrache.info',
+                     'michael.mercier@libr.fr',
+                     'camilo1729@gmail.com',
                      'pierre.neyron@imag.fr',
                      'bruno.bzeznik@imag.fr']
   s.description   = %q{The mindful appliance builder}

data/lib/kameleon.rb

@@ -73,7 +73,8 @@ module Kameleon
         :debug => userconf.fetch("debug", false),
         :script => userconf.fetch("script", false),
         :repositories_path =>  userconf.fetch("repositories_path",
-                                          File.join(userdir.to_s, 'repos')),
+                                              File.join(userdir.to_s, 'repos')),
+        :extend_yaml_erb => userconf.fetch("extend_yaml_erb", ".extend.yaml.erb")
       }
     end
 

data/lib/kameleon/cli.rb

@@ -12,7 +12,7 @@ module Kameleon
       include Thor::Actions
 
       desc "add <NAME> <GIT_URL>", "Adds a new repository named <NAME> cloned from <GIT_URL>."
-      method_option :branch, :type => :string ,
+      method_option :branch, :type => :string,
                     :default => nil,
                     :desc => "checkout <BRANCH>",
                     :aliases => "-b"
@@ -67,7 +67,7 @@ module Kameleon
       end
 
       desc "import <TEMPLATE_NAME>", "Imports the given template"
-      method_option :global, :type => :hash ,
+      method_option :global, :type => :hash,
                     :default => {},  :aliases => "-g",
                     :desc => "Set custom global variables."
       def import(template_name)
@@ -98,7 +98,7 @@ module Kameleon
       end
 
       desc "info <TEMPLATE_NAME>", "Display detailed information about a template"
-      method_option :global, :type => :hash ,
+      method_option :global, :type => :hash,
                     :default => {},  :aliases => "-g",
                     :desc => "Set custom global variables."
       def info(template_name)
@@ -116,6 +116,19 @@ module Kameleon
         tpl.display_info(false)
       end
 
+      desc "erb <PATH>", "Create a extend recipe ERB file"
+      def erb(path)
+        if File.directory?(path)
+          erb_file = Pathname.new(path).join(Kameleon.default_values[:extend_yaml_erb])
+        elsif File.file?(path) and path.end_with?(".yaml")
+          erb_file = Pathname.new(path.gsub(%r{^(.+?/)?([^/]+?)(\.yaml)?$},'\1.\2') + Kameleon.default_values[:extend_yaml_erb])
+        else
+          fail KameleonError, "Invalid path '#{path}', please give a path to a yaml file or a directory"
+        end
+        Kameleon.ui.verbose("Create extend recipe ERB '#{erb_file}'")
+        copy_file(Pathname.new(Kameleon.erb_dirpath).join("extend.yaml.erb"), erb_file)
+      end
+
       desc "commands", "Lists all available commands", :hide => true
       def commands
         puts Template.all_commands.keys - ["commands"]
@@ -164,7 +177,7 @@ module Kameleon
     end
 
     desc "new <RECIPE_PATH> <TEMPLATE_NAME>", "Creates a new recipe from template <TEMPLATE_NAME>"
-    method_option :global, :type => :hash ,
+    method_option :global, :type => :hash,
                   :default => {},  :aliases => "-g",
                   :desc => "Set custom global variables."
     def new(recipe_name, template_name)
@@ -204,20 +217,19 @@ module Kameleon
           recipe_temp = File.join(tmp_dir, File.basename(recipe_path))
           ## copying recipe
           File.open(recipe_temp, 'w+') do |file|
-            message="Use extend ERB template: "
-            extend_erb_tpl = [
-              Kameleon.env.repositories_path.join(template_name + ".erb"),
-              Pathname.new(template_name).dirname.ascend.to_a.push(Pathname.new("")).map do |p|
-                Kameleon.env.repositories_path.join(p, ".kameleon-extend.yaml.erb")
-              end,
-              Pathname.new(Kameleon.erb_dirpath).join("extend.yaml.erb")
-            ].flatten.find do |f|
+            message="Try and use extend recipe ERB: "
+            extend_yaml_erb_list = Pathname.new(template_name).dirname.ascend.to_a.map do |p|
+              Kameleon.env.repositories_path.join(p, Kameleon.default_values[:extend_yaml_erb])
+            end
+            extend_yaml_erb_list.unshift(Kameleon.env.repositories_path.join(template_name.gsub(%r{^(.+?/)?([^/]+?)(\.yaml)?$},'\1.\2') + Kameleon.default_values[:extend_yaml_erb]))
+            extend_yaml_erb_list.push(Pathname.new(Kameleon.erb_dirpath).join("extend.yaml.erb"))
+            extend_yaml_erb = extend_yaml_erb_list.find do |f|
               Kameleon.ui.verbose(message + f.to_s)
               message = "-> Not found, fallback: "
               File.readable?(f)
             end 
-            erb = ERB.new(File.open(extend_erb_tpl, 'rb') { |f| f.read })
-            result = erb.result(binding)
+            Kameleon.ui.debug("Open ERB file: '#{extend_yaml_erb}'")
+            result = ERB.new(File.open(extend_yaml_erb, 'rb') { |f| f.read }).result(binding)
             file.write(result)
           end
           copy_file(recipe_temp, recipe_path)
@@ -226,13 +238,13 @@ module Kameleon
     end
 
     desc "info <RECIPE_PATH>", "Display detailed information about a recipe"
-    method_option :global, :type => :hash ,
+    method_option :global, :type => :hash,
                   :default => {},  :aliases => "-g",
                   :desc => "Set custom global variables."
-    method_option :from_cache, :type => :string ,
+    method_option :from_cache, :type => :string,
                   :default => nil,
                   :desc => "Get info from a persistent cache tar file (ignore recipe path)"
-    method_option :relative, :type => :boolean ,
+    method_option :relative, :type => :boolean,
                   :default => false,
                   :desc => "Make pathnames relative to the current working directory"
     def info(*recipe_paths)
@@ -258,18 +270,18 @@ module Kameleon
     end
 
     desc "dag <RECIPE_PATH> [<RECIPE_PATH> [<...>]]", "Draw a DAG of the steps to build one or more recipes"
-    method_option :global, :type => :hash ,
+    method_option :global, :type => :hash,
                   :default => {},  :aliases => "-g",
                   :desc => "Set custom global variables."
-    method_option :file, :type => :string ,
+    method_option :file, :type => :string,
                   :default => "/tmp/kameleon.dag",
                   :desc => "DAG output filename"
-    method_option :format, :type => :string ,
+    method_option :format, :type => :string,
                   :desc => "DAG GraphViz format"
-    method_option :relative, :type => :boolean ,
+    method_option :relative, :type => :boolean,
                   :default => false,
                   :desc => "Make pathnames relative to the current working directory"
-    method_option :recipes_only, :type => :boolean ,
+    method_option :recipes_only, :type => :boolean,
                   :default => false,
                   :desc => "Show recipes only (mostly useful to display multiple recipes inheritance)"
     def dag(*recipe_paths)
@@ -300,10 +312,10 @@ module Kameleon
     end
 
     desc "dryrun <RECIPE_PATH>", "Show the steps the build would process"
-    method_option :global, :type => :hash ,
+    method_option :global, :type => :hash,
                   :default => {},  :aliases => "-g",
                   :desc => "Set custom global variables."
-    method_option :relative, :type => :boolean ,
+    method_option :relative, :type => :boolean,
                   :default => false,
                   :desc => "Make pathnames relative to the current working directory"
     def dryrun(*recipe_paths)
@@ -315,10 +327,10 @@ module Kameleon
     end
 
     desc "export <RECIPE_PATH> <EXPORT_PATH>", "Export the given recipe with its steps and data to a given directory"
-    method_option :global, :type => :hash ,
+    method_option :global, :type => :hash,
                   :default => {},  :aliases => "-g",
                   :desc => "Set custom global variables."
-    method_option :add, :type => :boolean ,
+    method_option :add, :type => :boolean,
                   :default => false,  :aliases => "-A",
                   :desc => "export recipe and steps to an existing directory (this may overwrite some existing files)"
     def export(recipe_path,dest_path)
@@ -358,36 +370,36 @@ module Kameleon
     end
 
     desc "build <RECIPE_PATH>", "Builds the appliance from the given recipe"
-    method_option :build_path, :type => :string ,
+    method_option :build_path, :type => :string,
                   :default => nil, :aliases => "-b",
                   :desc => "Sets the build directory path"
-    method_option :clean, :type => :boolean ,
+    method_option :clean, :type => :boolean,
                   :default => false,
                   :desc => "Runs the command `kameleon clean` first"
-    method_option :from_checkpoint, :type => :string ,
+    method_option :from_checkpoint, :type => :string,
                   :default => nil,
                   :desc => "Uses specific checkpoint to build the image. " \
                            "Default value is the last checkpoint."
-    method_option :enable_checkpoint, :type => :boolean ,
+    method_option :enable_checkpoint, :type => :boolean,
                   :default => false,
                   :desc => "Enables checkpoint [experimental]"
-    method_option :list_checkpoints, :type => :boolean , :aliases => "--checkpoints",
+    method_option :list_checkpoints, :type => :boolean, :aliases => "--checkpoints",
                   :default => false,
                   :desc => "Lists all availables checkpoints"
     method_option :enable_cache, :type => :boolean,
                   :default => false,
                   :desc => "Generates a persistent cache for the appliance."
-    method_option :cache_path, :type => :string ,
+    method_option :cache_path, :type => :string,
                   :default => nil,
                   :desc => "Sets the cache directory path"
-    method_option :from_cache, :type => :string ,
+    method_option :from_cache, :type => :string,
                   :default => nil,
                   :desc => "Uses a persistent cache tar file to build the image."
-    method_option :cache_archive_compression, :type => :string ,
+    method_option :cache_archive_compression, :type => :string,
                   :enum => ["none", "gzip", "bz2", "xz"],
                   :default => "gzip",
                   :desc => "Set the persistent cache tar file compression."
-    method_option :polipo_path, :type => :string ,
+    method_option :polipo_path, :type => :string,
                   :default => nil,
                   :desc => "Full path of the polipo binary to use for the persistent cache."
     method_option :proxy, :type => :string, :default => "",
@@ -397,7 +409,7 @@ module Kameleon
                   :desc => "Specifies the username and password if the parent "\
                            "proxy requires authorisation it should have the "\
                            "form 'username:password'"
-    method_option :proxy_offline, :type => :boolean ,
+    method_option :proxy_offline, :type => :boolean,
                   :default => false, :aliases => "--offline",
                   :desc => "Prevents Polipo from contacting remote servers"
     method_option :global, :type => :hash,

data/version.txt

@@ -1 +1 @@
-2.10.3
+2.10.4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.10.4
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -112,9 +112,9 @@ dependencies:
         version: '1'
 description: The mindful appliance builder
 email:
-- salem.harrache@inria.fr
-- michael.mercier@inria.fr
-- cristian.ruiz@imag.fr
+- salem@harrache.info
+- michael.mercier@libr.fr
+- camilo1729@gmail.com
 - pierre.neyron@imag.fr
 - bruno.bzeznik@imag.fr
 executables: