kameleon-builder 2.10.5 → 2.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb30622025baa485ebc09845773b1e39db3b701494c01e6a3ac32b94d9f4faa
-  data.tar.gz: ea307b68b21479e3f930ffdd53536d9616332037524efca18b25804cb02e616b
+  metadata.gz: e3fd959d36bbd756d9a632b39e1d9bdd1bcaa5a0c4fd8104187041473dbd4ae0
+  data.tar.gz: 3d36533205a0a55d3e2622ff1f713f4c2432f6cd48c34afc9bd35006855e9302
 SHA512:
-  metadata.gz: 4cd740a9d6156e3e6c0ab480e103b8cf4b2d4cb67634c599c2a3fa4f99553d8b067bd00eee821b49a66cec4816450c59cf021298117f413f07b1796e2c0c682e
-  data.tar.gz: ea1d8fa490900e1263c9603008df2b174422f6026ae5d8b31b21d71ad56daf4330bc18ade35a9488c12ab3665b468604d1b56baa944553fc95299596107f44a5
+  metadata.gz: 2915fa5554adacbbeda1d03655bf995ab8191e9396649adc2cd158a386926b00f991da040144bb35b5d15ca37e127222400749f3d82c6e00fe934cce4bf851f2
+  data.tar.gz: c0c5754fcffb10f0c1d80b5523accf99768facc1468190ffd3991842d05edeacdedfef9d0b5651dc844b90dddc8c535234de2214f1d47177c42fbeada596531c

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,14 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.10.6
+--------------
+
+Released on November 24th 2021
+
+- Add the option filter for the template and recipe listings
+- Preserve permission of files when importing template
+
 Version 2.10.5
 --------------
 

data/RELEASING.md

@@ -0,0 +1,69 @@
+About releases:
+===============
+You can use the script ``./scripts/bumpversion.py`` which will handle
+everything (incrementation, git tag creation, changelog update).
+First you need to install bumpversion using pip::
+```
+sudo pip install bumpversion
+```
+Assuming work is done in the devel branch.
+
+For stable releases:
+--------------------
+
+## Merge devel into master:
+```
+git checkout master
+git merge devel
+```
+
+## Fix anything needed
+Should be no conflict but...
+Make sure changelog is up to date.
+
+## Bump version
+***Warning*** Make sure that there is no dirty file (not committed) before the following.
+```
+./scripts/bumpversion.py release  # will do 2.7.0.dev -> 2.7.0 + git tag + changelog
+git push
+```
+
+## Build gem
+```
+gem build kameleon-builder.gemspec
+```
+
+## Push to Ruby gem repository
+```
+  gem push kameleon-builder-2.7.0.gem
+```
+
+Note: You need a rubygem account and the owner has to give you permissions so that you can push.
+To do so, create an account on https://rubygems.org/ and ask an owner to do
+the following command::
+
+```
+  gem owner kameleon-builder -a your@email.com
+```
+
+That's all :)
+
+For devel releases:
+-------------------
+
+## Move to the devel branch and rebase on master
+```
+git checkout devel
+git rebase master
+```
+
+## Prepare the new version 
+Create the new devel version (e.g. 2.7.0 dev)
+```
+  ./scripts/bumpversion.py newversion patch  # 2.6.7 -> 2.7.0.dev
+```
+
+At this point, do work, commit, and so on.
+And same as above to build "devel" gem and use them locally, or push them if really wanted.
+
+Up to the time to build a new stable version.

data/lib/kameleon/cli.rb

@@ -60,10 +60,13 @@ module Kameleon
       method_option :progress, :type => :boolean, :default => true,
                     :desc => "Show progress bar while resolving templates",
                     :aliases => "-p"
+      method_option :filter, :type => :string, :default => '',
+                    :desc => "Filter templates with the given regexp",
+                    :aliases => "-f"
       def list
         Kameleon.ui.shell.say "Recipe templates available in: ", :red, false
         Kameleon.ui.shell.say Kameleon.env.repositories_path.to_s, :yellow
-        Utils.list_recipes(Kameleon.env.repositories_path, options[:progress], true)
+        Utils.list_recipes(Kameleon.env.repositories_path, options[:filter], options[:progress], true)
       end
 
       desc "import <TEMPLATE_NAME>", "Imports the given template"
@@ -93,6 +96,7 @@ module Kameleon
             relative_path = path.relative_path_from(Kameleon.env.repositories_path)
             dst = File.join(Kameleon.env.workspace, relative_path)
             copy_file(path, dst)
+            chmod(dst, File.stat(path).mode, {:verbose=>false})
           end
         end
       end
@@ -169,11 +173,14 @@ module Kameleon
 
     desc "list", "Lists all defined recipes in the current directory"
     method_option :progress, :type => :boolean, :default => false,
-                  :desc => "Show progress bar while resolving templates",
+                  :desc => "Show progress bar while resolving recipes",
                   :aliases => "-p"
+    method_option :filter, :type => :string, :default => '',
+                  :desc => "Filter recipes with the given regexp",
+                  :aliases => "-f"
     def list
       Kameleon.ui.shell.say "Workspace recipes:", :red
-      Utils.list_recipes(Kameleon.env.workspace, options[:progress])
+      Utils.list_recipes(Kameleon.env.workspace, options[:filter], options[:progress])
     end
 
     desc "new <RECIPE_PATH> <TEMPLATE_NAME>", "Creates a new recipe from template <TEMPLATE_NAME>"
@@ -212,6 +219,7 @@ module Kameleon
           relative_path = path.relative_path_from(Kameleon.env.repositories_path)
           dst = File.join(Kameleon.env.workspace, relative_path)
           copy_file(path, dst)
+          chmod(dst, File.stat(path).mode, {:verbose=>false})
         end
         Dir::mktmpdir do |tmp_dir|
           recipe_temp = File.join(tmp_dir, File.basename(recipe_path))

data/lib/kameleon/utils.rb

@@ -125,11 +125,11 @@ module Kameleon
       end
     end
 
-    def self.list_recipes(recipes_path, 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)
+      recipes_files = get_recipes(recipes_path).select { |f| Regexp.new(filter).match(f.to_s.gsub(recipes_path.to_s + '/', '').chomp('.yaml')) }
       if recipes_files.empty?
         Kameleon.ui.shell.say "  <None>", :cyan
         return

data/lib/kameleon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.10.5
+  version: 2.10.6
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -131,7 +131,7 @@ files:
 - COPYING
 - Gemfile
 - README.rst
-- RELEASING.rst
+- RELEASING.md
 - Vagrantfile
 - bin/kameleon
 - completion/_kameleon

data/RELEASING.rst

@@ -1,29 +0,0 @@
-You can use the script ``./scripts/bumpversion.py`` which will handle
-everything (incrementation, git tag creation, changelog update).
-First you need to install bumpversion using pip::
-
-  sudo pip2 install bumpversion
-
-Then for the actual releasing:
-
-1) After each release, a new version has to be created (in this example, the 2.7.0 dev)::
-
-  python2 ./scripts/bumpversion.py newversion minor  # 2.6.7 -> 2.7.0.dev
-
-2) [work/commit] 
-3) **Warning:** Be sure that there is no dirty file (not committed) before
-   doing this.
-
-   Releasing a new version::
-
-  python2 ./scripts/bumpversion.py release  # 2.7.0.dev -> 2.7.0 + git tag + changelog
-  gem build kameleon-builder.gemspec
-  gem push kameleon-builder-2.7.0.gem
-
-You need a rubygem account and I have to give you permissions so that you can push.
-To do so, create an account on https://rubygems.org/ and ask an owner to do
-the following command::
-
-  gem owner kameleon-builder -a your@email.com
-
-And that's all :)