kameleon-builder 2.10.12 → 2.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756d8f2585c156772b7fff190366543ed56ea250de8ecf0a9b08fa2a10ab9291
-  data.tar.gz: c0d8a7a73a6eeb8d436711811744c674f71c76fb71d1f2f724476a0aa1f441a8
+  metadata.gz: 98949549d6db81a6e1f992d047d98cb1996422a1fafd974395983511f1a0fac0
+  data.tar.gz: 238e4bacb28a1061fb8ea65477949013357619501b40ceb28784e44feea51b26
 SHA512:
-  metadata.gz: 28dba475cc7f55acfe066a245cfc62e14962dacb933541b4df5c90bf78ae9c505f11561b0ec094feaf586cc6b2b85ce8b7c04da9a43ec0eee06652cb38507769
-  data.tar.gz: 5584616d421ffb8586ed25bbd1a20d4784077802231efba67d6777eef1f1a8a9b808b132a3093682979dc3f7b58c835515c1705ca084d8f8bc3eab7c02ca03da
+  metadata.gz: 9d44ab789cd681b54a6db3b7377e52e6ba66acc76391a02397f87df1d1b33f66492a454eb3902bbf76aba8a07041000803001ca1cff7448b0d0d8a7260780671
+  data.tar.gz: 448f0ebb4d031e99f11edbf8608628c24698a17f1da187557c6695fef21c8038d3b83ba9bb6727e30fd2fef568236d4d51efffbc7a121db7b4368ca7eafa4db4

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,17 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.10.13
+---------------
+
+Released on March 26th 2025
+
+- Drop useless contrib directory.
+- Rework gem summary and description.
+- Update gem dependencies for gem install on Debian 11 and 13.
+- Adapt sources to Ruby 3.1 - Psych's YAML: explicitly use YAML.unsafe_load.
+- Add git to requirements, need for kameleon repo commands.
+
 Version 2.10.12
 ---------------
 

data/COPYING

@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

data/erb/extend.yaml.erb

@@ -6,7 +6,7 @@
 #
 #==============================================================================
 # This recipe extends another. To look at the step involed, run:
-#   kameleon dryrun <%= recipe_name %>
+#   kameleon build --dryrun <%= recipe_name %>
 # To see the variables that you can override, use the following command:
 #   kameleon info <%= recipe_name %>
 ---

data/kameleon-builder.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kameleon/version'
 
@@ -17,8 +18,8 @@ Gem::Specification.new do |s|
                      'camilo1729@gmail.com',
                      'pierre.neyron@imag.fr',
                      'bruno.bzeznik@imag.fr']
-  s.description   = %q{The mindful appliance builder}
-  s.summary       = %q{Kameleon is a tool to build system appliances from scratch}
+  s.summary       = 'The mindful appliance builder'
+  s.description   = 'Kameleon is a tool to build system appliances, possibly from scratch'
   s.homepage      = 'http://kameleon.imag.fr/'
   s.license       = 'GPL-2.0-or-later'
 
@@ -28,12 +29,13 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(tests|s|features)/})
   s.require_paths = ['lib']
 
-  s.add_dependency 'childprocess', '~> 0.5.3', '>= 0.3.0'
-  s.add_dependency 'thor', '~> 1'
-  s.add_dependency 'table_print', '~> 1.5'
-  s.add_dependency 'psych', '~> 2.0'
+  s.add_dependency 'childprocess', '~> 4.0'
+  s.add_dependency 'psych', '~> 5.0'
   s.add_dependency 'ruby-graphviz', '~> 1.2'
-  s.add_dependency 'progressbar', '~> 1'
+  s.add_dependency 'ruby-progressbar', '~> 1.10'
+  s.add_dependency 'table_print', '~> 1.5'
+  s.add_dependency 'thor', '~> 1.0'
 
-  s.requirements = ['polipo 1.0.3, or greater', 'graphviz 2.38.0 or greater']
+  s.requirements << 'git'
+  s.requirements << 'graphviz'
 end

data/lib/kameleon/engine.rb

@@ -675,7 +675,7 @@ module Kameleon
 
     def load_build_recipe
       if File.file?(@build_recipe_path)
-        result = YAML.load_file(@build_recipe_path)
+        result = YAML.unsafe_load_file(@build_recipe_path)
         return result if result
       end
       return nil

data/lib/kameleon/persistent_cache.rb

@@ -258,7 +258,7 @@ module Kameleon
         end
         ## We have to load the file
         metadata_dir = File.join(@cache_dir,"metadata")
-        @cmd_cached = YAML.load(File.read("#{metadata_dir}/cache_cmd_index"))
+        @cmd_cached = YAML.unsafe_load(File.read("#{metadata_dir}/cache_cmd_index"))
       end
       @activated = true
       #@cached_recipe_dir = @cache_dir

data/lib/kameleon/recipe.rb

@@ -93,7 +93,7 @@ module Kameleon
       Kameleon.ui.verbose("Loading #{@path}")
       fail RecipeError, "Could not find this following recipe: #{@path}" \
          unless File.file? @path
-      yaml_recipe = YAML.load_file @path
+      yaml_recipe = YAML.unsafe_load_file @path
       unless yaml_recipe.kind_of? Hash
         fail RecipeError, "Invalid yaml: #{@path}"
       end
@@ -137,7 +137,7 @@ module Kameleon
 
       # Resolve dynamically-defined variables !!
       resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self, kwargs)
-      resolved_global = @global.merge YAML.load(resolved_global)
+      resolved_global = @global.merge YAML.unsafe_load(resolved_global)
       Kameleon.ui.debug("Resolved_global: #{resolved_global}")
       # Loads aliases
       load_aliases(yaml_recipe)
@@ -242,7 +242,7 @@ module Kameleon
       base_recipe_path << ".yaml" unless base_recipe_path.end_with? ".yaml"
       fail RecipeError, "Could not find this following recipe: #{@recipe_path}" \
          unless File.file? path
-      base_yaml_recipe = YAML.load_file base_recipe_path
+      base_yaml_recipe = YAML.unsafe_load_file base_recipe_path
       unless yaml_recipe.kind_of? Hash
         fail RecipeError, "Invalid yaml: #{base_yaml_recipe}"
       end
@@ -298,7 +298,7 @@ module Kameleon
       def load_global_file(global_file, recipe_path)
         def try_to_load(absolute_path)
           if File.file?(absolute_path)
-            global_to_include = YAML.load_file(absolute_path)
+            global_to_include = YAML.unsafe_load_file(absolute_path)
             if global_to_include.kind_of? Hash
               @step_files.push(absolute_path)
               return global_to_include
@@ -376,7 +376,7 @@ module Kameleon
           path = Pathname.new(File.join(dir_path, aliases_file))
           if File.file?(path)
             Kameleon.ui.verbose("Loading aliases #{path}")
-            @aliases.merge!(YAML.load_file(path))
+            @aliases.merge!(YAML.unsafe_load_file(path))
             @step_files.push(path)
             return path
           end
@@ -439,7 +439,7 @@ module Kameleon
             path = Pathname.new(File.join(dir_path, checkpoint))
             if File.file?(path)
               Kameleon.ui.verbose("Loading checkpoint configuration #{path}")
-              @checkpoint = YAML.load_file(path)
+              @checkpoint = YAML.unsafe_load_file(path)
               @checkpoint["path"] = path.to_s
               @step_files.push(path)
               break
@@ -461,7 +461,7 @@ module Kameleon
         macrostep_yaml = args
         step_path = @path
       else
-        macrostep_yaml = YAML.load_file(step_path)
+        macrostep_yaml = YAML.unsafe_load_file(step_path)
         # Basic macrostep syntax check
         if not macrostep_yaml.kind_of? Array
           fail RecipeError, "The macrostep #{step_path} is not valid "
@@ -550,7 +550,7 @@ module Kameleon
       end
       # Resolve dynamically-defined variables !!
       resolved_global = Utils.resolve_vars(@global.to_yaml, @path, @global, self, kwargs)
-      @global.merge! YAML.load(resolved_global)
+      @global.merge! YAML.unsafe_load(resolved_global)
 
       consistency_check
       resolve_checkpoint unless @checkpoint.nil?
@@ -652,7 +652,7 @@ module Kameleon
         Kameleon.ui.debug("Resolving alias '#{name}'")
         aliases_cmd = @aliases.fetch(name).clone
         aliases_cmd_str = aliases_cmd.to_yaml
-        args = YAML.load(cmd.string_cmd)[name]
+        args = YAML.unsafe_load(cmd.string_cmd)[name]
         args = [].push(args).flatten  # convert args to array
         expected_args_number = aliases_cmd_str.scan(/@\d+/).uniq.count
         if expected_args_number != args.count

data/lib/kameleon/step.rb

@@ -23,7 +23,7 @@ module Kameleon
 
     def key
       if @key.nil?
-        object = YAML.load(@string_cmd)
+        object = YAML.unsafe_load(@string_cmd)
         if object.kind_of? String
           @key = object
         else
@@ -40,7 +40,7 @@ module Kameleon
     def value
       if @value.nil?
         Kameleon.ui.debug("Parsed string = #{@string_cmd}")
-        object = YAML.load(@string_cmd)
+        object = YAML.unsafe_load(@string_cmd)
         if object.kind_of? Command
           @value = object
         elsif object.kind_of? String
@@ -192,7 +192,7 @@ module Kameleon
                                            @path,
                                            tmp_resolved_vars.merge(global),
                                            recipe)
-        tmp_resolved_vars.merge! YAML.load(yaml_resolved.chomp)
+        tmp_resolved_vars.merge! YAML.unsafe_load(yaml_resolved.chomp)
       end
       @variables.merge! tmp_resolved_vars
       @microsteps.each do |m|

data/lib/kameleon/version.rb

@@ -1,3 +1,3 @@
 module Kameleon
-  VERSION = '2.10.12'
+  VERSION = '2.10.13'
 end

data/lib/kameleon.rb

@@ -61,7 +61,7 @@ module Kameleon
 
     def load_userconf
       if File.exist?(Kameleon.userconf_path) and not File.zero?(Kameleon.userconf_path)
-        yaml_conf = YAML.load_file Kameleon.userconf_path
+        yaml_conf = YAML.unsafe_load_file Kameleon.userconf_path
         unless yaml_conf.kind_of? Hash
           yaml_conf = {}
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.10.12
+  version: 2.10.13
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -20,91 +20,85 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: table_print
+  name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: ruby-graphviz
+  name: table_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
-description: The mindful appliance builder
+        version: '1.0'
+description: Kameleon is a tool to build system appliances, possibly from scratch
 email:
 - salem@harrache.info
 - michael.mercier@libr.fr
@@ -135,36 +129,6 @@ files:
 - contrib/kameleon_exec_cmd.sh
 - contrib/kameleon_exec_cmd_wrapper.sh
 - contrib/proxy_env.sh
-- contrib/scripts/VirtualBox_deploy.sh
-- contrib/scripts/chroot_env
-- contrib/scripts/create_passwd.py
-- contrib/scripts/umount-chroot.sh
-- contrib/steps/bootstrap/debian/bootstrap_if_needed.yaml
-- contrib/steps/bootstrap/debian/bootstrap_static.yaml
-- contrib/steps/bootstrap/debian/debootstrap_arm.yaml
-- contrib/steps/export/clean_appliance.yaml
-- contrib/steps/export/compact_qcow_img.yaml
-- contrib/steps/export/save_as_g5k.yaml
-- contrib/steps/setup/add_timestamp.yaml
-- contrib/steps/setup/add_to_sudoers.yaml
-- contrib/steps/setup/archlinux/configure_ruby.yaml
-- contrib/steps/setup/archlinux/install_dev_tools.yaml
-- contrib/steps/setup/archlinux/install_gnome.yaml
-- contrib/steps/setup/archlinux/install_yaourt.yaml
-- contrib/steps/setup/autologin.yaml
-- contrib/steps/setup/centos/6.5/configure_repo.yaml
-- contrib/steps/setup/copy_ssh_auth_file.yaml
-- contrib/steps/setup/debian/add_network_interface.yaml
-- contrib/steps/setup/debian/cluster_tools_install.yaml
-- contrib/steps/setup/debian/install_gnome.yaml
-- contrib/steps/setup/debian/install_kde.yaml
-- contrib/steps/setup/debian/network_config_static.yaml
-- contrib/steps/setup/generate_user_ssh_key.yaml
-- contrib/steps/setup/install_my_ssh_key.yaml
-- contrib/steps/setup/make_swap_file.yaml
-- contrib/steps/setup/root_ssh_config.yaml
-- contrib/steps/setup/set_user_password.yaml
-- contrib/steps/setup/system_optimization.yaml
 - erb/extend.yaml.erb
 - erb/userconf.yaml.erb
 - kameleon-builder.gemspec
@@ -229,12 +193,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- polipo 1.0.3, or greater
-- graphviz 2.38.0 or greater
+- git
+- graphviz
 rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
-summary: Kameleon is a tool to build system appliances from scratch
+summary: The mindful appliance builder
 test_files:
 - tests/helper.rb
 - tests/issue76/fail.stdout

data/contrib/scripts/VirtualBox_deploy.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-NAME=$1
-VBOX_DISK=$2
-
-VBoxManage createvm --name $NAME --register
-VBoxManage modifyvm $NAME --memory 512
-VBoxManage storagectl $NAME --name SATA --add sata --controller IntelAhci --bootable on --sataportcount 1
-VBoxManage storageattach $NAME --storagectl SATA --port 0 --device 0 --type hdd --medium $VBOX_DISK
-#VBoxManage modifyvm $NAME --nic1 hostonly
-#VBoxManage modifyvm $NAME --nic1 nat
-VBoxManage startvm $NAME
-#VBoxManage unregistervm $NAME --delete

data/contrib/scripts/chroot_env

@@ -1,9 +0,0 @@
-#kameleon chroot base bash environnement
-
-umask 022
-
-export USER=root
-export HOME=/root
-export PATH=/usr/bin:/usr/sbin:/bin:/sbin
-export LC_ALL=POSIX
-

data/contrib/scripts/create_passwd.py

@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-### WARNING ###
-# requires Python >= 3.3
-
-import sys, crypt, getpass;
-
-# this script generate a password using salted SHA512 whitch is the default on debian wheezy
-
-cleartext = getpass.getpass("Password:")
-cleartext2 = getpass.getpass("Again:")
-if cleartext2 != cleartext:
-	print ('Not matched!')
-	sys.exit(1)
-	
-salt = crypt.mksalt(crypt.METHOD_SHA512)
-print (crypt.crypt(cleartext, salt))
-