libis-workflow 2.0.beta.13 → 2.0.beta.14

data/spec/workflow_spec.rb

@@ -26,7 +26,7 @@ describe 'TestWorkflow' do
         tasks: [
             {class: 'CollectFiles', recursive: true},
             {
-                name: 'ProcessFiles', subitems: true, recursive: false,
+                name: 'ProcessFiles', recursive: false,
                 tasks: [
                     {class: 'ChecksumTester', recursive: true},
                     {class: 'CamelizeName', recursive: true}
@@ -53,10 +53,6 @@ describe 'TestWorkflow' do
     job
   }
 
-  let!(:run) {
-    job.execute
-  }
-
   it 'should contain three tasks' do
     expect(workflow.config[:tasks].size).to eq 3
     expect(workflow.config[:tasks].first[:class]).to eq 'CollectFiles'
@@ -65,6 +61,7 @@ describe 'TestWorkflow' do
 
   # noinspection RubyResolve
   it 'should camelize the workitem name' do
+    run = job.execute
     puts run.options
     expect(run.options['CollectFiles'][:location]).to eq dirname
     expect(run.items.count).to eq 1
@@ -88,64 +85,68 @@ 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 : Processing subitem (1/1): items
-DEBUG -- ProcessFiles - items : Running subtask (1/2): ChecksumTester
+DEBUG -- 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 - items : Running subtask (2/2): CamelizeName
+DEBUG -- ProcessFiles/ChecksumTester - TestRun : 1 of 1 subitems passed
+DEBUG -- 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 - TestRun : 1 of 1 subitems passed
+DEBUG -- ProcessFiles/CamelizeName - TestRun : 1 of 1 subitems passed
 STR
     sample_out = sample_out.lines.to_a
+
+    run = job.execute
     output = logoutput.string.lines.to_a
 
-    expect(sample_out.count).to eq output.count
+    expect(output.count).to eq sample_out.count
     output.each_with_index do |o, i|
       expect(o[/(?<=\] ).*/]).to eq sample_out[i].strip
     end
 
-    expect(run.summary['DEBUG']).to eq 18
-    expect(run.log_history.count).to eq 4
-    expect(run.status_log.count).to eq 6
-    expect(run.items.first.log_history.count).to eq 14
-    expect(run.items.first.status_log.count).to eq 8
+    expect(run.summary['DEBUG']).to eq 20
+    expect(run.log_history.count).to eq 8
+    expect(run.status_log.count).to eq 8
+    expect(run.items.first.log_history.count).to eq 12
+    expect(run.items.first.status_log.count).to eq 6
 
     [
-        {tasklist: nil, text: :STARTED},
-        {tasklist: %w'CollectFiles', text: :Started},
-        {tasklist: %w'CollectFiles', text: :Done},
-        {tasklist: %w'ProcessFiles', text: :Started},
-        {tasklist: %w'ProcessFiles', text: :Done},
-        {tasklist: nil, :text => :DONE},
+        {task: 'CollectFiles', status: :STARTED},
+        {task: 'CollectFiles', status: :DONE},
+        {task: 'ProcessFiles', status: :STARTED},
+        {task: 'ProcessFiles/ChecksumTester', status: :STARTED},
+        {task: 'ProcessFiles/ChecksumTester', status: :DONE},
+        {task: 'ProcessFiles/CamelizeName', status: :STARTED},
+        {task: 'ProcessFiles/CamelizeName', status: :DONE},
+        {task: 'ProcessFiles', status: :DONE},
     ].each_with_index do |h, i|
       h.keys.each { |key| expect(run.status_log[i][key]).to eq h[key] }
     end
 
     [
-        {tasklist: %w'CollectFiles', text: :Started},
-        {tasklist: %w'CollectFiles', text: :Done},
-        {tasklist: %w'ProcessFiles', text: :Started},
-        {tasklist: %w'ProcessFiles ChecksumTester', text: :Started},
-        {tasklist: %w'ProcessFiles ChecksumTester', text: :Done},
-        {tasklist: %w'ProcessFiles CamelizeName', text: :Started},
-        {tasklist: %w'ProcessFiles CamelizeName', text: :Done},
-        {tasklist: %w'ProcessFiles', text: :Done},
+        {task: 'CollectFiles', status: :STARTED},
+        {task: 'CollectFiles', status: :DONE},
+        {task: 'ProcessFiles/ChecksumTester', status: :STARTED},
+        {task: 'ProcessFiles/ChecksumTester', status: :DONE},
+        {task: 'ProcessFiles/CamelizeName', status: :STARTED},
+        {task: 'ProcessFiles/CamelizeName', status: :DONE},
     ].each_with_index do |h, i|
       h.keys.each { |key| expect(run.items.first.status_log[i][key]).to eq h[key] }
     end
 
     [
-        {tasklist: %w'CollectFiles', text: :Started},
-        {tasklist: %w'CollectFiles', text: :Done},
-        {tasklist: %w'ProcessFiles ChecksumTester', text: :Started},
-        {tasklist: %w'ProcessFiles ChecksumTester', text: :Done},
-        {tasklist: %w'ProcessFiles CamelizeName', text: :Started},
-        {tasklist: %w'ProcessFiles CamelizeName', text: :Done},
+        {task: 'CollectFiles', status: :STARTED},
+        {task: 'CollectFiles', status: :DONE},
+        {task: 'ProcessFiles/ChecksumTester', status: :STARTED},
+        {task: 'ProcessFiles/ChecksumTester', status: :DONE},
+        {task: 'ProcessFiles/CamelizeName', status: :STARTED},
+        {task: 'ProcessFiles/CamelizeName', status: :DONE},
     ].each_with_index do |h, i|
       h.keys.each { |key| expect(run.items.first.first.status_log[i][key]).to eq h[key] }
     end
@@ -153,8 +154,12 @@ 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: 'Processing subitem (1/1): items'},
-        {severity: 'DEBUG', task: 'ProcessFiles', message: '1 of 1 subitems passed'},
+        {severity: 'DEBUG', 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: '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|
       h.keys.each { |key| expect(run.log_history[i][key]).to eq h[key] }
     end
@@ -164,12 +169,10 @@ STR
         {severity: 'DEBUG', task: 'CollectFiles', message: 'Processing subitem (2/3): test_file_item.rb'},
         {severity: 'DEBUG', task: 'CollectFiles', message: 'Processing subitem (3/3): test_run.rb'},
         {severity: 'DEBUG', task: 'CollectFiles', message: '3 of 3 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', message: 'Running subtask (1/2): ChecksumTester'},
         {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', message: 'Processing subitem (1/3): test_dir_item.rb'},
         {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', message: 'Processing subitem (2/3): test_file_item.rb'},
         {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', message: 'Processing subitem (3/3): test_run.rb'},
         {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', message: '3 of 3 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', message: 'Running subtask (2/2): CamelizeName'},
         {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', message: 'Processing subitem (1/3): test_dir_item.rb'},
         {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', message: 'Processing subitem (2/3): test_file_item.rb'},
         {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', message: 'Processing subitem (3/3): test_run.rb'},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.13
+  version: 2.0.beta.14
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,11 +124,13 @@ files:
 - lib/libis-workflow.rb
 - lib/libis/exceptions.rb
 - lib/libis/workflow.rb
+- lib/libis/workflow/action.rb
 - lib/libis/workflow/base.rb
 - lib/libis/workflow/base/dir_item.rb
 - lib/libis/workflow/base/file_item.rb
 - lib/libis/workflow/base/job.rb
 - lib/libis/workflow/base/logger.rb
+- lib/libis/workflow/base/logging.rb
 - lib/libis/workflow/base/run.rb
 - lib/libis/workflow/base/work_item.rb
 - lib/libis/workflow/base/workflow.rb
@@ -138,7 +140,9 @@ files:
 - lib/libis/workflow/job.rb
 - lib/libis/workflow/message_registry.rb
 - lib/libis/workflow/run.rb
+- lib/libis/workflow/status.rb
 - lib/libis/workflow/task.rb
+- lib/libis/workflow/task_group.rb
 - lib/libis/workflow/tasks/analyzer.rb
 - lib/libis/workflow/version.rb
 - lib/libis/workflow/work_item.rb