libis-workflow 2.0.37 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d248c18f7b5ec05c2a28bd7121a31d6c9f3f00c73a4e688c7fe00b4fdf12dde8
-  data.tar.gz: cfd5c563241f5a7bf2a76c287f7411ef1b81e720fa29886594e39d8f66a195dc
+  metadata.gz: 584b8e1d60eca39c3f050334e697a01c9385466ee97e135e2f424f6b80e49b99
+  data.tar.gz: 7c105c4a9685e0c12acf6ddeb6bd876e702b4b6638f50c43c593e3b74f5af492
 SHA512:
-  metadata.gz: 1103e4fdff7de541a410c065605c220fd9890a7e4b17cb38ea965f1bf3246d415f99c70f67a18ed604e9ad2a009c47a5d252edce46f5114d91057d4e2a1d771f
-  data.tar.gz: 0a30fa5acc5df9709ab742b5331e7a597b189ee563a0c08f12e072b72c6c748c85877d66f868554d6cc80c0ad5e23b1d663f0135e0fe184fd1b16be9a47fb93a
+  metadata.gz: 90995692a972340ef2363ccf4b74c16a8bea56b19ae8ee2ee9e9efa011e4f1b65613070d0c2186946d8f82b61a00ece8ad2a65219fa1e7e129a2bec2ddb3b4ec
+  data.tar.gz: 967aaff3c1178c2913bc8e97a82e2bbd4a94759dcac5812999adda01d3d6b4af9a20bb51c4276490818cb097326a244a773476fc91e6bf97f6f17134c1d41c60

data/.travis.yml

@@ -3,34 +3,39 @@ sudo: false
 bundler_args: --without development
 cache: bundler
 rvm:
-  - 2.3.0
-  - 2.4.1
-  - 2.5.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
-  - jruby-9.1.9.0
+  - jruby-9.1
   - jruby-head
 jdk:
   - openjdk8
-  - oraclejdk8
-  - oraclejdk9
+  - openjdk10
+  - openjdk11
 matrix:
   exclude:
-    - rvm: 2.3.0
-      jdk: oraclejdk8
-    - rvm: 2.3.0
-      jdk: oraclejdk9
-    - rvm: 2.4.1
-      jdk: oraclejdk8
-    - rvm: 2.4.1
-      jdk: oraclejdk9
-    - rvm: 2.5.0
-      jdk: oraclejdk8
-    - rvm: 2.5.0
-      jdk: oraclejdk9
+    - rvm: 2.3
+      jdk: openjdk10
+    - rvm: 2.3
+      jdk: openjdk11
+    - rvm: 2.4
+      jdk: openjdk10
+    - rvm: 2.4
+      jdk: openjdk11
+    - rvm: 2.5
+      jdk: openjdk10
+    - rvm: 2.5
+      jdk: openjdk11
+    - rvm: 2.6
+      jdk: openjdk10
+    - rvm: 2.6
+      jdk: openjdk11
     - rvm: ruby-head
-      jdk: oraclejdk8
+      jdk: openjdk10
     - rvm: ruby-head
-      jdk: oraclejdk9
+      jdk: openjdk11
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

data/lib/libis/workflow.rb

@@ -31,8 +31,6 @@ module Libis
     autoload :TaskGroup, 'libis/workflow/task_group'
     autoload :TaskRunner, 'libis/workflow/task_runner'
 
-    autoload :Worker, 'libis/workflow/worker'
-
     def self.configure
       yield Config.instance
     end

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

@@ -1,6 +1,7 @@
 require 'digest'
 
 require 'libis/workflow/base/work_item'
+require 'libis/tools/checksum'
 
 module Libis
   module Workflow
@@ -40,7 +41,7 @@ module Libis
             self.properties['mode'] = stats.mode
             self.properties['uid'] = stats.uid
             self.properties['gid'] = stats.gid
-            set_checksum(:MD5, ::Digest::MD5.hexdigest(File.read(name))) if File.file?(name)
+            set_checksum(:MD5, ::Libis::Tools::Checksum.hexdigest(name, :MD5)) if File.file?(name)
           rescue => _e
             # ignored
           end

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

@@ -1,4 +1,3 @@
-require 'backports/rails/hash'
 require 'libis/tools/extend/hash'
 
 require 'libis/workflow/config'

data/lib/libis/workflow/status.rb

@@ -89,7 +89,9 @@ module Libis
       # @param [Integer] max max count.
       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)
+        if log_entry.nil? || STATUS[status_symbol(log_entry['status'])] >= STATUS[:DONE]
+          log_entry = self.add_status_log('task' => task, 'status' => :STARTED, 'created' => DateTime.now)
+        end
         log_entry['progress'] = progress ? progress : (log_entry['progress'] || 0) + 1
         log_entry['max'] = max if max
         log_entry['updated'] = DateTime.now

data/lib/libis/workflow/task.rb

@@ -1,8 +1,6 @@
-require 'backports/rails/hash'
-require 'backports/rails/string'
-
 require 'libis/tools/parameter'
 require 'libis/tools/extend/hash'
+require 'libis/tools/extend/string'
 require 'libis/tools/logger'
 
 require 'libis/workflow'
@@ -97,7 +95,7 @@ module Libis
         set_status item, :FAILED
         raise e if parent
 
-      rescue => e
+      rescue Exception => e
         set_status item, :FAILED
         fatal_error "Exception occured: #{e.message}", item
         debug e.backtrace.join("\n")
@@ -215,9 +213,9 @@ module Libis
             item.set_status(namepath, :FAILED)
             break
 
-          rescue => e
+          rescue Exception => e
             item.set_status(namepath, :FAILED)
-            raise Libis::WorkflowAbort, e.message
+            raise Libis::WorkflowAbort, "#{e.message} @ #{e.backtrace.first}"
 
           else
             item = new_item if new_item.is_a?(Libis::Workflow::WorkItem)

data/lib/libis/workflow/version.rb

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

data/libis-workflow.gemspec

@@ -27,14 +27,11 @@ Gem::Specification.new do |spec|
 
   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_development_dependency 'awesome_print'
 
-  spec.add_runtime_dependency 'libis-tools', '~> 0.9'
-  spec.add_runtime_dependency 'sidekiq', '~> 4.0'
-  spec.add_runtime_dependency 'eldritch', '~> 1.1'
+  spec.add_runtime_dependency 'libis-tools', '~> 1.0'
 end

data/spec/tasks/camelize_name.rb

@@ -1,4 +1,4 @@
-require 'backports/rails/string'
+require 'libis/tools/extend/string'
 
 require 'libis/workflow'
 

data/spec/workflow_spec.rb

@@ -10,8 +10,8 @@ def check_output(logoutput, sample_out)
   sample_out = sample_out.lines.to_a.map {|x| x.strip}
   output = logoutput.string.lines.to_a.map {|x| x[/(?<=\] ).*/].strip}
 
-  puts 'output:'
-  ap output
+  # puts 'output:'
+  # ap output
 
   expect(output.size).to eq sample_out.size
   output.each_with_index do |o, i|
@@ -20,8 +20,8 @@ def check_output(logoutput, sample_out)
 end
 
 def check_status_log(status_log, sample_status_log)
-  puts 'status_log:'
-  status_log.each { |e| ap e }
+  # puts 'status_log:'
+  # status_log.each { |e| ap e }
   expect(status_log.size).to eq sample_status_log.size
   sample_status_log.each_with_index do |h, i|
     h.keys.each {|key| expect(status_log[i][key.to_s]).to eq h[key]}

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.37
+  version: 2.1.4
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,42 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: eldritch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 description: A simple framework to build custom task/workflow solutions.
 email: kris.dekeyser@libis.be
 executables: []
@@ -172,7 +130,6 @@ files:
 - lib/libis/workflow/task_runner.rb
 - lib/libis/workflow/version.rb
 - lib/libis/workflow/work_item.rb
-- lib/libis/workflow/worker.rb
 - lib/libis/workflow/workflow.rb
 - libis-workflow.gemspec
 - spec/items.rb
@@ -207,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: LIBIS Workflow framework.

data/lib/libis/workflow/worker.rb

@@ -1,42 +0,0 @@
-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