task-orchestrator 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbae6a935dbfe404d446bfd999e02d593d0a5035
-  data.tar.gz: 3c498d82e8a231ad8e65a0f019cac1c2dccb24b0
+  metadata.gz: d429c26750c50b057de12c86cfa1f9a35d712103
+  data.tar.gz: ecc803f3b40cb903e9093cafc70e236ebfb89cf2
 SHA512:
-  metadata.gz: 645cb8b67b0a97e4dd27d9bde36ff6651ae93d55ee3a0085ba477a50a3f580f433d129ebb41d082f132b60ab62f3092f6d16df29d9249c18d9654107017c5f3b
-  data.tar.gz: b696ddba05522ec91571062d662a5a55438b5567d40d210915f3f1497c10c61630df79f88c93d5514231d6b60f326244fe719ecceee91fb32b7630d5692919ed
+  metadata.gz: f7358c4788335a26d19a4c2c39a8a61e20abfefd6c955a3c3d94306f2c9db521f72a30a736d07b1b0a94e1f8fc0265922b46d196697ad988acad503c92ceef00
+  data.tar.gz: 91229f1333d4295043be212de1268c6b000acc458535d220a412f4f8f41cf65db034af13701834b4d09f8e8f0592f284869463bad221ca81392142a9448f1c70

data/examples/nested_loops

@@ -0,0 +1,10 @@
+orchestrator:
+  statedir: states
+  nested_loop:
+    description: nested loop test
+    save: true
+    steps:
+      - type: sequential
+        nested_loop: [[a,b],[x,y],[1,2]]
+        scripts:
+          - command: "echo :::LOOP.0::: :::LOOP.1::: :::LOOP.2:::"

data/lib/orchestrator/task.rb

@@ -142,6 +142,11 @@ module Orchestrator
         invalid("interpolation type is not valid in this context - :::#{match}:::") if match !~ pattern and match =~ /^(ENV|ARG|EXEC)\./
 
         case match
+        when /^LOOP\.\d$/
+          require 'pp'
+          invalid("command interpolation failed not nested loop type step") unless @nested_loop_param
+          i = match.match(/^LOOP\.(\d)$/)[1].to_i
+          @nested_loop_param[i] ? @nested_loop_param[i] : invalid("command interpolation failed unexisting nesting #{match}")
         when /^LOOP$/
           invalid("command interpolation failed not loop type step") unless @loop_param
           @loop_param
@@ -238,6 +243,30 @@ module Orchestrator
           end
           step['scripts'] = scripts
           step.delete('loop')
+        elsif step.has_key?('nested_loop')
+          invalid("task step nested loop is not array") unless step['nested_loop'].is_a?(Array)
+          step['nested_loop'].each do |loop|
+            invalid("task step nested loop is not array of arrays") unless loop.is_a?(Array)
+          end
+          scripts = []
+          loops = step['nested_loop'].inject([[]]) do |tuples, array|
+            tuples.inject([]) do |agg, tuple|
+              array.each do |x|
+                agg << [*tuple, x]
+              end
+              agg
+            end
+          end
+          loops.each do |item|
+            @nested_loop_param = item
+            step['scripts'].each_index do |index|
+              script = Marshal.load(Marshal.dump(step['scripts'][index]))
+              scripts << validate_command(script, 'task step nested loop script')
+            end
+            @nested_loop_param = nil
+          end
+          step['scripts'] = scripts
+          step.delete('nested_loop')
         else
           step['scripts'].each_index do |index|
             step['scripts'][index] = validate_command(step['scripts'][index], 'task step script')

data/lib/orchestrator/version.rb

@@ -1,3 +1,3 @@
 module Orchestrator
-  VERSION ||= '0.0.24'
+  VERSION ||= '0.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: task-orchestrator
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Alexander Piavlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -84,6 +84,7 @@ files:
 - examples/interpolation
 - examples/loops
 - examples/multistep
+- examples/nested_loops
 - examples/parallel
 - examples/retry_handler
 - examples/sequential