libis-workflow 2.0.25 → 2.0.28

data/lib/libis/workflow/task_group.rb

@@ -1,71 +1,72 @@
-require_relative 'task'
-
-module Libis
-  module Workflow
-
-    # noinspection RubyTooManyMethodsInspection
-    class TaskGroup < Libis::Workflow::Task
-
-      parameter abort_on_failure: true,
-                description: 'Stop processing tasks if one task fails.'
-
-      attr_accessor :tasks
-
-      def initialize(parent, cfg = {})
-        self.tasks = []
-        super parent, cfg
-      end
-
-      def <<(task)
-        self.tasks << task
-        task.parent = self
-      end
-
-      def apply_options(opts)
-        super opts
-        self.tasks.each do |task|
-          task.apply_options opts
-        end
-      end
-
-      protected
-
-      def process(item)
-
-        return unless check_processing_subtasks
-
-        tasks = subtasks
-        return unless tasks.size > 0
-
-        status = 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
-          item = task.run item
-          item.status_progress(self.namepath, i+1)
-          item_status = item.status(task.namepath)
-          status[item_status] += 1
-          break if parameter(:abort_on_failure) && item_status != :DONE
-        end
-
-        substatus_check(status, item, 'task')
-
-        info item.status_text(self.namepath).capitalize, item
-      end
-
-      def stop_processing_subtasks
-        @subtasks_stopper= true
-      end
-
-      def check_processing_subtasks
-        if @subtasks_stopper
-          @subtasks_stopper = false
-          return false
-        end
-        true
-      end
-
-    end
-
-  end
-end
+require_relative 'task'
+
+module Libis
+  module Workflow
+
+    # noinspection RubyTooManyMethodsInspection
+    class TaskGroup < Libis::Workflow::Task
+
+      parameter abort_on_failure: true,
+                description: 'Stop processing tasks if one task fails.'
+
+      attr_accessor :tasks
+
+      def initialize(parent, cfg = {})
+        self.tasks = []
+        super parent, cfg
+      end
+
+      def <<(task)
+        self.tasks << task
+        task.parent = self
+      end
+
+      def apply_options(opts)
+        super opts
+        self.tasks.each do |task|
+          task.apply_options opts
+        end
+      end
+
+      protected
+
+      def process(item)
+
+        return unless check_processing_subtasks
+
+        tasks = subtasks
+        return unless tasks.size > 0
+
+        status = 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
+          new_item = task.run item
+          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
+          break if parameter(:abort_on_failure) && item_status != :DONE
+        end
+
+        substatus_check(status, item, 'task')
+
+        info item.status_text(self.namepath).capitalize, item
+      end
+
+      def stop_processing_subtasks
+        @subtasks_stopper= true
+      end
+
+      def check_processing_subtasks
+        if @subtasks_stopper
+          @subtasks_stopper = false
+          return false
+        end
+        true
+      end
+
+    end
+
+  end
+end

data/lib/libis/workflow/task_runner.rb

@@ -1,34 +1,34 @@
-require_relative 'task_group'
-
-module Libis
-  module Workflow
-
-    # noinspection RubyTooManyMethodsInspection
-    class TaskRunner < Libis::Workflow::TaskGroup
-
-      parameter abort_on_failure: true, frozen: true
-      parameter recursive: false, frozen: true
-
-      def names
-        Array.new
-      end
-
-      def namepath
-        'Run'
-      end
-
-      def run(item)
-
-        check_item_type ::Libis::Workflow::Base::WorkItem, item
-        self.workitem = item
-
-        info 'Ingest run started.', item
-
-        super
-
-      end
-
-    end
-
-  end
-end
+require_relative 'task_group'
+
+module Libis
+  module Workflow
+
+    # noinspection RubyTooManyMethodsInspection
+    class TaskRunner < Libis::Workflow::TaskGroup
+
+      parameter abort_on_failure: true, frozen: true
+      parameter recursive: false, frozen: true
+
+      def names
+        Array.new
+      end
+
+      def namepath
+        'Run'
+      end
+
+      def run(item)
+
+        check_item_type ::Libis::Workflow::Base::WorkItem, item
+        self.workitem = item
+
+        info 'Ingest run started.', item
+
+        super
+
+      end
+
+    end
+
+  end
+end

data/lib/libis/workflow/version.rb

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

data/lib/libis/workflow/work_item.rb

@@ -1,37 +1,37 @@
-require 'libis/tools/extend/hash'
-require 'libis/workflow/base/work_item'
-
-module Libis
-  module Workflow
-
-    # In-memory implementation of ::Libis::Workflow::Base::WorkItem
-    class WorkItem
-      include ::Libis::Workflow::Base::WorkItem
-
-      attr_accessor :parent
-      attr_accessor :items
-      attr_accessor :options, :properties
-      attr_accessor :status_log
-      attr_accessor :summary
-
-      def initialize
-        self.parent = nil
-        self.items = []
-        self.options = {}
-        self.properties = {}
-        self.status_log = []
-        self.summary = {}
-      end
-
-      protected
-
-      def add_status_log(info)
-        # noinspection RubyResolve
-        self.status_log << info
-        self.status_log.last
-      end
-
-    end
-
-  end
-end
+require 'libis/tools/extend/hash'
+require 'libis/workflow/base/work_item'
+
+module Libis
+  module Workflow
+
+    # In-memory implementation of ::Libis::Workflow::Base::WorkItem
+    class WorkItem
+      include ::Libis::Workflow::Base::WorkItem
+
+      attr_accessor :parent
+      attr_accessor :items
+      attr_accessor :options, :properties
+      attr_accessor :status_log
+      attr_accessor :summary
+
+      def initialize
+        self.parent = nil
+        self.items = []
+        self.options = {}
+        self.properties = {}
+        self.status_log = []
+        self.summary = {}
+      end
+
+      protected
+
+      def add_status_log(info)
+        # noinspection RubyResolve
+        self.status_log << info
+        self.status_log.last
+      end
+
+    end
+
+  end
+end

data/lib/libis/workflow/worker.rb

@@ -1,42 +1,42 @@
-require 'sidekiq'
-
-require 'libis/tools/extend/hash'
-require 'libis/workflow/config'
-require 'libis/workflow/workflow'
-
-module Libis
-  module Workflow
-
-    class Worker
-      include Sidekiq::Worker
-
-      def perform(job_config, options = {})
-        job = configure(job_config, options)
-        options[:interactive] = false
-        job.execute options
-      end
-
-      def configure(job_config, options = {})
-        log_path = options.delete :log_path
-        if log_path
-          Libis::Workflow::Config.logger = ::Logger.new(
-              File.join(log_path, "#{job_config[:name]}.log"),
-              (options.delete(:log_shift_age) || 'daily'),
-              (options.delete(:log_shift_size) || 1024 ** 2)
-          )
-          Libis::Workflow::Config.logger.formatter = ::Logger::Formatter.new
-          Libis::Workflow::Config.logger.level = (options.delete(:log_level) || ::Logger::DEBUG)
-        end
-        get_job(job_config)
-      end
-
-      def get_job(job_config)
-        job = ::Libis::Workflow::Job.new
-        job.configure job_config.key_symbols_to_strings(recursive: true)
-        job
-      end
-
-    end
-
-  end
-end
+require 'sidekiq'
+
+require 'libis/tools/extend/hash'
+require 'libis/workflow/config'
+require 'libis/workflow/workflow'
+
+module Libis
+  module Workflow
+
+    class Worker
+      include Sidekiq::Worker
+
+      def perform(job_config, options = {})
+        job = configure(job_config, options)
+        options[:interactive] = false
+        job.execute options
+      end
+
+      def configure(job_config, options = {})
+        log_path = options.delete :log_path
+        if log_path
+          Libis::Workflow::Config.logger = ::Logger.new(
+              File.join(log_path, "#{job_config[:name]}.log"),
+              (options.delete(:log_shift_age) || 'daily'),
+              (options.delete(:log_shift_size) || 1024 ** 2)
+          )
+          Libis::Workflow::Config.logger.formatter = ::Logger::Formatter.new
+          Libis::Workflow::Config.logger.level = (options.delete(:log_level) || ::Logger::DEBUG)
+        end
+        get_job(job_config)
+      end
+
+      def get_job(job_config)
+        job = ::Libis::Workflow::Job.new
+        job.configure job_config.key_symbols_to_strings(recursive: true)
+        job
+      end
+
+    end
+
+  end
+end

data/lib/libis/workflow/workflow.rb

@@ -1,20 +1,20 @@
-require 'libis/workflow/base/workflow'
-
-module Libis
-  module Workflow
-
-    class Workflow
-      include ::Libis::Workflow::Base::Workflow
-
-      attr_accessor :name, :description, :config
-
-      def initialize
-        @name = ''
-        @description = ''
-        @config = Hash.new
-      end
-
-    end
-
-  end
-end
+require 'libis/workflow/base/workflow'
+
+module Libis
+  module Workflow
+
+    class Workflow
+      include ::Libis::Workflow::Base::Workflow
+
+      attr_accessor :name, :description, :config
+
+      def initialize
+        @name = ''
+        @description = ''
+        @config = Hash.new
+      end
+
+    end
+
+  end
+end

data/libis-workflow.gemspec

@@ -1,38 +1,38 @@
-# encoding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'libis/workflow/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'libis-workflow'
-  spec.version = ::Libis::Workflow::VERSION
-  spec.date = Date.today.to_s
-
-  spec.summary = %q{LIBIS Workflow framework.}
-  spec.description = %q{A simple framework to build custom task/workflow solutions.}
-
-  spec.author = 'Kris Dekeyser'
-  spec.email = 'kris.dekeyser@libis.be'
-  spec.homepage = 'https://github.com/Kris-LIBIS/workflow'
-  spec.license = 'MIT'
-
-  spec.platform = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-
-  spec.files = `git ls-files -z`.split("\x0")
-  spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
-
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.3'
-  spec.add_development_dependency 'rspec', '~> 3.1'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
-  spec.add_development_dependency 'coveralls', '~> 0.7'
-
-  spec.add_runtime_dependency 'libis-tools', '~> 0.9'
-  spec.add_runtime_dependency 'sidekiq', '~> 4.0'
-  spec.add_runtime_dependency 'eldritch', '~> 1.1'
-end
+# encoding: utf-8
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'libis/workflow/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'libis-workflow'
+  spec.version = ::Libis::Workflow::VERSION
+  spec.date = Date.today.to_s
+
+  spec.summary = %q{LIBIS Workflow framework.}
+  spec.description = %q{A simple framework to build custom task/workflow solutions.}
+
+  spec.author = 'Kris Dekeyser'
+  spec.email = 'kris.dekeyser@libis.be'
+  spec.homepage = 'https://github.com/Kris-LIBIS/workflow'
+  spec.license = 'MIT'
+
+  spec.platform = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 10.3'
+  spec.add_development_dependency 'rspec', '~> 3.1'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
+
+  spec.add_runtime_dependency 'libis-tools', '~> 0.9'
+  spec.add_runtime_dependency 'sidekiq', '~> 4.0'
+  spec.add_runtime_dependency 'eldritch', '~> 1.1'
+end