aspera-cli 4.27.2 → 4.27.3

data/lib/aspera/cli/preset_manager.rb

@@ -9,6 +9,8 @@ require 'aspera/assert'
 require 'aspera/yaml'
 require 'digest'
 require 'yaml'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Cli
@@ -113,8 +115,8 @@ module Aspera
           Log.log.error do
             "Default config name [#{default_name}] specified for plugin [#{plugin_name_sym}], but it does not exist in config file.\n" \
               "Please fix: either create preset:\n" \
-              "#{Info::CMD_NAME} config id #{default_name} init @json:'{}'\n" \
-              "or remove default:\n#{Info::CMD_NAME} config id default remove #{plugin_name_sym}"
+              "#{Info::CMD_NAME} config preset initialize #{default_name} @json:'{}'\n" \
+              "or remove default:\n#{Info::CMD_NAME} config preset unset #{Key::DEFAULTS} #{plugin_name_sym}"
           end
           raise Cli::Error, "No such preset: #{default_name}"
         end
@@ -192,10 +194,18 @@ module Aspera
         if result.nil?
           result = Key::GLOBAL
           set_key(Key::DEFAULTS, CONF_GLOBAL_SYM, result)
+          # A default declaration requires the preset to exist
+          @config_presets[result] ||= {}
         end
         result
       end
 
+      # @return [Boolean] true if `preset_name` is declared as the global default preset (does not create it)
+      def global_preset?(preset_name)
+        defaults = @config_presets[Key::DEFAULTS]
+        defaults.is_a?(Hash) && defaults[CONF_GLOBAL_SYM.to_s].eql?(preset_name)
+      end
+
       # Set param in the global defaults preset
       def set_global_default(key, value)
         set_key(global_default_preset, key, value)

data/lib/aspera/cli/prompt.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'io/console'
+require 'aspera/assert'
+
+module Aspera
+  module Cli
+    # Console input
+    module Prompt
+      # Prompt user for console input
+      # @param prompt [String]  prompt string to display
+      # @param sensitive [Boolean] whether to hide typed input
+      # @return [String] user input stripped of trailing newline
+      def prompt_user_input(prompt, sensitive: false)
+        return $stdin.getpass("#{prompt}> ") if sensitive
+        print("#{prompt}> ")
+        line = $stdin.gets
+        Aspera.assert_type(line, String) { 'Unexpected end of standard input' }
+        line.chomp
+      end
+
+      # Prompt user for input in a list of symbols
+      # @param prompt [String] prompt to display
+      # @param sym_list [Array] list of symbols to select from
+      # @return [Symbol] selected symbol
+      def prompt_user_input_in_list(prompt, sym_list)
+        loop do
+          input = prompt_user_input(prompt).to_sym
+          return input if sym_list.any? { |a| a.eql?(input) }
+          $stderr.puts("No such #{prompt}: #{input}, select one of: #{sym_list.join(', ')}") # rubocop:disable Style/StderrPuts
+        end
+      end
+    end
+  end
+end

data/lib/aspera/cli/result.rb

@@ -20,9 +20,11 @@ module Aspera
     class Result
       attr_reader :data, :fields
 
-      # @param data [Object,nil] The result data
-      # @param fields [Object] Specification of fields to include
+      # @param data [nil, Object] The result data
+      # @param fields [nil, Array<String>, Proc] Specification of fields to include
       def initialize(data: nil, fields: nil)
+        Aspera.assert_type(fields, NilClass, Array, Proc)
+        Aspera.assert_array_all(fields, String) if fields.is_a?(Array)
         @data = data
         @fields = fields
       end
@@ -39,18 +41,12 @@ module Aspera
         # Apply field filtering once for formats that need it
         filtered_data = formatter.filter_list_on_fields(@data)
         case formatter.format_type
-        when :text
-          formatter.display_message(:data, @data.to_s)
-        when :nagios
-          Nagios.process(@data)
-        when :ruby
-          formatter.display_message(:data, PP.pp(filtered_data, +''))
-        when :json
-          formatter.display_message(:data, JSON.generate(filtered_data))
-        when :jsonpp
-          formatter.display_message(:data, JSON.pretty_generate(filtered_data))
-        when :yaml
-          formatter.display_message(:data, YAML.dump(filtered_data))
+        when :nagios then Nagios.process(@data)
+        when :text   then formatter.display_message(:data, @data.to_s)
+        when :ruby   then formatter.display_message(:data, PP.pp(filtered_data, +''))
+        when :json   then formatter.display_message(:data, JSON.generate(filtered_data))
+        when :jsonpp then formatter.display_message(:data, JSON.pretty_generate(filtered_data))
+        when :yaml   then formatter.display_message(:data, YAML.dump(filtered_data))
         when :image
           if @data.nil?
             formatter.display_message(:data, formatter.special_format('null (no image)'))
@@ -82,8 +78,7 @@ module Aspera
             # here, data is the image blob
             formatter.display_message(:data, Preview::Terminal.build(data, **formatter.image_options))
           end
-        else
-          Aspera.error_unexpected_value(formatter.format_type) { 'format' }
+        else Aspera.error_unexpected_value(formatter.format_type) { 'format' }
         end
       end
     end
@@ -228,7 +223,7 @@ module Aspera
       end
 
       # Object list result (Array of Hash)
-      # @note The +total+ parameter is used to display pagination information (e.g., "Items: 10/100")
+      # @note The `total` parameter is used to display pagination information (e.g., "Items: 10/100")
       class ObjectList < Result
         attr_reader :total
 
@@ -299,7 +294,7 @@ module Aspera
         # @param id_result [String] Key in the result Hash used as item identifier
         # @param fields   [Object] Fields hint passed to the Result constructor (non-bulk only, when not :default)
         # @param bfail    [Boolean] When true, re-raise errors; when false, capture them as a status string
-        # @yieldparam item [Object] Each item in +items+
+        # @yieldparam item [Object] Each item in `items`
         # @yieldreturn [Hash, Array, nil] REST response; a Hash replaces the default id-keyed result
         # @return [Result::ObjectList, Result::SingleObject]
         def bulk(items, is_bulk:, command:, id_result: 'id', fields: :default, bfail: true)

data/lib/aspera/cli/runner.rb

@@ -166,7 +166,7 @@ module Aspera
         rescue Cli::SchemaRequest => e;             exception_info = {e: e, t: 'Schema'}
         rescue Cli::Error => e;                     exception_info = {e: e, t: 'Tool', usage: true}
         rescue Transfer::Error => e;                exception_info = {e: e, t: 'Transfer'}
-        rescue RestCallError => e;                  exception_info = {e: e, t: 'Rest'}
+        rescue Rest::CallError => 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}
@@ -228,29 +228,19 @@ module Aspera
         Result::Text.new(usage_text(plugin: plugin))
       end
 
-      # Composite option handler for the `log` option (dot-notation sub-properties).
-      # Supported sub-properties: +level+, +type+, +format+
-      # @param _option_sym [Symbol] Option name (unused, always :log)
-      # @param operation   [Symbol] +:set+ or +:get+
-      # @param value       [Hash,nil] Hash of sub-properties to set (only for +:set+)
-      def option_log(_option_sym, operation, value = nil)
-        Aspera.assert_values(operation, %i[set get])
-        case operation
-        when :set
-          Aspera.assert_type(value, Hash)
-          value.each do |k, v|
-            case k.to_sym
-            when :level   then Log.instance.level = v.to_sym
-            when :type    then Log.instance.logger_type = v.to_sym
-            when :format  then Log.instance.formatter = v
-            when :secrets then SecretHider.instance.log_secrets = BoolValue.true?(v)
-            else Aspera.error_unexpected_value(k) { 'log sub-option (level, type, format, secrets)' }
-            end
+      # `on_set` callback of the `log` option (dot-notation sub-properties): `level`, `type`, `format`, `secrets`
+      # @param value [Hash] sub-properties to set
+      def option_log=(value)
+        Aspera.assert_type(value, Hash)
+        value.each do |k, v|
+          case k.to_sym
+          when :level   then Log.instance.level = v.to_sym
+          when :type    then Log.instance.logger_type = v.to_sym
+          when :format  then Log.instance.formatter = v
+          when :secrets then SecretHider.instance.log_secrets = Parser.get_from_list(v.to_s, 'log secrets', BoolValue::ALL)
+          else Aspera.error_unexpected_value(k) { 'log sub-option (level, type, format, secrets)' }
           end
-        when :get
-          return {level: Log.instance.level, type: Log.instance.logger_type, format: Log.instance.formatter, secrets: SecretHider.instance.log_secrets}
         end
-        nil
       end
 
       private
@@ -279,25 +269,11 @@ module Aspera
           registry = plugin.class.command_registry
           cmds     = registry.children_of(path)
           label    = plugin.class.name.split('::').last.downcase
-          # Build label with positional argument slots inserted after each intermediate node
+          # Build label with positional argument slots inserted after each command
           # e.g. [:access_keys, :do, :download] -> "node access_keys do <access_key_id> download"
-          path.each_with_index do |seg, i|
-            label += " #{seg}"
-            seg_path = path[0..i]
-            seg_spec = registry[seg_path]
-            if seg_spec && registry.children_of(seg_path).any? && seg_spec.arguments
-              seg_spec.arguments.each do |arg_spec|
-                label += " <#{arg_spec.name}>"
-              end
-            end
-          end
-          if cmds.none?
-            leaf_spec = registry[path]
-            leaf_spec&.arguments&.each do |arg_spec|
-              argument = arg_spec.mandatory ? "<#{arg_spec.name}>" : "[#{arg_spec.name}]"
-              argument += '...' if arg_spec.multiple
-              label += " #{argument}"
-            end
+          path.each_index do |i|
+            label += " #{path[i]}"
+            registry.arguments_at(path[0..i]).each { |arg_spec| label += " #{arg_spec.syntax}" }
           end
           if cmds.any?
             # Intermediate node: show current command + description, then list subcommands
@@ -314,7 +290,7 @@ module Aspera
             spec = registry[path]
             lines << "\nCOMMAND: #{label}"
             lines << "    #{spec.description}" if spec&.description
-            display_args = spec&.arguments || []
+            display_args = registry.arguments_at(path)
             # transfer_paths commands use --sources for the file list; default is positional args (@args)
             if spec&.transfer_paths
               file_desc = if spec.transfer_paths == :receive
@@ -395,7 +371,7 @@ module Aspera
         @context.config = Plugins::Config.new(context: @context)
         @context.man_header = true
         # Sync cache_tokens from Config into the OAuth persist_mgr (now that option is parsed)
-        OAuth::Factory.instance.persist_mgr = @context.persistency if @context.config.option_cache_tokens
+        OAuth::Factory.instance.persist_mgr = @context.persistency if @context.options.get_option(:cache_tokens)
         # Email service: depends on options declared by Config
         @context.mailer = Mailer.new(@context.options, @context.main_folder)
         # Secret finder: depends on options (:secret) and presets, both set by Bootstrapper
@@ -450,32 +426,33 @@ module Aspera
         Log.log.debug('declare_global_options')
         @context.options.declare(:help, description: 'Show this message', allowed: Type::NONE, short: 'h') do
           @option_help = true
-          @context.options.help_requested = true
+          @context.help_requested = true
         end
         @context.options.declare(:show_config, description: 'Display parameters used for the provided action', allowed: Type::NONE) { @option_show_config = true }
         @context.options.declare(:version, description: 'Display version', allowed: Type::NONE, short: 'v') { @context.formatter.display_message(:data, Cli::VERSION); Process.exit(0) } # rubocop:disable Style/Semicolon
         @context.options.declare(
           :ui, description: 'Method to start browser',
-          allowed: USER_INTERFACES,
-          handler: {o: Environment.instance, m: :url_method}
+          allowed: USER_INTERFACES, default: Environment.instance.url_method,
+          on_set: Environment.instance.method(:url_method=)
         )
         @context.options.declare(
           :invalid_characters, description: 'Replacement character and invalid filename characters',
-          handler: {o: Environment.instance, m: :file_illegal_characters}
+          default: Environment.instance.file_illegal_characters,
+          on_set: Environment.instance.method(:file_illegal_characters=)
         )
-        @context.options.declare(:log_level, description: 'Log level', allowed: Log::LEVELS, handler: {o: Log.instance, m: :level})
-        @context.options.declare(:log_format, description: 'Log formatter', allowed: [Proc, Logger::Formatter, String], handler: {o: Log.instance, m: :formatter})
-        @context.options.declare(:logger, description: 'Logging method', allowed: Log::LOG_TYPES, handler: {o: Log.instance, m: :logger_type})
-        @context.options.declare(:log, description: 'Logging options (dot-notation: level, type, format, secrets)', handler: {o: self, m: :option_log}, schema: Schema::Registry::LOG_OPTIONS)
+        @context.options.declare(:log_level, description: 'Log level', allowed: Log::LEVELS, default: Log.instance.level, on_set: Log.instance.method(:level=))
+        @context.options.declare(:log_format, description: 'Log formatter', allowed: [Proc, Logger::Formatter, String], on_set: Log.instance.method(:formatter=))
+        @context.options.declare(:logger, description: 'Logging method', allowed: Log::LOG_TYPES, on_set: Log.instance.method(:logger_type=))
+        @context.options.declare(:log, description: 'Logging options (dot-notation: level, type, format, secrets)', on_set: method(:option_log=), schema: Schema::Registry::LOG_OPTIONS)
         @context.options.declare(:lock_port, description: 'Prevent dual execution of a command, e.g. in cron', allowed: Type::INTEGER)
         @context.options.declare(:once_only, description: 'Process only new items (some commands)', allowed: Type::BOOLEAN, default: false)
-        @context.options.declare(:log_secrets, description: 'Show passwords in logs', allowed: Type::BOOLEAN, handler: {o: SecretHider.instance, m: :log_secrets})
-        @context.options.declare(:clean_temp, description: 'Cleanup temporary files on exit', allowed: Type::BOOLEAN, handler: {o: TempFileManager.instance, m: :cleanup_on_exit})
-        @context.options.declare(:temp_folder, description: 'Temporary folder', handler: {o: TempFileManager.instance, m: :global_temp})
+        @context.options.declare(:log_secrets, description: 'Show passwords in logs', allowed: Type::BOOLEAN, default: SecretHider.instance.log_secrets, on_set: SecretHider.instance.method(:log_secrets=))
+        @context.options.declare(:clean_temp, description: 'Cleanup temporary files on exit', allowed: Type::BOOLEAN, default: TempFileManager.instance.cleanup_on_exit, on_set: TempFileManager.instance.method(:cleanup_on_exit=))
+        @context.options.declare(:temp_folder, description: 'Temporary folder', default: TempFileManager.instance.global_temp, on_set: TempFileManager.instance.method(:global_temp=))
         @context.options.declare(:pid_file, description: 'Write process identifier to file, delete on exit')
         @context.options.declare(
           :parser, description: 'Default parser for structured parameters and options',
-          handler: {o: ExtendedValue.instance, m: :default_decoder},
+          on_set: ExtendedValue.instance.method(:default_decoder=),
           allowed: ExtendedValue::DEFAULT_DECODERS,
           default: ExtendedValue::DEFAULT_DECODERS.first
         )

data/lib/aspera/cli/special_values.rb

@@ -5,10 +5,15 @@ module Aspera
     # base class for plugins modules
     module SpecialValues
       # special values
+      # `INIT` to unitialize with all current IDs
       INIT = 'INIT'
+      # `ALL` means "all ids"
       ALL = 'ALL'
+      # `DEF` for the default list
       DEF = 'DEF'
+      # `END` of arguments
       EOA = 'END'
+      # `LATEST`
       LATEST = 'LATEST'
     end
   end

data/lib/aspera/cli/sync_actions.rb

@@ -16,7 +16,7 @@ module Aspera
         %w[Syncd Error Confl Pconf] +
         (23..24).map { |i| "P(#{i})" }).freeze
       # Positional arguments shared by sync transfer commands (push/pull/bidi) and sync admin commands.
-      PATH_AND_INFO_ARGS = [{name: :path, type: String}, {name: :sync_info, type: Hash, mandatory: false, default: {}}].freeze
+      PATH_AND_INFO_ARGS = [{name: :path}, {name: :sync_info, type: Hash, mandatory: false, default: {}}].freeze
       # Names of the leaf commands registered under any `sync admin` node.
       ADMIN_COMMANDS = %i[find status meta counters file_info overview query].freeze
       # When a plugin class includes SyncActions, register the :sql option
@@ -32,13 +32,46 @@ module Aspera
         # @param admin_path  [Symbol, Array<Symbol>]  path relative to current scope, e.g. :admin
         def register_sync_admin_commands(base, admin_path)
           base.commands_under(admin_path) do
-            base.command(:find,      description: 'Find sync database files',     arguments: [{name: :path, type: String}], action: :action_sync_admin_find)
-            base.command(:status,    description: 'Show sync session status',     arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_status)
-            base.command(:meta,      description: 'Show sync session metadata',   arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_meta)
-            base.command(:counters,  description: 'Show sync counters',           arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_counters)
-            base.command(:file_info, description: 'Show per-file sync state',     arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_file_info)
-            base.command(:overview,  description: 'Show sync database overview',  arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_overview)
-            base.command(:query,     description: 'Execute a raw SQL query',      arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_query)
+            base.command(
+              :find, description: 'Find sync database files', arguments: [{name: :path}],
+              action: lambda do |path:, **|
+                dbs = Sync::Operations.list_db_files(path)
+                Result::ObjectList.new(dbs.keys.map { |n| {name: n, path: dbs[n]} })
+              end
+            )
+            base.command(
+              :status, description: 'Show sync session status', arguments: PATH_AND_INFO_ARGS,
+              action: ->(path:, sync_info: {}, **) { Result::SingleObject.new(Sync::Operations.admin_status(async_info_from_args(path: path, sync_info: sync_info))) }
+            )
+            base.command(
+              :meta, description: 'Show sync session metadata', arguments: PATH_AND_INFO_ARGS,
+              action: lambda do |path:, sync_info: {}, **|
+                require 'aspera/sync/database'
+                Result::SingleObject.new(db_from_args(path: path, sync_info: sync_info).meta(options.get_option(:sql)))
+              end
+            )
+            base.command(
+              :counters, description: 'Show sync counters', arguments: PATH_AND_INFO_ARGS,
+              action: lambda do |path:, sync_info: {}, **|
+                require 'aspera/sync/database'
+                Result::SingleObject.new(db_from_args(path: path, sync_info: sync_info).counters(options.get_option(:sql)))
+              end
+            )
+            base.command(:file_info, description: 'Show per-file sync state', arguments: PATH_AND_INFO_ARGS, action: :action_sync_admin_file_info)
+            base.command(
+              :overview, description: 'Show sync database overview', arguments: PATH_AND_INFO_ARGS,
+              action: lambda do |path:, sync_info: {}, **|
+                require 'aspera/sync/database'
+                Result::ObjectList.new(db_from_args(path: path, sync_info: sync_info).overview, fields: %w[table name type])
+              end
+            )
+            base.command(
+              :query, description: 'Execute a raw SQL query', arguments: PATH_AND_INFO_ARGS,
+              action: lambda do |path:, sync_info: {}, **|
+                require 'aspera/sync/database'
+                Result.auto(db_from_args(path: path, sync_info: sync_info).execute(options.get_option(:sql, mandatory: true)))
+              end
+            )
           end
         end
       end
@@ -119,25 +152,6 @@ module Aspera
         Sync::Database.new(Sync::Operations.session_db_file(sync_info))
       end
 
-      def action_sync_admin_status(path:, sync_info: {}, **)
-        Result::SingleObject.new(Sync::Operations.admin_status(async_info_from_args(path: path, sync_info: sync_info)))
-      end
-
-      def action_sync_admin_find(path:, **)
-        dbs = Sync::Operations.list_db_files(path)
-        Result::ObjectList.new(dbs.keys.map { |n| {name: n, path: dbs[n]} })
-      end
-
-      def action_sync_admin_meta(path:, sync_info: {}, **)
-        require 'aspera/sync/database'
-        Result::SingleObject.new(db_from_args(path: path, sync_info: sync_info).meta(options.get_option(:sql)))
-      end
-
-      def action_sync_admin_counters(path:, sync_info: {}, **)
-        require 'aspera/sync/database'
-        Result::SingleObject.new(db_from_args(path: path, sync_info: sync_info).counters(options.get_option(:sql)))
-      end
-
       def action_sync_admin_file_info(path:, sync_info: {}, **)
         require 'aspera/sync/database'
         result = db_from_args(path: path, sync_info: sync_info).file_info(options.get_option(:sql))
@@ -147,16 +161,6 @@ module Aspera
         Result::ObjectList.new(result, fields: %w[sstate record_id f_meta_path message])
       end
 
-      def action_sync_admin_overview(path:, sync_info: {}, **)
-        require 'aspera/sync/database'
-        Result::ObjectList.new(db_from_args(path: path, sync_info: sync_info).overview, fields: %w[table name type])
-      end
-
-      def action_sync_admin_query(path:, sync_info: {}, **)
-        require 'aspera/sync/database'
-        Result.auto(db_from_args(path: path, sync_info: sync_info).execute(options.get_option(:sql, mandatory: true)))
-      end
-
       # Execute a sync transfer for a given direction.
       # @param direction [Symbol]    one of Sync::Operations::DIRECTIONS (:push, :pull, :bidi)
       # @param path      [String]    local or remote path (depends on direction)

data/lib/aspera/cli/terminal_formatter.rb

@@ -4,6 +4,8 @@ require 'aspera/environment'
 require 'aspera/formatter_interface'
 require 'aspera/markdown'
 require 'aspera/assert'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Cli
@@ -11,9 +13,13 @@ module Aspera
     # @see FormatterInterface
     # @see MarkdownFormatter (in build/lib/doc_helper.rb)
     module TerminalFormatter
-      HINT = 'HINT:'.bg_green.gray.blink.freeze
       include FormatterInterface
 
+      # Prefix for hint messages (evaluated on each call, as colors can be enabled or disabled by option)
+      def hint
+        'HINT:'.bg(:green).white.blink
+      end
+
       # Format boolean with colored symbol (+/- or Y/ )
       def tick(yes)
         result =
@@ -29,7 +35,7 @@ module Aspera
       # Format special values with colors (dim for empty, reverse for others)
       def special_format(what)
         result = "<#{what}>"
-        return %w[null empty].any? { |s| what.include?(s) } ? result.dim : result.reverse_color
+        return %w[null empty].any? { |s| what.include?(s) } ? result.faint : result.inverse
       end
 
       # Prepare table row for terminal display (word wrap arrays)
@@ -59,7 +65,7 @@ module Aspera
         end
       end
 
-      module_function :tick, :special_format, :check_row, :markdown_text
+      module_function :hint, :tick, :special_format, :check_row, :markdown_text
     end
   end
 end

data/lib/aspera/cli/transfer_actions.rb

@@ -36,12 +36,6 @@ module Aspera
         Result::SingleObject.new(entry)
       end
 
-      # List all persisted async transfer entries.
-      def action_transfer_list(**)
-        rows = async_transfer_store.list
-        Result::ObjectList.new(rows, fields: %w[job_id agent_type status started_at ended_at bytes_transferred transfer_id])
-      end
-
       TERMINAL_STATUSES = %w[completed failed cancelled].freeze
       private_constant :TERMINAL_STATUSES
 

data/lib/aspera/cli/transfer_agent.rb

@@ -32,9 +32,15 @@ module Aspera
         <%=ts.to_yaml%>
       END_OF_TEMPLATE
       CP4I_REMOTE_HOST_LB = 'N/A'
+      # Transfer spec parameters overridden by option `ts`
+      TS_DEFAULTS = {
+        'create_dir'    => true,
+        'resume_policy' => 'sparse_csum'
+      }.freeze
       private_constant :FILE_LIST_FROM_TRANSFER_SPEC,
         :FILE_LIST_OPTIONS,
-        :DEFAULT_TRANSFER_NOTIFY_TEMPLATE
+        :DEFAULT_TRANSFER_NOTIFY_TEMPLATE,
+        :TS_DEFAULTS
 
       extend OptionDeclarator
 
@@ -42,8 +48,8 @@ module Aspera
       option :to_folder,     description: 'Destination folder for transferred files'
       option :sources,       description: "How list of transferred files is provided (#{FILE_LIST_OPTIONS.join(',')})",               default: FILE_LIST_FROM_ARGS
       option :src_type,      description: 'Type of file list',                                                                        allowed: %i[list pair], default: :list
-      option :transfer,      description: 'Transfer agent type, or agent parameters with optional agent key',                         allowed: [Hash, String], schema: Schema::Registry::TRANSFER_AGENT_OPTIONS
-      option :transfer_info, description: 'Parameters for transfer agent',                                                            deprecation: 'use --transfer instead', schema: Schema::Registry::TRANSFER_AGENT_OPTIONS
+      option :transfer,      description: 'Transfer agent type, or agent parameters with optional agent key',                         allowed: [Hash, String], shorthand: 'agent', schema: Schema::Registry::TRANSFER_AGENT_OPTIONS
+      option :transfer_info, description: 'Parameters for transfer agent',                                                            deprecation: {last: '4.26.2', message: 'use --transfer instead'}, schema: Schema::Registry::TRANSFER_AGENT_OPTIONS
 
       # @param context [Context] Application context
       def initialize(context)
@@ -51,12 +57,7 @@ module Aspera
         Aspera.assert_type(context.options, Parser) { 'context.options' }
         @context = context
         # Command line can override transfer spec
-        @user_transfer_spec = {
-          'create_dir'    => true,
-          'resume_policy' => 'sparse_csum'
-        }
-        # options for transfer agent (agent type + agent-specific parameters)
-        @transfer_options = {}
+        @user_transfer_spec = TS_DEFAULTS.dup
         # the currently selected transfer agent
         @agent = nil
         # source/destination pair, like "paths" of transfer spec
@@ -64,9 +65,7 @@ module Aspera
         # HTTPGW URL provided by webapp
         @httpgw_url_lambda = nil
         self.class.declare_options(@context.options)
-        @context.options.set_handler(:ts,            object: self, method: :user_transfer_spec)
-        @context.options.set_handler(:transfer,      object: self, method: :option_transfer)
-        @context.options.set_handler(:transfer_info, object: self, method: :transfer_options)
+        @context.options.on_set(:ts, method(:user_transfer_spec=))
         @context.options.parse_options!
         @notification_cb = nil
         if !@context.options.get_option(:notify_to).nil?
@@ -80,22 +79,17 @@ module Aspera
         end
       end
 
-      attr_accessor :user_transfer_spec, :transfer_options
+      attr_reader :user_transfer_spec
 
-      # Composite option handler for :transfer
-      # String value: shorthand for agent type, stored as {'agent' => value}
-      # Hash value:   merged into @transfer_options (may include 'agent' key)
-      def option_transfer(_option_sym, operation, value = nil)
-        Aspera.assert_values(operation, %i[set get])
-        case operation
-        when :set
-          value = {'agent' => value} if value.is_a?(String)
-          Aspera.assert_type(value, Hash)
-          @transfer_options = @transfer_options.deep_merge(value)
-        when :get
-          return @transfer_options
-        end
-        nil
+      # `on_set` callback of option `ts`: values override defaults
+      # @param value [Hash] transfer spec parameters
+      def user_transfer_spec=(value)
+        @user_transfer_spec = TS_DEFAULTS.merge(value)
+      end
+
+      # @return [Hash] agent type (key `agent`) and agent parameters, from options `transfer` and deprecated `transfer_info`
+      def transfer_options
+        @context.options.get_option(:transfer_info).deep_merge(@context.options.get_option(:transfer))
       end
 
       def agent_instance=(instance)
@@ -106,10 +100,10 @@ module Aspera
       def agent_instance
         return @agent unless @agent.nil?
         # agent type: from composite option 'agent' key, default :direct
-        raw_type = @transfer_options['agent'] || :direct
+        raw_type = transfer_options['agent'] || :direct
         agent_type = Parser.get_from_list(raw_type.to_s, 'transfer agent', Agent::Factory::ALL.keys)
         # set keys as symbols, strip internal keys not forwarded to the agent constructor
-        agent_options = @transfer_options.except('agent', 'asynchronous').symbolize_keys
+        agent_options = transfer_options.except('agent', 'asynchronous').symbolize_keys
         agent_options[:progress] = @context.progress_bar
         agent_options[:config_dir] = @context.main_folder
         # special cases
@@ -210,8 +204,8 @@ module Aspera
           when FILE_LIST_FROM_TRANSFER_SPEC
             Log.log.debug('assume list provided in transfer spec')
             special_case_direct_with_list =
-              (@transfer_options['agent'] || :direct).to_sym.eql?(:direct) &&
-              Transfer::Parameters.ascp_args_file_list?(@transfer_options['ascp_args'])
+              (transfer_options['agent'] || :direct).to_sym.eql?(:direct) &&
+              Transfer::Parameters.ascp_args_file_list?(transfer_options['ascp_args'])
             Aspera.assert(!@transfer_paths.nil? || special_case_direct_with_list, type: Cli::BadArgument) { 'transfer spec on command line must have sources' }
             # can be nil
             @transfer_paths
@@ -227,7 +221,7 @@ module Aspera
 
       # Start a transfer and wait for completion, plugins shall use this method
       # @param transfer_spec [Hash] transfer specification
-      # @param rest_token    [Rest, nil] if oauth token regeneration supported
+      # @param rest_token    [Rest::Client, nil] if oauth token regeneration supported
       def start(transfer_spec, rest_token: nil)
         # check parameters
         Aspera.assert_type(transfer_spec, Hash) { 'transfer_spec' }
@@ -264,13 +258,13 @@ module Aspera
         # create transfer agent
         agent_instance.start_transfer(transfer_spec, token_regenerator: rest_token)
         # --- async mode ---
-        if @transfer_options['asynchronous']
-          agent_type = (@transfer_options['agent'] || 'direct').to_s
+        if transfer_options['asynchronous']
+          agent_type = (transfer_options['agent'] || 'direct').to_s
           # In-process agents (direct, httpgw) expose last_job_id directly.
           # Remote-daemon agents do not override last_job_id (returns nil): generate a UUID.
           job_id = agent_instance.last_job_id || SecureRandom.uuid
           # Base agent_params from transfer options (strip internal keys)
-          agent_params = @transfer_options.except('agent', 'asynchronous')
+          agent_params = transfer_options.except('agent', 'asynchronous')
           # For daemon agents: capture any runtime-resolved connection detail
           case agent_type
           when 'desktop'

data/lib/aspera/cli/vault_manager.rb

@@ -10,17 +10,6 @@ module Aspera
     # Mixin providing vault/keychain functionality to Plugin::Config.
     # Depends on `options` and `context.main_folder` being available in the including class.
     module VaultManager
-      def action_vault_show(label:, id: nil, **)
-        v = vault_required
-        kwargs = id && v.method(:get).parameters.any? { |_t, n| n == :id } ? {id: id} : {}
-        Result::SingleObject.new(v.get(label: label, **kwargs))
-      end
-
-      def action_vault_create(info:, **)
-        vault_required.set(info.symbolize_keys)
-        Result::Status.new('Secret added')
-      end
-
       # Import secrets from a JSON array; skips entries missing :label
       def action_vault_import(secrets:, **)
         bulk_result(secrets, command: :import, id_result: 'label') do |entry|
@@ -36,12 +25,6 @@ module Aspera
         Result::Status.new("Secret deleted: #{label}")
       end
 
-      def action_vault_password(new_password:, **)
-        Aspera.assert(vault_required.respond_to?(:change_password), 'Vault does not support password change')
-        vault_required.change_password(new_password)
-        Result::Status.new('Vault password updated')
-      end
-
       # @return [Keychain::Base] vault instance, raises if not configured
       def vault_required
         Aspera.assert(!vault.nil?, type: Cli::BadArgument) { 'Missing mandatory option: vault' }

data/lib/aspera/cli/version.rb

@@ -4,6 +4,6 @@ module Aspera
   module Cli
     # For beta add extension : .beta1
     # For dev version add extension : .pre
-    VERSION = '4.27.2'
+    VERSION = '4.27.3'
   end
 end