libis-workflow-mongoid 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0869b0e5259976b3ee8221f7351900f46857d61a
-  data.tar.gz: a76332c123f31abab2f76dda7d99f090f790cca7
+  metadata.gz: fd3db3ee795224eb114f5dfd96a37aa9e8c29c77
+  data.tar.gz: 4f7bc7ddd64cb6d1ebd9b4f20a3a0d4549675626
 SHA512:
-  metadata.gz: 6faaa5a81eb5db582da131ab71c754d18a63c02db2050926df825cddc9fde95e1ee82bec592a79d1fc93a3a94cb59e2ff15cefa32d618d4a7acc9b0310b6200b
-  data.tar.gz: 4242ffa5512cfddfebd42f411a5156a8c19d2eefa44ed098d3e663dba8aee06ab75b1c1a6e495242abb6feaa805b6f6ce99cc9e43f11aa0616dc15809177ce37
+  metadata.gz: 3c4c79cc5ac6a543cf2a293c27911b8e90e1bb6bdb667326a0731f1a7f87bac2a972fb0ac399ff7303bc46d8a0576a12eab250ebfc1a2e30c301e60e25518f51
+  data.tar.gz: c6cc337fa3ae699abfef1bf25d4c7c062ee85d19b810b898e9d0e82fae2c85dd40e5eb22df74629507162b6d226885e95df93e3eabf41eb96adec2c9a064a851

data/lib/libis/workflow/mongoid/job.rb

@@ -18,7 +18,7 @@ module Libis
         field :run_object, type: String
         field :log_to_file, type: Boolean, default: true
         field :log_each_run, type: Boolean, default: true
-        field :log_level, type: String, default: 'DEBUG'
+        field :log_level, type: String, default: 'INFO'
         field :log_age, type: String, default: 'daily'
         field :log_keep, type: Integer, default: 5
 

data/lib/libis/workflow/mongoid/log_entry.rb

@@ -8,7 +8,8 @@ module Libis
     module Mongoid
 
       class LogEntry
-        include Libis::Workflow::Mongoid::Base
+        include ::Mongoid::Document
+        include ::Mongoid::Timestamps::Created::Short
 
         store_in collection: 'log'
 
@@ -19,6 +20,7 @@ module Libis
         field :status, type: String
         field :run_id
 
+        index({c_at: 1}, {name: 'by_created'})
         index({logger_type: 1, logger_id: 1, c_at: 1, }, {background: true, name: 'by_logger'})
         index({logger_type: 1, logger_id: 1, c_at: 1, task: 1}, {background: true, name: 'by_task'})
         index({logger_type: 1, logger_id: 1, c_at: 1, status: 1}, {background: true, sparse: true, name: 'by_status'})

data/lib/libis/workflow/mongoid/run.rb

@@ -12,7 +12,7 @@ module Libis
 
         field :start_date, type: Time, default: -> { Time.now }
         field :log_to_file, type: Boolean, default: false
-        field :log_level, type: String, default: 'DEBUG'
+        field :log_level, type: String, default: 'INFO'
         field :log_filename, type: String
 
         index({start_date: 1}, {sparse: 1, name: 'by_start'})

data/lib/libis/workflow/mongoid/version.rb

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

data/spec/workflow_spec.rb

@@ -35,6 +35,8 @@ describe 'TestWorkflow' do
 
   end
 
+  let(:logoutput) { ::Libis::Workflow::Config.logger.appenders.first.sio }
+
   let(:workflow) {
     wf = TestWorkflow.find_or_initialize_by(name: 'TestWorkflow')
     wf.configure(
@@ -66,7 +68,8 @@ describe 'TestWorkflow' do
         'workflow' => workflow,
         'run_object' => 'TestRun',
         'input' => {'dirname' => dirname, 'checksum_type' => 'SHA256'},
-        'log_to_file' => false
+        'log_to_file' => false,
+        'log_each_run' => false
     )
 
     # job = TestJob.find_or_initialize_by(name: 'TestJob')
@@ -87,13 +90,11 @@ describe 'TestWorkflow' do
 
   let(:run) { job.execute }
 
-  let(:logoutput) { ::Libis::Tools::Config.logger.appenders.first.sio }
-
   it 'should contain three tasks' do
 
-    expect(workflow.config['tasks'].size).to eq 3
+    expect(workflow.config['tasks'].size).to eq 2
     expect(workflow.config['tasks'].first['class']).to eq 'CollectFiles'
-    expect(workflow.config['tasks'].last['class']).to eq '::Libis::Workflow::Tasks::Analyzer'
+    expect(workflow.config['tasks'].last['name']).to eq 'ProcessFiles'
 
   end
 
@@ -121,15 +122,11 @@ describe 'TestWorkflow' do
 
   it 'should return expected debug output' do
 
-    expect(run.summary['DEBUG']).to eq 23
-    expect(run.log_history.count).to eq 8
-    expect(run.status_log.count).to eq 8
-    item = run.items.first
-    expect(item.log_history.count).to eq 15
-    expect(item.status_log.count).to eq 6
-    expect(item.summary['DEBUG']).to eq 15
+    run
 
     sample_out = <<STR
+Run - TestRun : Ingest run started.
+Run - TestRun : Running subtask (1/2): CollectFiles
 CollectFiles - TestRun : Processing subitem (1/1): items
 CollectFiles - items : Processing subitem (1/4): test_dir_item.rb
 CollectFiles - items : Processing subitem (2/4): test_file_item.rb
@@ -137,6 +134,7 @@ CollectFiles - items : Processing subitem (3/4): test_item.rb
 CollectFiles - items : Processing subitem (4/4): test_run.rb
 CollectFiles - items : 4 of 4 subitems passed
 CollectFiles - TestRun : 1 of 1 subitems passed
+Run - TestRun : Running subtask (2/2): ProcessFiles
 ProcessFiles - TestRun : Running subtask (1/2): ChecksumTester
 ProcessFiles/ChecksumTester - TestRun : Processing subitem (1/1): items
 ProcessFiles/ChecksumTester - items : Processing subitem (1/4): test_dir_item.rb
@@ -153,10 +151,23 @@ ProcessFiles/CamelizeName - Items : Processing subitem (3/4): test_item.rb
 ProcessFiles/CamelizeName - Items : Processing subitem (4/4): test_run.rb
 ProcessFiles/CamelizeName - Items : 4 of 4 subitems passed
 ProcessFiles/CamelizeName - TestRun : 1 of 1 subitems passed
+ProcessFiles - TestRun : Done
+Run - TestRun : Done
 STR
+
     sample_out = sample_out.lines.to_a
     output = logoutput.string.lines
 
+    # puts output
+
+    expect(run.summary['DEBUG']).to eq 21
+    expect(run.log_history.count).to eq 13
+    expect(run.status_log.count).to eq 10
+    item = run.items.first
+    expect(item.log_history.count).to eq 15
+    expect(item.status_log.count).to eq 6
+    expect(item.summary['DEBUG']).to eq 15
+
     expect(output.count).to eq sample_out.count
     output.each_with_index do |o, i|
       expect(o.strip).to match(/#{Regexp.escape sample_out[i].strip}$/)
@@ -172,7 +183,7 @@ STR
     expect(wf.description).to eq 'Workflow for testing'
     expect(wf.input.count).to eq 2
     expect(wf.input[:dirname][:default]).to eq '.'
-    expect(wf.config['tasks'].count).to eq 3
+    expect(wf.config['tasks'].count).to eq 2
     expect(wf.config['tasks'][0]['class']).to eq 'CollectFiles'
     expect(wf.config['tasks'][0]['recursive']).to eq true
     expect(wf.config['tasks'][1]['name']).to eq 'ProcessFiles'
@@ -182,7 +193,6 @@ STR
     expect(wf.config['tasks'][1]['tasks'][0]['recursive']).to eq true
     expect(wf.config['tasks'][1]['tasks'][1]['class']).to eq 'CamelizeName'
     expect(wf.config['tasks'][1]['tasks'][1]['recursive']).to eq true
-    expect(wf.config['tasks'][2]['class']).to eq '::Libis::Workflow::Tasks::Analyzer'
   end
 
   # noinspection RubyResolve

metadata

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