aspera-cli 4.27.2 → 4.27.3

data/lib/aspera/api/node.rb

@@ -12,6 +12,8 @@ require 'openssl'
 require 'pathname'
 require 'zlib'
 require 'net/ssh/buffer'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Api
@@ -33,7 +35,7 @@ module Aspera
 
     # Aspera Node API client
     # with gen4 extensions (access keys)
-    class Node < Rest
+    class Node < Rest::Client
       # Format of node scope : node.<access key>:<scope>
       module Scope
         # Node sub-scopes
@@ -42,6 +44,26 @@ module Aspera
         # Separator between node.AK and user:all
         SEPARATOR = ':'
         NODE_PREFIX = 'node.'
+
+        extend self
+
+        # Encode node API scope
+        # @param access_key [String] Access Key
+        # @param scope [String] internal scope
+        # @return [String] full node scope
+        def join(access_key:, scope:)
+          ["#{NODE_PREFIX}#{access_key}", scope].join(SEPARATOR)
+        end
+
+        # Decode node scope into access key and scope
+        # @param scope [String] scope string to split
+        # @return [Hash] decoded scope with access key and scope parts
+        def split(scope)
+          items = scope.split(Scope::SEPARATOR, 2)
+          Aspera.assert(items.length.eql?(2)) { "invalid scope: #{scope}" }
+          Aspera.assert(items[0].start_with?(NODE_PREFIX)) { "invalid scope: #{scope}" }
+          {access_key: items[0].delete_prefix(NODE_PREFIX), scope: items[1]}
+        end
       end
       # Delimiter in decoded node token
       SIGNATURE_DELIMITER = '==SIGNATURE=='
@@ -54,10 +76,10 @@ module Aspera
       HEADER_X_ASPERA_ACCESS_KEY = 'X-Aspera-AccessKey'
       HEADER_X_CACHE_CONTROL = 'X-Aspera-Cache-Control'
       HEADER_X_NEXT_ITER_TOKEN = 'X-Aspera-Next-Iteration-Token'
+      HEADER_X_TOTAL_COUNT = 'X-Total-Count'
       HEADER_ACCEPT_VERSION = 'Accept-Version'
       # / in cloud
       PATH_SEPARATOR = '/'
-      HEADER_X_TOTAL_COUNT = 'X-Total-Count'
 
       # Register node special token decoder
       OAuth::Factory.instance.register_decoder(lambda { |token| Node.decode_bearer_token(token) })
@@ -133,22 +155,6 @@ module Aspera
           [folder.join(PATH_SEPARATOR), inside]
         end
 
-        # Node API scopes
-        # @return [String] node scope
-        def token_scope(access_key, scope)
-          return [Scope::NODE_PREFIX, access_key, Scope::SEPARATOR, scope].join('')
-        end
-
-        # Decode node scope into access key and scope
-        # @param scope [String] scope string to decode
-        # @return [Hash] decoded scope with access key and scope parts
-        def decode_scope(scope)
-          items = scope.split(Scope::SEPARATOR, 2)
-          Aspera.assert(items.length.eql?(2)) { "invalid scope: #{scope}" }
-          Aspera.assert(items[0].start_with?(Scope::NODE_PREFIX)) { "invalid scope: #{scope}" }
-          return {access_key: items[0].delete_prefix(Scope::NODE_PREFIX), scope: items[1]}
-        end
-
         # Create an Aspera Node bearer token
         # @param access_key [String] Access key identifier
         # @param payload [String] JSON payload to be included in the token
@@ -162,9 +168,8 @@ module Aspera
           # Manage convenience parameters
           expiration_sec = payload['_validity'] || BEARER_TOKEN_VALIDITY_DEFAULT
           payload.delete('_validity')
-          scope = payload['_scope'] || Scope::USER
-          payload.delete('_scope')
-          payload['scope'] ||= token_scope(access_key, scope)
+          scope = payload.delete('_scope') || Scope::USER
+          payload['scope'] ||= Scope.join(access_key: access_key, scope: scope)
           payload['auth_type'] ||= 'access_key'
           payload['expires_at'] ||= (Time.now + expiration_sec).utc.strftime('%FT%TZ')
           payload_json = JSON.generate(payload)
@@ -185,7 +190,7 @@ module Aspera
         def bearer_headers(bearer_auth, access_key: nil)
           # If username is not provided, use the access key from the token
           if access_key.nil?
-            access_key = Node.decode_scope(Node.decode_bearer_token(OAuth::Factory.bearer_token(bearer_auth))['scope'])[:access_key]
+            access_key = Node::Scope.split(Node.decode_bearer_token(OAuth::Factory.bearer_token(bearer_auth))['scope'])[:access_key]
             Aspera.assert(!access_key.nil?, 'access_key could not be determined from token')
           end
           return {
@@ -233,7 +238,7 @@ module Aspera
         end
         Log.log.warn { "Cannot resolve link with node id #{node_id}, no resolver" }
         return
-      rescue RestCallError => e
+      rescue Rest::CallError => e
         Log.log.warn { "Cannot resolve link with node id #{node_id}: #{e.message}" }
         return
       end
@@ -287,7 +292,7 @@ module Aspera
             query['page'] = 0
           end
           loop do
-            RestParameters.instance.spinner_cb.call(folder_items.count)
+            Rest::Parameters.instance.spinner_cb.call(folder_items.count)
             data, http = read("files/#{file_id}/files", query, headers: headers, ret: :both)
             folder_items.concat(data)
             if use_v4
@@ -304,7 +309,7 @@ module Aspera
           Log.log.warn { "#{path || file_id}: #{e.class} #{e.message}" }
           Log.log.debug { (['Backtrace:'] + e.backtrace).join("\n") }
         ensure
-          RestParameters.instance.spinner_cb.call(folder_items.count, action: :success)
+          Rest::Parameters.instance.spinner_cb.call(folder_items.count, action: :success)
         end
         folder_items
       end
@@ -326,7 +331,7 @@ module Aspera
         until folders_to_explore.empty?
           # Consume first in job list
           current_item = folders_to_explore.shift
-          Log.log.debug { "Exploring #{current_item[:path]}".bg_green }
+          Log.log.debug { "Exploring #{current_item[:path]}".bg(:green) }
           # Get folder content
           folder_contents = read_folder_content(current_item[:id], query, exception: false, path: current_item[:path])
           Log.dump(:folder_contents, folder_contents)
@@ -527,7 +532,7 @@ module Aspera
 
       # Executes `GET` call in loop using `iteration_token` (`/ops/transfers`)
       # @param iteration [Array]   a single element array with the iteration token or nil
-      # @param call_args [Hash]    additional arguments to pass to `Rest.call`
+      # @param call_args [Hash]    additional arguments to pass to `Rest::Client#call`
       # @return [Array] list of items returned by the API call
       def read_with_paging(subpath, query = nil, iteration: nil, **call_args)
         Aspera.assert_type(iteration, Array, NilClass) { 'iteration' }
@@ -535,7 +540,7 @@ module Aspera
         Aspera.assert(!call_args.key?(:query), ':query must not be in call_args (use query parameter)')
         query = {} if query.nil?
         query[:iteration_token] = iteration[0] unless iteration.nil? || iteration[0].nil?
-        max = query.delete(RestList::MAX_ITEMS)
+        max = query.delete(Rest::List::MAX_ITEMS)
         # Return empty list immediately if max is 0
         return [] if max&.zero?
         item_list = []
@@ -551,7 +556,7 @@ module Aspera
             break
           end
           # Update progress spinner
-          RestParameters.instance.spinner_cb.call(item_list.length)
+          Rest::Parameters.instance.spinner_cb.call(item_list.length)
           # Parse Link header according to RFC 8288 to extract next iteration token
           next_url = LinkHeader.parse(http['Link']).find_href(rel: 'next')
           next_iteration_token = nil
@@ -572,7 +577,7 @@ module Aspera
           query[:iteration_token] = next_iteration_token
         end
         # Signal completion
-        RestParameters.instance.spinner_cb.call(action: :success)
+        Rest::Parameters.instance.spinner_cb.call(action: :success)
         # save iteration token if needed
         iteration[0] = query[:iteration_token] unless iteration.nil?
         item_list
@@ -582,7 +587,7 @@ module Aspera
       #
       # @param subpath [String] API Path
       # @param query [Hash, nil] Optional query parameters for the API request
-      # @param kwargs [Hash] Other parameters for Rest.read
+      # @param kwargs [Hash] Other parameters for Rest::Client#read
       #
       # @return [Array<Hash>] List of folder entries (files, folders, links)
       def read_with_pages(subpath, query = nil, **kwargs)
@@ -592,7 +597,7 @@ module Aspera
         query['page'] ||= 1
         suffix = nil
         loop do
-          RestParameters.instance.spinner_cb.call("#{items.count}#{suffix}")
+          Rest::Parameters.instance.spinner_cb.call("#{items.count}#{suffix}")
           data, http = read(subpath, query, **kwargs, ret: :both)
           items.concat(data)
           break if data.length < query['per_page']
@@ -603,7 +608,7 @@ module Aspera
         Log.log.warn { "#{e.class} #{e.message}" }
         Log.log.debug { (['Backtrace:'] + e.backtrace).join("\n") }
       ensure
-        RestParameters.instance.spinner_cb.call(items.count, action: :success)
+        Rest::Parameters.instance.spinner_cb.call(items.count, action: :success)
         return items # rubocop:disable Lint/EnsureReturn
       end
 

data/lib/aspera/ascmd.rb

@@ -3,9 +3,11 @@
 # cspell:ignore ascmd smode errstr zstr zmode zuid zgid zctime zatime zmtime fcount dcount btype blist codeset lc_ctype ascmdtypes
 require 'aspera/log'
 require 'aspera/assert'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
-  # Run +ascmd+ commands using specified executor (usually, remotely on transfer node)
+  # Run `ascmd` commands using specified executor (usually, remotely on transfer node)
   # Equivalent of SDK "command client"
   # execute: "ascmd -h" to get syntax
   # Note: "ls" can take filters: as_ls -f *.txt -f *.bin /

data/lib/aspera/ascp/installation.rb

@@ -42,6 +42,14 @@ module Aspera
       # policy for product selection
       FIRST_FOUND = 'FIRST'
 
+      class << self
+        # @param value [String, nil] value of option `sdk_folder`
+        # @return [Boolean] true if value selects a product instead of a folder
+        def product_selector?(value)
+          value.is_a?(String) && value.start_with?(USE_PRODUCT_PREFIX)
+        end
+      end
+
       # Loads YAML from cloud with locations of SDK archives for all platforms
       # @return [Hash] location structure
       def sdk_locations
@@ -55,30 +63,25 @@ module Aspera
         end
       end
 
-      # Set `ascp` executable "location"
+      # Set `ascp` executable "location" (option `sdk_folder`)
       # It can be:
-      # - Full path to folder where `ascp` executable is located
-      # - "product:PRODUCT_NAME" to use ascp from named product
+      # - Full path to folder where `ascp` executable is located, also used as SDK folder (keys, conf)
+      # - "product:PRODUCT_NAME" to use ascp from named product, SDK folder stays the default one
       # - "product:FIRST" to use ascp from first found product
+      # @param ascp_location [String] folder or product selector
+      # @return [nil]
       def sdk_folder=(ascp_location)
         Aspera.assert_type(ascp_location, String) { 'ascp_location' }
         Aspera.assert(!ascp_location.empty?, 'ascp location cannot be empty: check your config file')
-        folder =
-          if ascp_location.start_with?(USE_PRODUCT_PREFIX)
-            product_name = ascp_location.delete_prefix(USE_PRODUCT_PREFIX)
-            if product_name.eql?(FIRST_FOUND)
-              pl = installed_products.first
-              Aspera.assert(!pl.nil?) { "No Aspera transfer module or SDK found.\nRefer to the manual or install SDK with command:\nascli conf transferd install" }
-            else
-              pl = installed_products.find { |i| i[:name].eql?(product_name) }
-              Aspera.assert(!pl.nil?) { "No such product installed: #{product_name}" }
-            end
-            File.dirname(pl[:ascp_path])
-          else
-            ascp_location.include?('/ascp') ? File.dirname(ascp_location) : ascp_location
-          end
-        Log.log.debug { "ascp_folder=#{folder}" }
-        Products::Transferd.sdk_directory = folder
+        @ascp_folder = nil
+        if self.class.product_selector?(ascp_location)
+          # Resolved on first use: product scan requires the SDK folder, which is set later
+          @ascp_product = ascp_location.delete_prefix(USE_PRODUCT_PREFIX)
+          Log.log.debug { "ascp_product=#{@ascp_product}" }
+        else
+          @ascp_product = nil
+          Products::Transferd.sdk_directory = ascp_location.include?('/ascp') ? File.dirname(ascp_location) : ascp_location
+        end
         nil
       end
 
@@ -114,8 +117,9 @@ module Aspera
         case file_type
         when *EXE_FILES
           file_is_required = file_type.eql?(:ascp)
-          file = Products::Transferd.transferd_path
-          file = File.join(File.dirname(file), Environment.instance.exe_file(file_type.to_s)) unless file_type.eql?(:transferd)
+          file = sdk_exe_path(file_type)
+          # transferd always comes from SDK
+          file = File.join(product_ascp_folder, File.basename(file)) unless @ascp_product.nil? || file_type.eql?(:transferd)
         when :ssh_private_dsa, :ssh_private_rsa
           # assume last 3 letters are type
           type = file_type.to_s[-3..].to_sym
@@ -282,7 +286,7 @@ module Aspera
         end
       end
 
-      # Downloads and extracts the SDK archive for the current platform into +folder+
+      # Downloads and extracts the SDK archive for the current platform into `folder`
       # @param folder  [String]      Destination folder path
       # @param url     [nil, String] URL to SDK archive, if nil: default url for version
       # @param version [nil, String] Specific version, if nil: latest version
@@ -306,7 +310,7 @@ module Aspera
         if UriReader.file?(url)
           archive_io.write(File.binread(UriReader.file_path(url)))
         else
-          Rest.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to: archive_io)
+          Rest::Client.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to: archive_io)
           archive_io.rewind
         end
         extract_archive_files(url, archive_io) do |entry_name, entry_stream, link_target|
@@ -385,10 +389,13 @@ module Aspera
         folder = Products::Transferd.sdk_directory
         download_sdk(folder: folder, url: url, version: version)
         # Ensure necessary files are there, or generate them, restrict file access on SDK executables
+        # (executables of SDK, even if `ascp` of another product is selected)
         SDK_FILES.each do |file_id_sym|
-          file_path = path(file_id_sym)
-          if file_path && EXE_FILES.include?(file_id_sym)
+          if EXE_FILES.include?(file_id_sym)
+            file_path = sdk_exe_path(file_id_sym)
             Environment.restrict_file_access(file_path, mode: 0o755) if File.exist?(file_path)
+          else
+            path(file_id_sym)
           end
         end
         # Generate meta data XML file in SDK if needed, based on actual binaries versions
@@ -399,8 +406,8 @@ module Aspera
           sdk_name = meta_data.scan(%r{<name>(.*?)</name>}).flatten.first || 'unknown'
           sdk_version = meta_data.scan(%r{<version>(.*?)</version>}).flatten.first || 'unknown'
         else
-          sdk_ascp_version = get_ascp_version(path(:ascp))
-          transferd_version = get_exe_version(path(:transferd), 'version')
+          sdk_ascp_version = get_ascp_version(sdk_exe_path(:ascp))
+          transferd_version = get_exe_version(sdk_exe_path(:transferd), 'version')
           sdk_name = 'IBM Aspera Transfer SDK'
           sdk_version = transferd_version || sdk_ascp_version
           File.write(meta_data_file, "<product><name>#{sdk_name}</name><version>#{sdk_version}</version></product>")
@@ -435,6 +442,34 @@ module Aspera
         # cache for installed products found
         @found_products = nil
         @transferd_urls = TRANSFERD_ARCHIVE_LOCATION_URL
+        # product selected with option `sdk_folder`, or nil to use SDK folder
+        @ascp_product = nil
+        # cache for folder of `ascp` of selected product
+        @ascp_folder = nil
+      end
+
+      # @param file_type [Symbol] one of EXE_FILES
+      # @return [String] path to executable in SDK folder
+      def sdk_exe_path(file_type)
+        file = Products::Transferd.transferd_path
+        file = File.join(File.dirname(file), Environment.instance.exe_file(file_type.to_s)) unless file_type.eql?(:transferd)
+        return file
+      end
+
+      # @return [String] folder of `ascp` of product selected with option `sdk_folder`
+      def product_ascp_folder
+        if @ascp_folder.nil?
+          if @ascp_product.eql?(FIRST_FOUND)
+            pl = installed_products.first
+            Aspera.assert(!pl.nil?) { "No Aspera transfer module or SDK found.\nRefer to the manual or install SDK with command:\nascli config ascp install" }
+          else
+            pl = installed_products.find { |i| i[:name].eql?(@ascp_product) }
+            Aspera.assert(!pl.nil?) { "No such product installed: #{@ascp_product}" }
+          end
+          @ascp_folder = File.dirname(pl[:ascp_path])
+          Log.log.debug { "ascp_folder=#{@ascp_folder}" }
+        end
+        return @ascp_folder
       end
 
       public

data/lib/aspera/ascp/management.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'aspera/assert'
+require 'aspera/string_ext'
 
 module Aspera
   module Ascp

data/lib/aspera/assert.rb

@@ -17,6 +17,10 @@ module Aspera
   class AssertError < Error
   end
 
+  # Raised when a looked up entity is not found
+  class EntityNotFound < Error
+  end
+
   class << self
     # Replaces `raise` in assertion
     # Allows sending exception, or just error log, when type is `:error`

data/lib/aspera/cli/ascp_actions.rb

@@ -21,26 +21,31 @@ module Aspera
       private_constant :AGENT_SCHEMA_KEY
 
       # Set the SDK directory, checking default and former locations
+      # If a product is selected for `ascp`, the SDK directory is still needed (keys, conf, transferd)
       def set_sdk_dir
-        sdk_dir = Products::Transferd.sdk_directory rescue nil
-        if sdk_dir.nil?
-          @sdk_default_location = true
-          Log.log.debug('SDK folder is not set, checking default')
-          sdk_dir = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME)
-          Log.log.debug { "Checking: #{sdk_dir}" }
-          if !Dir.exist?(sdk_dir)
-            Log.log.debug { "No such folder: #{sdk_dir}" }
-            former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), TRANSFERD_APP_NAME)
-            Log.log.debug { "Checking: #{former_sdk_folder}" }
-            sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
-          end
-          Log.log.debug { "Using: #{sdk_dir}" }
+        sdk_folder = options.get_option(:sdk_folder)
+        product_selected = Ascp::Installation.product_selector?(sdk_folder)
+        return unless sdk_folder.nil? || product_selected
+        @sdk_default_location = true
+        Log.log.debug('SDK folder is not set, checking default')
+        sdk_dir = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME)
+        Log.log.debug { "Checking: #{sdk_dir}" }
+        if !Dir.exist?(sdk_dir)
+          Log.log.debug { "No such folder: #{sdk_dir}" }
+          former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), TRANSFERD_APP_NAME)
+          Log.log.debug { "Checking: #{former_sdk_folder}" }
+          sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
+        end
+        Log.log.debug { "Using: #{sdk_dir}" }
+        if product_selected
           Products::Transferd.sdk_directory = sdk_dir
+        else
+          options.set_option(:sdk_folder, sdk_dir, source: :default)
         end
       end
 
       # Install the transfer SDK (ascp + transferd) from a URL or using the default source.
-      # Version defaults to +Info::SDK_VERSION+; pass +LATEST+ as argument to install the latest available version.
+      # Version defaults to `Info::SDK_VERSION`; pass `LATEST` as argument to install the latest available version.
       # @param version [String, nil] version to install; nil means use the default SDK version
       # @return [Result::Status] installation result message
       def install_transfer_sdk(version: nil)
@@ -52,27 +57,14 @@ module Aspera
         return Result::Status.new("Installed #{name} version #{ver} in #{folder}")
       end
 
-      def action_ascp_show(**)
-        Result::Text.new(Ascp::Installation.instance.path(:ascp))
-      end
-
       def action_ascp_info(**)
+        SecretHider.instance.add_secret_keys(DataRepository::ELEMENTS)
         data = Ascp::Installation.instance.ascp_info
         data['ts'] = transfer.user_transfer_spec
         DataRepository::ELEMENTS.each_with_object(data) { |i, h| h[i.to_s] = DataRepository.instance.item(i) }
-        SecretHider::ADDITIONAL_KEYS_TO_HIDE.concat(DataRepository::ELEMENTS.map(&:to_s))
         Result::SingleObject.new(data)
       end
 
-      def action_ascp_install(version: nil, **)
-        install_transfer_sdk(version: version)
-      end
-
-      def action_ascp_spec(**)
-        builder = Schema::Documentation.new(TerminalFormatter, Transfer::Spec::SCHEMA, include_option: true, agent_columns: true).build
-        Result::ObjectList.new(builder.rows, fields: builder.columns)
-      end
-
       def action_ascp_schema(agent_name: nil, **)
         schema = Transfer::Spec::SCHEMA.current.merge({'$comment'=>'DO NOT EDIT, this file was generated from the YAML.'})
         schema['properties'] = schema['properties'].select { |_k, v| CommandLineBuilder.supported_by_agent(agent_name, v) } unless agent_name.nil?
@@ -88,10 +80,6 @@ module Aspera
         Result::ObjectList.new(error_data)
       end
 
-      def action_ascp_products_list(**)
-        Result::ObjectList.new(Ascp::Installation.instance.installed_products, fields: %w[name app_root])
-      end
-
       def action_agents_list(**)
         rows = Agent::Factory::ALL.map do |sym, names|
           schema_key = AGENT_SCHEMA_KEY[sym]
@@ -141,15 +129,6 @@ module Aspera
         end
         Result::ObjectList.new(rows, fields: %w[name type description])
       end
-
-      def action_transferd_install(**)
-        install_transfer_sdk
-      end
-
-      def action_transferd_list(**)
-        sdk_list = Ascp::Installation.instance.sdk_locations
-        Result::ObjectList.new(sdk_list, fields: sdk_list.first.keys - ['url'])
-      end
     end
   end
 end

data/lib/aspera/cli/async_transfer_store.rb

@@ -10,7 +10,7 @@ module Aspera
     #
     # Each entry is a JSON document identified by a `job_id` (UUID generated by ascli).
     # The underlying storage uses PersistencyFolder with the category prefix
-    # +CATEGORY+ so all async-transfer files are grouped together and can be
+    # `CATEGORY` so all async-transfer files are grouped together and can be
     # garbage-collected independently.
     #
     # Schema of a stored entry:
@@ -81,7 +81,7 @@ module Aspera
       end
 
       # List all async transfer entries.
-      # @return [Array<Hash>] each entry includes the +job_id+ field
+      # @return [Array<Hash>] each entry includes the `job_id` field
       def list
         @persistency.current_items(CATEGORY).map do |key, raw|
           data = JSON.parse(raw)

data/lib/aspera/cli/bootstrapper.rb

@@ -31,8 +31,8 @@ module Aspera
     #   - populate context.persistency, context.presets, context.http_config, context.progress_bar
     #   - register plugin lookup folders
     #   - register @preset / @vault extended-value handlers
-    #   - configure global singletons: RestParameters, OAuth::Factory, SSL, Transfer::Parameters,
-    #     RestErrorAnalyzer
+    #   - configure global singletons: Rest::Parameters, OAuth::Factory, SSL, Transfer::Parameters,
+    #     Rest::ErrorAnalyzer
     #   - set up the PAC proxy executor (option :fpac)
     class Bootstrapper
       # Folder name inside $HOME for all Aspera tool data (~/.aspera)
@@ -88,16 +88,13 @@ module Aspera
         setup_rest_and_transfer_runtime
       end
 
-      # Public accessor used as option handler for :config_file
-      attr_accessor :config_file_option
-
       private
 
       # Declare + parse :home option: sets context.main_folder
       def setup_main_folder
         @context.options.declare(
           :home, description: 'Home folder for tool',
-          handler: {o: @context, m: :main_folder},
+          on_set: @context.method(:main_folder=),
           default: default_app_main_folder(app_name: Info::CMD_NAME)
         )
         @context.options.parse_options!
@@ -115,11 +112,10 @@ module Aspera
       def setup_config_file
         @context.options.declare(
           :config_file, description: 'Path to YAML file with preset configuration',
-          handler: {o: self, m: :config_file_option},
           default: File.join(@context.main_folder, DEFAULT_CONFIG_FILENAME)
         )
         @context.options.parse_options!
-        @context.presets = PresetManager.new(config_file: @config_file_option)
+        @context.presets = PresetManager.new(config_file: @context.options.get_option(:config_file))
         @context.http_config = Http.new
       end
 
@@ -165,18 +161,18 @@ module Aspera
         end
       end
 
-      # Configure global singletons: RestParameters, SSL, Transfer, RestErrorAnalyzer.
+      # Configure global singletons: Rest::Parameters, SSL, Transfer, Rest::ErrorAnalyzer.
       # OAuth persist_mgr is NOT set here: it depends on :cache_tokens which is parsed later
       # by Config#initialize. Runner sets it after Config.new.
       def setup_rest_and_transfer_runtime
-        RestParameters.instance.user_agent    = Info::CMD_NAME
-        RestParameters.instance.progress_bar  = @context.progress_bar
-        RestParameters.instance.session_cb    = ->(http_session) { @context.http_config.update_session(http_session) }
-        RestParameters.instance.spinner_cb    = ->(title = nil, action: :spin) { @context.formatter.long_operation(title, action: action) }
+        Rest::Parameters.instance.user_agent    = Info::CMD_NAME
+        Rest::Parameters.instance.progress_bar  = @context.progress_bar
+        Rest::Parameters.instance.session_cb    = ->(http_session) { @context.http_config.update_session(http_session) }
+        Rest::Parameters.instance.spinner_cb    = ->(title = nil, action: :spin) { @context.formatter.long_operation(title, action: action) }
         OAuth::Web.additional_info = "#{Info::CMD_NAME} v#{Cli::VERSION}"
         Transfer::Parameters.file_list_folder = File.join(@context.main_folder, FILE_LIST_FOLDER_NAME)
-        RestErrorAnalyzer.instance.log_file   = File.join(@context.main_folder, REST_EXCEPTIONS_LOG_FILENAME)
-        RestErrorsAspera.register_handlers
+        Rest::ErrorAnalyzer.instance.log_file = File.join(@context.main_folder, REST_EXCEPTIONS_LOG_FILENAME)
+        Rest::AsperaErrors.register_handlers
       end
 
       # @return [String] ~/.aspera