libis-workflow 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332e3f108f5464f08d9ab1d6f156332db8879863
-  data.tar.gz: 4f58de6e1266c4e27bee4081154cadf703fb3149
+  metadata.gz: db408853eaf1375de415370047728a3e4667d3f8
+  data.tar.gz: bc1996868fe1402e3a215d3b4ba3f55ff0e4886f
 SHA512:
-  metadata.gz: 1c8e22d490d9b8c3b52bcca7708d2e7402ad858e27debcec75e06b7b62c44efdfd9dc1e094b7955d77b338ad24fe0ab9b4cabe0297eca07e5a2235aafaf3d06e
-  data.tar.gz: 9ae775f9bdc770c7df9d70144cbced20d519443a3258dce4224200b29fea0acc48cd3540e0ab12e9911fc6f075656f7d4c7df8c67b14dedff315226ca402c426
+  metadata.gz: 1f19b3c2e59d474dc9d89698ea008128a1bc942c70686827f8c0631d37f2858d4d1d8cd2234bb25a725a6c5a7597f50fcfb7ab342eac42e279731c28e95b4aa0
+  data.tar.gz: 4673df7b1e87f8b4d79db363456f3bfb28e26142ecf7ab4a92cf7ff9b593346e47090eeee35a2860a1344ead49554bf18dee9b1d10763ecab9d19e5edbbb08e0

data/lib/libis/workflow/task_group.rb

@@ -38,7 +38,7 @@ module Libis
 
         status = Hash.new(0)
         tasks.each_with_index do |task, i|
-          debug 'Running subtask (%d/%d): %s', item, i+1, tasks.size, task.name
+          info 'Running subtask (%d/%d): %s', item, i+1, tasks.size, task.name
           task.run item
           status[item.status(task.namepath)] += 1
           break if parameter(:abort_on_failure) && item.status(task.namepath) != :DONE

data/lib/libis/workflow/tasks/analyzer.rb

@@ -12,6 +12,16 @@ module Libis
         # @param [Libis::Workflow::Base::WorkItem] item
         def run(item)
 
+          recursive_run(item)
+          self.workitem = item
+          info 'Ingest finished', item
+
+        end
+
+        private
+
+        def recursive_run(item)
+
           item.properties['ingest_failed'] = item.check_status(:FAILED)
 
           item.summary = {}
@@ -22,7 +32,7 @@ module Libis
           end
 
           item.each do |i|
-            run i
+            recursive_run i
             i.summary.each do |level, count|
               item.summary[level] ||= 0
               item.summary[level] += (count || 0)
@@ -31,8 +41,9 @@ module Libis
 
         rescue RuntimeError => ex
 
-          puts 'Failed to analyze item: %s - %s' % [item.class, item.name]
-          puts 'Exception: %s' % ex.message
+          self.workitem = item
+          error 'Failed to analyze item: %s - %s', item, item.class, item.name
+          error 'Exception: %s', item, ex.message
 
         ensure
 

data/lib/libis/workflow/version.rb

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

data/spec/workflow_spec.rb

@@ -89,20 +89,21 @@ 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 -- ProcessFiles - TestRun : Running subtask (1/2): ChecksumTester
+ 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 - TestRun : Running subtask (2/2): CamelizeName
+ 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
+ INFO -- Analyzer - TestRun : Ingest finished
 STR
     sample_out = sample_out.lines.to_a
 
@@ -113,11 +114,11 @@ STR
 
     expect(output.size).to eq sample_out.size
     output.each_with_index do |o, i|
-      expect(o[/(?<=\] ).*/]).to eq sample_out[i].strip
+      expect(o[/(?<=\] ).*/].strip).to eq sample_out[i].strip
     end
 
-    expect(run.summary['DEBUG']).to eq 20
-    expect(run.log_history.size).to eq 8
+    expect(run.summary['DEBUG']).to eq 18
+    expect(run.log_history.size).to eq 9
     expect(run.status_log.size).to eq 8
     expect(run.items.first.log_history.size).to eq 12
     expect(run.items.first.status_log.size).to eq 6
@@ -160,10 +161,10 @@ STR
     [
         {severity: 'DEBUG', task: 'CollectFiles', message: 'Processing subitem (1/1): items'},
         {severity: 'DEBUG', task: 'CollectFiles', message: '1 of 1 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', message: 'Running subtask (1/2): ChecksumTester'},
+        {severity: 'INFO', task: 'ProcessFiles', message: 'Running subtask (1/2): ChecksumTester'},
         {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', message: 'Processing subitem (1/1): items'},
         {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', message: '1 of 1 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', message: 'Running subtask (2/2): CamelizeName'},
+        {severity: 'INFO', task: 'ProcessFiles', message: 'Running subtask (2/2): CamelizeName'},
         {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', message: 'Processing subitem (1/1): items'},
         {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', message: '1 of 1 subitems passed'},
     ].each_with_index do |h, i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler