aspera-cli 4.26.0 → 4.26.2

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

@@ -97,7 +97,7 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('console api', e.to_s)
             end
-            Main.result_object_list(nagios.status_list)
+            Result::ObjectList.new(nagios.status_list)
           when :transfer
             command = options.get_next_command(%i[current smart])
             case command
@@ -105,11 +105,11 @@ module Aspera
               command = options.get_next_command(%i[list submit])
               case command
               when :list
-                return Main.result_object_list(api_console.read('smart_transfers'))
+                return Result::ObjectList.new(api_console.read('smart_transfers'))
               when :submit
                 smart_id = options.get_next_argument('smart_id')
                 params = options.get_next_argument('transfer parameters', validation: Hash)
-                return Main.result_object_list(api_console.create("smart_transfers/#{smart_id}", params))
+                return Result::ObjectList.new(api_console.create("smart_transfers/#{smart_id}", params))
               end
             when :current
               command = options.get_next_command(%i[list show files start pause cancel resume rerun change_rate change_policy move_forwards move_back])
@@ -125,21 +125,21 @@ module Aspera
                 if (filter = query.delete('filter'))
                   parse_extended_filter(filter, query)
                 end
-                return Main.result_object_list(
+                return Result::ObjectList.new(
                   api_console.read('transfers', query),
                   fields: %w[id contact name status]
                 )
               when :show
                 transfer_id = options.instance_identifier(description: 'transfer ID')
-                return Main.result_single_object(api_console.read("transfers/#{transfer_id}"))
+                return Result::SingleObject.new(api_console.read("transfers/#{transfer_id}"))
               when :files
                 transfer_id = options.instance_identifier(description: 'transfer ID')
                 query = query_read_delete(default: {})
                 query['limit'] ||= 100
-                return Main.result_object_list(api_console.read("transfers/#{transfer_id}/files", query))
+                return Result::ObjectList.new(api_console.read("transfers/#{transfer_id}/files", query))
               when :start, :pause, :cancel, :resume, :rerun, :change_rate, :change_policy, :move_forwards, :move_back
                 transfer_id = options.instance_identifier(description: 'transfer ID')
-                return Main.result_single_object(api_console.update("transfers/#{transfer_id}/#{command}", query_read_delete))
+                return Result::SingleObject.new(api_console.update("transfers/#{transfer_id}/#{command}", query_read_delete))
               end
             end
           end

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

@@ -36,11 +36,11 @@ module Aspera
               endpoint: options.get_option(:endpoint)
             }
             if service_credentials.nil?
-              Aspera.assert(!cos_node_params[:endpoint].nil?, type: Cli::BadArgument){'endpoint required when service credentials not provided'}
+              Aspera.assert(!cos_node_params[:endpoint].nil?, 'endpoint required when service credentials not provided', type: Cli::BadArgument)
               cos_node_params[:api_key] = options.get_option(:apikey, mandatory: true)
               cos_node_params[:instance_id] = options.get_option(:crn, mandatory: true)
             else
-              Aspera.assert(cos_node_params[:endpoint].nil?, type: Cli::BadArgument){'endpoint not allowed when service credentials provided'}
+              Aspera.assert(cos_node_params[:endpoint].nil?, 'endpoint not allowed when service credentials provided', type: Cli::BadArgument)
               cos_node_params.merge!(Api::CosNode.parameters_from_svc_credentials(service_credentials, options.get_option(:region, mandatory: true)))
             end
             api_node = Api::CosNode.new(**cos_node_params)

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

@@ -9,6 +9,9 @@ module Aspera
   module Cli
     # Instantiate plugin from well-known locations
     module Plugins
+      # @!method self.instance
+      #   Returns the singleton instance of Factory
+      #   @return [Factory] the singleton instance
       class Factory
         include Singleton
 

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

@@ -78,7 +78,7 @@ module Aspera
           # extract elements from faspex public link
           def get_link_data(public_url)
             public_uri = URI.parse(public_url)
