kameleon-builder 2.10.8 → 2.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 553ea238eb5037446a3a2fd352806d8f32bc19d728288b60b515d00c606c8862
-  data.tar.gz: 8ec292f91ce56340f1492f1c8f9533b4615fb108029d4985eb515d5c08a97a14
+  metadata.gz: '0090f004c5c7501866feada95e6f0a402bd02b6eb3bfbbe1f3252bcc6e399f8f'
+  data.tar.gz: 6ff09a19773c76287ab9e0ef9c6aa4b49675be9e030ef195b3b53a636208add6
 SHA512:
-  metadata.gz: 9b57c04cd35dbeb46a61dbb9b1a433b141f7952e8db071795505c061781ccbf63df33f4d3540f9c3c9d530ba7c4e3fa9d25f3397ea81e3abd17b85bbf7a75e35
-  data.tar.gz: 69179ec31b646c1b98c42817a880aa2423a316ada9338383f7fb88f7d4f9f0aefd40808803df4e5dd129d50a2f85218544c57223126f79121f6af2427a821691
+  metadata.gz: b075dc8cb7cb14dc4576cca16ea8f3d785d9d44e3dd75028d84b285e9c07e02e2bb40467a504801634b6bd7d315115411643288f052ca4220cfb047d0cc7b7d2
+  data.tar.gz: f3444f8b1b0b5b8ea942debad0625ff22ae890a13355131dfb41c1e3a1cd6694577b31e2598bf04aaea7041f14b97d69d8f24e7d90f2860afc803dedc7cadf27

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.10.8
+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,16 @@
 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
 --------------
 

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

@@ -1,3 +1,3 @@
 module Kameleon
-  VERSION = '2.10.8'
+  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.8
+  version: 2.10.9
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-21 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