eco-helpers 3.0.4 → 3.0.7

data/lib/eco/api/usecases/ooze_samples/ooze_base_case.rb

@@ -14,6 +14,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   def main(_session, options, _usecase)
     options[:end_get] = false
     raise "You need to inherit from this class ('#{self.class}') and call super with a block" unless block_given?
+
     @target = nil
     yield
   end
@@ -22,6 +23,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   def process_ooze(ooz = target)
     ooz ||= ooze
     raise "You need to inherit from this class ('#{self.class}') and call super with a block" unless block_given?
+
     yield(ooz)
     update_ooze(ooz)
   end
@@ -33,15 +35,18 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   end
 
   def create_page(page = nil, template_id: nil, retrieve: false)
-    template_id = template_id.id if template_id.is_a?(Ecoportal::API::V2::Page)
-    template_id ||= page.template_id if page.respond_to?(:template_id)
+    template_id = template_id.id        if template_id.is_a?(Ecoportal::API::V2::Page)
+    template_id ||= page.template_id    if page.respond_to?(:template_id)
     template_id ||= page["template_id"] if page.is_a?(Hash)
-    page = new_page(template_id) unless page || !template_id
+    page = new_page(template_id)        unless page || !template_id
+
     yield(page) if block_given?
+
     reference = apiv2.pages.create(page, from: template_id)
     ooze_id   = reference.page_id
     stage_id  = reference.active_stage_id
     return [ooze_id, stage_id] unless retrieve
+
     ooze(ooze_id, stage_id: stage_id)
   end
 
@@ -49,6 +54,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     unless section.is_a?(Ecoportal::API::V2::Page::Section)
       raise "You need to specify a section for a new field. Given: #{section.class}"
     end
+
     entry.components.add(doc: doc) do |field|
       section.add_component(field, after: after, before: before, side: side)
     end.tap do |field|
@@ -60,6 +66,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     unless section.is_a?(Ecoportal::API::V2::Page::Section)
       raise "You need to specify a section for a new field. Given: #{section.class}"
     end
+
     entry.components.add(label: name, type: type) do |field|
       section.add_component(field, after: after, before: before, side: side)
     end.tap do |field|
@@ -69,6 +76,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
 
   def with_fields(entry = target, type: nil, label: nil)
     flds = entry.components
+
     if type
       if flds.respond_to?(:get_by_type)
         flds = flds.get_by_type(type)
@@ -76,6 +84,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
         flds = flds.select {|fld| fld.type == type}
       end
     end
+
     flds.select do |fld|
       value = label == :unnamed ? nil : label
       !label || same_string?(fld.label, value)
@@ -87,6 +96,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   def with_sections(entry = target, type: nil, heading: nil)
     secs = entry.sections
     secs = secs.get_by_type(type) if type
+
     secs.select do |sec|
       value = heading == :unnamed ? nil : heading
       !heading || same_string?(sec.heading, value)
@@ -97,6 +107,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
 
   def with_stage(name:)
     return unless (stage = target.stages.get_by_name(name))
+
     yield(stage) if block_given?
     stage
   end
@@ -110,7 +121,9 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
 
   def ooze(ooze_id = nil, stage_id: nil)
     return target unless ooze_id
+
     before_loading_new_target(ooze_id)
+
     apiv2.pages.get(ooze_id, stage_id: stage_id).tap do |ooze|
       if ooze
         new_target(ooze)
@@ -130,7 +143,9 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
 
     if (stg = ooze.stages[id_name] || ooze.stages.get_by_name(id_name))
       return ooze if ooze.respond_to?(:current_stage_id) && (ooze.current_stage_id == stg.id)
+
       before_loading_new_target(ooze_id)
+
       return apiv2.pages.get(ooze_id, stage_id: stg.id).tap do |stage|
         if stage
           new_target(stage)
@@ -142,6 +157,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
         end
       end
     end
+
     exit_error "Stage '#{id_name}' doesn't exist in ooze '#{ooze_id}'"
   end
 
@@ -178,8 +194,10 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
         msg += " after doing unsaved changes to #{object_reference(target)}"
         log(:warn) { msg }
       end
+
       yield(target) if block_given?
     end
+
     @target = object
   end
 
@@ -206,6 +224,7 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   def display_patch(entry = target)
     return if options.dig(:feedback, :only_stats)
     return unless (patch = (patch_doc(entry) || {})["page"])
+
     pp patch
   end
 
@@ -222,12 +241,15 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     entry.validate.tap do |validation|
       log(:error) { validation } if validation.is_a?(String)
     end
+
     display_patch(entry)
     backup_patch!(entry)
+
     if dirty?(entry) && dry_count > self.class::DRY_COUNT
       log(:info) { "Reached #{self.class::DRY_COUNT} dry-run samples." }
       exit(0)
     end
+
     false
   end
 

data/lib/eco/api/usecases/ooze_samples/register_update_case.rb

@@ -49,6 +49,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
 
   def before_loading_new_target(ooze_id)
     return unless (pending = queue_shift(ooze_id))
+
     update_ooze(pending).tap do |result|
       if result.is_a?(Ecoportal::API::Common::Response)
         if result.success?
@@ -83,6 +84,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
           log(:warn) { msg }
           update_ooze(pending)
         end
+
         if (ooz = ooze(page_result.id))
           @retrieved_oozes += 1
           yield(ooz)
@@ -97,9 +99,11 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
 
   def enqueue(object)
     return unless object.respond_to?(:id)
+
     unless object.is_a?(Ecoportal::API::V2::Page) or object.is_a?(Ecoportal::API::V2::Pages::PageStage)
       raise "Queuing is just for entries. Expecting Page or PageStage. Given: #{object.class}"
     end
+
     if (elem = queue_get(object.id))
       msg = "Something is wrong. Native case 'RegisterUpdateCase' is "
       if (elem != object) && dirty?(elem)
@@ -131,7 +135,9 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
 
   def batched_search_results
     raise "Missing block. It yields in slices of #{self.class.batch_size} results" unless block_given?
+
     results_preview
+
     results = []
     apiv2.registers.search(register_id, search_options) do |page_result|
       results << page_result
@@ -140,6 +146,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
         results = []
       end
     end
+
     yield(results) unless results.empty?
   end
 
@@ -180,6 +187,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
 
   def backup_patch!(ooze = target)
     return if (patch_doc(ooze) || {})["page"]
+
     log(:info) {
       "No changes to update for #{object_reference(ooze)}."
     }
@@ -188,8 +196,10 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
   def results_preview
     apiv2.registers.search(register_id, search_options.merge(only_first: true)).tap do |search_results|
       @total_search_oozes = search_results.total
+
       str_results = "Total target entries: #{search_results.total} (out of #{search_results.total_before_filtering})"
       default_answer = session.config.run_mode_remote?? "Y" : "N"
+
       session.prompt_user(
         "Do you want to proceed (y/N):",
         explanation: str_results,

data/lib/eco/api/usecases/use_case.rb

@@ -58,7 +58,9 @@ module Eco
 
           UseCaseIO.new(**kargs).tap do |uio|
             @options = uio.options
-            uio.session.logger.debug("#{self.class}: going to process '#{name}'")
+            uio.session.log(:debug) {
+              "#{self.class}: going to process '#{name}'"
+            }
 
             set_session_n_options(uio) if callback_from_loader?
 

data/lib/eco/cli/config/use_cases.rb

@@ -28,13 +28,16 @@ module Eco
         # @return [String] summary of the use cases.
         def help(refine: nil)
           refinement = refine.is_a?(String)? " (containing: '#{refine}')" : ""
+
           ["The following are the available use cases#{refinement}:"].then do |lines|
             max_len = keys_max_len(@linked_cases.keys)
+
             @linked_cases.keys.sort.select do |key|
               !refine.is_a?(String) || key.include?(refine)
             end.each do |option_case|
               lines << help_line(option_case, @linked_cases[option_case].description, max_len)
             end
+
             lines
           end.join("\n")
         end
@@ -150,6 +153,7 @@ module Eco
 
         def validate_io!(io)
           return if io.is_a?(Eco::API::UseCases::BaseIO)
+
           raise ArgumentError, "You need to provide Eco::API::UseCases::BaseIO object. Given: #{io.class}"
         end
       end

data/lib/eco/cli/scripting/args_helpers.rb

@@ -30,7 +30,8 @@ module Eco
             all_available: all_available
           }
           unknown = arguments.unknown(**args) do |key, correct|
-            suggestions[key] = correct unless correct.empty?
+            next suggestions[key] = correct unless correct.empty?
+            suggstions[key] = '-- not known similar options! --'
           end
           unknown = unknown.select {|arg| is_modifier?(arg)} if only_options
 
@@ -38,7 +39,7 @@ module Eco
 
           suggestions_str = suggestions.slice(*unknown).map do |key, correct|
             str      = "Unknown option '#{key}'."
-            str_corr = correct.map {|key| "'#{key}'"}
+            str_corr = correct.map {|ky| "'#{ky}'"}
             str     << " Did you mean: #{str_corr.join(', ')}" unless correct.empty?
             str
           end.join("\n  * ")

data/lib/eco/cli/scripting/argument.rb

@@ -2,12 +2,11 @@ module Eco
   class CLI
     class Scripting
       class Argument
-
         attr_reader :key
 
         class << self
           def is_modifier?(value)
-           value&.start_with?("-")
+            value&.start_with?("-")
           end
         end
 
@@ -19,6 +18,7 @@ module Eco
         def args_slice(*args)
           #pp "known arg '#{key}' => included? #{args.include?(key)}"
           return args unless args.include?(key)
+
           i = args.index(key)
           j = with_param?? i+1 : i
           args - args.slice(i..j)

data/lib/eco/cli_default/input.rb

@@ -21,61 +21,65 @@ ASSETS.cli.config do |cnf|
 
   cnf.input(default_option: "-entries-from") do |session, str_opt, options|
     input = []
-    if SCR.get_arg(str_opt)
-      file = SCR.get_file(str_opt, required: true)
 
-      # Command line check
-      format = formats.reduce(nil) do |matched, (frm, selectors)|
-        used = selectors[:option].reduce(false) {|us, option| SCR.get_arg(option) || us}
-        next matched if matched
-        next frm     if used
-      end
+    next input unless SCR.get_arg(str_opt)
+
+    file = SCR.get_file(str_opt, required: true)
 
-      # File/Folder check
-      file = File.expand_path(file)
-      if File.directory?(file)
-        folder = file
-        file   = Dir.glob("#{file}/*").reject {|f| File.directory?(f)}
-        ext    = (format && formats[format][:extname]) || [File.extname(file.first)]
-        file   = file.select {|f| ext.any? {|e| File.extname(f) == e}}.tap do |files|
-          if files.empty?
-            session.logger.error("Could not find any file with extension: #{ext} in folder '#{folder}'")
-            exit(1)
-          end
+    # Command line check
+    format = formats.reduce(nil) do |matched, (frm, selectors)|
+      used = selectors[:option].reduce(false) {|us, option| SCR.get_arg(option) || us}
+      next matched if matched
+      next frm     if used
+    end
+
+    # File/Folder check
+    file = File.expand_path(file)
+    if File.directory?(file)
+      folder = file
+      file   = Dir.glob("#{file}/*").reject {|f| File.directory?(f)}
+      ext    = (format && formats[format][:extname]) || [File.extname(file.first)]
+      file   = file.select {|f| ext.any? {|e| File.extname(f) == e}}.tap do |files|
+        if files.empty?
+          session.log(:error) {
+            "Could not find any file with extension: #{ext} in folder '#{folder}'"
+          }
+          exit(1)
         end
-      else
-        ext = File.extname(file)
       end
+    else
+      ext = File.extname(file)
+    end
 
-      format ||= formats.reduce(nil) do |matched, (frm, selectors)|
-        next matched if matched
-        next frm     if selectors[:extname].any? {|e| ext == e}
-      end
-      format ||= :csv
+    format ||= formats.reduce(nil) do |matched, (frm, selectors)|
+      next matched if matched
+      next frm     if selectors[:extname].any? {|e| ext == e}
+    end
+    format ||= :csv
 
-      options.deep_merge!(input: {file: {name: file}})
-      options.deep_merge!(input: {file: {format: format}})
+    options.deep_merge!(input: {file: {name: file}})
+    options.deep_merge!(input: {file: {format: format}})
 
-      encoding = options.dig(:input, :file, :encoding)
+    encoding = options.dig(:input, :file, :encoding)
 
-      case format
-      when :xml
-        [file].flatten.each {|f| session.config.files.validate(:xml, f)}
-        kargs = {file: file, format: format}
-        kargs.merge!(encoding: encoding) if encoding
-        input = session.entries(**kargs)
-      when :xls
-        input = session.entries(file: file, format: format)
-      when :json
-        input = [file].flatten.reduce(Eco::API::Organization::People.new([])) do |people, filename|
-          people.merge(JSON.parse(File.read(filename)))
-        end
-      else # :csv
-        kargs = {check_headers: true}
-        kargs.merge!(encoding: encoding) if encoding
-        input = session.csv_entries(file, **kargs)
+    case format
+    when :xml
+      [file].flatten.each {|f| session.config.files.validate(:xml, f)}
+      kargs = {file: file, format: format}
+      kargs.merge!(encoding: encoding) if encoding
+      input = session.entries(**kargs)
+    when :xls
+      input = session.entries(file: file, format: format)
+    when :json
+      input = [file].flatten.reduce(Eco::API::Organization::People.new([])) do |people, filename|
+        people.merge(JSON.parse(File.read(filename)))
       end
+    else # :csv
+      kargs = {check_headers: true}
+      kargs.merge!(encoding: encoding) if encoding
+      input = session.csv_entries(file, **kargs)
     end
+
     input
   end
 end

data/lib/eco/cli_default/input_filters.rb

@@ -1,47 +1,62 @@
 ASSETS.cli.config do |cnf|
   cnf.input_filters do |filters|
-
-    filters.add("-input-filter-tags-all", "only those that have ALL the specified tags separated by '|'") do |input, session, options|
+    desc = "only those that have ALL the specified tags separated by '|'"
+    filters.add("-input-filter-tags-all", desc) do |input, session, options|
       tags = SCR.get_arg("-input-filter-tags-all", with_param: true).upcase.split("|")
+
       options.deep_merge!(input: {filter: {filter_tags: {all: tags}}})
+
       input.filter_tags_all(tags).tap do |filtered|
-        msg = "Filtered #{filtered.count} entries (out of #{input.count}) with 'all' filter_tags #{tags}"
-        session.logger.info(msg)
+        msg  = "Filtered #{filtered.count} entries (out of #{input.count})"
+        msg << " with 'all' filter_tags #{tags}"
+        session.log(:info) { msg }
       end
     end
 
-    filters.add("-input-filter-tags-any", "only those that have ANY the specified tags separated by '|'") do |input, session, options|
+    desc = "only those that have ANY the specified tags separated by '|'"
+    filters.add("-input-filter-tags-any", desc) do |input, session, options|
       tags = SCR.get_arg("-input-filter-tags-any", with_param: true).upcase.split("|")
+
       options.deep_merge!(input: {filter: {filter_tags: {any: tags}}})
+
       input.filter_tags_any(tags).tap do |filtered|
-        msg = "Filtered #{filtered.count} entries (out of #{input.count}) with 'any' filter_tags #{tags}"
-        session.logger.info(msg)
+        msg  = "Filtered #{filtered.count} entries (out of #{input.count})"
+        msg << " with 'any' filter_tags #{tags}"
+        session.log(:info) { msg }
       end
     end
 
-    filters.add("-input-filter-tags-tree", "only those that have ANY tag in the specified subtrees separated by '|'") do |input, session, options|
+    desc = "only those that have ANY tag in the specified subtrees separated by '|'"
+    filters.add("-input-filter-tags-tree", desc) do |input, session, options|
       top_tags = SCR.get_arg("-input-filter-tags-tree", with_param: true).upcase.split("|")
-      tags     = top_tags.each_with_object([])  do |top, tags|
-        tags.concat(session.tagtree.node(top).tags)
+      tags     = top_tags.each_with_object([])  do |top, tgs|
+        tgs.concat(session.tagtree.node(top).tags)
       end.uniq
+
       options.deep_merge!(input: {filter: {filter_tags: {tree: top_tags, any: tags}}})
+
       input.filter_tags_any(tags).tap do |filtered|
-        msg = "Filtered #{filtered.count} entries (out of #{input.count}) with 'any' filter_tags in subtrees #{top_tags}"
-        session.logger.info(msg)
+        msg  = "Filtered #{filtered.count} entries (out of #{input.count})"
+        msg << " with 'any' filter_tags in subtrees #{top_tags}"
+        session.log(:info) { msg }
       end
     end
 
-    filters.add("-input-no-id", "only those that do not have 'id' or 'external_id' specified") do |input, session, options|
+    desc = "only those that do not have 'id' or 'external_id' specified"
+    filters.add("-input-no-id", desc) do |input, _sess, options|
       options.deep_merge!(input: {filter: {external_id: nil}})
+
       input.select do |entry|
-        !!(entry.id || entry.external_id)
-      end.yield_self do |filtered|
+        entry.id || entry.external_id
+      end.then do |filtered|
         input.newFrom filtered
       end
     end
 
-    filters.add("-input-supervisor-id", "only those with certain supervisor id or external_id") do |input, session, options|
-      id     = SCR.get_arg("-input-supervisor-id", with_param: true)
+    desc = "only those with certain supervisor id or external_id"
+    filters.add("-input-supervisor-id", desc) do |input, _sess, options|
+      id = SCR.get_arg("-input-supervisor-id", with_param: true)
+
       options.deep_merge!(input: {filter: {supervisor_id: id}})
       #unless sup = entries.find({"id" => id, "external_id" => id})
       #  raise "Could not find anyone in the input with that id '#{id}'"

data/lib/eco/cli_default/options.rb

@@ -7,18 +7,22 @@ ASSETS.cli.config do |cnf| # rubocop:disable Metrics/BlockLength
         if (there = SCR.get_arg(opt))
           refine = SCR.get_arg(opt, with_param: true)
         end
+
         refine || there
       end
 
       if (hpf = active.call("-filters"))
         puts conf.people_filters.help(refine: hpf)
       end
+
       if (hif = active.call("-input-filters"))
         puts conf.input_filters.help(refine: hif)
       end
+
       if (ho = active.call("-options"))
         puts conf.options_set.help(refine: ho)
       end
+
       if (huc = active.call("-usecases"))
         puts conf.usecases.help(refine: huc)
       end
@@ -64,13 +68,13 @@ ASSETS.cli.config do |cnf| # rubocop:disable Metrics/BlockLength
 
       unless sch_id
         msg = "You need to specify a correct schema id or name. '#{sch_name}' does not exist"
-        session.logger.error(msg)
+        session.log(:error) { msg }
         exit(1)
       end
-
       options.deep_merge!(people: {filter: {details: {schema_id: sch_id}}})
-      session.logger.info("Setting schema #{session.schemas.to_name(sch_id)}")
-
+      session.log(:info) {
+        "Setting schema #{session.schemas.to_name(sch_id)}"
+      }
       session.schema = sch_id
     end
 

data/lib/eco/cli_default/people.rb

@@ -24,7 +24,7 @@ ASSETS.cli.config do |cnf|
         msg  = "(Optimization) "
         msg << "Switching from partial to full people download. "
         msg << "Input (#{input.count}) surpases MAX_GET_PARTIAL (#{MAX_GET_PARTIAL}) entries."
-        session.logger.info(msg)
+        session.log(:info) { msg }
 
         options.deep_merge!(people: {
           get: {

data/lib/eco/cli_default/people_filters.rb

@@ -1,22 +1,21 @@
-ASSETS.cli.config do |cnf|
-  cnf.people_filters do |filters|
-
-    filters.add("-only-users", "only those with account") do |people, session, options|
+ASSETS.cli.config do |cnf| # rubocop:disable Metrics/BlockLength
+  cnf.people_filters do |filters| # rubocop:disable Metrics/BlockLength
+    filters.add("-only-users", "only those with account") do |people, _sess, options|
       options.deep_merge!(people: {filter: {account: true}})
       people.users
     end
 
-    filters.add("-no-account", "only those with no account") do |people, session, options|
+    filters.add("-no-account", "only those with no account") do |people, _sess, options|
       options.deep_merge!(people: {filter: {account: false}})
       people.account_present(false)
     end
 
-    filters.add("-with-details", "only those with details") do |people, session, options|
+    filters.add("-with-details", "only those with details") do |people, _sess, options|
       options.deep_merge!(people: {filter: {details: true}})
       people.details_present
     end
 
-    filters.add("-no-id", "only those with no external_id") do |people, session, options|
+    filters.add("-no-id", "only those with no external_id") do |people, _sess, options|
       options.deep_merge!(people: {filter: {external_id: nil}})
       people.external_id_present(false)
     end
@@ -27,25 +26,29 @@ ASSETS.cli.config do |cnf|
     # end
 
     filters.add("-supervisor-id", "only those with certain supervisor") do |people, session, options|
-      id     = SCR.get_arg("-supervisor-id", with_param: true)
+      id  = SCR.get_arg("-supervisor-id", with_param: true)
       options.deep_merge!(people: {filter: {supervisor_id: id}})
-      unless sup = session.micro.with_supervisor(id, people, strict: true)
+
+      unless (sup = session.micro.with_supervisor(id, people, strict: true))
         status = session.batch.search([{"id" => id}])
         sup    = status.people.first
       end
+
       unless sup
-        session.logger.error("Supervisor with id '#{id}' does not exist")
+        session.log(:error) {
+          "Supervisor with id '#{id}' does not exist"
+        }
         exit(1)
       end
 
       people.supervisor_id(sup.id)
     end
 
-    filters.add("-no-default-tag", "only those users with no default tag") do |people, session, options|
+    filters.add("-no-default-tag", "only those users with no default tag") do |people, _sess, options|
       options.deep_merge!(people: {filter: {account: {default_tag: nil}}})
-      people.users.select do |person|
-        !person.account.default_tag
-      end.yield_self do |filtered|
+      people.users.reject do |person|
+        person.account.default_tag
+      end.then do |filtered|
         people.newFrom filtered
       end
     end
@@ -56,7 +59,7 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(input: {filter: {filter_tags: {any: tags}}})
       people.filter_tags_all(tags).tap do |filtered|
         msg = "Filtered #{filtered.count} people (out of #{people.count}) with 'all' filter_tags #{tags}"
-        session.logger.info(msg)
+        session.log(:info) { msg }
       end
     end
 
@@ -66,20 +69,21 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(input: {filter: {filter_tags_any: tags}})
       people.filter_tags_any(tags).tap do |filtered|
         msg = "Filtered #{filtered.count} people (out of #{people.count}) with 'any' filter_tags #{tags}"
-        session.logger.info(msg)
+        session.log(:info) { msg }
       end
     end
 
     desc = "only those that have ANY tag in the specified subtrees separated by '|'"
     filters.add("-filter-tags-tree", desc) do |people, session, options|
       top_tags = SCR.get_arg("-filter-tags-tree", with_param: true).upcase.split("|").compact
-      tags     = top_tags.each_with_object([])  do |top, tags|
-        tags.concat(session.tagtree.node(top).tags)
+      tags     = top_tags.each_with_object([]) do |top, tgs|
+        tgs.concat(session.tagtree.node(top).tags)
       end.uniq
       options.deep_merge!(input: {filter: {filter_tags: {tree: top_tags, any: tags}}})
       people.filter_tags_any(tags).tap do |filtered|
-        msg = "Filtered #{filtered.count} people (out of #{people.count}) with 'any' filter_tags in subtrees #{top_tags}"
-        session.logger.info(msg)
+        msg  = "Filtered #{filtered.count} people (out of #{people.count})"
+        msg << " with 'any' filter_tags in subtrees #{top_tags}"
+        session.log(:info) { msg }
       end
     end
 
@@ -89,17 +93,21 @@ ASSETS.cli.config do |cnf|
 
       unless sch_id
         msg = "You need to specify a correct schema id or name. '#{sch_name}' does not exist"
-        session.logger.error(msg)
+        session.log(:error) { msg }
         exit(1)
       end
 
       options.deep_merge!(people: {filter: {details: {schema_id: sch_id}}})
-      session.logger.info("Filtering people records with schema #{session.schemas.to_name(sch_id)}")
+      session.log(:info) {
+        "Filtering people records with schema #{session.schemas.to_name(sch_id)}"
+      }
 
       people.select do |person|
         person.details && (person.details.schema_id == sch_id)
-      end.yield_self do |filtered|
-        session.logger.info("Filtered #{filtered.count} people out of #{people.count} total")
+      end.then do |filtered|
+        session.log(:info) {
+          "Filtered #{filtered.count} people out of #{people.count} total"
+        }
         people.newFrom filtered
       end
     end