libis-workflow 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b61310a01954b0c05959bec7446bfcddcbb106
-  data.tar.gz: 9dd4d787573e40fb33a348e5a6936569660988cc
+  metadata.gz: f5b71b6e2dc24c0ae35dd5d3391b186d2f5c12cd
+  data.tar.gz: 8a588d9b4ade3a58fd7c6d73e9eca833453d98f5
 SHA512:
-  metadata.gz: 00376fe9680c270c1b20fd85a96512480e3111a618213365b6f1c8a72785b69722c461b21ceef896f0f8df513377479e32656fdfb4cc969d63bcafe6edd411c9
-  data.tar.gz: 9e46ad09f53c12bc6385e3dc616f5b0a4f6f632d6ce1786b1969f6d01dc54d8f4647bd21b975868ac81fe470c4d30a4e6476d5ec4fdc8fe57ab7e206037c4766
+  metadata.gz: 51555a1d868759dae017bb1b456e7fa362bcdc519dddfaddab60b5e5e878eaef012e38ca337759dcd888378d9e5e94384ebb4772c558e6444e07135dd706e671
+  data.tar.gz: fceddf54b276796ee8fc86725a689dced75c891ff0dcd9b1a590dfd2b0296983b8c647330a2a9f2bba7e3752e3c3cf2645a8ca61d6903299ff999befc01483b1

data/lib/libis/workflow/task.rb

@@ -81,14 +81,14 @@ module Libis
 
       rescue WorkflowError => e
         error e.message, item
-        update_status item, :FAILED
+        set_status item, :FAILED
 
       rescue WorkflowAbort => e
-        update_status item, :FAILED
+        set_status item, :FAILED
         raise e if parent
 
       rescue ::Exception => e
-        update_status item, :FAILED
+        set_status item, :FAILED
         fatal "Exception occured: #{e.message}", item
         debug e.backtrace.join("\n")
 
@@ -159,7 +159,7 @@ module Libis
           set_status item, :STARTED
           self.process item
           run_subitems(item) if parameter(:recursive)
-          update_status item, :DONE
+          set_status item, :DONE if item.check_status(:STARTED, self.namepath)
         else
           run_subitems(item) if parameter(:recursive)
         end
@@ -198,22 +198,24 @@ module Libis
       end
 
       def substatus_check(status, item, task_or_item)
-        if (failed = status[:FAILED]) > 0
-          error "%d sub#{task_or_item}(s) failed", item, failed
-          update_status(item, :FAILED)
+        item_status = :DONE
+
+        if (waiting = status[:ASYNC_WAIT]) > 0
+          info "waiting for %d sub#{task_or_item}(s) in async process", item, waiting
+          item_status = :ASYNC_WAIT
         end
 
         if (halted = status[:ASYNC_HALT]) > 0
           warn "%d sub#{task_or_item}(s) halted in async process", item, halted
-          update_status(item, :ASYNC_HALT)
+          item_status = :ASYNC_HALT
         end
 
-        if (waiting = status[:ASYNC_WAIT]) > 0
-          info "waiting for %d sub#{task_or_item}(s) in async process", item, waiting
-          update_status(item, :ASYNC_WAIT)
+        if (failed = status[:FAILED]) > 0
+          error "%d sub#{task_or_item}(s) failed", item, failed
+          item_status = :FAILED
         end
 
-        update_status(item, :DONE)
+        set_status(item, item_status)
       end
 
       def capture_cmd(cmd, *opts)
@@ -264,11 +266,6 @@ module Libis
         @item_skipper = true
       end
 
-      def update_status(item, state)
-        return nil unless item.compare_status(state, self.namepath) < 0
-        set_status(item, state)
-      end
-
       def set_status(item, state)
         item.set_status self.namepath, state
         state

data/lib/libis/workflow/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Kris Dekeyser