kameleon-builder 2.10.6 → 2.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3fd959d36bbd756d9a632b39e1d9bdd1bcaa5a0c4fd8104187041473dbd4ae0
-  data.tar.gz: 3d36533205a0a55d3e2622ff1f713f4c2432f6cd48c34afc9bd35006855e9302
+  metadata.gz: 553ea238eb5037446a3a2fd352806d8f32bc19d728288b60b515d00c606c8862
+  data.tar.gz: 8ec292f91ce56340f1492f1c8f9533b4615fb108029d4985eb515d5c08a97a14
 SHA512:
-  metadata.gz: 2915fa5554adacbbeda1d03655bf995ab8191e9396649adc2cd158a386926b00f991da040144bb35b5d15ca37e127222400749f3d82c6e00fe934cce4bf851f2
-  data.tar.gz: c0c5754fcffb10f0c1d80b5523accf99768facc1468190ffd3991842d05edeacdedfef9d0b5651dc844b90dddc8c535234de2214f1d47177c42fbeada596531c
+  metadata.gz: 9b57c04cd35dbeb46a61dbb9b1a433b141f7952e8db071795505c061781ccbf63df33f4d3540f9c3c9d530ba7c4e3fa9d25f3397ea81e3abd17b85bbf7a75e35
+  data.tar.gz: 69179ec31b646c1b98c42817a880aa2423a316ada9338383f7fb88f7d4f9f0aefd40808803df4e5dd129d50a2f85218544c57223126f79121f6af2427a821691

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,21 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.10.8
+--------------
+
+Released on October 21st 2022
+
+- Fix a fatal error with the pipe command: make sure the destination context is started.
+- Avoid git warning when running kameleon repo update: use git pull --ff-only
+
+Version 2.10.7
+--------------
+
+Released on December 02nd 2021
+
+- Add support for the .filter file to filter recipes/template lists
+
 Version 2.10.6
 --------------
 

data/lib/kameleon/cli.rb

@@ -60,7 +60,7 @@ module Kameleon
       method_option :progress, :type => :boolean, :default => true,
                     :desc => "Show progress bar while resolving templates",
                     :aliases => "-p"
-      method_option :filter, :type => :string, :default => '',
+      method_option :filter, :type => :string, :default => nil,
                     :desc => "Filter templates with the given regexp",
                     :aliases => "-f"
       def list
@@ -175,7 +175,7 @@ module Kameleon
     method_option :progress, :type => :boolean, :default => false,
                   :desc => "Show progress bar while resolving recipes",
                   :aliases => "-p"
-    method_option :filter, :type => :string, :default => '',
+    method_option :filter, :type => :string, :default => nil,
                   :desc => "Filter recipes with the given regexp",
                   :aliases => "-f"
     def list

data/lib/kameleon/context.rb

@@ -106,6 +106,7 @@ module Kameleon
 
       Kameleon.ui.verbose("Forwarding #{tmp.path} to STDIN of #{other_ctx.name}_ctx")
       dest_pipe_path = "${KAMELEON_WORKDIR}/pipe-#{ Kameleon::Utils.generate_slug(other_cmd)[0..20] }"
+      other_ctx.load_shell
       other_ctx.send_file(tmp.path, dest_pipe_path)
       other_cmd_with_pipe = "cat #{dest_pipe_path} | #{other_cmd} && rm #{dest_pipe_path}"
       other_ctx.execute(other_cmd_with_pipe, kwargs)

data/lib/kameleon/repository.rb

@@ -30,7 +30,7 @@ module Kameleon
       git_repo = File.join(Kameleon.env.repositories_path, name)
       raise RepositoryError, "Repository not found '#{name}'" if not File.directory?(git_repo)
       cmd = ["git", "--git-dir", File.join(git_repo, ".git"), "--work-tree",
-             git_repo, "pull", "--verbose"]
+             git_repo, "pull", "--ff-only"]
       process = ChildProcess.build(*cmd)
       process.io.inherit!
       process.start

data/lib/kameleon/shell.rb

@@ -177,7 +177,7 @@ SCRIPT
 
     def execute(cmd, kwargs = {})
       cmd_obj = Command.new(cmd)
-      send_command cmd_obj = Command.new(cmd)
+      send_command(cmd_obj)
       iodata = {:stderr => { :io        => @stderr,
                              :name      => 'stderr',
                              :begin     => false,

data/lib/kameleon/utils.rb

@@ -125,11 +125,11 @@ module Kameleon
       end
     end
 
-    def self.list_recipes(recipes_path, filter = '', do_progressbar = false, is_repository = false, kwargs = {})
+    def self.list_recipes(recipes_path, filter, do_progressbar = false, is_repository = false, kwargs = {})
       Kameleon.env.root_dir = recipes_path
       catch_exception = kwargs.fetch(:catch_exception, true)
       recipes_hash = []
-      recipes_files = get_recipes(recipes_path).select { |f| Regexp.new(filter).match(f.to_s.gsub(recipes_path.to_s + '/', '').chomp('.yaml')) }
+      recipes_files = get_recipes(recipes_path, filter)
       if recipes_files.empty?
         Kameleon.ui.shell.say "  <None>", :cyan
         return
@@ -162,7 +162,7 @@ module Kameleon
         desc_width = (80 - name_width - 3) if desc_width < 0
       end
       repo_str_old = nil
-      recipes_hash.sort_by{ |k| k["name"] }.each do |r|
+      recipes_hash.each do |r|
         if is_repository
           repo_str,recipe_dir_str,recipe_str = r["name"].match(%r{^([^/]+/)(.+/)?([^/]+)$}).to_a[1..3].map{|m| m.to_s}
         else
@@ -184,18 +184,28 @@ module Kameleon
       end
     end
 
-    def self.get_recipes(path)
-      path.children.collect do |child|
-        if child.file?
-          if child.extname == ".yaml"
-            unless child.to_s.include? "/steps/" or child.to_s.include? "/.steps/"
-              child
-            end
-          end
-        elsif child.directory?
-          get_recipes(child)
+    def self.get_recipes(path, filter = nil, base = nil)
+      base = path if base.nil?
+      if filter.nil?
+        begin
+          filter = File.read(File.join(path, "/.filter")).chomp
+          Kameleon.ui.verbose("Found filter #{filter} in #{path}")
+          base = path
+        rescue
+        end
+      end
+      recipes = path.children.select{|child| child.file? and child.extname == ".yaml"}.map do |child|
+        recipe = child.to_s.gsub(base.to_s + '/', '').chomp('.yaml')
+        if filter.nil? or Regexp.new(filter).match(recipe)
+          child
+        else
+          Kameleon.ui.verbose("Filters out #{recipe}, does not match #{filter}")
+          nil
         end
-      end.select { |x| x }.flatten(1)
+      end.select { |x| x }.flatten(1).sort{|a,b| a.to_s <=> b.to_s}
+      recipes + path.children.select{|child| child.directory? and child.basename.to_s != "steps" and child.basename.to_s != ".steps"}.sort{|a,b| a.to_s <=> b.to_s}.map do |child|
+        get_recipes(child, filter, base)
+      end.flatten(1)
     end
 
     def self.which(cmd)

data/lib/kameleon/version.rb

@@ -1,3 +1,3 @@
 module Kameleon
-  VERSION = '2.10.6'
+  VERSION = '2.10.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.10.6
+  version: 2.10.8
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess