aspera-cli 4.15.0 → 4.17.0

data/lib/aspera/{fasp → ascp}/management.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Aspera
-  module Fasp
-    # executes a local "ascp", connects mgt port, equivalent of "Fasp Manager"
+  module Ascp
+    # processing of ascp management port events
     class Management
       # cspell: disable
       OPERATIONS = %w[
@@ -185,6 +185,8 @@ module Aspera
         ExtraCreatePolicy]
       # Management port start message
       MGT_HEADER = 'FASPMGR 2'
+      # empty line is separator to end event information
+      MGT_FRAME_SEPARATOR = ''
       # fields description for JSON generation
       # spellchecker: disable
       INTEGER_FIELDS = %w[Bytescont FaspFileArgIndex StartByte Rate MinRate Port Priority RateCap MinRateCap TCPPort CreatePolicy TimePolicy
@@ -193,28 +195,26 @@ module Aspera
                           ArgScansCompleted PathScansAttempted FileScansCompleted TransfersAttempted TransfersPassed Delay].freeze
       BOOLEAN_FIELDS = %w[Encryption Remote RateLock MinRateLock PolicyLock FilesEncrypt FilesDecrypt VLinkLocalEnabled VLinkRemoteEnabled
                           MoveRange Keepalive TestLogin UseProxy Precalc RTTAutocorrect].freeze
+      BOOLEAN_TRUE = 'Yes'
       # cspell: enable
 
       class << self
-        # translates legacy event into enhanced (JSON) event
+        # translates mgt port event into (enhanced) typed event
         def enhanced_event_format(event)
           return event.keys.each_with_object({}) do |e, h|
-            # capital_to_snake_case
-            new_name = e
-                .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-                .gsub(/([a-z\d])(usec)$/, '\1_\2')
-                .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-                .downcase
+            new_name = e.capital_to_snake.gsub(/(usec)$/, '_\1').downcase
             value = event[e]
             value = value.to_i if INTEGER_FIELDS.include?(e)
-            value = value.eql?('Yes') if BOOLEAN_FIELDS.include?(e)
+            value = value.eql?(BOOLEAN_TRUE) if BOOLEAN_FIELDS.include?(e)
             h[new_name] = value
           end
         end
       end # class << self
 
       def initialize
+        # current event being parsed line by line
         @event_build = nil
+        # last fully built event
         @last_event = nil
       end
       attr_reader :last_event
@@ -226,16 +226,16 @@ module Aspera
           # begin event
           @event_build = {}
         when /^([^:]+): (.*)$/
+          raise 'mgt port: unexpected line: data without header' if @event_build.nil?
           # event field
           @event_build[Regexp.last_match(1)] = Regexp.last_match(2)
-        when ''
-          # empty line is separator to end event information
-          raise 'unexpected empty line' if @event_build.nil?
+        when MGT_FRAME_SEPARATOR
+          raise 'mgt port: unexpected line: end frame without header' if @event_build.nil?
           @last_event = @event_build
           @event_build = nil
           return @last_event
         else
-          raise "unexpected line:[#{line}]"
+          raise "mgt port: unexpected line: [#{line}]"
         end # case
         return nil
       end

data/lib/aspera/{fasp → ascp}/products.rb

@@ -4,7 +4,7 @@
 require 'aspera/environment'
 
 module Aspera
-  module Fasp
+  module Ascp
     # find Aspera standard products installation in standard paths
     class Products
       # known product names

data/lib/aspera/assert.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Aspera
+  class InternalError < StandardError
+  end
+
+  class AssertError < StandardError
+  end
+  class << self
+    # the block is executed in the context of the Aspera module
+    def assert(assertion, info = nil, level: 2, exception_class: AssertError)
+      raise InternalError, 'bad assert: both info and block given' unless info.nil? || !block_given?
+      return if assertion
+      message = 'assertion failed'
+      info = yield if block_given?
+      message = "#{message}: #{info}" if info
+      message = "#{message}: #{caller(level..level).first}"
+      raise exception_class, message
+    end
+
+    # assert that value has the given type
+    # @param value [Object] the value to check
+    # @param type [Class] the expected type
+    def assert_type(value, type, exception_class: AssertError)
+      assert(value.is_a?(type), level: 3, exception_class: exception_class){"#{block_given? ? "#{yield}: " : nil}expecting #{type}, but have #{value.inspect}"}
+    end
+
+    # assert that value is one of the given values
+    def assert_values(value, values, exception_class: AssertError)
+      assert(values.include?(value), level: 3, exception_class: exception_class) do
+        "#{block_given? ? "#{yield}: " : nil}expecting one of #{values.inspect}, but have #{value.inspect}"
+      end
+    end
+
+    # the line with this shall never be reached
+    def error_unreachable_line
+      raise InternalError, "unreachable line reached: #{caller(2..2).first}"
+    end
+
+    # the value is not one of the expected values
+    def error_unexpected_value(value, exception_class: InternalError)
+      raise exception_class, "#{block_given? ? "#{yield}: " : nil}unexpected value: #{value.inspect}"
+    end
+  end
+end

data/lib/aspera/cli/basic_auth_plugin.rb

@@ -6,22 +6,23 @@ require 'aspera/cli/plugin'
 module Aspera
   module Cli
     # base class for applications supporting basic authentication
-    class BasicAuthPlugin < Aspera::Cli::Plugin
+    class BasicAuthPlugin < Cli::Plugin
       class << self
-        @@basic_options_declared = false # rubocop:disable Style/ClassVars
-        def declare_options(options, force: false)
-          return if @@basic_options_declared && !force
-          @@basic_options_declared = true # rubocop:disable Style/ClassVars
+        #@@basic_options_declared = false # rubocop:disable Style/ClassVars
+        def declare_options(options) # , force: false
+          #return if @@basic_options_declared && !force
+          #@@basic_options_declared = true # rubocop:disable Style/ClassVars
           options.declare(:url, 'URL of application, e.g. https://faspex.example.com/aspera/faspex')
-          options.declare(:username, 'Username to log in')
+          options.declare(:username, "User's name to log in")
           options.declare(:password, "User's password")
           options.parse_options!
         end
       end
 
-      def initialize(env)
-        super(env)
-        BasicAuthPlugin.declare_options(options, force: env[:all_manuals])
+      def initialize(basic_options: true, **env)
+        super(**env)
+        # , force: env[:all_manuals]
+        BasicAuthPlugin.declare_options(options) if basic_options
       end
 
       # returns a Rest object with basic auth
@@ -38,7 +39,7 @@ module Aspera
       end
 
       def basic_auth_api(subpath=nil)
-        return Rest.new(basic_auth_params(subpath))
+        return Rest.new(**basic_auth_params(subpath))
       end
     end # BasicAuthPlugin
   end # Cli

data/lib/aspera/cli/extended_value.rb

@@ -4,6 +4,7 @@
 require 'aspera/uri_reader'
 require 'aspera/environment'
 require 'aspera/log'
+require 'aspera/assert'
 require 'json'
 require 'base64'
 require 'zlib'
@@ -17,6 +18,7 @@ module Aspera
       include Singleton
 
       # special values
+      INIT = 'INIT'
       ALL = 'ALL'
       DEF = 'DEF'
 
@@ -30,9 +32,7 @@ module Aspera
             if col_titles.nil?
               col_titles = values
             else
-              entry = {}
-              col_titles.each{|title|entry[title] = values.shift}
-              hash_array.push(entry)
+              hash_array.push(col_titles.zip(values).to_h)
             end
           end
           Log.log.warn('Titled CSV file without any line') if hash_array.empty?
@@ -63,7 +63,7 @@ module Aspera
           path:   lambda{|v|File.expand_path(v)},
           re:     lambda{|v|Regexp.new(v)},
           ruby:   lambda{|v|Environment.secure_eval(v, __FILE__, __LINE__)},
-          secret: lambda{|v|ExtendedValue.assert_no_value(v, :secret); $stdin.getpass('secret> ')}, # rubocop:disable Style/Semicolon
+          secret: lambda{|v|prompt = v.empty? ? 'secret' : v; $stdin.getpass("#{prompt}> ")}, # rubocop:disable Style/Semicolon
           stdin:  lambda{|v|ExtendedValue.assert_no_value(v, :stdin); $stdin.read}, # rubocop:disable Style/Semicolon
           yaml:   lambda{|v|YAML.load(v)},
           zlib:   lambda{|v|Zlib::Inflate.inflate(v)},
@@ -78,7 +78,7 @@ module Aspera
       # add a new handler
       def set_handler(name, method)
         Log.log.debug{"setting handler for #{name}"}
-        raise 'name must be Symbol' unless name.is_a?(Symbol)
+        Aspera.assert_type(name, Symbol){'name'}
         @handlers[name] = method
       end
 

data/lib/aspera/cli/formatter.rb

@@ -3,6 +3,8 @@
 # cspell:ignore jsonpp
 require 'aspera/secret_hider'
 require 'aspera/environment'
+require 'aspera/log'
+require 'aspera/assert'
 require 'terminal-table'
 require 'yaml'
 require 'pp'
@@ -18,7 +20,7 @@ module Aspera
 
       # General method
       def flatten(something)
-        raise 'only Hash' unless something.is_a?(Hash)
+        Aspera.assert_type(something, Hash)
         @result = {}
         flatten_any(something, '')
         return @result
@@ -94,6 +96,7 @@ module Aspera
       DISPLAY_FORMATS = %i[text nagios ruby json jsonpp yaml table csv].freeze
       # user output levels
       DISPLAY_LEVELS = %i[info data error].freeze
+      RESULT_PARAMS = %i[type data total fields name].freeze
 
       private_constant :DISPLAY_FORMATS, :DISPLAY_LEVELS, :CSV_RECORD_SEPARATOR, :CSV_FIELD_SEPARATOR
       # prefix to display error messages in user messages (terminal)
@@ -104,7 +107,7 @@ module Aspera
       class << self
         # Highlight special values
         def special(what, use_colors: $stdout.isatty)
-          result = "<#{what}>"
+          result = $stdout.isatty ? "<#{what}>" : "&lt;#{what}&gt;"
           if use_colors
             result = if %w[null empty].any?{|s|what.include?(s)}
               result.dim
@@ -155,16 +158,26 @@ module Aspera
       end
 
       def option_handler(option_symbol, operation, value=nil)
+        Aspera.assert_values(operation, %i[set get])
         case operation
-        when :set then @options[option_symbol] = value
+        when :set
+          @options[option_symbol] = value
+          if option_symbol.eql?(:output)
+            $stdout = if value.eql?('-')
+              STDOUT # rubocop:disable Style/GlobalStdStream
+            else
+              File.open(value, 'w')
+            end
+          end
         when :get then return @options[option_symbol]
-        else raise "internal error: no such operation: #{operation}"
+        else Aspera.error_unreachable_line
         end
         nil
       end
 
       def declare_options(options)
         options.declare(:format, 'Output format', values: DISPLAY_FORMATS, handler: {o: self, m: :option_handler}, default: :table)
+        options.declare(:output, 'Destination for results', types: String, handler: {o: self, m: :option_handler})
         options.declare(:display, 'Output only some information', values: DISPLAY_LEVELS, handler: {o: self, m: :option_handler}, default: :info)
         options.declare(
           :fields, "Comma separated list of: fields, or #{ExtendedValue::ALL}, or #{ExtendedValue::DEF}", handler: {o: self, m: :option_handler},
@@ -186,7 +199,7 @@ module Aspera
         when :data then $stdout.puts(message) unless @options[:display].eql?(:error)
         when :info then $stdout.puts(message) if @options[:display].eql?(:info)
         when :error then $stderr.puts(message)
-        else raise "wrong message_level:#{message_level}"
+        else Aspera.error_unexpected_value(message_level)
         end
       end
 
@@ -219,7 +232,7 @@ module Aspera
           when Array then @options[:fields]
           when Regexp then return all_fields(data).select{|i|i.match(@options[:fields])}
           when Proc then return all_fields(data).select{|i|@options[:fields].call(i)}
-          else raise "internal error: option: fields: #{@options[:fields]}"
+          else Aspera.error_unexpected_value(@options[:fields])
           end
         result = []
         until request.empty?
@@ -252,7 +265,7 @@ module Aspera
       # object_array: array of hash
       # fields: list of column names
       def display_table(object_array, fields)
-        raise 'internal error: no field specified' if fields.nil?
+        Aspera.assert(!fields.nil?){'missing fields parameter'}
         case @options[:select]
         when Proc
           object_array.select!{|i|@options[:select].call(i)}
@@ -296,12 +309,12 @@ module Aspera
 
       # this method displays the results, especially the table format
       def display_results(results)
-        raise "INTERNAL ERROR, result unsupported key: #{results.keys - %i[type data fields name]}" unless (results.keys - %i[type data fields name]).empty?
-        # :type :data :fields :name
-        raise "INTERNAL ERROR, result must be Hash (got: #{results.class}: #{results})" unless results.is_a?(Hash)
-        raise "INTERNAL ERROR, result must have type (#{results})" unless results.key?(:type)
-        raise 'INTERNAL ERROR, result must have data' unless results.key?(:data) || %i[empty nothing].include?(results[:type])
+        Aspera.assert_type(results, Hash)
+        Aspera.assert((results.keys - RESULT_PARAMS).empty?){"result unsupported key: #{results.keys - RESULT_PARAMS}"}
+        Aspera.assert(results.key?(:type)){"result must have type (#{results})"}
+        Aspera.assert(results.key?(:data) || %i[empty nothing].include?(results[:type])){'result must have data'}
         Log.log.debug{"display_results: #{results[:data].class} #{results[:type]}"}
+        display_item_count(results[:data].length, results[:total]) if results.key?(:total)
         SecretHider.deep_remove_secret(results[:data]) unless @options[:show_secrets] || @options[:display].eql?(:data)
         case @options[:format]
         when :text
@@ -323,8 +336,8 @@ module Aspera
           when :object_list, :single_object
             obj_list = results[:data]
             obj_list = [obj_list] if results[:type].eql?(:single_object)
-            raise "internal error: expecting Array: got #{obj_list.class}" unless obj_list.is_a?(Array)
-            raise 'internal error: expecting Array of Hash' unless obj_list.all?(Hash)
+            Aspera.assert_type(obj_list, Array)
+            Aspera.assert(obj_list.all?(Hash)){"expecting Array of Hash: #{obj_list.inspect}"}
             # :object_list is an array of hash tables, where key=colum name
             obj_list = obj_list.map{|obj|Flattener.new.flatten(obj)} if @options[:flat_hash]
             display_table(obj_list, compute_fields(obj_list, results[:fields]))

data/lib/aspera/cli/hints.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'aspera/fasp/error'
+require 'aspera/transfer/error'
 require 'aspera/rest'
+require 'aspera/log'
+require 'aspera/assert'
 require 'net/ssh'
 require 'openssl'
 
@@ -12,7 +14,7 @@ module Aspera
       # Well know issues that users may get
       ERROR_HINTS = [
         {
-          exception:   Fasp::Error,
+          exception:   Transfer::Error,
           match:       'Remote host is not who we expected',
           remediation: [
             'For this specific error, refer to:',
@@ -22,7 +24,7 @@ module Aspera
           ]
         },
         {
-          exception:   Aspera::RestCallError,
+          exception:   RestCallError,
           match:       /Signature has expired/,
           remediation: [
             'There is too much time difference between your computer and the server',
@@ -58,14 +60,13 @@ module Aspera
             matches = hint[:match]
             matches = [matches] unless matches.is_a?(Array)
             matches.each do |m|
+              Aspera.assert_values(m.class, [String, Regexp])
               case m
               when String
                 next unless message.eql?(m)
               when Regexp
                 next unless message.match?(m)
-              else
-                Log.log.warn("Internal error: hint is a #{m.class}")
-                next
+              else Aspera.error_unexpected_value(m)
               end
               remediation = hint[:remediation]
               remediation = [remediation] unless remediation.is_a?(Array)

data/lib/aspera/cli/main.rb

@@ -4,12 +4,15 @@ require 'aspera/cli/manager'
 require 'aspera/cli/formatter'
 require 'aspera/cli/plugins/config'
 require 'aspera/cli/extended_value'
+require 'aspera/cli/plugin_factory'
 require 'aspera/cli/transfer_agent'
 require 'aspera/cli/version'
 require 'aspera/cli/info'
 require 'aspera/cli/hints'
+require 'aspera/preview/terminal'
 require 'aspera/secret_hider'
 require 'aspera/log'
+require 'aspera/assert'
 
 module Aspera
   module Cli
@@ -17,6 +20,9 @@ module Aspera
     class Main
       # Plugins store transfer result using this key and use result_transfer_multiple()
       STATUS_FIELD = 'status'
+      CONF_PLUGIN_SYM = :config
+
+      private_constant :CONF_PLUGIN_SYM
 
       class << self
         # expect some list, but nothing to display
@@ -53,13 +59,21 @@ module Aspera
           raise global_status unless global_status.eql?(:success)
           return {type: :object_list, data: status_table}
         end
+
+        def result_picture_in_terminal(options, blob)
+          terminal_options = options.get_option(:query, default: {}).symbolize_keys
+          allowed_options = Preview::Terminal.method(:build).parameters.select{|i|i[0].eql?(:key)}.map{|i|i[1]}
+          unknown_options = terminal_options.keys - allowed_options
+          raise "invalid options: #{unknown_options.join(', ')}, use #{allowed_options.join(', ')}" unless unknown_options.empty?
+          return Main.result_status(Preview::Terminal.build(blob, **terminal_options))
+        end
       end # self
 
       private
 
       # shortcuts helpers like in plugins
       %i[options transfer config formatter persistency].each do |name|
-        define_method(name){@agents[name]}
+        define_method(name){@plug_init[name]}
       end
 
       # =============================================================
@@ -70,7 +84,7 @@ module Aspera
       def initialize(argv)
         @argv = argv
         # environment provided to plugin for various capabilities
-        @agents = {}
+        @plug_init = Plugin::INIT_PARAMS.each_with_object({}) { |key, hash| hash[key] = nil }
         @option_help = false
         @option_show_config = false
         @bash_completion = false
@@ -78,10 +92,12 @@ module Aspera
 
       # This can throw exception if there is a problem with the environment, needs to be caught by execute method
       def init_agents_and_options
-        # first thing : manage debug level (allows debugging of option parser)
+        @plug_init[:only_manual] = false
+        # create formatter, in case there is an exception, it is used to display.
+        @plug_init[:formatter] = Formatter.new
+        # second : manage debug level (allows debugging of option parser)
         early_debug_setup
-        @agents[:formatter] = Formatter.new
-        @agents[:options] = Manager.new(PROGRAM_NAME)
+        @plug_init[:options] = Manager.new(PROGRAM_NAME)
         # give command line arguments to option manager
         options.parse_command_line(@argv)
         # formatter adds options
@@ -94,11 +110,14 @@ module Aspera
         # declare and parse global options
         declare_global_options
         # the Config plugin adds the @preset parser, so declare before TransferAgent which may use it
-        @agents[:config] = Plugins::Config.new(@agents, gem: GEM_NAME, name: PROGRAM_NAME, help: DOC_URL, version: Aspera::Cli::VERSION)
+        @plug_init[:config] = Plugins::Config.new(**@plug_init, gem: GEM_NAME, name: PROGRAM_NAME, help: DOC_URL, version: Cli::VERSION)
+        @plug_init[:persistency] = @plug_init[:config].persistency
         # data persistency
-        raise 'internal error: missing persistency object' unless @agents[:persistency]
+        Aspera.assert(@plug_init[:persistency]){'missing persistency object'}
         # the TransferAgent plugin may use the @preset parser
-        @agents[:transfer] = TransferAgent.new(options, config)
+        @plug_init[:config].transfer = @plug_init[:transfer] = TransferAgent.new(options, config)
+        nil_keys = @plug_init.select{|_, value|value.nil?}.keys
+        Aspera.assert(nil_keys.empty?){"nil : #{nil_keys}"}
         Log.log.debug('plugin env created'.red)
         # set banner when all environment is created so that additional extended value modifiers are known, e.g. @preset
         options.parser.banner = app_banner
@@ -108,7 +127,7 @@ module Aspera
         t = ' ' * 8
         return <<~END_OF_BANNER
           NAME
-          #{t}#{PROGRAM_NAME} -- a command line tool for Aspera Applications (v#{Aspera::Cli::VERSION})
+          #{t}#{PROGRAM_NAME} -- a command line tool for Aspera Applications (v#{Cli::VERSION})
 
           SYNOPSIS
           #{t}#{PROGRAM_NAME} COMMANDS [OPTIONS] [ARGS]
@@ -144,7 +163,7 @@ module Aspera
         options.declare(:help, 'Show this message', values: :none, short: 'h') { @option_help = true }
         options.declare(:bash_comp, 'Generate bash completion for command', values: :none) { @bash_completion = true }
         options.declare(:show_config, 'Display parameters used for the provided action', values: :none) { @option_show_config = true }
-        options.declare(:version, 'Display version', values: :none, short: 'v') { formatter.display_message(:data, Aspera::Cli::VERSION); Process.exit(0) } # rubocop:disable Style/Semicolon, Layout/LineLength
+        options.declare(:version, 'Display version', values: :none, short: 'v') { formatter.display_message(:data, Cli::VERSION); Process.exit(0) } # rubocop:disable Style/Semicolon, Layout/LineLength
         options.declare(:warnings, 'Check for language warnings', values: :none, short: 'w') { $VERBOSE = true }
         options.declare(
           :ui, 'Method to start browser',
@@ -166,20 +185,19 @@ module Aspera
       # also loads the plugin options, and default values from conf file
       # @param plugin_name_sym : symbol for plugin name
       def get_plugin_instance_with_options(plugin_name_sym, env=nil)
-        env ||= @agents
+        env ||= @plug_init
         Log.log.debug{"get_plugin_instance_with_options(#{plugin_name_sym})"}
-        require config.plugins[plugin_name_sym][:require_stanza]
+        require PluginFactory.instance.plugins[plugin_name_sym][:require_stanza]
         # load default params only if no param already loaded before plugin instantiation
         env[:config].add_plugin_default_preset(plugin_name_sym)
-        command_plugin = Plugins::Config.plugin_class(plugin_name_sym).new(env)
+        command_plugin = PluginFactory.instance.create(plugin_name_sym, **env)
         Log.log.debug{"got #{command_plugin.class}"}
-        # TODO: check that ancestor is Plugin?
         return command_plugin
       end
 
       def generate_bash_completion
         if options.get_next_argument('', expected: :multiple, mandatory: false).nil?
-          config.plugins.each_key{|p|puts p.to_s}
+          PluginFactory.instance.plugins.each_key{|p|puts p}
         else
           Log.log.warn('only first level completion so far')
         end
@@ -192,11 +210,11 @@ module Aspera
         formatter.display_message(:error, options.parser)
         if all_plugins
           # list plugins that have a "require" field, i.e. all but main plugin
-          config.plugins.each_key do |plugin_name_sym|
-            next if plugin_name_sym.eql?(Plugins::Config::CONF_PLUGIN_SYM)
+          PluginFactory.instance.plugins.each_key do |plugin_name_sym|
+            next if plugin_name_sym.eql?(CONF_PLUGIN_SYM)
             # override main option parser with a brand new, to avoid having global options
-            plugin_env = @agents.clone
-            plugin_env[:all_manuals] = true # force declaration of all options
+            plugin_env = @plug_init.clone
+            plugin_env[:only_manual] = true # force declaration of all options
             plugin_env[:options] = Manager.new(PROGRAM_NAME)
             plugin_env[:options].parser.banner = '' # remove default banner
             get_plugin_instance_with_options(plugin_name_sym, plugin_env)
@@ -212,13 +230,15 @@ module Aspera
       # early debug for parser
       # Note: does not accept shortcuts
       def early_debug_setup
-        Aspera::Log.instance.program_name = PROGRAM_NAME
+        Log.instance.program_name = PROGRAM_NAME
         @argv.each do |arg|
           case arg
           when '--' then break
-          when /^--log-level=(.*)/ then Aspera::Log.instance.level = Regexp.last_match(1).to_sym
-          when /^--logger=(.*)/ then Aspera::Log.instance.logger_type = Regexp.last_match(1).to_sym
+          when /^--log-level=(.*)/ then Log.instance.level = Regexp.last_match(1).to_sym
+          when /^--logger=(.*)/ then Log.instance.logger_type = Regexp.last_match(1).to_sym
           end
+        rescue => e
+          $stderr.puts("Error: #{e}")
         end
       end
 
@@ -234,16 +254,16 @@ module Aspera
         begin
           init_agents_and_options
           # find plugins, shall be after parse! ?
-          config.add_plugins_from_lookup_folders
+          PluginFactory.instance.add_plugins_from_lookup_folders
           # help requested without command ? (plugins must be known here)
           exit_with_usage(true) if @option_help && options.command_or_arg_empty?
           generate_bash_completion if @bash_completion
           config.periodic_check_newer_gem_version
           command_sym =
             if @option_show_config && options.command_or_arg_empty?
-              Plugins::Config::CONF_PLUGIN_SYM
+              CONF_PLUGIN_SYM
             else
-              options.get_next_command(config.plugins.keys.dup.unshift(:help))
+              options.get_next_command(PluginFactory.instance.plugins.keys.dup.unshift(:help))
             end
           # command will not be executed, but we need manual
           options.fail_on_missing_mandatory = false if @option_help || @option_show_config
@@ -251,7 +271,7 @@ module Aspera
           case command_sym
           when :help
             exit_with_usage(true)
-          when Plugins::Config::CONF_PLUGIN_SYM
+          when CONF_PLUGIN_SYM
             command_plugin = config
           else
             # get plugin, set options, etc
@@ -294,8 +314,8 @@ module Aspera
         rescue Cli::BadArgument => e;               exception_info = {e: e, t: 'Argument', usage: true}
         rescue Cli::NoSuchIdentifier => e;          exception_info = {e: e, t: 'Identifier'}
         rescue Cli::Error => e;                     exception_info = {e: e, t: 'Tool', usage: true}
-        rescue Fasp::Error => e;                    exception_info = {e: e, t: 'Transfer'}
-        rescue Aspera::RestCallError => e;          exception_info = {e: e, t: 'Rest'}
+        rescue Transfer::Error => e;                exception_info = {e: e, t: 'Transfer'}
+        rescue RestCallError => e;                  exception_info = {e: e, t: 'Rest'}
         rescue SocketError => e;                    exception_info = {e: e, t: 'Network'}
         rescue StandardError => e;                  exception_info = {e: e, t: "Other(#{e.class.name})", debug: true}
         rescue Interrupt => e;                      exception_info = {e: e, t: 'Interruption', debug: true}
@@ -304,7 +324,7 @@ module Aspera
         TempFileManager.instance.cleanup
         # 1- processing of error condition
         unless exception_info.nil?
-          Log.log.warn(exception_info[:e].message) if Aspera::Log.instance.logger_type.eql?(:syslog) && exception_info[:security]
+          Log.log.warn(exception_info[:e].message) if Log.instance.logger_type.eql?(:syslog) && exception_info[:security]
           formatter.display_message(:error, "#{Formatter::ERROR_FLASH} #{exception_info[:t]}: #{exception_info[:e].message}")
           formatter.display_message(:error, 'Use option -h to get help.') if exception_info[:usage]
           # Is that a known error condition with proposal for remediation ?