kameleon-builder 2.10.7 → 2.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa12710602f297326fe8253eab48928c5e527a07bdc91b3f6686375faa83c8c5
-  data.tar.gz: 306b743b116a9a53801208368f54a2e71bcf2b1bdb55f17d7549eac003403e0d
+  metadata.gz: '0090f004c5c7501866feada95e6f0a402bd02b6eb3bfbbe1f3252bcc6e399f8f'
+  data.tar.gz: 6ff09a19773c76287ab9e0ef9c6aa4b49675be9e030ef195b3b53a636208add6
 SHA512:
-  metadata.gz: a97ddc0ccb77269a2084ad51022b66393300404cd220d1eff6c51e85d2de8f33122d8d44d308c8c27ff4bcda6122076d5ed6e269ca01c2af51059a45eb4aa31b
-  data.tar.gz: 5290bd82ceb90cabe2ee472485feb652c6b653638b45bff99e1869b56c86edf6845241082ea2561a0b33ea6ce52e2130d775dbcf59ec673e749cdedb1fb4612a
+  metadata.gz: b075dc8cb7cb14dc4576cca16ea8f3d785d9d44e3dd75028d84b285e9c07e02e2bb40467a504801634b6bd7d315115411643288f052ca4220cfb047d0cc7b7d2
+  data.tar.gz: f3444f8b1b0b5b8ea942debad0625ff22ae890a13355131dfb41c1e3a1cd6694577b31e2598bf04aaea7041f14b97d69d8f24e7d90f2860afc803dedc7cadf27

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.10.7
+current_version = 2.10.9
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}
@@ -14,4 +14,3 @@ optional_value = gamma
 values = 
 	dev
 	gamma
-

data/.gitignore

@@ -24,3 +24,7 @@ coverage
 *.log
 bin/*
 build
+share/python-wheels
+lib/python*
+pyvenv.cfg
+.envrc

data/CHANGES

@@ -1,6 +1,24 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.10.9
+--------------
+
+Released on April 27th 2023
+
+- Add the --microstep-checkpoint option to enable creating checkpoint on all microsteps.
+- Add timing info for microsteps and microstep checkpoints in verbose mode.
+- Minor fixes.
+- Enable using a python venv for bumpversion (.gitignore, .envrc)
+
+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
 --------------
 

data/lib/kameleon/cli.rb

@@ -390,7 +390,11 @@ module Kameleon
                            "Default value is the last checkpoint."
     method_option :enable_checkpoint, :type => :boolean,
                   :default => false,
-                  :desc => "Enables checkpoint [experimental]"
+                  :desc => "Enables checkpointing"
+    method_option :microstep_checkpoint, :type => :string,
+                  :enum => ["first", "all"],
+                  :default => "first",
+                  :desc => "Create checkpoint of the first microstep only, or all"
     method_option :list_checkpoints, :type => :boolean, :aliases => "--checkpoints",
                   :default => false,
                   :desc => "Lists all availables checkpoints"

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/engine.rb

@@ -28,6 +28,7 @@ module Kameleon
       end
       @enable_checkpoint = @options[:enable_checkpoint]
       @enable_checkpoint = true unless @options[:from_checkpoint].nil?
+      @microstep_checkpoint = @options[:microstep_checkpoint]
       # Check if the recipe have checkpoint entry
       if @enable_checkpoint && @recipe.checkpoint.nil?
         fail BuildError, "Checkpoint is unavailable for this recipe"
@@ -189,6 +190,7 @@ module Kameleon
       section.sequence do |macrostep|
         checkpointed = false
         macrostep_time = Time.now.to_i
+        macrostep_checkpoint_duration = 0
         if @cache then
           Kameleon.ui.debug("Starting proxy cache server for macrostep '#{macrostep.name}'...")
           # the following function start a polipo web proxy and stops a previous run
@@ -198,6 +200,8 @@ module Kameleon
           end
         end
         macrostep.sequence do |microstep|
+          microstep_time = Time.now.to_i
+          microstep_checkpoint_duration = 0
           step_prefix = "Step #{ microstep.order } : "
           Kameleon.ui.info("#{step_prefix}#{ microstep.slug }")
           if @enable_checkpoint
@@ -208,16 +212,25 @@ module Kameleon
             if microstep.in_cache && microstep.on_checkpoint == "use_cache"
               Kameleon.ui.msg("--> Using checkpoint")
             else
+              begin
               Kameleon.ui.msg("--> Running the step...")
               microstep.commands.each do |cmd|
                 safe_exec_cmd(cmd)
               end
+              rescue SystemExit, Interrupt
+                reload_contexts
+                breakpoint(nil)
+              end
               unless microstep.on_checkpoint == "redo"
-                unless checkpointed
+                unless checkpointed and @microstep_checkpoint == "first"
                   if checkpoint_enabled?
+                    microstep_checkpoint_time = Time.now.to_i
                     Kameleon.ui.msg("--> Creating checkpoint : #{ microstep.identifier }")
                     create_checkpoint(microstep.identifier)
                     checkpointed = true
+                    microstep_checkpoint_duration = Time.now.to_i - microstep_checkpoint_time
+                    macrostep_checkpoint_duration += microstep_checkpoint_duration
+                    Kameleon.ui.verbose("Checkpoint creation for MicroStep #{microstep.name} took: #{microstep_checkpoint_duration} secs")
                   end
                 end
               end
@@ -233,8 +246,9 @@ module Kameleon
               breakpoint(nil)
             end
           end
+          Kameleon.ui.verbose("MicroStep #{microstep.name} took: #{Time.now.to_i - microstep_time - microstep_checkpoint_duration} secs")
         end
-        Kameleon.ui.info("Step #{macrostep.name} took: #{Time.now.to_i-macrostep_time} secs")
+        Kameleon.ui.info("Step #{macrostep.name} took: #{Time.now.to_i - macrostep_time - macrostep_checkpoint_duration} secs")
       end
       @cleaned_sections.push(section.name)
     end

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/version.rb

@@ -1,3 +1,3 @@
 module Kameleon
-  VERSION = '2.10.7'
+  VERSION = '2.10.9'
 end

data/lib64

@@ -0,0 +1 @@
+./lib

data/tests/recipes/steps/checkpoints/test.yaml

@@ -8,6 +8,7 @@ apply:
   - exec_local: echo @microstep_id
 
 list:
+  - exec_local: touch $KAMELEON_WORKDIR/list_checkpoint.txt
   - exec_local: cat $KAMELEON_WORKDIR/list_checkpoint.txt
 
 clear:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.10.7
+  version: 2.10.9
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -189,6 +189,7 @@ files:
 - lib/kameleon/ui.rb
 - lib/kameleon/utils.rb
 - lib/kameleon/version.rb
+- lib64
 - scripts/bumpversion.py
 - tests/helper.rb
 - tests/issue76/fail.stdout
@@ -235,8 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - polipo 1.0.3, or greater
 - graphviz 2.38.0 or greater
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Kameleon is a tool to build system appliances from scratch