libis-workflow-mongoid 2.0.beta.21 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d88ce6d6d6b90f72527cca249309fe55e92a30b
-  data.tar.gz: 9d27cc522b2d3224c15f4ccf141aa777891a5486
+  metadata.gz: 475b4ffca7f1f3fb2db8a8657ffed71d15d7abcd
+  data.tar.gz: fcbef1f20aa86feea36d5a19fd7de4d8731b1673
 SHA512:
-  metadata.gz: b456962e0f80aad26e6614bfde0bee8703596040a3ba8404b5cede910b457ed2b689bec1606f0a00fcf27e71940c9a6d0bc57179ead52ef697c35498a408550f
-  data.tar.gz: 4f5c8ab9c460a04e4ff315c85a31f76897748504cd0899f9a94f903c99d9f120017adcf8aa5d09edb65c16fc7293bfe3f612f0451e2808807471a7329539791a
+  metadata.gz: ca8260f6aabe378a5f2f15e46bddb588b9bcd5da0a40339eccb62f27b04e37629e216f854f76a4dc5ddfce9b644731f76fca4e1f1f0c1119b48ff2f2f760aba7
+  data.tar.gz: eec596db0b15252f4ef48911b4c8d2b03ae49324812b660925440a2a21786e7c49fb71179b76e279232383626025fbcdf8ae02c025ba483ff3560b4ec35a02cb

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

@@ -22,6 +22,8 @@ module Libis
         ::Mongo::Logger.logger.level = Logger::ERROR
       end
 
+      Config[:log_dir] = '.'
+
     end
   end
 end

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

@@ -18,6 +18,10 @@ module Libis
         field :description, type: String
         field :input, type: Hash, default: -> { Hash.new }
         field :run_object, type: String
+        field :log_to_file, type: Boolean, default: false
+        field :log_level, type: String, default: 'DEBUG'
+        field :log_age, type: String, default: 'daily'
+        field :log_keep, type: Integer, default: 5
 
         index({name: 1}, {unique: 1})
 
@@ -25,6 +29,27 @@ module Libis
 
         belongs_to :workflow, polymorphic: true
 
+        def logger
+          return ::Libis::Workflow::Mongoid::Config.logger unless self.log_to_file
+          logger = ::Logging::Repository[self.name]
+          return logger if logger
+          unless ::Logging::Appenders[self.name]
+            ::Logging::Appenders::RollingFile.new(
+                self.name,
+                filename: File.join(::Libis::Workflow::Mongoid::Config[:log_dir], "#{self.name}{.%Y%m%d}.log"),
+                layout: Config.get_log_formatter,
+                truncate: true,
+                age: self.log_age,
+                keep: self.log_keep,
+                roll_by: 'date',
+                level: self.log_level
+            )
+          end
+          logger = Config.logger(self.name, self.name)
+          logger.additive = false
+          logger
+        end
+
         # def create_run_object
         #   # noinspection RubyResolve
         #   self.runs.build

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

@@ -14,10 +14,11 @@ module Libis
         store_in collection: 'log'
 
         field :severity, type: String
-        field :task, type: String, default: '*UNKNOWN*'
+        field :task, type: String, default: ''
         field :code, type: Integer
         field :message, type: String
         field :status, type: String
+        field :run_id
 
         belongs_to :logger, polymorphic: true
 

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

@@ -17,6 +17,7 @@ module Libis
         store_in collection: 'workflow_runs'
 
         field :start_date, type: Time, default: -> { Time.now }
+        field :log_to_file, type: Boolean, default: false
 
         set_callback(:destroy, :before) do |document|
           wd = document.work_dir
@@ -26,6 +27,7 @@ module Libis
         index start_date: 1
 
         belongs_to :job, polymorphic: true
+        embeds_one :log_config, as: :log_configurator
 
         def run
           self.tasks = []
@@ -34,6 +36,23 @@ module Libis
           super
         end
 
+        def logger
+          return ::Libis::Workflow::Mongoid::Config.logger unless self.log_to_file
+          logger = ::Logging::Repository[self.name]
+          return logger if logger
+          unless ::Logging::Appenders[self.name]
+            ::Logging::Appenders::File.new(
+                self.name,
+                filename: File.join(::Libis::Workflow::Mongoid::Config[:log_dir], "#{self.name}.log"),
+                layout: Config.get_log_formatter,
+                level: self.log_level
+            )
+          end
+          logger = Config.logger(self.name, self.name)
+          logger.additive = false
+          logger
+        end
+
       end
 
     end

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

@@ -3,7 +3,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.beta.21' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.1' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
     end
   end
 end

data/libis-workflow-mongoid.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'libis-workflow', '~> 2.0.beta'
+  spec.add_runtime_dependency 'libis-workflow', '~> 2.0'
 
   spec.add_runtime_dependency 'mongoid', '~> 5.0'
 

data/spec/workflow_spec.rb

@@ -14,19 +14,18 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 describe 'TestWorkflow' do
 
-  before(:context) do
-    @dirname = File.absolute_path(File.join(File.dirname(__FILE__), 'items'))
-    @logoutput = StringIO.new
+  dirname = File.absolute_path(File.join(File.dirname(__FILE__), 'items'))
+
+  before :each do
 
     # noinspection RubyResolve
     ::Libis::Workflow::Mongoid.configure do |cfg|
       cfg.itemdir = File.join(File.dirname(__FILE__), 'items')
       cfg.taskdir = File.join(File.dirname(__FILE__), 'tasks')
       cfg.workdir = File.join(File.dirname(__FILE__), 'work')
-      cfg.logger = Logger.new logoutput
-      cfg.set_log_formatter
-      cfg.logger.level = Logger::DEBUG
       cfg.database_connect 'mongoid.yml', :test
+      cfg.logger.appenders =
+          ::Logging::Appenders.string_io('StringIO', layout: ::Libis::Tools::Config.get_log_formatter)
     end
 
     TestWorkflow.create_indexes
@@ -34,8 +33,11 @@ describe 'TestWorkflow' do
     TestFileItem.create_indexes
     TestDirItem.create_indexes
 
-    @workflow = TestWorkflow.find_or_initialize_by(name: 'TestWorkflow')
-    @workflow.configure(
+  end
+
+  let(:workflow) {
+    wf = TestWorkflow.find_or_initialize_by(name: 'TestWorkflow')
+    wf.configure(
         name: 'TestWorkflow',
         description: 'Workflow for testing',
         tasks: [
@@ -44,8 +46,8 @@ describe 'TestWorkflow' do
                 name: 'ProcessFiles',
                 subitems: true,
                 tasks: [
-                    {class: 'ChecksumTester',  recursive: true},
-                    {class: 'CamelizeName',  recursive: true}
+                    {class: 'ChecksumTester', recursive: true},
+                    {class: 'CamelizeName', recursive: true}
                 ]
             }
         ],
@@ -54,29 +56,28 @@ describe 'TestWorkflow' do
             checksum_type: {default: 'SHA1', propagate_to: 'ProcessFiles/ChecksumTester'}
         }
     )
-    @workflow.save
-
-    @job = TestJob.find_or_initialize_by(name: 'TestJob')
-    @job.configure(
-            name: 'TestJob',
-            description: 'Job for testing',
-            workflow: @workflow,
-            run_object: 'TestRun',
-            input: {dirname: dirname, checksum_type: 'SHA256'},
+    wf.save
+    wf
+  }
+  let(:job) {
+    job = TestJob.find_or_initialize_by(name: 'TestJob')
+    job.configure(
+        name: 'TestJob',
+        description: 'Job for testing',
+        workflow: workflow,
+        run_object: 'TestRun',
+        input: {dirname: dirname, checksum_type: 'SHA256'},
     )
 
     # noinspection RubyResolve
-    @job.runs.each { |run| run.destroy! }
-    @job.save
-    @run = @job.execute
+    job.runs.each { |run| run.destroy! }
+    job.save
+    job
+  }
 
-  end
+  let(:run) { job.execute }
 
-  def dirname; @dirname; end
-  def logoutput; @logoutput; end
-  def workflow; @workflow; end
-  def job; @job; end
-  def run; @run; end
+  let(:logoutput) { ::Libis::Tools::Config.logger.appenders.first.sio }
 
   it 'should contain three tasks' do
 
@@ -88,7 +89,6 @@ describe 'TestWorkflow' do
 
   it 'should camelize the workitem name' do
 
-    puts run.options
     expect(run.options['CollectFiles']['location']).to eq dirname
 
     expect(run.items.size).to eq 1
@@ -120,29 +120,29 @@ describe 'TestWorkflow' do
     expect(item.summary['DEBUG']).to eq 15
 
     sample_out = <<STR
-DEBUG -- CollectFiles - TestRun : Processing subitem (1/1): items
-DEBUG -- CollectFiles - items : Processing subitem (1/4): test_dir_item.rb
-DEBUG -- CollectFiles - items : Processing subitem (2/4): test_file_item.rb
-DEBUG -- CollectFiles - items : Processing subitem (3/4): test_item.rb
-DEBUG -- CollectFiles - items : Processing subitem (4/4): test_run.rb
-DEBUG -- CollectFiles - items : 4 of 4 subitems passed
-DEBUG -- CollectFiles - TestRun : 1 of 1 subitems passed
-DEBUG -- ProcessFiles - TestRun : Running subtask (1/2): ChecksumTester
-DEBUG -- ProcessFiles/ChecksumTester - TestRun : Processing subitem (1/1): items
-DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (1/4): test_dir_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (2/4): test_file_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (3/4): test_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (4/4): test_run.rb
-DEBUG -- ProcessFiles/ChecksumTester - items : 4 of 4 subitems passed
-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/4): test_dir_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (2/4): test_file_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (3/4): test_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (4/4): test_run.rb
-DEBUG -- ProcessFiles/CamelizeName - Items : 4 of 4 subitems passed
-DEBUG -- ProcessFiles/CamelizeName - TestRun : 1 of 1 subitems passed
+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
+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
+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
+ProcessFiles/ChecksumTester - items : Processing subitem (2/4): test_file_item.rb
+ProcessFiles/ChecksumTester - items : Processing subitem (3/4): test_item.rb
+ProcessFiles/ChecksumTester - items : Processing subitem (4/4): test_run.rb
+ProcessFiles/ChecksumTester - items : 4 of 4 subitems passed
+ProcessFiles/ChecksumTester - TestRun : 1 of 1 subitems passed
+ProcessFiles - TestRun : Running subtask (2/2): CamelizeName
+ProcessFiles/CamelizeName - TestRun : Processing subitem (1/1): items
+ProcessFiles/CamelizeName - Items : Processing subitem (1/4): test_dir_item.rb
+ProcessFiles/CamelizeName - Items : Processing subitem (2/4): test_file_item.rb
+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
 STR
     sample_out = sample_out.lines.to_a
     output = logoutput.string.lines
@@ -177,6 +177,7 @@ STR
 
   # noinspection RubyResolve
   it 'find run' do
+    run
     my_job = TestJob.first
     expect(my_job).to eq job
     expect(my_job.runs.all.count).to eq 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.21
+  version: 2.0.1
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -154,9 +154,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -178,3 +178,4 @@ test_files:
 - spec/test_job.rb
 - spec/test_workflow.rb
 - spec/workflow_spec.rb
+has_rdoc: