libis-workflow 2.0.19 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e665a465a9cff03e17f953974de23cd3ab91131
-  data.tar.gz: 181f401350092ad4e21a3f20fc2f6678e2efa0d4
+  metadata.gz: 1369d1c69a4f8ee9f1d767c2047caf4c5fad0cee
+  data.tar.gz: 1b85e8cc488fb1b361ad4d68ff412079f2dacd97
 SHA512:
-  metadata.gz: db815e368e494d393b17f6ee382756805c06d2ddbec268913ae2e46b48b666f2966035d58035165082d4693aec755b5e9a3251eee8bc6c935a1cec7abc095786
-  data.tar.gz: 23161851ae6fe1218d9e12c9c23cf95cbe2af596e9f57fcecb611af40739f3190a4e694c0abf839711c589171cb7438c298ab7decedc4b049e95d4800c89ebb5
+  metadata.gz: 9b0bb414ceabdc6a1e1eeaba572ca6b77b4a1772f51bdb174a8cd28bd21f91d8bf09e0d70c230b57e0e3bc47c8ca9d51ae6f7db80c7c6cee5ed4e7f613539adc
+  data.tar.gz: 88bd9d8b6b8b5931c7ec35c9a57e0a93bbab802a07a66f299142ae46c08e517c4cefebac7514caf3b74c2421e2ff6419d366c0d0913294f18ca55fd3b81f08ed

data/lib/libis/workflow/status.rb

@@ -88,10 +88,10 @@ 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 = 0, max = nil)
+      def status_progress(task, progress, 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
+        log_entry['progress'] = progress ? progress : (log_entry['progress'] || 0) + 1
         log_entry['max'] = max if max
         log_entry['updated'] = DateTime.now
         self.save!

data/lib/libis/workflow/task.rb

@@ -15,7 +15,7 @@ module Libis
       include ::Libis::Tools::Logger
       include ::Libis::Tools::ParameterContainer
 
-      attr_accessor :parent, :name, :workitem
+      attr_accessor :parent, :name, :workitem, :processing_item
 
       parameter recursive: false, description: 'Run the task on all subitems recursively.'
       parameter abort_recursion_on_failure: false, description: 'Stop processing items recursively if one item fails.'
@@ -157,7 +157,9 @@ module Libis
 
         unless @item_skipper
           set_status item, :STARTED
+          self.processing_item = item
           self.process item
+          item = self.processing_item
           run_subitems(item) if parameter(:recursive)
           set_status item, :DONE if item.check_status(:STARTED, self.namepath)
         else

data/lib/libis/workflow/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Workflow
-    VERSION = '2.0.19' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+    VERSION = '2.0.21' 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.0.19
+  version: 2.0.21
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: LIBIS Workflow framework.