libis-workflow 2.0.32 → 2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6763478973f57afc6e94d2d38b5edf5e8c42360c
-  data.tar.gz: e8680a2303d8d8b8853fa9aafef13c00ae094fe3
+  metadata.gz: b8ed3adeee0f666862bdedd0f695722d67619385
+  data.tar.gz: 8935af86aff161a31acb46e0a195b7a15b33d7de
 SHA512:
-  metadata.gz: 720f2709d12c46e11c042b3cdea181444da2cfa045189c056252b4c95a4933f3684be652a0939e9b812210b474305dbb67b4f78b9a849f9e97194043e1857e8a
-  data.tar.gz: 4b580fa05e0e2869d4d247fa9838ee48e87512655bc86d337481d45274e2c010ce25eaa7a4e31165cfbcb7ffbebf0de67101523fc247e1f9ab1be0a1a4827ebc
+  metadata.gz: 707f1e5286e629a04b7d5b1b0623bf5d23d175d2b278c5d1a42d0b3502e529db433407f12b328f2b64860140a6f1b2ef88da245e1f03ca0b8213f2b80258cb4f
+  data.tar.gz: d81c44bfe8b845ffc6f46a54ef19b9458482aef798945b3daa034b56b0365ff1947e723f824175e9b1a0eba2600285a8ad8d1228676a481a7a7c4c0b80b44195

data/.travis.yml

@@ -3,8 +3,7 @@ sudo: false
 bundler_args: --without development
 cache: bundler
 rvm:
-  - 2.1.0
-  - 2.2.0
+  - 2.2.2
   - ruby-head
   - jruby-9.0.1.0
 jdk:
@@ -13,13 +12,9 @@ jdk:
   - oraclejdk8
 matrix:
   exclude:
-    - rvm: 2.1.0
+    - rvm: 2.2.2
       jdk: oraclejdk7
-    - rvm: 2.1.0
-      jdk: oraclejdk8
-    - rvm: 2.2.0
-      jdk: oraclejdk7
-    - rvm: 2.2.0
+    - rvm: 2.2.2
       jdk: oraclejdk8
     - rvm: ruby-head
       jdk: oraclejdk7

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

@@ -41,7 +41,7 @@ module Libis
             self.properties['uid'] = stats.uid
             self.properties['gid'] = stats.gid
             set_checksum(:MD5, ::Digest::MD5.hexdigest(File.read(name))) if File.file?(name)
-          rescue
+          rescue => _e
             # ignored
           end
           self.properties['filename'] = name

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

@@ -96,7 +96,7 @@ module Libis
             hash[name] = parameter
             hash
           end
-        rescue
+        rescue => _e
           {}
         end
 

data/lib/libis/workflow/task.rb

@@ -23,7 +23,7 @@ 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 }
+        ObjectSpace.each_object(::Class).select {|klass| klass < self}
       end
 
       def initialize(parent, cfg = {})
@@ -33,8 +33,8 @@ module Libis
         configure cfg
       end
 
-      def <<(task)
-        raise Libis::WorkflowError, "Processing task '#{self.namepath}' is not allowed to have subtasks."
+      def <<(_task)
+        raise Libis::WorkflowError, "Processing task '#{namepath}' is not allowed to have subtasks."
       end
 
       # @param [Libis::Workflow::Base::WorkItem] item
@@ -42,23 +42,24 @@ module Libis
         check_item_type ::Libis::Workflow::Base::WorkItem, item
         self.workitem = item
 
-        case self.action
+        case action
           when :retry
-            if item.check_status(:DONE, self.namepath)
-              debug 'Retry: skipping task %s because it has finished successfully.', item, self.namepath
+            if item.check_status(:DONE, namepath)
+              debug 'Retry: skipping task %s because it has finished successfully.', item, namepath
               return item
             end
           when :failed
             return item
           else
+            # type code here
         end
 
-        (parameter(:retry_count)+1).times do
+        (parameter(:retry_count) + 1).times do
 
           i = run_item(item)
           item = i if i.is_a?(Libis::Workflow::WorkItem)
 
-          case item.status(self.namepath)
+          case item.status(namepath)
             when :DONE
               self.action = :run
               return item
@@ -79,7 +80,7 @@ module Libis
         end
 
         item.get_run.action = :failed
-        
+
         return item
 
       rescue WorkflowError => e
@@ -90,7 +91,7 @@ module Libis
         set_status item, :FAILED
         raise e if parent
 
-      rescue ::Exception => e
+      rescue => e
         set_status item, :FAILED
         fatal_error "Exception occured: #{e.message}", item
         debug e.backtrace.join("\n")
@@ -101,43 +102,43 @@ module Libis
       end
 
       def names
-        (self.parent.names rescue Array.new).push(name).compact
+        (parent.names rescue []).push(name).compact
       end
 
-      def namepath;
-        self.names.join('/');
+      def namepath
+        names.join('/')
       end
 
       def apply_options(opts)
         o = {}
         o.merge!(opts[self.class.to_s] || {})
-        o.merge!(opts[self.name] || opts[self.names.join('/')] || {})
+        o.merge!(opts[name] || opts[names.join('/')] || {})
 
-        if o and o.is_a? Hash
+        if o && o.is_a?(Hash)
           default_values.each do |name, _|
             next unless o.key?(name.to_s)
             next if o[name.to_s].nil?
             paramdef = get_parameter_definition name.to_sym
             value = paramdef.parse(o[name.to_s])
-            self.parameter(name.to_sym, value)
+            parameter(name.to_sym, value)
           end
         end
       end
 
       def message(severity, msg, *args)
-        taskname = self.namepath rescue nil
-        self.set_application(taskname)
-        item = self.workitem rescue nil
+        taskname = namepath rescue nil
+        set_application(taskname)
+        item = workitem rescue nil
         item = args.shift if args.size > 0 and args[0].is_a?(::Libis::Workflow::Base::WorkItem)
         subject = item.namepath rescue nil
         subject ||= item.name rescue nil
         subject ||= item.to_s rescue nil
-        self.set_subject(subject)
+        set_subject(subject)
         super(severity, msg, *args)
       end
 
       def logger
-        (self.parent || self.get_run).logger
+        (parent || get_run).logger
       end
 
       protected
@@ -145,16 +146,16 @@ module Libis
       def configure(cfg)
         self.name = cfg['name'] || (cfg['class'] || self.class).to_s.split('::').last
         (cfg['options'] || {}).merge(
-            cfg.reject { |k, _| %w(options name class).include? k }
+            cfg.reject {|k, _| %w[options name class].include? k}
         ).symbolize_keys.each do |k, v|
-          self.parameter(k, v)
+          parameter(k, v)
         end
       end
 
       def run_item(item)
         @item_skipper = false
 
-        return item if item.status(self.namepath) == :DONE
+        return item if item.status(namepath) == :DONE
 
         pre_process(item)
 
@@ -163,10 +164,10 @@ module Libis
         else
           set_status item, :STARTED
           self.processing_item = item
-          self.process item
-          item = self.processing_item
+          process item
+          item = processing_item
           run_subitems(item) if parameter(:recursive)
-          set_status item, :DONE if item.check_status(:STARTED, self.namepath)
+          set_status item, :DONE if item.check_status(:STARTED, namepath)
         end
 
         post_process item
@@ -187,18 +188,40 @@ module Libis
         return unless check_processing_subitems
 
         items = subitems(parent_item)
-        return unless items.size > 0
+        return if items.empty?
 
         status_count = Hash.new(0)
-        parent_item.status_progress(self.namepath, 0, items.count)
+        parent_item.status_progress(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
-          new_item = run_item(item)
-          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_count[item_status] += 1
-          break if parameter(:abort_recursion_on_failure) && item_status != :DONE
+          debug 'Processing subitem (%d/%d): %s', parent_item, i + 1, items.size, item.to_s
+          new_item = item
+
+          begin
+            new_item = run_item(item)
+
+          rescue Libis::WorkflowError => e
+            item.set_status(namepath, :FAILED)
+            break if parameter(:abort_recursion_on_failure)
+
+          rescue Libis::WorkflowAbort => e
+            item.set_status(namepath, :FAILED)
+            break
+
+          rescue => e
+            item.set_status(namepath, :FAILED)
+            raise Libis::WorkflowAbort, e.message
+
+          else
+            item = new_item if new_item.is_a?(Libis::Workflow::WorkItem)
+            parent_item.status_progress(namepath, i + 1)
+
+          ensure
+            item_status = item.status(namepath)
+            status_count[item_status] += 1
+            break if parameter(:abort_recursion_on_failure) && item_status != :DONE
+
+          end
+
         end
 
         debug '%d of %d subitems passed', parent_item, status_count[:DONE], items.size
@@ -239,11 +262,11 @@ module Libis
       end
 
       def action=(action)
-        self.get_run.action = action
+        get_run.action = action
       end
 
       def action
-        self.get_run.action
+        get_run.action
       end
 
       def get_run(item = nil)
@@ -251,7 +274,7 @@ module Libis
       end
 
       def get_root_item(item = nil)
-        (item || self.workitem).get_root
+        (item || workitem).get_root
       end
 
       def get_work_dir(item = nil)
@@ -275,30 +298,30 @@ module Libis
       end
 
       def set_status(item, state)
-        item.set_status self.namepath, state
+        item.set_status namepath, state
         state
       end
 
       def check_item_type(klass, item = nil)
-        item ||= self.workitem
+        item ||= workitem
         unless item.is_a? klass.to_s.constantize
-          raise WorkflowError, "Workitem is of wrong type : #{item.class} - expected #{klass.to_s}"
+          raise WorkflowError, "Workitem is of wrong type : #{item.class} - expected #{klass}"
         end
       end
 
       def item_type?(klass, item = nil)
-        item ||= self.workitem
+        item ||= workitem
         item.is_a? klass.to_s.constantize
       end
 
       private
 
       def subtasks
-        self.tasks
+        tasks
       end
 
       def subitems(item = nil)
-        (item || self.workitem).get_item_list
+        (item || workitem).get_item_list
       end
 
       def default_values
@@ -306,9 +329,8 @@ module Libis
       end
 
       def self.default_values
-        parameter_defs.inject({}) do |hash, parameter|
+        parameter_defs.each_with_object({}) do |parameter, hash|
           hash[parameter.first] = parameter.last[:default]
-          hash
         end
       end
 

data/lib/libis/workflow/version.rb

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

data/libis-workflow.gemspec

@@ -1,24 +1,25 @@
-# encoding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'libis/workflow/version'
+require 'date'
 
 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.summary = 'LIBIS Workflow framework.'
+  spec.description = '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'
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    spec.platform = Gem::Platform::JAVA
+  end
 
   spec.files = `git ls-files -z`.split("\x0")
   spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }

metadata

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