libis-workflow 2.0.33 → 2.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ed3adeee0f666862bdedd0f695722d67619385
-  data.tar.gz: 8935af86aff161a31acb46e0a195b7a15b33d7de
+  metadata.gz: bb823bd0608daf4a967030f006907ea878a2f76b
+  data.tar.gz: ce590a7b9e6ad276081218e2c49af9742df33a11
 SHA512:
-  metadata.gz: 707f1e5286e629a04b7d5b1b0623bf5d23d175d2b278c5d1a42d0b3502e529db433407f12b328f2b64860140a6f1b2ef88da245e1f03ca0b8213f2b80258cb4f
-  data.tar.gz: d81c44bfe8b845ffc6f46a54ef19b9458482aef798945b3daa034b56b0365ff1947e723f824175e9b1a0eba2600285a8ad8d1228676a481a7a7c4c0b80b44195
+  metadata.gz: c999e3ff98da80b45e4709d789a4f1e15f54d39906ff025f8016b52c3573dd08eab94f2769fd36f655b0f60a7adfb3dd2a9e2fc5634fd8c02ae9a7bbfd1e52f2
+  data.tar.gz: 2a08d0d8d62e5c26bbb07540174ffd3d6ddefa3fd90d2c034ab47c6a68d3ede00c3c3a64e56ad9c526038ef0b54fd2b7b2e81258143dd18c5698418445e4ff00

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

@@ -39,6 +39,7 @@ module Libis
         # @param [Hash] message
         def add_log(message = {})
           msg = message_struct(message)
+          # noinspection RubyResolve
           add_log_entry(msg)
           self.save!
         end

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

@@ -53,6 +53,8 @@ module Libis
       #   self.status_log << info
       # end
       #
+      # The implementation should also take care that the public methods #save and #save! are implemented.
+      # ActiveRecord and Mongoid are known to implement these, but others may not.
       #
       module WorkItem
         include Enumerable
@@ -133,7 +135,9 @@ module Libis
           return self unless item and item.is_a?(Libis::Workflow::Base::WorkItem)
           self.items << item
           item.parent = self
+          # noinspection RubyResolve
           self.save!
+          # noinspection RubyResolve
           item.save!
           self
         end
@@ -172,19 +176,7 @@ module Libis
         # @return [Libis::Workflow::Base::Run]
         def get_run
           return self if self.is_a?(Libis::Workflow::Base::Run)
-          self.get_parent && self.get_parent.get_run || nil
-        end
-
-        # Dummy method. It is a placeholder for DB backed implementations. Wherever appropriate WorkItem#save will be
-        # called to save the current item's state. If state needs to persisted, you should override this method or make
-        # sure your persistence layer implements it in your class.
-        def save
-        end
-
-        # Dummy method. It is a placeholder for DB backed implementations. Wherever appropriate WorkItem#save will be
-        # called to save the current item's state. If state needs to persisted, you should override this method or make
-        # sure your persistence layer implements it in your class.
-        def save!
+          self.get_parent&.get_run
         end
 
       end

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

@@ -105,6 +105,7 @@ module Libis
           options = options.key_strings_to_symbols
           result = {}
           self.input.each do |key, parameter|
+            value = nil
             if options.has_key?(key)
               value = parameter.parse(options[key])
             elsif !parameter[:default].nil?

data/lib/libis/workflow/task.rb

@@ -23,7 +23,9 @@ module Libis
       parameter retry_interval: 10, description: 'Number of seconds to wait between retries.'
 
       def self.task_classes
-        ObjectSpace.each_object(::Class).select {|klass| klass < self}
+        # noinspection RubyArgCount
+        ObjectSpace.each_object(::Class)
+            .select {|klass| klass < self && klass != Libis::Workflow::TaskRunner}
       end
 
       def initialize(parent, cfg = {})
@@ -43,15 +45,15 @@ module Libis
         self.workitem = item
 
         case action
-          when :retry
-            if item.check_status(:DONE, namepath)
-              debug 'Retry: skipping task %s because it has finished successfully.', item, namepath
-              return item
-            end
-          when :failed
+        when :retry
+          if item.check_status(:DONE, namepath)
+            debug 'Retry: skipping task %s because it has finished successfully.', item, namepath
             return item
-          else
-            # type code here
+          end
+        when :failed
+          return item
+        else
+          # type code here
         end
 
         (parameter(:retry_count) + 1).times do
@@ -59,18 +61,19 @@ module Libis
           i = run_item(item)
           item = i if i.is_a?(Libis::Workflow::WorkItem)
 
+          # noinspection RubyScope
           case item.status(namepath)
-            when :DONE
-              self.action = :run
-              return item
-            when :ASYNC_WAIT
-              self.action = :retry
-            when :ASYNC_HALT
-              break
-            when :FAILED
-              break
-            else
-              return item
+          when :DONE
+            self.action = :run
+            return item
+          when :ASYNC_WAIT
+            self.action = :retry
+          when :ASYNC_HALT
+            break
+          when :FAILED
+            break
+          else
+            return item
           end
 
           self.action = :retry
@@ -201,9 +204,11 @@ module Libis
 
           rescue Libis::WorkflowError => e
             item.set_status(namepath, :FAILED)
+            error 'Error processing subitem (%d/%d): %s', item, i + 1, items.size, e.message
             break if parameter(:abort_recursion_on_failure)
 
           rescue Libis::WorkflowAbort => e
+            fatal_error 'Fatal error processing subitem (%d/%d): %s', item, i + 1, items.size, e.message
             item.set_status(namepath, :FAILED)
             break
 
@@ -216,7 +221,9 @@ module Libis
             parent_item.status_progress(namepath, i + 1)
 
           ensure
+            # noinspection RubyScope
             item_status = item.status(namepath)
+            # noinspection RubyScope
             status_count[item_status] += 1
             break if parameter(:abort_recursion_on_failure) && item_status != :DONE
 
@@ -224,6 +231,7 @@ 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

data/lib/libis/workflow/version.rb

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

data/lib/libis/workflow/work_item.rb

@@ -23,6 +23,12 @@ module Libis
         self.summary = {}
       end
 
+      def save
+      end
+
+      def save!
+      end
+
       protected
 
       def add_status_log(info)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.33
+  version: 2.0.34
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler