kameleon-builder 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b11eb6024451e8df957feaa54ba6f655569dd54
-  data.tar.gz: 5f903059a1e2dd4cb01ea11d91fdcfa885b4bfa0
+  metadata.gz: 6d7458a3fde25cc58852865df6aa62bd43b03dc4
+  data.tar.gz: 20f4f7320bb696713b64e3894c202a1f7386a181
 SHA512:
-  metadata.gz: 773ff3b250101855bc17abf0e468486a63642675d68463e2c7ac9f8b73663124cb34a6eaf2205856847c6b44f54f3c963168096bf45f2aaface7bbb5ee124dea
-  data.tar.gz: 5a108c1268d2d40737e4744091e546a8db14bd581f9fdcfbdce382374efde9e19a110f45b7628325697149f7f823b753ab9673fc59ec438666ec50fdcafeeefc
+  metadata.gz: 0dd429c6424f1484c1b2fff7f124e2a2a0d6b6a8e7e546b9101eba8a5f5809587007a33395ad73125bd45830edbf03e18a0ed31e482ddda5025f7b582051edb7
+  data.tar.gz: 4be4b3d61a51e0b0959a2b17777d1891b34a9da08a60e6e532cf36360efbd85e99a8f4a9aedb5d27986f19dad0df3e676c78635c92db4435f68e65b003b7272a

data/.bumpversion.cfg

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

data/CHANGES

@@ -1,9 +1,19 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.9.2
+-------------
+
+Released on February 21st 2018
+
+- Enforce the number of sub commands for the rescue and test commands
+- Support nested aliases
+
 Version 2.9.1
 -------------
 
+Released on January 28st 2018
+
 - Make the test and group command work in the cleaning steps.
 
 Version 2.9.0

data/lib/kameleon/engine.rb

@@ -298,6 +298,10 @@ module Kameleon
           first_context.pipe(first_cmd.value, second_cmd.value, second_context, kwargs)
         end
       when "rescue"
+        unless cmd.value.length == 2
+          Kameleon.ui.error("Invalid 'rescue' command arguments. Expecting 2 sub commands")
+          fail ExecError
+        end
         first_cmd, second_cmd = cmd.value
         begin
           exec_cmd(first_cmd, kwargs)
@@ -305,6 +309,10 @@ module Kameleon
           safe_exec_cmd(second_cmd, kwargs)
         end
       when "test"
+        unless cmd.value.length == 2 or cmd.value.length == 3
+          Kameleon.ui.error("Invalid 'test' command arguments. Expecting 2 or 3 sub commands")
+          fail ExecError
+        end
         first_cmd, second_cmd, third_cmd = cmd.value
         begin
           Kameleon.ui.debug("Execute test condition")
@@ -313,8 +321,10 @@ module Kameleon
           # be executed rather than the "then" statement.
           exec_cmd(first_cmd, kwargs.reject {|k| k == :only_with_context})
         rescue ExecError
-          Kameleon.ui.debug("Execute test 'else' statment'")
-          exec_cmd(third_cmd, kwargs) unless third_cmd.nil?
+          unless third_cmd.nil?
+            Kameleon.ui.debug("Execute test 'else' statment'")
+            exec_cmd(third_cmd, kwargs)
+          end
         else
           Kameleon.ui.debug("Execute test 'then' statment'")
           exec_cmd(second_cmd, kwargs)

data/lib/kameleon/recipe.rb

@@ -546,20 +546,18 @@ module Kameleon
       consistency_check
       resolve_checkpoint unless @checkpoint.nil?
 
-      Kameleon.ui.verbose("Resolving variables")
+      Kameleon.ui.verbose("Resolving aliases")
       @sections.values.each do |section|
         section.macrosteps.each do |macrostep|
           # First pass : resolve aliases
           Kameleon.ui.debug("Resolving aliases for macrostep '#{macrostep.name}'")
           macrostep.microsteps.each do |microstep|
             microstep.commands.map! do |cmd|
-              # resolve alias
-              @aliases.keys.include?(cmd.key) ? resolve_alias(cmd) : cmd
+              resolve_alias(cmd)
             end
+            # flatten for multiple-command alias + variables
+            microstep.commands.flatten!
           end
-          # flatten for multiple-command alias + variables
-          Kameleon.ui.debug("Resolving check statements for macrostep '#{macrostep.name}'")
-          macrostep.microsteps.each { |microstep| microstep.commands.flatten! }
         end
       end
 
@@ -641,26 +639,36 @@ module Kameleon
 
     def resolve_alias(cmd)
       name = cmd.key
-      aliases_cmd = @aliases.fetch(name).clone
-      aliases_cmd_str = aliases_cmd.to_yaml
-      args = YAML.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
-        if args.length == 0
-          msg = "#{name} takes no arguments (#{args.count} given)"
-        else
-          msg = "#{name} takes exactly #{expected_args_number} arguments"
-                " (#{args.count} given)"
+      if @aliases.keys.include?(name) 
+        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 = [].push(args).flatten  # convert args to array
+        expected_args_number = aliases_cmd_str.scan(/@\d+/).uniq.count
+        if expected_args_number != args.count
+          if args.length == 0
+            msg = "#{name} takes no arguments (#{args.count} given)"
+          else
+            msg = "#{name} takes exactly #{expected_args_number} arguments"
+                  " (#{args.count} given)"
+          end
+          raise RecipeError, msg
         end
-        raise RecipeError, msg
-      end
-      microstep = Microstep.new({cmd.microstep_name => aliases_cmd})
-      args.each_with_index do |arg, i|
-        microstep.gsub!("@#{i+1}", arg)
-      end
-      microstep.commands.map do |escaped_cmd|
-        Command.new(YAML.load(escaped_cmd.string_cmd), cmd.microstep_name)
+        aliases_cmd.map do |c|
+          nc = Command.new(c, cmd.microstep_name)
+          args.each_with_index do |arg, i|
+            nc.gsub!("@#{i+1}", arg)
+          end
+          resolve_alias(nc)
+        end 
+      elsif cmd.value.kind_of?(Array)
+        Kameleon.ui.debug("Search for aliases in the sub-commands of '#{name}'")
+        cmd.value.map!{ |cmd| resolve_alias(cmd) }.flatten!
+        cmd.remaster_string_cmd_from_value!
+      else
+        Kameleon.ui.debug("Leaf command '#{name}' is not an alias")
+        cmd
       end
     end
 
@@ -669,10 +677,10 @@ module Kameleon
       if (cmd.key =~ /on_(.*)clean/ || cmd.key =~ /on_(.*)init/)
         cmds = []
         if cmd.value.kind_of?(Array)
-          cmds = cmd.value.map do |c|
-            @aliases.keys.include?(c.key) ? resolve_alias(c) : c
+          cmds = cmd.value.map do |cmd|
+            resolve_alias(cmd)
           end
-          cmds = cmds.flatten
+          cmds.flatten!
         else
           fail RecipeError, "Invalid #{cmd.key} arguments"
         end

data/lib/kameleon/step.rb

@@ -73,13 +73,24 @@ module Kameleon
       end
     end
 
+    def string_cmd=(str)
+      Kameleon.ui.debug("Set string_cmd to '#{str}' and clear cached value")
+      @string_cmd = str
+      @value = nil
+    end
+
+    def remaster_string_cmd_from_value!
+      self.string_cmd = YAML.dump(to_array).gsub("---", "").strip
+      return self
+    end
+
     def gsub!(arg1, arg2)
       if value.kind_of? Array
         value.each { |cmd| cmd.gsub!(arg1, arg2) }
       else
         @value.gsub!(arg1, arg2)
       end
-      @string_cmd = YAML.dump(to_array).gsub("---", "").strip
+      remaster_string_cmd_from_value!
       return self
     end
 

data/version.txt

@@ -1 +1 @@
-2.9.1
+2.9.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess