libis-workflow 2.0.29 → 2.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d49ea18050014ac64b6c23b97dded2f5595641
-  data.tar.gz: 6da973b5eee84b3eb25598200bb76f757c94fc7f
+  metadata.gz: 4df3c5f29975a0cd1cf20d24ba44a943bc5bc34c
+  data.tar.gz: 7933d28eb59d222c33dad47ad57f09a0104ff51d
 SHA512:
-  metadata.gz: 25dc30ef7485f9d7636547048dce41c3cdd81a940d955b9391c0cdbbcbbdef03b80fe808ecbc5d9462bf57cd5ff8e7b150a8674a5b228b101ef17db80d2833ec
-  data.tar.gz: c819b43d37ef7ee39c1043719fb2d4b6f2ab11d52f5b311a62a1733b05aeee6da0817ceabd67d729f79a84cc16757c6a5c98f61c1cd77e86cc36d5e50f9a4136
+  metadata.gz: 5e27bd1cb5b0d2ca8b1798bc619bb0062dcba00f5e087056a3b31afcacfb97914358ab9e4bdbf23f81a0d0196d1e76e7ef3742d7200b6a0698e36f31f063e444
+  data.tar.gz: 393f6adcb0f7702c6f2114de0d3ede2373fad13af3f85cc56fa86bea6b76e0e7a09fcc2f73e7fb84eac56156ac2e7ceddf6c6aec0f76476ded26202f7fbe8237

data/lib/libis/workflow/status.rb

@@ -2,11 +2,13 @@ module Libis
   module Workflow
     module Status
 
+      protected
+
       STATUS = {
           NOT_STARTED: 0,
           STARTED: 1,
-          DONE: 2,
-          ASYNC_WAIT: 3,
+          ASYNC_WAIT: 2,
+          DONE: 3,
           ASYNC_HALT: 4,
           FAILED: 5
       }
@@ -14,12 +16,14 @@ module Libis
       STATUS_TEXT = [
           'not started',
           'started',
-          'done',
           'waiting for running async process',
+          'done',
           'waiting for halted async process',
           'failed'
       ]
 
+      public
+
       # Changes the status of the object. The status changed is logged in the status_log with the current timestamp.
       #
       # @param [String] task namepath of the task
@@ -27,7 +31,7 @@ module Libis
       def set_status(task, status)
         task = task.namepath if task.is_a?(Libis::Workflow::Task)
         log_entry = self.status_entry(task)
-        if log_entry.nil? || status == :STARTED
+        if log_entry.nil? || STATUS[status_symbol(log_entry['status'])] > STATUS[status_symbol(status)]
           log_entry = self.add_status_log('task' => task, 'status' => status, 'created' => DateTime.now)
         end
         log_entry['status'] = status
@@ -74,7 +78,7 @@ module Libis
       # Compare status with current status of the object.
       #
       # @param [Symbol] state
-      # @return [Integer] 1, 0 or -1 depnding on which
+      # @return [Integer] 1, 0 or -1 depending on which status is higher in rank
       def compare_status(state, task = nil)
         STATUS[self.status(task)] <=> STATUS[state]
       end
@@ -83,7 +87,7 @@ module Libis
       # @param [String] task namepath of the task
       # @param [Integer] progress progress indicator (as <progress> of <max> or as % if <max> not set). Default: 0
       # @param [Integer] max max count.
-      def status_progress(task, progress, max = nil)
+      def status_progress(task, progress = nil, max = nil)
         log_entry = self.status_entry(task)
         log_entry ||= self.add_status_log('task' => task, 'status' => :STARTED, 'created' => DateTime.now)
         log_entry['progress'] = progress ? progress : (log_entry['progress'] || 0) + 1

data/lib/libis/workflow/task.rb

@@ -189,7 +189,7 @@ module Libis
         items = subitems(parent_item)
         return unless items.size > 0
 
-        status = Hash.new(0)
+        status_count = Hash.new(0)
         parent_item.status_progress(self.namepath, 0, items.count)
         items.each_with_index do |item, i|
           debug 'Processing subitem (%d/%d): %s', parent_item, i+1, items.size, item.to_s
@@ -197,28 +197,28 @@ module Libis
           item = new_item if new_item.is_a?(Libis::Workflow::WorkItem)
           parent_item.status_progress(self.namepath, i+1)
           item_status = item.status(self.namepath)
-          status[item_status] += 1
+          status_count[item_status] += 1
           break if parameter(:abort_recursion_on_failure) && item_status != :DONE
         end
 
-        debug '%d of %d subitems passed', parent_item, status[:DONE], items.size
-        substatus_check(status, parent_item, 'item')
+        debug '%d of %d subitems passed', parent_item, status_count[:DONE], items.size
+        substatus_check(status_count, parent_item, 'item')
       end
 
-      def substatus_check(status, item, task_or_item)
+      def substatus_check(status_count, item, task_or_item)
         item_status = :DONE
 
-        if (waiting = status[:ASYNC_WAIT]) > 0
+        if (waiting = status_count[: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
+        if (halted = status_count[:ASYNC_HALT]) > 0
           warn "%d sub#{task_or_item}(s) halted in async process", item, halted
           item_status = :ASYNC_HALT
         end
 
-        if (failed = status[:FAILED]) > 0
+        if (failed = status_count[:FAILED]) > 0
           error "%d sub#{task_or_item}(s) failed", item, failed
           item_status = :FAILED
         end

data/lib/libis/workflow/task_group.rb

@@ -37,7 +37,7 @@ module Libis
         tasks = subtasks
         return unless tasks.size > 0
 
-        status = Hash.new(0)
+        status_count = Hash.new(0)
         item.status_progress(self.namepath, 0, tasks.count)
         tasks.each_with_index do |task, i|
           info 'Running subtask (%d/%d): %s', item, i+1, tasks.size, task.name
@@ -45,11 +45,11 @@ module Libis
           item = new_item if new_item.is_a?(Libis::Workflow::WorkItem)
           item.status_progress(self.namepath, i+1)
           item_status = item.status(task.namepath)
-          status[item_status] += 1
+          status_count[item_status] += 1
           break if parameter(:abort_on_failure) && item_status != :DONE
         end
 
-        substatus_check(status, item, 'task')
+        substatus_check(status_count, item, 'task')
 
         info item.status_text(self.namepath).capitalize, item
       end

data/lib/libis/workflow/version.rb

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

data/spec/workflow_spec.rb

@@ -121,6 +121,7 @@ STR
       expect(o[/(?<=\] ).*/].strip).to eq sample_out[i].strip
     end
 
+    # run.status_log.each { |e| puts e }
     expect(run.status_log.size).to eq 5
     expect(run.items.first.status_log.size).to eq 3
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.29
+  version: 2.0.30
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,4 +206,3 @@ test_files:
 - spec/tasks/checksum_tester.rb
 - spec/tasks/collect_files.rb
 - spec/workflow_spec.rb
-has_rdoc: