libis-workflow 2.1.8 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca60cb469baf356cfdbfc24d5b67213b407d1a03d31aac4282fef76e618ee21
-  data.tar.gz: 3d63a8d33290b99cd93c96881dc9bff5bc3d8931430ab81563d5f9db80903127
+  metadata.gz: 1dc320ccf41f1ec673274778ff2cec80ff5d4e0833706b019e2fa6faa34c9cd6
+  data.tar.gz: 94142b587e3722ff66d5b0c9c5217d58985b067809360152a4079707f169091e
 SHA512:
-  metadata.gz: 88de25eccc8af1d2e57d70cd97687c1b7d37ef086d1b3315398836c6e00277645f128d5718d316b1f5445e4320ab14c0c4b30bc482ae69a3a04e57f0c26073c4
-  data.tar.gz: c69167119af26dc0fd7d0c526bfdf117c4fec427a296c54576bc5a96eb160b5667600f20c5d97208516296d0c09f00b8454791055bb5e006dcdff52349037e69
+  metadata.gz: ba1df60123766f9af303be678988bf390eb83cd8df6e63108bede48bb157f2fd4fee206e6778fd5d7c029221f176e484608fd3704d909ca2886360d723d8a524
+  data.tar.gz: d28c97c7b4907241ca2bb9920e9cfb912381db8a48ee6638f5e063d6c93975b8bfa91319d56869b22c01ca09244298061352487aae8f120b73e988a29a395f7d

data/lib/libis/workflow/base/job.rb

@@ -64,8 +64,10 @@ module Libis
 
           run.job = self
           (opts.delete('run_config') || {}).each { |key,value| run.send("#{key}=", value) }
+          (opts.delete('run_properties') || {}).each { |key,value| run.properties[key] = value }
           run.options = self.input.merge(opts)
           run.save!
+          run.reload
 
           run.run
 

data/lib/libis/workflow/task.rb

@@ -38,6 +38,10 @@ module Libis
         raise Libis::WorkflowError, "Processing task '#{namepath}' is not allowed to have subtasks."
       end
 
+      def root_task
+        parent&.root_task || self
+      end
+
       # @param [Libis::Workflow::Base::WorkItem] item
       def run(item)
         check_item_type ::Libis::Workflow::Base::WorkItem, item
@@ -232,16 +236,22 @@ module Libis
 
         end
 
-        # noinspection RubyScope
-        debug '%d of %d subitems passed', parent_item, status_count[:DONE], items.size
         substatus_check(status_count, parent_item, 'item')
       end
 
+      def global_status(item)
+        results = Hash.new(0)
+        self.tasks.each { |subtask| results[item.status(subtask.namepath)] += 1 }
+        [:FAILED, :ASYNC_WAIT, :ASYNC_HALT].each { |status| return status if results[status] > 0 }
+        return :FAILED if results[:STARTED] > 1
+        :DONE
+      end
+
       def substatus_check(status_count, item, task_or_item)
         item_status = :DONE
 
         if (not_started = status_count[:NOT_STARTED]) > 0
-          error "%d sub#{task_or_item}(s) skipped", item, not_started
+          debug "%d sub#{task_or_item}(s) skipped", item, not_started
         end
 
         if (started = status_count[:STARTED]) > 0
@@ -264,6 +274,10 @@ module Libis
           item_status = :FAILED
         end
 
+        if (done = status_count[:DONE]) > 0
+          debug "%d sub#{task_or_item}(s) passed", item, done
+        end
+
         set_status(item, item_status)
       end
 

data/lib/libis/workflow/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Workflow
-    VERSION = '2.1.8' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+    VERSION = '2.1.10' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.10
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake