libis-workflow 2.0.beta.9 → 2.0.beta.10

data/spec/tasks/camelize_name.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'backports/rails/string'
 
-require 'libis/workflow/workitems'
+require 'libis/workflow'
 
 class CamelizeName < ::Libis::Workflow::Task
 

data/spec/tasks/checksum_tester.rb

@@ -2,7 +2,7 @@
 require 'libis/tools/checksum'
 
 require 'libis/exceptions'
-require 'libis/workflow/workitems'
+require 'libis/workflow'
 
 class ChecksumTester < ::Libis::Workflow::Task
 

data/spec/workflow_spec.rb

@@ -4,16 +4,17 @@ require 'stringio'
 
 describe 'TestWorkflow' do
 
-  let(:dirname) { File.absolute_path(File.join(File.dirname(__FILE__), 'items')) }
+  let(:basedir) { File.absolute_path File.join(File.dirname(__FILE__)) }
+  let(:dirname) { File.join(basedir, 'items') }
 
   let(:logoutput) { StringIO.new }
 
   let(:workflow) {
     # noinspection RubyResolve
     ::Libis::Workflow.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.itemdir = dirname
+      cfg.taskdir = File.join(basedir, 'tasks')
+      cfg.workdir = File.join(basedir, 'work')
       cfg.logger = Logger.new logoutput
       cfg.logger.level = Logger::DEBUG
     end
@@ -25,9 +26,7 @@ describe 'TestWorkflow' do
         tasks: [
             {class: 'CollectFiles', recursive: true},
             {
-                name: 'ProcessFiles',
-                subitems: true,
-                recursive: false,
+                name: 'ProcessFiles', subitems: true, recursive: false,
                 tasks: [
                     {class: 'ChecksumTester', recursive: true},
                     {class: 'CamelizeName', recursive: true}
@@ -71,54 +70,24 @@ describe 'TestWorkflow' do
   it 'should return expected debug output' do
 
     sample_out = <<STR
-DEBUG -- CollectFiles - TestRun : Started
 DEBUG -- CollectFiles - TestRun : Processing subitem (1/1): items
-DEBUG -- CollectFiles - items : Started
 DEBUG -- CollectFiles - items : Processing subitem (1/3): test_dir_item.rb
-DEBUG -- CollectFiles - items/test_dir_item.rb : Started
-DEBUG -- CollectFiles - items/test_dir_item.rb : Completed
 DEBUG -- CollectFiles - items : Processing subitem (2/3): test_file_item.rb
-DEBUG -- CollectFiles - items/test_file_item.rb : Started
-DEBUG -- CollectFiles - items/test_file_item.rb : Completed
 DEBUG -- CollectFiles - items : Processing subitem (3/3): test_run.rb
-DEBUG -- CollectFiles - items/test_run.rb : Started
-DEBUG -- CollectFiles - items/test_run.rb : Completed
 DEBUG -- CollectFiles - items : 3 of 3 subitems passed
-DEBUG -- CollectFiles - items : Completed
 DEBUG -- CollectFiles - TestRun : 1 of 1 subitems passed
-DEBUG -- CollectFiles - TestRun : Completed
-DEBUG -- ProcessFiles - TestRun : Started
 DEBUG -- ProcessFiles - TestRun : Processing subitem (1/1): items
-DEBUG -- ProcessFiles - items : Started
 DEBUG -- ProcessFiles - items : Running subtask (1/2): ChecksumTester
-DEBUG -- ProcessFiles/ChecksumTester - items : Started
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (1/3): test_dir_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_dir_item.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_dir_item.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (2/3): test_file_item.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_file_item.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_file_item.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : Processing subitem (3/3): test_run.rb
-DEBUG -- ProcessFiles/ChecksumTester - items/test_run.rb : Started
-DEBUG -- ProcessFiles/ChecksumTester - items/test_run.rb : Completed
 DEBUG -- ProcessFiles/ChecksumTester - items : 3 of 3 subitems passed
-DEBUG -- ProcessFiles/ChecksumTester - items : Completed
 DEBUG -- ProcessFiles - items : Running subtask (2/2): CamelizeName
-DEBUG -- ProcessFiles/CamelizeName - items : Started
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (1/3): test_dir_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_dir_item.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestDirItem.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (2/3): test_file_item.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_file_item.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestFileItem.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : Processing subitem (3/3): test_run.rb
-DEBUG -- ProcessFiles/CamelizeName - Items/test_run.rb : Started
-DEBUG -- ProcessFiles/CamelizeName - Items/TestRun.rb : Completed
 DEBUG -- ProcessFiles/CamelizeName - Items : 3 of 3 subitems passed
-DEBUG -- ProcessFiles/CamelizeName - Items : Completed
-DEBUG -- ProcessFiles - Items : Completed
 DEBUG -- ProcessFiles - TestRun : 1 of 1 subitems passed
-DEBUG -- ProcessFiles - TestRun : Completed
 STR
     sample_out = sample_out.lines.to_a
     output = logoutput.string.lines.to_a
@@ -128,10 +97,10 @@ STR
       expect(o[/(?<=\] ).*/]).to eq sample_out[i].strip
     end
 
-    expect(run.summary['DEBUG']).to eq 48
-    expect(run.log_history.count).to eq 8
+    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 22
+    expect(run.items.first.log_history.count).to eq 14
     expect(run.items.first.status_log.count).to eq 8
 
     [
@@ -170,55 +139,35 @@ STR
     end
 
     [
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Processing subitem (1/1): items'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: '1 of 1 subitems passed'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Completed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Processing subitem (1/1): items'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: '1 of 1 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Completed'},
+        {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'},
     ].each_with_index do |h, i|
       h.keys.each { |key| expect(run.log_history[i][key]).to eq h[key] }
     end
 
     [
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Processing subitem (1/3): test_dir_item.rb'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Processing subitem (2/3): test_file_item.rb'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Processing subitem (3/3): test_run.rb'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: '3 of 3 subitems passed'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Completed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Running subtask (1/2): ChecksumTester'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Processing subitem (1/3): test_dir_item.rb'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Processing subitem (2/3): test_file_item.rb'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Processing subitem (3/3): test_run.rb'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: '3 of 3 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Completed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Running subtask (2/2): CamelizeName'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Processing subitem (1/3): test_dir_item.rb'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Processing subitem (2/3): test_file_item.rb'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Processing subitem (3/3): test_run.rb'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: '3 of 3 subitems passed'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Completed'},
-        {severity: 'DEBUG', task: 'ProcessFiles', id: 0, message: 'Completed'},
+        {severity: 'DEBUG', task: 'CollectFiles', message: 'Processing subitem (1/3): test_dir_item.rb'},
+        {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'},
+        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', message: '3 of 3 subitems passed'},
     ].each_with_index do |h, i|
       h.keys.each { |key| expect(run.items.first.log_history[i][key]).to eq h[key] }
     end
 
-    [
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'CollectFiles', id: 0, message: 'Completed'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'ProcessFiles/ChecksumTester', id: 0, message: 'Completed'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Started'},
-        {severity: 'DEBUG', task: 'ProcessFiles/CamelizeName', id: 0, message: 'Completed'},
-    ].each_with_index do |h, i|
-      h.keys.each { |key| expect(run.items.first.first.log_history[i][key]).to eq h[key] }
-    end
+    # noinspection RubyResolve
+    expect(run.items.first.first.log_history).to be_empty
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.9
+  version: 2.0.beta.10
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,21 +124,24 @@ files:
 - lib/libis-workflow.rb
 - lib/libis/exceptions.rb
 - lib/libis/workflow.rb
+- lib/libis/workflow/base.rb
+- lib/libis/workflow/base/dir_item.rb
+- lib/libis/workflow/base/file_item.rb
 - lib/libis/workflow/base/logger.rb
 - lib/libis/workflow/base/run.rb
+- lib/libis/workflow/base/work_item.rb
 - lib/libis/workflow/base/workflow.rb
 - lib/libis/workflow/config.rb
+- lib/libis/workflow/dir_item.rb
+- lib/libis/workflow/file_item.rb
 - lib/libis/workflow/message_registry.rb
 - lib/libis/workflow/run.rb
 - lib/libis/workflow/task.rb
 - lib/libis/workflow/tasks/analyzer.rb
 - lib/libis/workflow/version.rb
+- lib/libis/workflow/work_item.rb
 - lib/libis/workflow/worker.rb
 - lib/libis/workflow/workflow.rb
-- lib/libis/workflow/workitems.rb
-- lib/libis/workflow/workitems/dir_item.rb
-- lib/libis/workflow/workitems/file_item.rb
-- lib/libis/workflow/workitems/work_item.rb
 - libis-workflow.gemspec
 - spec/items.rb
 - spec/items/test_dir_item.rb
@@ -170,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: LIBIS Workflow framework.

data/lib/libis/workflow/workitems/dir_item.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-require 'libis/workflow/workitems/file_item'
-
-module Libis
-  module Workflow
-
-    module DirItem
-      include ::Libis::Workflow::FileItem
-    end
-  end
-end

data/lib/libis/workflow/workitems/file_item.rb

@@ -1,78 +0,0 @@
-# encoding: utf-8
-
-require 'digest'
-
-require 'libis/workflow/workitems/work_item'
-
-module Libis
-  module Workflow
-
-    module FileItem
-      include WorkItem
-
-      def filename
-        File.basename(self.properties[:filename]) || self.properties[:link]
-      end
-
-      def name
-        self.properties[:name] || self.filename
-      end
-
-      def filelist
-        (self.parent.filelist rescue Array.new).push(filename).compact
-      end
-
-      def filepath
-        self.filelist.join('/')
-      end
-
-      def fullpath
-        self.properties[:filename]
-      end
-
-      def filename=(name)
-        begin
-          stats = ::File.stat name
-          self.properties[:size] = stats.size
-          self.properties[:access_time] = stats.atime
-          self.properties[:modification_time] = stats.mtime
-          self.properties[:creation_time] = stats.ctime
-          self.properties[:mode] = stats.mode
-          self.properties[:uid] = stats.uid
-          self.properties[:gid] = stats.gid
-          set_checksum(:MD5, ::Digest::MD5.hexdigest(File.read(name))) if File.file?(name)
-        rescue
-          # ignored
-        end
-        self.properties[:filename] = name
-      end
-
-      def checksum(checksum_type)
-        self.properties[('checksum_' + checksum_type.to_s.downcase).to_sym]
-      end
-
-      def set_checksum(checksum_type, value)
-        self.properties[('checksum_' + checksum_type.to_s.downcase).to_sym] = value
-      end
-
-      def link
-        self.properties[:link]
-      end
-
-      def link=(name)
-        self.properties[:link] = name
-      end
-
-      def set_info(info)
-        info.each do |k, v|
-          self.properties[k] = v
-        end
-      end
-
-      def safe_name
-        self.name.to_s.gsub(/[^\w.-]/) { |s| '%%%02x' % s.ord }
-      end
-
-    end
-  end
-end

data/lib/libis/workflow/workitems/work_item.rb

@@ -1,231 +0,0 @@
-# encoding: utf-8
-
-require 'backports/rails/hash'
-
-require 'libis/workflow/config'
-
-module Libis
-  module Workflow
-
-    # Base module for all work items.
-    #
-    # This module contains some basic attributes required for making the workflow and tasks behave properly:
-    #
-    # - status: [Symbol] the status field. Each task sets the status of the items it works on. Before starting processing
-    #     the status is set to "#{task_name}Started". After successfull processing it is set to "#{task_name}Done" and if
-    #     the task failed, it is set to "#{task_name}Failed". The status field can be used to perform real-time
-    #     monitoring, reporting and error-recovery or restart of the ingest.
-    #     The initial value for this attribute is :START.
-    # - parent: [Object|nil] a link to a parent work item. Work items can be organized in any hierarchy you think is
-    #     relevant for your workflow (e.g. directory[/directory...]/file/line or library/section/book/page). Of course
-    #     hierarchies are not mandatory.
-    # - items: [Array] a list of child work items. see above.
-    # - options: [Hash] a set of options for the task chain on how to deal with this work item. This attribute can be
-    #     used to fine-tune the behaviour of tasks for a particular work item.
-    # - properties: [Hash] a set of properties, typically collected during the workflow processing and used to store
-    #     final or intermediate resulst of tasks. The ::Lias::Ingester::FileItem module uses this attribute to store the
-    #     properties (e.g. size, checksum, ...) of the file it represents.
-    # - log_history: [Array] a list of all logging messages collected for this work item. Whenever a task logs a message
-    #     it will automatically be registered for the work item that it is processing or for the work item that was
-    #     supplied as the first argument.
-    # - status_log: [Array] a list of all status changes the work item went through.
-    # - summary: [Hash] collected statistics about the ingest for the work item and its children. This structure will
-    #     be filled in by the included task ::Lias::Ingester::Tasks::Analyzer wich is appended to the workflow by default.
-    #
-    # The module is created so that it is possible to implement an ActiveRecord/Datamapper/... implementation easily.
-
-    module WorkItem
-      include Enumerable
-
-      attr_accessor :parent
-      attr_accessor :items
-      attr_accessor :options, :properties
-      attr_accessor :log_history, :status_log
-      attr_accessor :summary
-
-      # The initializer takes care of properly setting the correct default values for the attributes. A derived class
-      # that wishes to define it's own initializer should take care to call 'super' or make sure it overwrites the
-      # attribute definitions itself. (e.g. in a ActiveRecord implementation)
-      def initialize
-        self.parent = nil
-        self.items = []
-        self.options = {}
-        self.properties = {}
-        self.log_history = []
-        self.status_log = []
-        self.summary = {}
-      end
-
-      # String representation of the identity of the work item.
-      #
-      # You may want to overwrite this method as it tries the :name property or whatever #inspect returns if that
-      # failes. Typically this should return the key value, file name or id number. If that's what your :name property
-      # contains, you're fine.
-      #
-      # @return [String] string identification for this work item.
-      def name
-        self.properties[:name] || self.inspect
-      end
-
-      def to_s; self.name; end
-
-      def names
-        (self.parent.names rescue Array.new).push(name).compact
-      end
-
-      def namepath; self.names.join('/'); end
-
-      # File name save version of the to_s output. The output should be safe to use as a file name to store work item
-      # data. Typical use is when extra file items are created by a task and need to be stored on disk. The default
-      # implementation URL-encodes (%xx) all characters except alphanumeric, '.' and '-'.
-      #
-      # @return [String] file name
-      def to_filename
-        self.to_s.gsub(/[^\w.-]/) { |s| '%%%02x' % s.ord }
-      end
-
-      # Gets the current status of the object.
-      #
-      # @return [Symbol] status code
-      def status
-        s = self.status_log.last
-        status_label((s[:text] rescue nil), (s[:tasklist] rescue nil))
-      end
-
-      # Changes the status of the object. As a side effect the status is also logged in the status_log with the current
-      # timestamp.
-      #
-      # @param [Symbol] s
-      def status=(s, tasklist = nil)
-        s, tasklist = s if s.is_a? Array
-        s = s.to_sym
-        if status_label(s, tasklist) != self.status
-          self.status_log << {
-              timestamp: ::Time.now,
-              tasklist: tasklist,
-              text: s
-          }
-          self.save
-        end
-      end
-
-      # Check ingest status of the object. The status is checked to see if it ends in 'Failed'.
-      #
-      # @return [Boolean] true if the object failed, false otherwise
-      def failed?
-        self.status.to_s =~ /Failed$/ ? true : false
-      end
-
-      # Helper function for the Tasks to add a log entry to the log_history.
-      #
-      # The supplied message structure is expected to contain the following fields:
-      # - :severity : ::Logger::Severity value
-      # - :id : optional message id
-      # - :text : message text
-      # - :task : list of tasks names (task hierarchy) that submits the message
-      #
-      # @param [Hash] message
-      def add_log(message = {})
-        msg = message_struct(message)
-        self.log_history << msg
-        self.save
-      end
-
-      def <=(message = {}); self.add_log(message); end
-
-      # Iterates over the work item clients and invokes code on each of them.
-      def each
-        self.items.each { |item| yield item }
-      end
-
-      # Add a child work item
-      #
-      # @param [WorkItem] item to be added to the child list :items
-      def add_item(item)
-        return self unless item and item.is_a? WorkItem
-        self.items << item
-        item.parent = self
-        self.save!
-        item.save!
-        self
-      end
-
-      alias :<< :add_item
-
-      # Dummy method. It is a placeholder for DB backed implementations. Wherever appropriate WorkItem#save will be
-      # called to save the current item's state. If state needs to persisted, you should override this method or make
-      # sure your persistence layer implements it in your class.
-      def save
-      end
-
-      # Dummy method. It is a placeholder for DB backed implementations. Wherever appropriate WorkItem#save will be
-      # called to save the current item's state. If state needs to persisted, you should override this method or make
-      # sure your persistence layer implements it in your class.
-      def save!
-      end
-
-      # Add a structured message to the log history. The message text can be submitted as an integer or text. If an
-      # integer is submitted, it will be used to look up the text in the MessageRegistry. The message text will be
-      # passed to the % operator with the args parameter. If that failes (e.g. because the format string is not correct)
-      # the args value is appended to the message.
-      #
-      # @param [Symbol] severity
-      # @param [Hash] msg should contain message text as :id or :text and the hierarchical name of the task as :task
-      # @param [Array] args string format values
-      def log_message(severity, msg, *args)
-        # Prepare info from msg struct for use with string substitution
-        message_id, message_text = if msg[:id]
-                                     [msg[:id], MessageRegistry.instance.get_message(msg[:id])]
-                                   elsif msg[:text]
-                                     [0, msg[:text]]
-                                   else
-                                     [0, '']
-                                   end
-        task = msg[:task] || '*UNKNOWN*'
-        message_text = (message_text % args rescue "#{message_text} - #{args}")
-
-        self.add_log severity: severity, id: message_id.to_i, text: message_text, task: task
-        name = ''
-        begin
-          name = self.to_s
-          name = self.name
-          name = self.namepath
-        rescue
-          # do nothing
-        end
-        Config.logger.add(severity, message_text, ('%s - %s ' % [task, name]))
-      end
-
-      protected
-
-      SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY) unless const_defined? :SEV_LABEL
-
-      # go up the hierarchy and return the topmost work item
-      #
-      # @return [WorkItem] the root work item
-      def root
-        root = self
-        root = root.parent while root.parent and root.parent.is_a? WorkItem
-        root
-      end
-
-      # create and return a proper message structure
-      # @param [Hash] opts
-      def message_struct(opts = {})
-        opts.reverse_merge!(severity: ::Logger::INFO, id: 0, text: '')
-        {
-            timestamp: ::Time.now,
-            severity: SEV_LABEL[opts[:severity]],
-            task: opts[:task],
-            id: opts[:id],
-            message: opts[:text]
-        }
-      end
-
-      def status_label(text, tasklist)
-        s = "#{tasklist.last rescue ''}#{text}" rescue :NOT_STARTED
-        s.empty? ? :NOT_STARTED : s.to_sym
-      end
-    end
-  end
-end

data/lib/libis/workflow/workitems.rb

@@ -1,5 +0,0 @@
-# encoding: utf-8
-
-require_relative 'workitems/work_item'
-require_relative 'workitems/file_item'
-require_relative 'workitems/dir_item'