kameleon-builder 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a1d0784e9debc5d6a2ff2fbeecea448ae460ab
-  data.tar.gz: 4ba768376ef0c21b166d4a80e1dda5c8cb40eb46
+  metadata.gz: 2b11eb6024451e8df957feaa54ba6f655569dd54
+  data.tar.gz: 5f903059a1e2dd4cb01ea11d91fdcfa885b4bfa0
 SHA512:
-  metadata.gz: 54f16a561da4b4ba99d1bb70dcce202ddff375293f3759afc9c0e1f65fbb3176ede757d7e40a17276903992aa67197a46c9725e5f0b4c4d2c80d8c4eb7f429b6
-  data.tar.gz: ec49aeb1b0178b397f71e4e1179838948821f67336f3d671135d45966fe63a9b32d275ce95de2063a8d314cea4becf17cc76ab79632ff20a3a20f0641ec73ae9
+  metadata.gz: 773ff3b250101855bc17abf0e468486a63642675d68463e2c7ac9f8b73663124cb34a6eaf2205856847c6b44f54f3c963168096bf45f2aaface7bbb5ee124dea
+  data.tar.gz: 5a108c1268d2d40737e4744091e546a8db14bd581f9fdcfbdce382374efde9e19a110f45b7628325697149f7f823b753ab9673fc59ec438666ec50fdcafeeefc

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,6 +1,11 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.9.1
+-------------
+
+- Make the test and group command work in the cleaning steps.
+
 Version 2.9.0
 -------------
 

data/lib/kameleon/context.rb

@@ -88,7 +88,7 @@ module Kameleon
       raise ContextClosed, "The ctx '#{name}' was closed"
     end
 
-    def pipe(cmd, other_cmd, other_ctx)
+    def pipe(cmd, other_cmd, other_ctx, kwargs = {})
       if @cache.mode == :from then
         Kameleon.ui.info("Redirecting pipe into cache")
         tmp = @cache.get_cache_cmd(cmd)
@@ -96,7 +96,7 @@ module Kameleon
         tmp = Tempfile.new("pipe-#{ Kameleon::Utils.generate_slug(cmd)[0..20] }")
         Kameleon.ui.verbose("Running piped commands")
         Kameleon.ui.verbose("Saving STDOUT from #{@name}_ctx to local file #{tmp.path}")
-        execute(cmd, :stdout => tmp)
+        execute(cmd, kwargs.merge({:stdout => tmp}))
         tmp.close
       end
       ## Saving one side of the pipe into the cache
@@ -108,7 +108,7 @@ module Kameleon
       dest_pipe_path = "${KAMELEON_WORKDIR}/pipe-#{ Kameleon::Utils.generate_slug(other_cmd)[0..20] }"
       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)
+      other_ctx.execute(other_cmd_with_pipe, kwargs)
     end
 
     def load_shell()

data/lib/kameleon/engine.rb

@@ -270,46 +270,59 @@ module Kameleon
         else
           map[context].reload
         end
-      when "exec_in"
-        @in_context.execute(cmd.value, kwargs)
-      when "exec_out"
-        @out_context.execute(cmd.value, kwargs)
-      when "exec_local"
-        @local_context.execute(cmd.value, kwargs)
+      when "exec_in", "exec_out", "exec_local"
+        if kwargs[:only_with_context] and map[cmd.key].closed?
+          Kameleon.ui.debug("Not executing #{cmd.key} command (context closed): #{cmd.value}")
+        else
+          map[cmd.key].execute(cmd.value, kwargs)
+        end
       when "pipe"
         first_cmd, second_cmd = cmd.value
         expected_cmds = ["exec_in", "exec_out", "exec_local"]
+        execute = true
         [first_cmd.key, second_cmd.key].each do |key|
           unless expected_cmds.include?(key)
             Kameleon.ui.error("Invalid pipe arguments. Expected : "\
                               "#{expected_cmds}")
             fail ExecError
           end
+          if kwargs[:only_with_context] and map[key].closed?
+            Kameleon.ui.debug("Not executing pipe command (context closed sub command #{key})")
+            execute = false
+          end
+        end
+        if execute
+          first_context = map[first_cmd.key]
+          second_context = map[second_cmd.key]
+          @cache.cache_cmd_raw(cmd.raw_cmd_id) if @cache
+          first_context.pipe(first_cmd.value, second_cmd.value, second_context, kwargs)
         end
-        first_context = map[first_cmd.key]
-        second_context = map[second_cmd.key]
-        @cache.cache_cmd_raw(cmd.raw_cmd_id) if @cache
-        first_context.pipe(first_cmd.value, second_cmd.value, second_context)
       when "rescue"
         first_cmd, second_cmd = cmd.value
         begin
-          exec_cmd(first_cmd)
+          exec_cmd(first_cmd, kwargs)
         rescue ExecError
-          safe_exec_cmd(second_cmd)
+          safe_exec_cmd(second_cmd, kwargs)
         end
       when "test"
         first_cmd, second_cmd, third_cmd = cmd.value
         begin
-          exec_cmd(first_cmd)
+          Kameleon.ui.debug("Execute test condition")
+          # Drop any :only_with_context flag, so that "if" fails if a closed
+          # context exception occurs. In that case, the "else" statement must
+          # be executed rather than the "then" statement.
+          exec_cmd(first_cmd, kwargs.reject {|k| k == :only_with_context})
         rescue ExecError
-          safe_exec_cmd(third_cmd) unless third_cmd.nil?
+          Kameleon.ui.debug("Execute test 'else' statment'")
+          exec_cmd(third_cmd, kwargs) unless third_cmd.nil?
         else
-          safe_exec_cmd(second_cmd)
+          Kameleon.ui.debug("Execute test 'then' statment'")
+          exec_cmd(second_cmd, kwargs)
         end
       when "group"
          cmds = cmd.value
          cmds.each do |cmd|
-           safe_exec_cmd(cmd)
+           exec_cmd(cmd, kwargs)
          end
       else
         Kameleon.ui.warn("Unknown command : #{cmd.key}")
@@ -379,18 +392,14 @@ module Kameleon
     end
 
     def clean(kwargs = {})
-      map = {"exec_in" => @in_context,
-             "exec_out" => @out_context,
-             "exec_local" => @local_context}
+      kwargs = kwargs.merge({:only_with_context => true})
       if kwargs.fetch(:with_checkpoint, false)
         Kameleon.ui.info("Removing all checkpoints")
         @recipe.checkpoint["clear"].each do |cmd|
-          if map.keys.include? cmd.key
-            begin
-              exec_cmd(cmd) unless map[cmd.key].closed?
-            rescue
-              Kameleon.ui.warn("An error occurred while executing : #{cmd.value}")
-            end
+          begin
+            exec_cmd(cmd, kwargs)
+          rescue
+            Kameleon.ui.warn("An error occurred while executing : #{cmd.value}")
           end
         end
       end
@@ -404,12 +413,10 @@ module Kameleon
             end
           end
           microstep.commands.each do |cmd|
-            if map.keys.include? cmd.key
-              begin
-                exec_cmd(cmd) unless map[cmd.key].closed?
-              rescue
-                Kameleon.ui.warn("An error occurred while executing : #{cmd.value}")
-              end
+            begin
+              exec_cmd(cmd, kwargs)
+            rescue
+              Kameleon.ui.warn("An error occurred while executing : #{cmd.value}")
             end
           end
         end

data/version.txt

@@ -1 +1 @@
-2.9.0
+2.9.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -223,7 +223,7 @@ requirements:
 - polipo 1.0.3, or greater
 - graphviz 2.38.0 or greater
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Kameleon is a tool to build virtual machines from scratch