aspera-cli 4.27.0 → 4.27.1

data/lib/aspera/cli/plugins/basic_auth.rb

@@ -12,18 +12,6 @@ module Aspera
         option :username, description: "User's identifier"
         option :password, description: "User's password"
 
-        # Declare url/username/password on an arbitrary Options object.
-        # Still needed for ad-hoc callers that are not plugin instances
-        # (e.g. PresetActions#action_config_lookup).
-        class << self
-          def declare_options(options)
-            options.declare(:url,      description: 'URL of application, e.g. https://app.example.com/aspera/app') unless options.option_declared?(:url)
-            options.declare(:username, description: "User's identifier") unless options.option_declared?(:username)
-            options.declare(:password, description: "User's password") unless options.option_declared?(:password)
-            options.parse_options!
-          end
-        end
-
         def initialize(context:, basic_options: true)
           super(context: context)
           # DSL options (url, username, password) are auto-declared by Base#initialize

data/lib/aspera/cli/plugins/config.rb

@@ -68,7 +68,7 @@ module Aspera
           # @return [String] product family folder (~/.aspera)
           def module_family_folder
             user_home_folder = Dir.home
-            Aspera.assert(Dir.exist?(user_home_folder), type: Cli::Error){"Home folder does not exist: #{user_home_folder}. Check your user environment."}
+            Aspera.assert(Dir.exist?(user_home_folder), type: Cli::Error) { "Home folder does not exist: #{user_home_folder}. Check your user environment." }
             return File.join(user_home_folder, ASPERA_HOME_FOLDER_NAME)
           end
 
@@ -84,7 +84,7 @@ module Aspera
         private_constant :DEFAULT_CHECK_NEW_VERSION_DAYS
 
         option :preset,             description: 'Load the named option preset from current config file',             short: 'P', handler: :option_preset
-        option :version_check_days, description: 'Period in days to check new version (zero to disable)',             allowed: Allowed::TYPES_INTEGER, default: DEFAULT_CHECK_NEW_VERSION_DAYS
+        option :version_check_days, description: 'Period in days to check new version (zero to disable)',             allowed: Type::INTEGER, default: DEFAULT_CHECK_NEW_VERSION_DAYS
         option :plugin_folder,      description: 'Folder where to find additional plugins',                           handler: :option_plugin_folder
         option :sdk_url,            description: 'Ascp: URL to get Aspera Transfer Executables',                      default: SpecialValues::DEF
         option :locations_url,      description: 'Ascp: URL to get download locations of Aspera Transfer Daemon',    handler: {o: Ascp::Installation.instance, m: :transferd_urls}
@@ -92,7 +92,7 @@ module Aspera
         option :smtp,               schema: Schema::Registry::SMTP_OPTIONS
         option :notify_to,          description: 'Email: Recipient for notification of transfers'
         option :notify_template,    description: 'Email: ERB template for notification of transfers'
-        option :cache_tokens,       description: 'Save and reuse OAuth tokens', allowed: Allowed::TYPES_BOOLEAN, default: true, handler: :option_cache_tokens
+        option :cache_tokens,       description: 'Save and reuse OAuth tokens', allowed: Type::BOOLEAN, default: true, handler: :option_cache_tokens
 
         def initialize(**_)
           super
@@ -100,7 +100,7 @@ module Aspera
           @sdk_default_location = false
           @option_cache_tokens = true
           # :no_default uses a &block callback - must stay imperative
-          options.declare(:no_default, description: 'Do not load default configuration for plugin', allowed: Allowed::TYPES_NONE, short: 'N'){presets.use_plugin_defaults = false}
+          options.declare(:no_default, description: 'Do not load default configuration for plugin', allowed: Type::NONE, short: 'N') { presets.use_plugin_defaults = false }
           # Declare wizard options (Wizard#initialize calls options.declare internally)
           @wizard = Wizard.new(self, context.main_folder)
           options.parse_options!
@@ -113,7 +113,7 @@ module Aspera
 
         # DSL command declarations - replaces ACTIONS + execute_action
         command :preset, description: 'Manage configuration presets'
-        commands_under(:preset) do
+        commands_under :preset do
           command :list,     description: 'List all presets'
           command :overview, description: 'Display all options from all presets'
           command :lookup,   description: 'Find preset matching URL and username'
@@ -127,11 +127,9 @@ module Aspera
             arguments: [{name: :name, type: :identifier}, {name: :param_name, type: String}]
           command :unset,      description: 'Remove a parameter from a preset',
             arguments: [{name: :name, type: :identifier}, {name: :param_name, type: String}]
-          command(
-            :set, description: 'Set a parameter in a preset',
+          command :set, description: 'Set a parameter in a preset',
             arguments: [{name: :name, type: :identifier}, {name: :param_name, type: String},
                         {name: :param_value, type: nil}]
-          )
           command :initialize, description: 'Initialize a preset with a value',
             arguments: [{name: :name, type: :identifier}, {name: :config_value, type: Hash}]
           command :update,     description: 'Update a preset with current option values',
@@ -159,11 +157,11 @@ module Aspera
           ]
         command :pubkey, description: 'Display the public key of an RSA private key',
           arguments: [{name: :private_key_pem, type: String}],
-          action: ->(private_key_pem:, **){Result::Text.new(OpenSSL::PKey::RSA.new(private_key_pem).public_key.to_s)}
+          action: ->(private_key_pem:, **) { Result::Text.new(OpenSSL::PKey::RSA.new(private_key_pem).public_key.to_s) }
         command :remote_certificate, description: 'Retrieve the certificate chain of a remote HTTPS server'
         command :echo, description: 'Display the value of a given argument',
           arguments: [{name: :value, type: nil}],
-          action: ->(value:, **){Result.auto(value)}
+          action: ->(value:, **) { Result.auto(value) }
         command :download, description: 'Download a file from a URL',
           arguments: [
             {name: :file_url,  type: String},
@@ -176,14 +174,14 @@ module Aspera
         command :wizard, description: 'Run the setup wizard for an Aspera product (interactive)',
           arguments: [{name: :url, type: String}, {name: :plugin_name, mandatory: false, default: nil},
                       {name: :preset_name, mandatory: false, default: ''}]
-        command :coffee, description: 'Display a coffee image', action: ->{Result::Image.new(COFFEE_IMAGE_URL)}
+        command :coffee, description: 'Display a coffee image', action: -> { Result::Image.new(COFFEE_IMAGE_URL) }
         command :image, description: 'Display an image',
           arguments: [{name: :image_uri, type: nil}],
-          action: ->(image_uri:, **){Result::Image.new(image_uri)}
+          action: ->(image_uri:, **) { Result::Image.new(image_uri) }
         command :sync, description: 'Manage Aspera Sync operations'
         command :gem, description: 'Display gem information'
-        command :folder, description: 'Display the configuration folder path', action: ->{Result::Text.new(context.main_folder)}
-        command :file, description: 'Display the configuration file path', action: ->{Result::Text.new(context.presets.config_file)}
+        command :folder, description: 'Display the configuration folder path', action: -> { Result::Text.new(context.main_folder) }
+        command :file, description: 'Display the configuration file path', action: -> { Result::Text.new(context.presets.config_file) }
         command(
           :email_test, description: 'Send a test email',
           action: lambda do
@@ -191,41 +189,45 @@ module Aspera
             Result::Nothing.new
           end
         )
-        command :smtp_settings, description: 'Display the current SMTP settings', action: ->{Result::SingleObject.new(context.mailer.email_settings)}
+        command :smtp_settings, description: 'Display the current SMTP settings', action: -> { Result::SingleObject.new(context.mailer.email_settings) }
         command(
           :proxy_check, description: 'Check the proxy returned by the PAC script for a given URL',
           arguments: [{name: :server_url, type: String}],
           action: lambda do |server_url:, **|
-            Aspera.assert(!context.pac_executor.nil?, type: Cli::BadArgument){'No PAC script configured, use --fpac'}
+            Aspera.assert(!context.pac_executor.nil?, type: Cli::BadArgument) { 'No PAC script configured, use --fpac' }
             Result::ValueList.new(context.pac_executor.get_proxies(server_url), name: 'proxy')
           end
         )
-        command :check_update, description: 'Check if a newer version of the gem is available', action: ->{Result::SingleObject.new(check_gem_version)}
+        command :check_update, description: 'Check if a newer version of the gem is available', action: -> { Result::SingleObject.new(check_gem_version) }
         command :initdemo, description: 'Initialize the demo server preset'
         command :vault, description: 'Manage secrets in the vault'
-        commands_under(:vault) do
+        commands_under :vault do
           command :info,     description: 'Display vault information',
-            action: ->(**){Result::SingleObject.new(vault.info)}
-          command :list,     description: 'List secrets in the vault',
-            action: ->(**){Result::ObjectList.new(vault.list)}
-          command :show,     description: 'Show a secret by label',
-            arguments: [{name: :label, type: String}]
+            action: ->(**) { Result::SingleObject.new(vault_required.info) }
+          command :ids,      description: 'List secret labels in the vault',
+            action: ->(**) { Result::ObjectList.new(vault_required.ids) }
+          command :list,     description: 'List all secrets with full details',
+            action: ->(**) { Result::ObjectList.new(vault_required.all) }
+          command :show,     description: 'Show a secret by label (or id)',
+            arguments: [{name: :label, type: String}, {name: :id, type: String, mandatory: false, default: nil}]
           command :create,   description: 'Add a new secret to the vault',
-            arguments: [{name: :info, type: Hash}]
-          command :delete,   description: 'Delete a secret by label',
-            arguments: [{name: :label, type: String}]
+            arguments: [{name: :info, type: Hash, schema: Schema::Registry::VAULT_SECRET}]
+          command :delete,   description: 'Delete a secret by label (or id)',
+            arguments: [{name: :label, type: String}, {name: :id, type: String, mandatory: false, default: nil}]
           command :password, description: 'Change the vault password',
             arguments: [{name: :new_password, type: String}]
+          command :import,   description: 'Import secrets from a JSON array (supports --bulk)',
+            arguments: [{name: :secrets, type: Array, schema: {type: 'array', items: {'$ref' => Schema::Registry::VAULT_SECRET}}}]
         end
         command :commands, description: 'List all available commands across all plugins'
         command :options, description: 'List all options available for a plugin',
           arguments: [{name: :plugin_name, type: String}]
         command :test, description: 'Internal test commands'
-        command :platform, description: 'Display the current platform/architecture', action: ->{Result::Text.new(Environment.instance.architecture)}
+        command :platform, description: 'Display the current platform/architecture', action: -> { Result::Text.new(Environment.instance.architecture) }
         command :completion, description: 'Generate shell completion scripts'
 
         # remote_certificate sub-commands
-        commands_under(:remote_certificate) do
+        commands_under :remote_certificate do
           command :chain, description: 'Display the full certificate chain as PEM',
             arguments: [{name: :remote_url, type: String}]
           command :only, description: 'Display only the server certificate as PEM',
@@ -235,7 +237,7 @@ module Aspera
         end
 
         # tokens sub-commands
-        commands_under(:tokens) do
+        commands_under :tokens do
           command(
             :flush, description: 'Delete all cached OAuth tokens',
             action: lambda do
@@ -255,7 +257,7 @@ module Aspera
         end
 
         # plugins sub-commands
-        commands_under(:plugins) do
+        commands_under :plugins do
           command :list, description: 'List all available plugins'
           command :create, description: 'Create a new plugin skeleton file',
             arguments: [
@@ -266,7 +268,7 @@ module Aspera
 
         # ascp sub-commands
         command :ascp, description: 'Manage FASP/ascp transfer engine'
-        commands_under(:ascp) do
+        commands_under :ascp do
           command :show,    description: 'Display ascp binary path'
           command :info,    description: 'Display ascp and transfer spec information'
           command :install, description: 'Install the transfer SDK',
@@ -276,14 +278,14 @@ module Aspera
             arguments: [{name: :agent_name, mandatory: false, default: nil}]
           command :errors,   description: 'Display FASP error codes'
           command :products, description: 'Manage installed Aspera products'
-          commands_under(%i[ascp products]) do
+          commands_under :products do
             command :list, description: 'List installed Aspera products'
           end
         end
 
         # agents sub-commands
         command :agents, description: 'Manage transfer agents'
-        commands_under(:agents) do
+        commands_under :agents do
           command :list,       description: 'List all transfer agents'
           command :show,       description: 'Show details for a transfer agent',
             arguments: [{name: :agent_name, allowed: Agent::Factory::ALL.keys}]
@@ -293,7 +295,7 @@ module Aspera
 
         # transfer async management sub-commands
         command :transfer, description: 'Manage asynchronous transfers'
-        commands_under(:transfer) do
+        commands_under :transfer do
           command :list,    description: 'List all async transfer jobs'
           command :status,  description: 'Show status of an async transfer job',
             arguments: [{name: :job_id, type: String}]
@@ -302,13 +304,13 @@ module Aspera
 
         # transferd sub-commands
         command :transferd, description: 'Manage the transfer daemon (transferd)'
-        commands_under(:transferd) do
+        commands_under :transferd do
           command :install, description: 'Install the transfer daemon'
           command :list,    description: 'List available SDK locations'
         end
 
         # sync sub-commands
-        commands_under(:sync) do
+        commands_under :sync do
           command(
             :spec, description: 'Display the sync configuration schema',
             action: lambda do
@@ -317,21 +319,21 @@ module Aspera
             end
           )
           command :admin, description: 'Manage sync database (admin operations)'
-          SyncActions.register_sync_admin_commands(self, %i[sync admin])
+          SyncActions.register_sync_admin_commands(self, :admin)
           command :translate, description: 'Translate async-style arguments to sync config format',
             arguments: [{name: :async_arguments, type: String, multiple: true}],
-            action: ->(async_arguments:, **){Result::SingleObject.new(Sync::Operations.args_to_conf(async_arguments))}
+            action: ->(async_arguments:, **) { Result::SingleObject.new(Sync::Operations.args_to_conf(async_arguments)) }
         end
 
         # gem sub-commands
-        commands_under(:gem) do
-          command :path,    description: 'Display the gem source root path',    action: ->{Result::Text.new(self.class.gem_src_root)}
-          command :version, description: 'Display the gem version',             action: ->{Result::Text.new(Cli::VERSION)}
-          command :name,    description: 'Display the gem name',                action: ->{Result::Text.new(Info::GEM_NAME)}
+        commands_under :gem do
+          command :path,    description: 'Display the gem source root path',    action: -> { Result::Text.new(self.class.gem_src_root) }
+          command :version, description: 'Display the gem version',             action: -> { Result::Text.new(Cli::VERSION) }
+          command :name,    description: 'Display the gem name',                action: -> { Result::Text.new(Info::GEM_NAME) }
         end
 
         # test sub-commands
-        commands_under(:test) do
+        commands_under :test do
           command :throw, description: 'Raise an exception (for testing)',
             arguments: [
               {name: :exception_class_name, type: String},
@@ -341,7 +343,7 @@ module Aspera
         end
 
         # completion sub-commands
-        commands_under(:completion) do
+        commands_under :completion do
           command :bash, description: 'Generate bash completion script',
             arguments: [{name: :words, type: String, multiple: true, mandatory: false}]
         end
@@ -352,8 +354,8 @@ module Aspera
 
         def option_plugin_folder=(value)
           value = [value] unless value.is_a?(Array)
-          Aspera.assert_array_all(value, String){'plugin folder(s)'}
-          value.each{ |f| Plugins::Factory.instance.add_lookup_folder(f)}
+          Aspera.assert_array_all(value, String) { 'plugin folder(s)' }
+          value.each { |f| Plugins::Factory.instance.add_lookup_folder(f) }
         end
 
         def option_plugin_folder
@@ -384,7 +386,7 @@ module Aspera
           when :toc, :local
             require 'aspera/markdown'
             local_doc = File.join(self.class.gem_src_root, '..', 'docs', 'README.md')
-            Aspera.assert(File.exist?(local_doc), type: Cli::Error){"Local documentation not found: #{local_doc}"}
+            Aspera.assert(File.exist?(local_doc), type: Cli::Error) { "Local documentation not found: #{local_doc}" }
             content = File.read(local_doc)
             if location == :toc
               entries = Markdown.toc(content)
@@ -393,7 +395,7 @@ module Aspera
             # :local
             if section
               text = Markdown.extract_section(content, section)
-              Aspera.assert(!text.nil?, type: Cli::Error){"Section not found: #{section}"}
+              Aspera.assert(!text.nil?, type: Cli::Error) { "Section not found: #{section}" }
               return Result::Text.new(text)
             end
             if Environment.instance.url_method.eql?(:graphical)
@@ -411,34 +413,34 @@ module Aspera
 
         def action_remote_certificate_chain(remote_url:, **)
           remote_chain = Rest.remote_certificate_chain(remote_url, as_string: false)
-          Aspera.assert(remote_chain&.first){"No certificate found for #{remote_url}"}
+          Aspera.assert(remote_chain&.first) { "No certificate found for #{remote_url}" }
           Result::Text.new(remote_chain.map(&:to_pem).join("\n"))
         end
 
         def action_remote_certificate_only(remote_url:, **)
           remote_chain = Rest.remote_certificate_chain(remote_url, as_string: false)
-          Aspera.assert(remote_chain&.first){"No certificate found for #{remote_url}"}
+          Aspera.assert(remote_chain&.first) { "No certificate found for #{remote_url}" }
           Result::Text.new(remote_chain.first.to_pem)
         end
 
         def action_remote_certificate_name(remote_url:, **)
           remote_chain = Rest.remote_certificate_chain(remote_url, as_string: false)
-          Aspera.assert(remote_chain&.first){"No certificate found for #{remote_url}"}
-          Result::Text.new(remote_chain.first.subject.to_a.find{ |name, _, _| name == 'CN'}[1])
+          Aspera.assert(remote_chain&.first) { "No certificate found for #{remote_url}" }
+          Result::Text.new(remote_chain.first.subject.to_a.find { |name, _, _| name == 'CN' }[1])
         end
 
         def action_download(file_url:, file_dest: nil, **)
           file_url = file_url.chomp
           file_dest = File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), file_url.gsub(%r{.*/}, '')) if file_dest.nil?
           Log.log.info("Downloading: #{file_url}")
-          Rest.new(base_url: file_url).call(operation: 'GET', save_to_file: file_dest)
+          Rest.new(base_url: file_url).call(operation: 'GET', save_to: file_dest)
           Result::Status.new("Saved to: #{file_dest}")
         end
 
         def action_tokens_show(token_id:, **)
           require 'aspera/api/node'
           data = OAuth::Factory.instance.get_token_info(token_id)
-          Aspera.assert(!data.nil?, type: Cli::Error){'Unknown identifier'}
+          Aspera.assert(!data.nil?, type: Cli::Error) { 'Unknown identifier' }
           Result::SingleObject.new(data)
         end
 
@@ -493,9 +495,9 @@ module Aspera
         def action_initdemo
           cp = presets.config_presets
           if cp.key?(DEMO_PRESET)
-            Log.log.warn{"Demo server preset already present: #{DEMO_PRESET}"}
+            Log.log.warn { "Demo server preset already present: #{DEMO_PRESET}" }
           else
-            Log.log.info{"Creating Demo server preset: #{DEMO_PRESET}"}
+            Log.log.info { "Creating Demo server preset: #{DEMO_PRESET}" }
             cp[DEMO_PRESET] = {
               'url'                                    => "ssh://#{DEMO_SERVER}.asperasoft.com:33001",
               'username'                               => ASPERA,
@@ -504,12 +506,12 @@ module Aspera
           end
           cp[PresetManager::Key::DEFAULTS] ||= {}
           if cp[PresetManager::Key::DEFAULTS].key?(SERVER_COMMAND)
-            Log.log.warn{"Server default preset already set to: #{cp[PresetManager::Key::DEFAULTS][SERVER_COMMAND]}"}
-            Log.log.warn{"Use #{DEMO_PRESET} for demo: -P#{DEMO_PRESET}"} unless
+            Log.log.warn { "Server default preset already set to: #{cp[PresetManager::Key::DEFAULTS][SERVER_COMMAND]}" }
+            Log.log.warn { "Use #{DEMO_PRESET} for demo: -P#{DEMO_PRESET}" } unless
               DEMO_PRESET.eql?(cp[PresetManager::Key::DEFAULTS][SERVER_COMMAND])
           else
             cp[PresetManager::Key::DEFAULTS][SERVER_COMMAND] = DEMO_PRESET
-            Log.log.info{"Setting server default preset to : #{DEMO_PRESET}"}
+            Log.log.info { "Setting server default preset to : #{DEMO_PRESET}" }
           end
           Result::Status.new('Done')
         end
@@ -518,19 +520,20 @@ module Aspera
           commands = Plugins::Factory.instance.plugin_list.flat_map do |name|
             plugin_class = Plugins::Factory.instance.plugin_class(name)
             reg = plugin_class.command_registry
-            reg.all_paths.reject{ |path| reg.children_of(path).any?}.map do |path|
+            reg.all_paths.reject { |path| reg.children_of(path).any? }.map do |path|
               spec = reg[path]
-              arg_tokens = spec&.arguments.to_a.map do |a|
-                token =
-                  if a.allowed
-                    a.allowed.join('|')
-                  else
-                    a.name.to_s
-                  end
-                token += '...' if a.multiple
-                a.mandatory ? "<#{token}>" : "[<#{token}>]"
+              # Build syntax by interleaving each path segment with the arguments declared on that node
+              tokens = [name.to_s]
+              path.each_with_index do |seg, i|
+                tokens << seg.to_s
+                node_args = reg[path[0, i + 1]]&.arguments.to_a
+                node_args.each do |a|
+                  token = a.allowed ? a.allowed.join('|') : a.name.to_s
+                  token += '...' if a.multiple
+                  tokens << (a.mandatory ? "<#{token}>" : "[<#{token}>]")
+                end
               end
-              syntax = ([name.to_s] + path.map(&:to_s) + arg_tokens).join(' ')
+              syntax = tokens.join(' ')
               {
                 syntax:      syntax,
                 description: spec&.description.to_s
@@ -557,14 +560,14 @@ module Aspera
 
         def action_test_throw(exception_class_name:, exception_text:, **)
           type = Object.const_get(exception_class_name)
-          Aspera.assert(type <= Exception){"#{type} is not an exception: #{type.class}"}
+          Aspera.assert(type <= Exception) { "#{type} is not an exception: #{type.class}" }
           raise type, exception_text
         end
 
         def action_completion_bash(words: nil, **)
           if words.nil? || words.empty?
             # Level 0: propose plugin names
-            Plugins::Factory.instance.plugin_list.each{ |p| puts p}
+            Plugins::Factory.instance.plugin_list.each { |p| puts p }
           else
             plugin_sym = words.first.to_sym
             plugin_class = begin
@@ -574,7 +577,7 @@ module Aspera
             end
             # Navigate into the registry using remaining words as path
             path = words[1..].map(&:to_sym)
-            plugin_class.command_registry.children_of(path).each_key{ |k| puts k}
+            plugin_class.command_registry.children_of(path).each_key { |k| puts k }
           end
           Process.exit(0)
         end

data/lib/aspera/cli/plugins/console.rb

@@ -42,7 +42,7 @@ module Aspera
               }
             rescue StandardError => e
               error = e
-              Log.log.debug{"detect error: #{e}"}
+              Log.log.debug { "detect error: #{e}" }
             end
             raise error if error
             return
@@ -76,16 +76,16 @@ module Aspera
         command :health,   description: 'Check Console API health', setup: :setup_api
         command :transfer, description: 'Manage transfers',         setup: :setup_api
 
-        commands_under(:transfer) do
+        commands_under :transfer do
           command :current, description: 'Manage current transfers'
           command :smart,   description: 'Manage smart transfers'
         end
 
-        commands_under(%i[transfer current]) do
+        commands_under %i[transfer current] do
           command :list,          description: 'List current transfers'
           command :show,          description: 'Show a transfer',
             arguments: [{name: :transfer_id, type: :identifier}],
-            action: ->(api_console:, transfer_id:, **){Result::SingleObject.new(api_console.read("transfers/#{transfer_id}"))}
+            action: ->(api_console:, transfer_id:, **) { Result::SingleObject.new(api_console.read("transfers/#{transfer_id}")) }
           command :files,         description: 'List files in a transfer',
             arguments: [{name: :transfer_id, type: :identifier}]
           command :start,         description: 'Start a transfer',
@@ -117,8 +117,8 @@ module Aspera
           end
         end
 
-        commands_under(%i[transfer smart]) do
-          command :list,   description: 'List smart transfers', action: ->(api_console:){Result::ObjectList.new(api_console.read('smart_transfers'))}
+        commands_under %i[transfer smart] do
+          command :list,   description: 'List smart transfers', action: ->(api_console:) { Result::ObjectList.new(api_console.read('smart_transfers')) }
           command :submit, description: 'Submit a smart transfer',
             arguments: [{name: :smart_id}, {name: :transfer_params, type: Hash}]
         end
@@ -175,10 +175,10 @@ module Aspera
         private
 
         def parse_extended_filter(filter, query)
-          Aspera.assert(filter.start_with?('(') && filter.end_with?(')'), type: BadArgument){"Invalid filter syntax: #{filter}, shall be (field op val)and(field op val)..."}
+          Aspera.assert(filter.start_with?('(') && filter.end_with?(')'), type: BadArgument) { "Invalid filter syntax: #{filter}, shall be (field op val)and(field op val)..." }
           filter[1..-2].split(')and(').each_with_index do |expr, i|
             m = expr.match(EXPR_RE)
-            Aspera.assert(m, type: BadArgument){"Invalid expression: #{expr}, shall be: <field> <op> <val>"}
+            Aspera.assert(m, type: BadArgument) { "Invalid expression: #{expr}, shall be: <field> <op> <val>" }
             t = m.captures
             i += 1
             query["filter#{i}"] = t[0]

data/lib/aspera/cli/plugins/cos.rb

@@ -13,9 +13,9 @@ module Aspera
 
         command :node, description: 'Execute COS node commands', setup: :setup_cos_node
 
-        commands_under(:node) do
+        commands_under :node do
           Node::COMMANDS_COS.each do |cmd|
-            command(cmd, description: "Node #{cmd} command")
+            command cmd, description: "Node #{cmd} command"
           end
         end
 
@@ -27,10 +27,11 @@ module Aspera
         option :region,              description: 'Storage region'
         option :identity,            description: "Authentication URL (#{Api::CosNode::IBM_CLOUD_TOKEN_URL})", default: Api::CosNode::IBM_CLOUD_TOKEN_URL
 
+        use_options Node
+
         def initialize(**_)
           super
           options.parse_options!
-          Node.declare_options(options)
         end
 
         # Build the COS Node API and plugin from CLI options.

data/lib/aspera/cli/plugins/factory.rb

@@ -53,13 +53,13 @@ module Aspera
 
         # @return [String] path to source file of plugin
         def plugin_source(plugin_name_sym)
-          Aspera.assert(@plugins.key?(plugin_name_sym), type: NoSuchElement){"plugin not found: #{plugin_name_sym}"}
+          Aspera.assert(@plugins.key?(plugin_name_sym), type: NoSuchElement) { "plugin not found: #{plugin_name_sym}" }
           @plugins[plugin_name_sym][:source]
         end
 
         # @return [Class] class object for plugin
         def plugin_class(plugin_name_sym)
-          Aspera.assert(@plugins.key?(plugin_name_sym), type: NoSuchElement){"plugin not found: #{plugin_name_sym}"}
+          Aspera.assert(@plugins.key?(plugin_name_sym), type: NoSuchElement) { "plugin not found: #{plugin_name_sym}" }
           require @plugins[plugin_name_sym][:require_stanza]
           # Module.nesting[1] is Aspera::Cli::Plugins
           return Object.const_get("#{Module.nesting[1]}::#{plugin_name_sym.to_s.snake_to_capital}")