-            Aspera.assert(m = public_uri.path.match(%r{^(.*)/(external.*)$}), type: Cli::BadArgument){'Public link does not match Faspex format'}
+            Aspera.assert(m = public_uri.path.match(%r{^(.*)/(external.*)$}), 'Public link does not match Faspex format', type: Cli::BadArgument)
             base = m[1]
             subpath = m[2]
             port_add = public_uri.port.eql?(public_uri.default_port) ? '' : ":#{public_uri.port}"
@@ -165,7 +165,7 @@ module Aspera
         def mailbox_filtered_entries(stop_at_id: nil)
           recipient_names = [options.get_option(:recipient) || options.get_option(:username, mandatory: true)]
           # some workgroup messages have no star in recipient name
-          recipient_names.push(recipient_names.first[1..-1]) if recipient_names.first.start_with?('*')
+          recipient_names.push(recipient_names.first.delete_prefix('*')) if recipient_names.first.start_with?('*')
           # mailbox is in ATOM_MAILBOXES
           mailbox = options.get_option(:box, mandatory: true)
           # parameters
@@ -176,7 +176,7 @@ module Aspera
           if !mailbox_query.nil?
             Aspera.assert_type(mailbox_query, Hash){'query'}
             Aspera.assert((mailbox_query.keys - ATOM_EXT_PARAMS).empty?){"query: supported params: #{ATOM_EXT_PARAMS}"}
-            Aspera.assert(!(mailbox_query.key?('startIndex') && mailbox_query.key?('page'))){'query: startIndex and page are exclusive'}
+            Aspera.assert(!(mailbox_query.key?('startIndex') && mailbox_query.key?('page')), 'query: startIndex and page are exclusive')
             # Extract pagination control parameters (not part of API query)
             max_items = mailbox_query.delete(RestList::MAX_ITEMS)
             max_pages = mailbox_query.delete(RestList::MAX_PAGES)
@@ -286,15 +286,15 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('faspex api', e.to_s)
             end
-            Main.result_object_list(nagios.status_list)
+            Result::ObjectList.new(nagios.status_list)
           when :package
             command_pkg = options.get_next_command(%i[send receive list show], aliases: {recv: :receive})
             case command_pkg
             when :show
               delivery_id = options.instance_identifier
-              return Main.result_single_object(mailbox_filtered_entries(stop_at_id: delivery_id).find{ |p| p[PACKAGE_MATCH_FIELD].eql?(delivery_id)})
+              return Result::SingleObject.new(mailbox_filtered_entries(stop_at_id: delivery_id).find{ |p| p[PACKAGE_MATCH_FIELD].eql?(delivery_id)})
             when :list
-              return Main.result_object_list(mailbox_filtered_entries, fields: [PACKAGE_MATCH_FIELD, 'title', 'items'])
+              return Result::ObjectList.new(mailbox_filtered_entries, fields: [PACKAGE_MATCH_FIELD, 'title', 'items'])
             when :send
               delivery_info = options.get_option(:delivery_info, mandatory: true)
               Aspera.assert_type(delivery_info, Hash, type: Cli::BadArgument){'delivery_info'}
@@ -308,7 +308,7 @@ module Aspera
                 first_source['paths'].concat(transfer.source_list)
                 source_id = options.get_option(:remote_source)
                 if source_id && (m = Manager.percent_selector(source_id))
-                  Aspera.assert(m[:field].eql?('name'), type: Cli::BadArgument){'only name as selector, or give id'}
+                  Aspera.assert_values(m[:field], ['name'], type: Cli::BadArgument){'selector field'}
                   source_list = api_v3.read('source_shares')['items']
                   source_id = self.class.get_source_id_by_name(m[:value], source_list)
                 end
@@ -316,7 +316,7 @@ module Aspera
                 pkg_created = api_v3.create('send', package_create_params)
                 if first_source.key?('id')
                   # no transfer spec if remote source: handled by faspex
-                  return {data: [pkg_created['links']['status']], type: :value_list, name: 'link'}
+                  return Result::ValueList.new([pkg_created['links']['status']], name: 'link')
                 end
                 raise Cli::BadArgument, 'expecting one session exactly' if pkg_created['xfer_sessions'].length != 1
                 transfer_spec = pkg_created['xfer_sessions'].first
@@ -326,7 +326,7 @@ module Aspera
                 transfer_spec = send_public_link_to_ts(public_link_url, package_create_params)
               end
               # Log.dump(:transfer_spec,transfer_spec)
-              return Main.result_transfer(transfer.start(transfer_spec))
+              return Runner.result_transfer(transfer.start(transfer_spec))
             when :receive
               link_url = options.get_option(:link)
               # list of faspex ID/URI to download
@@ -349,15 +349,15 @@ module Aspera
                 end
                 # get command line parameters
                 delivery_id = options.instance_identifier
-                Aspera.assert(!delivery_id.empty?){'empty id'}
+                Aspera.assert(!delivery_id.empty?, 'empty id')
                 recipient = options.get_option(:recipient)
                 if delivery_id.eql?(SpecialValues::ALL)
                   pkg_id_uri = mailbox_filtered_entries.map{ |i| {id: i[PACKAGE_MATCH_FIELD], uri: self.class.get_fasp_uri_from_entry(i, raise_no_link: false)}}
                 elsif delivery_id.eql?(SpecialValues::INIT)
-                  Aspera.assert(skip_ids_persistency){'Only with option once_only'}
+                  Aspera.assert(skip_ids_persistency, 'Only with option once_only')
                   skip_ids_persistency.data.clear.concat(mailbox_filtered_entries.map{ |i| {id: i[PACKAGE_MATCH_FIELD]}})
                   skip_ids_persistency.save
-                  return Main.result_status("Initialized skip for #{skip_ids_persistency.data.count} package(s)")
+                  return Result::Status.new("Initialized skip for #{skip_ids_persistency.data.count} package(s)")
                 elsif !recipient.nil? && recipient.start_with?('*')
                   found_package_link = mailbox_filtered_entries(stop_at_id: delivery_id).find{ |p| p[PACKAGE_MATCH_FIELD].eql?(delivery_id)}['link'].first['href']
                   raise "Not Found. Dropbox and Workgroup packages can use the link option with #{Transfer::Uri::SCHEME}" if found_package_link.nil?
@@ -401,7 +401,7 @@ module Aspera
               # skip_ids_data.select!{|id|pkg_id_uri.select{|p|p[:id].eql?(id)}}
               pkg_id_uri.reject!{ |i| skip_ids_data.include?(i[:id])}
               Log.dump(:pkg_id_uri, pkg_id_uri)
-              return Main.result_status('no new package') if pkg_id_uri.empty?
+              return Result::Status.new('no new package') if pkg_id_uri.empty?
               result_transfer = []
               pkg_id_uri.each do |id_uri|
                 if id_uri[:uri].nil?
@@ -427,22 +427,22 @@ module Aspera
                   transfer_spec['direction'] = Transfer::Spec::DIRECTION_RECEIVE
                   statuses = transfer.start(transfer_spec)
                 end
-                result_transfer.push({'package' => id_uri[:id], Main::STATUS_FIELD => statuses})
+                result_transfer.push({'package' => id_uri[:id], Runner::STATUS_FIELD => statuses})
                 # skip only if all sessions completed
                 skip_ids_data.push(id_uri[:id]) if TransferAgent.session_status(statuses).eql?(:success)
               end
               skip_ids_persistency&.save
-              return Main.result_transfer_multiple(result_transfer)
+              return Runner.result_transfer_multiple(result_transfer)
             end
           when :source
             command_source = options.get_next_command(%i[list info node])
             source_list = api_v3.read('source_shares')['items']
             case command_source
             when :list
-              return Main.result_object_list(source_list)
+              return Result::ObjectList.new(source_list)
             else # :info :node
               source_id = options.instance_identifier do |field, value|
-                Aspera.assert(field.eql?('name'), type: Cli::BadArgument){'only name as selector, or give id'}
+                Aspera.assert_values(field, ['name'], type: Cli::BadArgument){'selector field'}
                 self.class.get_source_id_by_name(value, source_list)
               end.to_i
               selected_source = source_list.find{ |i| i['id'].eql?(source_id)}
@@ -462,7 +462,7 @@ module Aspera
               Log.dump(:source_info, source_info)
               case command_source
               when :info
-                return Main.result_single_object(source_info)
+                return Result::SingleObject.new(source_info)
               when :node
                 node_config = ExtendedValue.instance.evaluate(source_info[KEY_NODE], context: 'faspex node')
                 Log.log.debug{"node=#{node_config}"}
@@ -481,13 +481,13 @@ module Aspera
             end
           when :me
             my_info = api_v3.read('me')
-            return Main.result_single_object(my_info)
+            return Result::SingleObject.new(my_info)
           when :dropbox
             command_pkg = options.get_next_command([:list])
             case command_pkg
             when :list
               dropbox_list = api_v3.read('dropboxes')
-              return Main.result_object_list(dropbox_list['items'], fields: %w[name id description can_read can_write])
+              return Result::ObjectList.new(dropbox_list['items'], fields: %w[name id description can_read can_write])
             end
           when :v4
             command = options.get_next_command(%i[package dropbox dmembership workgroup wmembership user metadata_profile])
@@ -526,11 +526,11 @@ module Aspera
               u['first_name'], u['last_name'] = u['displayName'].split(' ', 2)
               u['x'] = true
             end
-            return Main.result_object_list(users)
+            return Result::ObjectList.new(users)
           when :login_methods
             login_meths = api_v3.call(operation: 'GET', subpath: 'login/new', headers: {'Accept' => 'application/xrds+xml'}, ret: :resp).body
             login_methods = XmlSimple.xml_in(login_meths, {'ForceArray' => false})
-            return Main.result_object_list(login_methods['XRD']['Service'])
+            return Result::ObjectList.new(login_methods['XRD']['Service'])
           end
         end
       end

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

@@ -213,10 +213,10 @@ module Aspera
           packages = []
           case package_ids
           when SpecialValues::INIT
-            Aspera.assert(skip_ids_persistency){'Only with option once_only'}
+            Aspera.assert(skip_ids_persistency, 'Only with option once_only')
             skip_ids_persistency.data.clear.concat(list_packages_with_filter.first.map{ |p| p['id']})
             skip_ids_persistency.save
-            return Main.result_status("Initialized skip for #{skip_ids_persistency.data.count} package(s)")
+            return Result::Status.new("Initialized skip for #{skip_ids_persistency.data.count} package(s)")
           when SpecialValues::ALL
             # TODO: if packages have same name, they will overwrite ?
             packages = list_packages_with_filter(query: {'status' => 'completed'}).first
@@ -234,8 +234,8 @@ module Aspera
           result_transfer = []
           param_file_list = {}
           begin
-            param_file_list['paths'] = transfer.source_list.map{ |source| {'path'=>source}}
-          rescue Cli::BadArgument
+            param_file_list['paths'] = transfer.ts_source_paths
+          rescue Cli::MissingArgument
             # paths is optional
           end
           box = options.get_option(:box)
@@ -259,18 +259,18 @@ module Aspera
             # delete flag for Connect Client
             transfer_spec.delete('authentication')
             statuses = transfer.start(transfer_spec)
-            result_transfer.push({'package' => pkg_id, Main::STATUS_FIELD => statuses})
+            result_transfer.push({'package' => pkg_id, Runner::STATUS_FIELD => statuses})
             # skip only if all sessions completed
             if TransferAgent.session_status(statuses).eql?(:success) && skip_ids_persistency
               skip_ids_persistency.data.push(pkg_id)
               skip_ids_persistency.save
             end
           end
-          return Main.result_transfer_multiple(result_transfer)
+          return Runner.result_transfer_multiple(result_transfer)
         end
 
         def package_send
-          parameters = value_create_modify(command: :send)
+          parameters = value_create_modify(command: :send, schema: Schema::Registry.req_body(Schema::Registry::FASPEX, 'packages.post'))
           # autofill recipient for public url
           if @api_v5.pub_link_context&.key?('recipient_type') && !parameters.key?('recipients')
             parameters['recipients'] = [{
@@ -296,7 +296,7 @@ module Aspera
             )
             # well, we asked a TS for connect, but we actually want a generic one
             transfer_spec.delete('authentication')
-            return Main.result_transfer(transfer.start(transfer_spec))
+            return Runner.result_transfer(transfer.start(transfer_spec))
           else
             # send from remote shared folder
             if (m = Manager.percent_selector(shared_folder))
@@ -314,7 +314,7 @@ module Aspera
               formatter.display_status("Package #{package['id']}")
               result = wait_package_status(package['id'])
             end
-            return Main.result_single_object(result)
+            return Result::SingleObject.new(result)
           end
         end
 
@@ -371,24 +371,25 @@ module Aspera
             query.delete('iteration_token')
           end
           RestParameters.instance.spinner_cb.call(action: :success)
-          return Main.result_object_list(all_items, total: total_count)
+          return Result::ObjectList.new(all_items, total: total_count)
         end
 
         def package_action
-          command = options.get_next_command(%i[show browse status delete receive send list])
+          command = options.get_next_command(%i[show browse status delete receive send list file_processing])
           package_id =
-            if %i[receive show browse status delete].include?(command)
+            unless %i[send list].include?(command)
               @api_v5.pub_link_context&.key?('package_id') ? @api_v5.pub_link_context['package_id'] : options.instance_identifier
             end
+          package_instance = "packages/#{package_id}"
           case command
           when :show
-            return Main.result_single_object(@api_v5.read("packages/#{package_id}"))
+            return Result::SingleObject.new(@api_v5.read(package_instance))
           when :browse
-            return browse_folder("packages/#{package_id}/files/#{Api::Faspex.box_type(options.get_option(:box))}", recipient_query(package_id))
+            return browse_folder("#{package_instance}/files/#{Api::Faspex.box_type(options.get_option(:box))}", recipient_query(package_id))
           when :status
             status_list = options.get_next_argument('list of states, or nothing', mandatory: false, validation: Array)
             status = wait_package_status(package_id, status_list: status_list)
-            return Main.result_single_object(status)
+            return Result::SingleObject.new(status)
           when :delete
             ids = package_id
             ids = [ids] unless ids.is_a?(Array)
@@ -401,7 +402,7 @@ module Aspera
               body:         {ids: ids},
               headers:      {'Accept' => Mime::JSON}
             )
-            return Main.result_status('Package(s) deleted')
+            return Result::Status.new('Package(s) deleted')
           when :receive
             return package_receive(package_id)
           when :send
@@ -411,11 +412,18 @@ module Aspera
             fields = %w[id title status sender.name recipients.0.name release_date total_bytes total_files]
             fields.delete('recipients.0.name') if %w[inbox inbox_history].include?(options.get_option(:box))
             fields.delete('sender.name') if %w[outbox outbox_history].include?(options.get_option(:box))
-            return Main.result_object_list(list, total: total, fields: fields)
+            return Result::ObjectList.new(list, total: total, fields: fields)
+          when :file_processing
+            result, count = @api_v5.list_entities_limit_offset_total_count(
+              entity: "#{package_instance}/file_statuses",
+              items_key: 'files'
+            )
+            return Result::ObjectList.new(result, total: count)
           end
         end
 
         def execute_resource(res_sym)
+          # Arguments for Plugin::Base::entity_execute
           exec_args = {
             api:    @api_v5,
             entity: res_sym.to_s
@@ -448,9 +456,14 @@ module Aspera
             available_commands += %i[shared_folders browse]
           when :jobs
             exec_args[:display_fields] = %w[id job_name job_type status]
+          when :file_processing
+            available_commands = %i[next modify]
+            # schema for modify
+            exec_args[:schema] = Schema::Registry.req_body(Schema::Registry::FASPEX, 'file_processing.put')
+            exec_args[:is_singleton] = true
           end
           res_command = options.get_next_command(available_commands)
-          return Main.result_value_list(Api::Faspex::EMAIL_NOTIF_LIST, name: 'email_id') if res_command.eql?(:list) && res_sym.eql?(:email_notifications)
+          return Result::ValueList.new(Api::Faspex::EMAIL_NOTIF_LIST, name: 'email_id') if res_command.eql?(:list) && res_sym.eql?(:email_notifications)
           case res_command
           when :create, :modify, :delete, :show
             return entity_execute(command: res_command, **exec_args) do |field, value|
@@ -458,28 +471,28 @@ module Aspera
                    end
           when :list
             data, total = exec_args[:api].list_entities_limit_offset_total_count(entity: exec_args[:entity], items_key: exec_args[:items_key], query: query_read_delete(default: exec_args[:list_query]))
-            return Main.result_object_list(data, total: total, fields: exec_args[:display_fields])
+            return Result::ObjectList.new(data, total: total, fields: exec_args[:display_fields])
           when :shared_folders
             # nodes
             node_id = options.instance_identifier do |field, value|
               @api_v5.lookup_entity_by_field(entity: 'nodes', field: field, value: value)['id']
             end
-            shfld_entity = "nodes/#{node_id}/shared_folders"
+            shared_folder_entity = "nodes/#{node_id}/shared_folders"
             sh_command = options.get_next_command(Operations::ALL + [:user])
             case sh_command
             when *Operations::ALL
               return entity_execute(
                 api: @api_v5,
-                entity: shfld_entity,
+                entity: shared_folder_entity,
                 command: sh_command
               ) do |field, value|
-                       @api_v5.lookup_entity_by_field(entity: shfld_entity, field: field, value: value)['id']
+                       @api_v5.lookup_entity_by_field(entity: shared_folder_entity, field: field, value: value)['id']
                      end
             when :user
               sh_id = options.instance_identifier do |field, value|
-                @api_v5.lookup_entity_by_field(entity: shfld_entity, field: field, value: value)['id']
+                @api_v5.lookup_entity_by_field(entity: shared_folder_entity, field: field, value: value)['id']
               end
-              user_path = "#{shfld_entity}/#{sh_id}/custom_access_users"
+              user_path = "#{shared_folder_entity}/#{sh_id}/custom_access_users"
               return entity_execute(api: @api_v5, entity: user_path, items_key: 'users') do |field, value|
                        @api_v5.lookup_entity_by_field(entity: user_path, items_key: 'users', field: field, value: value)['id']
                      end
@@ -494,8 +507,7 @@ module Aspera
           when :invite_external_collaborator
             # :shared_inboxes, :workgroups
             shared_inbox_id = options.instance_identifier{ |field, value| @api_v5.lookup_entity_by_field(entity: res_sym.to_s, field: field, value: value, query: res_id_query)['id']}
-            creation_payload = value_create_modify(command: res_command, type: [Hash, String])
-            creation_payload = {'email_address' => creation_payload} if creation_payload.is_a?(String)
+            creation_payload = value_create_modify(command: res_command)
             result = @api_v5.create("#{res_sym}/#{shared_inbox_id}/external_collaborator", creation_payload)
             formatter.display_status(result['message'])
             result = @api_v5.lookup_entity_by_field(
@@ -504,7 +516,7 @@ module Aspera
               value: creation_payload['email_address'],
               query: {}
             )
-            return Main.result_single_object(result)
+            return Result::SingleObject.new(result)
           when :members, :saml_groups
             # res_command := :shared_inboxes, :workgroups
             res_id = options.instance_identifier{ |field, value| @api_v5.lookup_entity_by_field(entity: res_sym.to_s, field: field, value: value, query: res_id_query)['id']}
@@ -550,7 +562,14 @@ module Aspera
             # :accounts
             contact_id = options.instance_identifier{ |field, value| @api_v5.lookup_entity_by_field(entity: 'accounts', field: field, value: value, query: res_id_query)['id']}
             @api_v5.create("accounts/#{contact_id}/reset_password", {})
-            return Main.result_status('password reset, user shall check email')
+            return Result::Status.new('password reset, user shall check email')
+          when :next
+            result, count = @api_v5.list_entities_limit_offset_total_count(
+              entity: exec_args[:entity],
+              operation: 'POST',
+              items_key: 'files'
+            )
+            return Result::ObjectList.new(result, total: count)
           end
           Aspera.error_unreachable_line
         end
@@ -564,29 +583,29 @@ module Aspera
             delete_data = value_create_modify(command: command, default: {})
             delete_data = @api_v5.read('configuration').slice('days_before_deleting_package_records') if delete_data.empty?
             res = @api_v5.create('internal/packages/clean_deleted', delete_data)
-            return Main.result_single_object(res)
+            return Result::SingleObject.new(res)
           when :events
             event_type = options.get_next_command(%i[application webhook])
             case event_type
             when :application
               list, total = @api_v5.list_entities_limit_offset_total_count(entity: 'application_events', query: query_read_delete)
-              return Main.result_object_list(list, total: total, fields: %w[event_type created_at application user.name])
+              return Result::ObjectList.new(list, total: total, fields: %w[event_type created_at application user.name])
             when :webhook
               list, total = @api_v5.list_entities_limit_offset_total_count(
                 entity: 'all_webhooks_events',
                 query: query_read_delete,
                 items_key: 'events'
               )
-              return Main.result_object_list(list, total: total)
+              return Result::ObjectList.new(list, total: total)
             end
           when :configuration
             conf_path = 'configuration'
             conf_cmd = options.get_next_command(%i[show modify])
             case conf_cmd
             when :show
-              return Main.result_single_object(@api_v5.read(conf_path))
+              return Result::SingleObject.new(@api_v5.read(conf_path))
             when :modify
-              return Main.result_single_object(@api_v5.update(conf_path, value_create_modify(command: conf_cmd)))
+              return Result::SingleObject.new(@api_v5.update(conf_path, value_create_modify(command: conf_cmd)))
             end
           when :smtp
             # only one SMTP config
@@ -594,21 +613,21 @@ module Aspera
             smtp_cmd = options.get_next_command(%i[show create modify delete test])
             case smtp_cmd
             when :show
-              return Main.result_single_object(@api_v5.read(smtp_path))
+              return Result::SingleObject.new(@api_v5.read(smtp_path))
             when :create
-              return Main.result_single_object(@api_v5.create(smtp_path, value_create_modify(command: smtp_cmd)))
+              return Result::SingleObject.new(@api_v5.create(smtp_path, value_create_modify(command: smtp_cmd)))
             when :modify
-              return Main.result_single_object(@api_v5.update(smtp_path, value_create_modify(command: smtp_cmd)))
+              return Result::SingleObject.new(@api_v5.update(smtp_path, value_create_modify(command: smtp_cmd)))
             when :delete
               @api_v5.delete(smtp_path)
-              return Main.result_status('SMTP configuration deleted')
+              return Result::Status.new('SMTP configuration deleted')
             when :test
               test_data = options.get_next_argument('Email or test data, see API')
               test_data = {test_email_recipient: test_data} if test_data.is_a?(String)
               creation = @api_v5.create(File.join(smtp_path, 'test'), test_data)
               result = wait_for_job(creation['job_id'])
               result['serialized_args'] = JSON.parse(result['serialized_args']) rescue result['serialized_args']
-              return Main.result_single_object(result)
+              return Result::SingleObject.new(result)
             end
           end
         end
@@ -625,7 +644,7 @@ module Aspera
           end
           case command
           when :version
-            return Main.result_single_object(@api_v5.read('version'))
+            return Result::SingleObject.new(@api_v5.read('version'))
           when :health
             nagios = Nagios.new
             begin
@@ -638,29 +657,29 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('core', e.to_s)
             end
-            Main.result_object_list(nagios.status_list)
+            Result::ObjectList.new(nagios.status_list)
           when :user
             case options.get_next_command(%i[account profile])
             when :account
-              return Main.result_single_object(@api_v5.read('account', query_read_delete))
+              return Result::SingleObject.new(@api_v5.read('account', query_read_delete))
             when :profile
               case options.get_next_command(%i[show modify])
               when :show
-                return Main.result_single_object(@api_v5.read('account/preferences'))
+                return Result::SingleObject.new(@api_v5.read('account/preferences'))
               when :modify
                 @api_v5.update('account/preferences', options.get_next_argument('modified parameters', validation: Hash))
-                return Main.result_status('modified')
+                return Result::Status.new('modified')
               end
             end
           when :bearer_token
-            return Main.result_text(@api_v5.oauth.authorization)
+            return Result::Text.new(@api_v5.oauth.authorization)
           when :packages
             return package_action
           when :shared_folders
             all_shared_folders = @api_v5.read('shared_folders')['shared_folders']
             case options.get_next_command(%i[list browse])
             when :list
-              return Main.result_object_list(all_shared_folders)
+              return Result::ObjectList.new(all_shared_folders)
             when :browse
               shared_folder_id = options.instance_identifier do |field, value|
                 matches = all_shared_folders.select{ |i| i[field].eql?(value)}
@@ -685,7 +704,7 @@ module Aspera
               end
             when :resend
               @api_v5.create("#{invitation_endpoint}/#{options.instance_identifier}/resend", nil)
-              return Main.result_status('Invitation resent')
+              return Result::Status.new('Invitation resent')
             else
               return entity_execute(
                 api: @api_v5,
@@ -702,10 +721,10 @@ module Aspera
             parameters = value_create_modify(command: command, default: {}).symbolize_keys
             uri = URI.parse(parameters.delete(:url){WebServerSimple::DEFAULT_URL})
             server = WebServerSimple.new(uri, **parameters.slice(*WebServerSimple::PARAMS))
-            Aspera.assert(parameters.except(*WebServerSimple::PARAMS).empty?)
+            Aspera.assert(parameters.except(*WebServerSimple::PARAMS).empty?){"unexpected parameters: #{parameters.except(*WebServerSimple::PARAMS).keys}"}
             server.mount(uri.path, Faspex4GWServlet, @api_v5, nil)
             server.start
-            return Main.result_status('Gateway terminated')
+            return Result::Status.new('Gateway terminated')
           when :postprocessing
             require 'aspera/faspex_postproc' # cspell:disable-line
             parameters = value_create_modify(command: command, default: {}).symbolize_keys
@@ -714,7 +733,7 @@ module Aspera
             server = WebServerSimple.new(uri, **parameters.slice(*WebServerSimple::PARAMS))
             server.mount(uri.path, Faspex4PostProcServlet, parameters.except(*WebServerSimple::PARAMS))
             server.start
-            return Main.result_status('Gateway terminated')
+            return Result::Status.new('Gateway terminated')
           end
         end
         SHARED_INBOX_MEMBER_LEVELS = %i[submit_only standard shared_inbox_admin].freeze

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

@@ -91,7 +91,7 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('api', e.to_s)
             end
-            Main.result_object_list(nagios.status_list)
+            Result::ObjectList.new(nagios.status_list)
           when :bridges
             return entity_execute(api: api, entity: 'bridges')
           end

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

@@ -57,10 +57,10 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('api', e.to_s)
             end
-            Main.result_object_list(nagios.status_list)
+            Result::ObjectList.new(nagios.status_list)
           when :info
             api_v1 = Api::Httpgw.new(url: base_url)
-            return Main.result_single_object(api_v1.info)
+            return Result::SingleObject.new(api_v1.info)
           end
         end
       end