libis-workflow 2.1.14 → 2.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c5ef592f59a3caa686b720be93627ac6c3b4ef0dc090b7c34fde4df0dd884f
-  data.tar.gz: 1d94306c409a49e0e32a793b2776006f5cbd1bbea7cc249e6ac6c367929910b1
+  metadata.gz: e66dece77083326a3d88dcfa86846180adec96c38689f6881d9fae6c51b6ae47
+  data.tar.gz: 36257c4ab77177ae135a235d564cc43781bc8d04bc103cdf68e7279c103ea196
 SHA512:
-  metadata.gz: 89cd04b42874247038d0f68ff9f99d9c69c73133db0434a36f7f3379987ddc268a9f724ee2ad8bb9fec1cf6bc8b0cf763c03282cca21e1baf197e06df41435f2
-  data.tar.gz: c4f5932fe4f02ba30f225fa8100ae6907476f69f067de278be9cf5d5eb1f3b1e32f81f93603f215050b62534a53315b4d8dd6d55ab795f5178ac4d93a7d691e4
+  metadata.gz: 2a332c4a3b6417e52d6f71cf3346dcb83666cd6404ab3c8c391bd6607b7ace204462632d3ac7864283cb6204c1b635ba6b1a623bd380b1b5ef14a19201b6e194
+  data.tar.gz: f56a7cde0ff9ec1bfbf2c276234a39672310c22b18e811fc62fdcb8c53529260b35eeb04f64c68be39633c70848af58e13e16a26a4b8b27f7cd73e0bea44c416

data/.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "rdbg",
+            "request": "launch",
+            "name": "Debug rspec test",
+            "command": "rspec",
+            "script": "${file}"
+        },
+        {
+            "type": "rdbg",
+            "name": "Debug current file with rdbg",
+            "request": "launch",
+            "script": "${file}",
+            "args": [],
+            "askParameters": true
+        }
+    ]
+}

data/lib/libis/workflow/run.rb

@@ -25,6 +25,9 @@ module Libis
         nil
       end
 
+      def reload
+      end
+
       def logger
         self.properties[:logger] || (job.logger rescue nil)
       end

data/lib/libis/workflow/task.rb

@@ -213,21 +213,21 @@ module Libis
 
           rescue Libis::WorkflowError => e
             set_status(item, :FAILED)
-            error 'Error processing subitem (%d/%d): %s', item, i + 1, items.size, e.message
+            error 'Error processing subitem (%d/%d): %s @ %s', item, i + 1, items.size, e.message, e.backtrace.first
             break if parameter(:abort_recursion_on_failure)
 
           rescue Libis::WorkflowAbort => e
-            fatal_error 'Fatal error processing subitem (%d/%d): %s @ %s\n%s', item, i + 1, items.size, e.message, e.backtrace.first, e.backtrace.map{|t| ' -- ' + t}.join("\n")
+            fatal_error "Fatal error processing subitem (%d/%d): %s\n%s", item, i + 1, items.size, e.message, e.backtrace[..9].map{|t| ' -- ' + t}.join("\n")
             set_status(item, :FAILED)
             break
 
           rescue Libis::WorkflowAbortForget => e
-            fatal_error 'Fatal error processing subitem (%d/%d): %s @ %s\n%s', item, i + 1, items.size, e.message, e.backtrace.first, e.backtrace.map{|t| ' -- ' + t}.join("\n")
+            fatal_error "Fatal error processing subitem (%d/%d): %s\n%s", item, i + 1, items.size, e.message, e.backtrace[..9].map{|t| ' -- ' + t}.join("\n")
             set_status(item, :FAILED)
             raise e
 
           rescue Exception => e
-            fatal_error 'Fatal error processing subitem (%d/%d): %s @ %s\n%s', item, i + 1, items.size, e.message, e.backtrace.first, e.backtrace.map{|t| ' -- ' + t}.join("\n")
+            fatal_error "Fatal error processing subitem (%d/%d): %s @ %s\n%s", item, i + 1, items.size, e.message, e.backtrace[..9].map{|t| ' -- ' + t}.join("\n")
             set_status(item, :FAILED)
             raise Libis::WorkflowAbort, "#{e.message} @ #{e.backtrace.first}"
 
@@ -340,7 +340,7 @@ module Libis
       end
 
       def set_status(item, state)
-        item.set_status(namepath, state) unless parameter(:run_always)
+        item.set_status(namepath, state)# unless parameter(:run_always)
         state
       end
 

data/lib/libis/workflow/task_group.rb

@@ -43,7 +43,7 @@ module Libis
         tasks.each_with_index do |task, i|
           unless task.parameter(:run_always)
             next unless continue
-            if  item.status(task.namepath) == :DONE && item.get_run.action == :retry
+            if item.status(task.namepath) == :DONE && item.get_run.action == :retry
               debug 'Retry: skipping task %s because it has finished successfully.', item, task.namepath
               next
             end

data/lib/libis/workflow/version.rb

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

data/libis-workflow.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  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', '~> 1.1'
 
-  spec.add_runtime_dependency 'libis-tools', '~> 1.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'awesome_print'
 end

data/spec/workflow_spec.rb

@@ -6,22 +6,28 @@ require 'awesome_print'
 basedir = File.absolute_path File.join(File.dirname(__FILE__))
 dirname = File.join(basedir, 'items')
 
-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}
+def print_output(logoutput)
+  output = logoutput.string.lines.to_a.map {|x| x[/(?<=\] ).*/]&.strip}.compact
 
-  # puts 'output:'
-  # ap output
+  puts 'output:'
+  ap output
+end
 
+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}.compact
   expect(output.size).to eq sample_out.size
   output.each_with_index do |o, i|
-    expect(o).to eq sample_out[i]
+    expect(o).to start_with sample_out[i]
   end
 end
 
+def print_status_log(status_log)
+  puts 'status_log:'
+  status_log.each { |e| ap e }
+end
+
 def check_status_log(status_log, sample_status_log)
-  # 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]}
@@ -113,24 +119,26 @@ DEBUG -- CollectFiles - TestRun : Processing subitem (1/1): items
 DEBUG -- CollectFiles - items : Processing subitem (1/3): test_dir_item.rb
 DEBUG -- CollectFiles - items : Processing subitem (2/3): test_file_item.rb
 DEBUG -- CollectFiles - items : Processing subitem (3/3): test_run.rb
-DEBUG -- CollectFiles - items : 3 of 3 subitems passed
-DEBUG -- CollectFiles - TestRun : 1 of 1 subitems passed
+DEBUG -- CollectFiles - items : 3 subitem(s) passed
+DEBUG -- CollectFiles - TestRun : 1 subitem(s) passed
  INFO -- Run - TestRun : Running subtask (2/2): ProcessFiles
  INFO -- ProcessFiles - TestRun : Running subtask (1/2): ChecksumTester
 DEBUG -- ProcessFiles/ChecksumTester - TestRun : Processing subitem (1/1): items
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (1/3): test_dir_item.rb
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (2/3): test_file_item.rb
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (3/3): test_run.rb
-DEBUG -- ProcessFiles/ChecksumTester - items : 3 of 3 subitems passed
-DEBUG -- ProcessFiles/ChecksumTester - TestRun : 1 of 1 subitems passed
+DEBUG -- ProcessFiles/ChecksumTester - items : 3 subitem(s) passed
+DEBUG -- ProcessFiles/ChecksumTester - TestRun : 1 subitem(s) passed
  INFO -- ProcessFiles - TestRun : Running subtask (2/2): CamelizeName
 DEBUG -- ProcessFiles/CamelizeName - TestRun : Processing subitem (1/1): items
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (1/3): test_dir_item.rb
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (2/3): test_file_item.rb
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (3/3): test_run.rb
-DEBUG -- ProcessFiles/CamelizeName - Items : 3 of 3 subitems passed
-DEBUG -- ProcessFiles/CamelizeName - TestRun : 1 of 1 subitems passed
+DEBUG -- ProcessFiles/CamelizeName - Items : 3 subitem(s) passed
+DEBUG -- ProcessFiles/CamelizeName - TestRun : 1 subitem(s) passed
+DEBUG -- ProcessFiles - TestRun : 2 subtask(s) passed
  INFO -- ProcessFiles - TestRun : Done
+DEBUG -- Run - TestRun : 2 subtask(s) passed
  INFO -- Run - TestRun : Done
 STR
 
@@ -422,7 +430,7 @@ STR
       it 'should run final task' do
         run
 
-        check_output logoutput, <<STR
+         check_output logoutput, <<STR
  INFO -- Run - TestRun : Ingest run started.
  INFO -- Run - TestRun : Running subtask (1/3): CollectFiles
  INFO -- Run - TestRun : Running subtask (2/3): ProcessingTask
@@ -551,10 +559,23 @@ STR
       it 'should run final task during retry' do
         run
 
-        logoutput.truncate(0)
         run.run :retry
 
         check_output logoutput, <<STR
+INFO -- Run - TestRun : Ingest run started.
+INFO -- Run - TestRun : Running subtask (1/3): CollectFiles
+INFO -- Run - TestRun : Running subtask (2/3): ProcessingTask
+ERROR -- ProcessingTask - TestRun : Task failed with failed status
+ERROR -- ProcessingTask - TestRun : Task failed with failed status
+ERROR -- ProcessingTask - TestRun : Task failed with failed status
+ERROR -- ProcessingTask - items : 3 subitem(s) failed
+ERROR -- ProcessingTask - TestRun : 1 subitem(s) failed
+INFO -- Run - TestRun : Running subtask (3/3): FinalTask
+INFO -- FinalTask - TestRun : Final processing of test_dir_item.rb
+INFO -- FinalTask - TestRun : Final processing of test_file_item.rb
+INFO -- FinalTask - TestRun : Final processing of test_run.rb
+ERROR -- Run - TestRun : 1 subtask(s) failed
+ INFO -- Run - TestRun : Failed
  INFO -- Run - TestRun : Ingest run started.
  INFO -- Run - TestRun : Running subtask (2/3): ProcessingTask
 ERROR -- ProcessingTask - TestRun : Task failed with failed status

metadata

@@ -1,73 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.1.14
+  version: 2.1.15
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: libis-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: libis-tools
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: A simple framework to build custom task/workflow solutions.
 email: kris.dekeyser@libis.be
 executables: []
@@ -103,6 +103,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
+- ".vscode/launch.json"
 - Gemfile
 - LICENSE
 - README.md
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: LIBIS Workflow framework.