aspera-cli 4.20.0 → 4.21.0

data/lib/aspera/cli/plugin.rb

@@ -220,12 +220,12 @@ module Aspera
         query = options.get_option(:query)
         # dup default, as it could be frozen
         query = default.dup if query.nil?
-        Log.log.debug{"Query=#{query}".bg_red}
+        Log.log.debug{"query_read_delete=#{query}".bg_red}
         begin
           # check it is suitable
           URI.encode_www_form(query) unless query.nil?
         rescue StandardError => e
-          raise Cli::BadArgument, "Query must be an extended value which can be encoded with URI.encode_www_form. Refer to manual. (#{e.message})"
+          raise Cli::BadArgument, "Query must be an extended value (Hash, Array) which can be encoded with URI.encode_www_form. Refer to manual. (#{e.message})"
         end
         return query
       end

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

@@ -66,14 +66,14 @@ module Aspera
             base_url = "#{base_url}.#{Api::AoC::SAAS_DOMAIN_PROD}" unless base_url.include?('.')
             # AoC is only https
             return nil unless base_url.start_with?('https://')
-            res_http = Rest.new(base_url: base_url, redirect_max: 10).call(operation: 'GET')[:http]
-            # Any AoC is on this domain
-            return nil unless res_http.uri.host.end_with?(Api::AoC::SAAS_DOMAIN_PROD)
-            Log.log.debug{"AoC Main page: #{res_http.body.include?(Api::AoC::PRODUCT_NAME)}"}
-            base_url = res_http.uri.to_s if res_http.uri.path.include?('/public')
+            res_http = Rest.new(base_url: base_url, redirect_max: 0).call(operation: 'GET', subpath: 'auth/ping', return_error: true)[:http]
+            return nil if res_http['Location'].nil?
+            redirect_uri = URI.parse(res_http['Location'])
+            od = Api::AoC.split_org_domain(URI.parse(base_url))
+            return nil unless redirect_uri.path.end_with?("oauth2/#{od[:organization]}/login")
             # either in standard domain, or product name in page
             return {
-              version: 'SaaS',
+              version: Api::AoC.saas_url?(base_url) ? 'SaaS' : 'Self-managed',
               url:     base_url
             }
           end
@@ -92,8 +92,6 @@ module Aspera
             # set vars to look like object
             options = object.options
             formatter = object.formatter
-            options.declare(:use_generic_client, 'Wizard: AoC: use global or org specific jwt client id', values: :bool, default: true)
-            options.parse_options!
             instance_url = options.get_option(:url, mandatory: true)
             pub_link_info = Api::AoC.link_info(instance_url)
             if !pub_link_info[:token].nil?
@@ -108,6 +106,8 @@ module Aspera
                 test_args:    'organization'
               }
             end
+            options.declare(:use_generic_client, 'Wizard: AoC: use global or org specific jwt client id', values: :bool, default: Api::AoC.saas_url?(instance_url))
+            options.parse_options!
             # make username mandatory for jwt, this triggers interactive input
             wiz_username = options.get_option(:username, mandatory: true)
             raise "Username shall be an email in AoC: #{wiz_username}" if !(wiz_username =~ /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i)
@@ -133,15 +133,15 @@ module Aspera
                 formatter.display_status('Please login to your Aspera on Cloud instance.'.red)
                 formatter.display_status('Navigate to: 𓃑  → Admin → Integrations → API Clients')
                 formatter.display_status('Check or create in integration:')
-                formatter.display_status("- name: #{@info[:name]}")
+                formatter.display_status('- name: cli')
                 formatter.display_status("- redirect uri: #{REDIRECT_LOCALHOST}")
                 formatter.display_status('- origin: localhost')
                 formatter.display_status('Use the generated client id and secret in the following prompts.'.red)
               end
-              Environment.instance.open_uri("#{instance_url}/admin/api-clients")
+              Environment.instance.open_uri("#{instance_url}/admin/integrations/api-clients")
               options.get_option(:client_id, mandatory: true)
               options.get_option(:client_secret, mandatory: true)
-              use_browser_authentication = true
+              # use_browser_authentication = true
             end
             if use_browser_authentication
               formatter.display_status('We will use web authentication to bootstrap.')
@@ -282,13 +282,17 @@ module Aspera
         end
 
         # list all entities, given additional, default and user's queries
+        # @param resource_class_path path to query on API
+        # @param fields fields to display
+        # @param base_query a query applied always
+        # @param default_query default query unless overriden by user
         def result_list(resource_class_path, fields: nil, base_query: {}, default_query: {})
           Aspera.assert_type(base_query, Hash)
           Aspera.assert_type(default_query, Hash)
           user_query = query_read_delete(default: default_query)
           # caller may add specific modifications or checks
           yield(user_query) if block_given?
-          return {type: :object_list, fields: fields}.merge(api_read_all(resource_class_path, base_query.merge(user_query)))
+          return {type: :object_list, fields: fields}.merge(api_read_all(resource_class_path, base_query.merge(user_query).compact))
         end
 
         def resolve_dropbox_name_default_ws_id(query)
@@ -411,8 +415,8 @@ module Aspera
             when :operation then default_fields = nil
             when :short_link then default_fields.push('short_url', 'data.url_token_data.purpose')
             when :user then default_fields.push('name', 'email')
-            when :group_membership then default_fields.push(*%w[group_id member_type member_id])
-            when :workspace_membership then default_fields.push(*%w[workspace_id member_type member_id])
+            when :group_membership then default_fields.push('group_id', 'member_type', 'member_id')
+            when :workspace_membership then default_fields.push('workspace_id', 'member_type', 'member_id')
             end
             return result_list(resource_class_path, fields: default_fields, default_query: default_query)
           when :show
@@ -801,6 +805,12 @@ module Aspera
               else
                 ids_to_download = [ids_to_download] unless ids_to_download.is_a?(Array)
               end
+              file_list =
+                begin
+                  transfer.source_list.map{|i|{'source'=>i}}
+                rescue Cli::BadArgument
+                  [{'source' => '.'}]
+                end
               # list here
               result_transfer = []
               formatter.display_status("found #{ids_to_download.length} package(s).")
@@ -816,7 +826,7 @@ module Aspera
                   package_node_api.transfer_spec_gen4(
                     package_info['contents_file_id'],
                     Transfer::Spec::DIRECTION_RECEIVE,
-                    {'paths'=> [{'source' => '.'}]}),
+                    {'paths'=> file_list}),
                   rest_token: package_node_api)
                 result_transfer.push({'package' => package_id, Main::STATUS_FIELD => statuses})
                 # update skip list only if all transfer sessions completed
@@ -837,14 +847,14 @@ module Aspera
                        resolve_dropbox_name_default_ws_id(query)
                      end
             when :delete
-              return do_bulk_operation(command: package_command, descr: 'identifier', values: identifier) do |id|
+              return do_bulk_operation(command: package_command, descr: 'identifier', values: instance_identifier) do |id|
                 Aspera.assert_values(id.class, [String, Integer]){'identifier'}
                 aoc_api.delete("packages/#{id}")
               end
             when *Node::NODE4_READ_ACTIONS
               package_id = instance_identifier
               package_info = aoc_api.read("packages/#{package_id}")
-              return execute_nodegen4_command(package_command, package_info['node_id'], file_id: package_info['file_id'], scope: Api::Node::SCOPE_USER)
+              return execute_nodegen4_command(package_command, package_info['node_id'], file_id: package_info['contents_file_id'], scope: Api::Node::SCOPE_USER)
             end
           when :files
             command_repo = options.get_next_command([:short_link].concat(NODE4_EXT_COMMANDS))

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

@@ -9,7 +9,7 @@ require 'aspera/cli/formatter'
 require 'aspera/cli/info'
 require 'aspera/cli/transfer_progress'
 require 'aspera/ascp/installation'
-require 'aspera/ascp/products'
+require 'aspera/products/trsdk'
 require 'aspera/transfer/error_info'
 require 'aspera/transfer/parameters'
 require 'aspera/transfer/spec'
@@ -54,7 +54,7 @@ module Aspera
         PERSISTENCY_FOLDER = 'persist_store'
         ASPERA = 'aspera'
         SERVER_COMMAND = 'server'
-        APP_NAME_SDK = 'sdk'
+        DIR_SDK = 'sdk'
         CONNECT_WEB_URL = 'https://d3gcli72yxqn2z.cloudfront.net/connect'
         CONNECT_VERSIONS = 'connectversions.js' # cspell: disable-line
         DEMO_SERVER = 'demo'
@@ -213,7 +213,7 @@ module Aspera
           options.declare(:ascp_path, 'Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
           options.declare(:use_product, 'Use ascp from specified product', handler: {o: self, m: :option_use_product})
           options.declare(:sdk_url, 'URL to get SDK', default: SpecialValues::DEF)
-          options.declare(:sdk_folder, 'SDK folder path', handler: {o: Ascp::Installation.instance, m: :sdk_folder})
+          options.declare(:sdk_folder, 'SDK folder path', handler: {o: Products::Trsdk, m: :sdk_directory})
           options.declare(:progress_bar, 'Display progress bar', values: :bool, default: Environment.terminal?)
           # email options
           options.declare(:smtp, 'SMTP configuration', types: Hash)
@@ -232,22 +232,22 @@ module Aspera
           options.parse_options!
           @progress_bar = TransferProgress.new if options.get_option(:progress_bar)
           # Check SDK folder is set or not, for compatibility, we check in two places
-          sdk_folder = Ascp::Installation.instance.sdk_folder rescue nil
-          if sdk_folder.nil?
+          sdk_dir = Products::Trsdk.sdk_directory rescue nil
+          if sdk_dir.nil?
             @sdk_default_location = true
             Log.log.debug('SDK folder is not set, checking default')
             # new location
-            sdk_folder = self.class.default_app_main_folder(app_name: APP_NAME_SDK)
-            Log.log.debug{"checking: #{sdk_folder}"}
-            if !Dir.exist?(sdk_folder)
-              Log.log.debug{"not exists: #{sdk_folder}"}
+            sdk_dir = self.class.default_app_main_folder(app_name: DIR_SDK)
+            Log.log.debug{"checking: #{sdk_dir}"}
+            if !Dir.exist?(sdk_dir)
+              Log.log.debug{"not exists: #{sdk_dir}"}
               # former location
-              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), APP_NAME_SDK)
+              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), DIR_SDK)
               Log.log.debug{"checking: #{former_sdk_folder}"}
-              sdk_folder = former_sdk_folder if Dir.exist?(former_sdk_folder)
+              sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
             end
-            Log.log.debug{"using: #{sdk_folder}"}
-            Ascp::Installation.instance.sdk_folder = sdk_folder
+            Log.log.debug{"using: #{sdk_dir}"}
+            Products::Trsdk.sdk_directory = sdk_dir
           end
           pac_script = options.get_option(:fpac)
           # create PAC executor
@@ -414,7 +414,7 @@ module Aspera
 
         def periodic_check_newer_gem_version
           # get verification period
-          delay_days = options.get_option(:version_check_days, mandatory: true)
+          delay_days = options.get_option(:version_check_days, mandatory: true).to_i
           # check only if not zero day
           return if delay_days.eql?(0)
           # get last date from persistency
@@ -700,6 +700,7 @@ module Aspera
             return execute_connect_action
           when :use
             ascp_path = options.get_next_argument('path to ascp')
+            Ascp::Installation.instance.ascp_path = ascp_path
             formatter.display_status("ascp version: #{Ascp::Installation.instance.get_ascp_version(ascp_path)}")
             set_global_default(:ascp_path, ascp_path)
             return Main.result_nothing
@@ -713,13 +714,13 @@ module Aspera
             # add keys
             DataRepository::ELEMENTS.each_with_object(data){|i, h|h[i.to_s] = DataRepository.instance.item(i)}
             # declare those as secrets
-            SecretHider::ADDITIONAL_KEYS_TO_HIDE.push(*DataRepository::ELEMENTS.map(&:to_s))
+            SecretHider::ADDITIONAL_KEYS_TO_HIDE.concat(DataRepository::ELEMENTS.map(&:to_s))
             return {type: :single_object, data: data}
           when :products
             command = options.get_next_command(%i[list use])
             case command
             when :list
-              return {type: :object_list, data: Ascp::Products.installed_products, fields: %w[name app_root]}
+              return {type: :object_list, data: Ascp::Installation.instance.installed_products, fields: %w[name app_root]}
             when :use
               default_product = options.get_next_argument('product name')
               Ascp::Installation.instance.use_ascp_from_product(default_product)
@@ -728,7 +729,7 @@ module Aspera
             end
           when :install
             # reset to default location, if older default was used
-            Ascp::Installation.instance.sdk_folder = self.class.default_app_main_folder(app_name: APP_NAME_SDK) if @sdk_default_location
+            Products::Trsdk.sdk_directory = self.class.default_app_main_folder(app_name: DIR_SDK) if @sdk_default_location
             n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true))
             return Main.result_status("Installed #{n} version #{v}")
           when :spec
@@ -856,7 +857,7 @@ module Aspera
           remote_certificate
           gem
           plugins
-          flush_tokens
+          tokens
           echo
           wizard
           detect
@@ -912,9 +913,18 @@ module Aspera
             end
           when :echo # display the content of a value given on command line
             return Formatter.auto_type(options.get_next_argument('value', validation: nil))
-          when :flush_tokens
-            deleted_files = OAuth::Factory.instance.flush_tokens
-            return {type: :value_list, data: deleted_files, name: 'file'}
+          when :tokens
+            require 'aspera/api/node'
+            case options.get_next_command(%i{flush list show})
+            when :flush
+              return {type: :value_list, data: OAuth::Factory.instance.flush_tokens, name: 'file'}
+            when :list
+              return {type: :object_list, data: OAuth::Factory.instance.persisted_tokens}
+            when :show
+              data = OAuth::Factory.instance.get_token_info(instance_identifier)
+              raise Cli::Error, 'No such identifier' if data.nil?
+              return {type: :single_object, data: data}
+            end
           when :plugins
             case options.get_next_command(%i[list create])
             when :list

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

@@ -305,7 +305,7 @@ module Aspera
                 # authenticated user
                 delivery_info['sources'] ||= [{'paths' => []}]
                 first_source = delivery_info['sources'].first
-                first_source['paths'].push(*transfer.source_list)
+                first_source['paths'].concat(transfer.source_list)
                 source_id = instance_identifier(as_option: :remote_source) do |field, value|
                   Aspera.assert(field.eql?('name'), exception_class: Cli::BadArgument){'only name as selector, or give id'}
                   source_list = api_v3.read('source_shares')['items']

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

@@ -253,9 +253,10 @@ module Aspera
         # @param query [Hash,nil] additional query parameters
         # @param real_path [String] real path if it's n ot just the type
         # @param item_list_key [String] key in the result to get the list of items
-        def list_entities(type:, real_path: nil, item_list_key: nil, query: {})
+        def list_entities(type:, real_path: nil, item_list_key: nil, query: nil)
           Log.log.trace1{"list_entities t=#{type} p=#{real_path} k=#{item_list_key} q=#{query}"}
           type = type.to_s if type.is_a?(Symbol)
+          query = {} if query.nil?
           Aspera.assert_type(type, String)
           Aspera.assert_type(query, Hash)
           item_list_key = type if item_list_key.nil?
@@ -555,6 +556,7 @@ module Aspera
             id_as_arg = 'type'
           when :accounts
             display_fields = Formatter.all_but('user_profile_data_attributes')
+            available_commands.push(:reset_password)
           when :oauth_clients
             display_fields = Formatter.all_but('public_key')
             adm_api = Rest.new(**@api_v5.params.merge(base_url: "#{@faspex5_api_base_url}/#{PATH_AUTH}"))
@@ -642,7 +644,12 @@ module Aspera
                        value: value,
                        query: {type: Rest.array_params(%w{local_user saml_user self_registered_user external_user})})['id']
                    end
+          when :reset_password
+            contact_id = instance_identifier { |field, value| lookup_entity_by_field(type: res_type.to_s, field: field, value: value, query: res_id_query)['id']}
+            adm_api.create("#{res_type}/#{contact_id}/reset_password", {})
+            return Main.result_status('password reset, user shall check email')
           end
+          Aspera.error_unreachable_line
         end
 
         def execute_admin
@@ -662,9 +669,10 @@ module Aspera
             event_type = options.get_next_command(%i[application webhook])
             case event_type
             when :application
-              return {type: :object_list, data: list_entities(type: 'application_events'), fields: %w[event_type created_at application user.name]}
+              return {type: :object_list, data: list_entities(type: 'application_events', query: query_read_delete),
+fields: %w[event_type created_at application user.name]}
             when :webhook
-              return {type: :object_list, data: list_entities(type: 'all_webhooks_events', item_list_key: 'events')}
+              return {type: :object_list, data: list_entities(type: 'all_webhooks_events', query: query_read_delete, item_list_key: 'events')}
             end
           when :configuration
             conf_path = 'configuration'

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

@@ -131,6 +131,8 @@ module Aspera
         COMMANDS_SHARES = (BASE_ACTIONS - %i[search]).freeze
         COMMANDS_FASPEX = COMMON_ACTIONS
 
+        GEN4_LS_FIELDS = %w[name type recursive_size size modified_time access_level].freeze
+
         def initialize(api: nil, **env)
           super(**env, basic_options: api.nil?)
           Node.declare_options(options) if api.nil?
@@ -484,22 +486,15 @@ module Aspera
           when :browse
             apifid = apifid_from_next_arg(top_file_id)
             file_info = apifid[:api].read_with_cache("files/#{apifid[:file_id]}")
-            if file_info['type'].eql?('folder')
-              result = apifid[:api].call(
-                operation: 'GET',
-                subpath:   "files/#{apifid[:file_id]}/files",
-                headers:   Api::Node.cache_control_headers,
-                query:     query_read_delete)
-              items = result[:data]
-              formatter.display_item_count(result[:data].length, result[:http]['X-Total-Count'])
-            else
-              items = [file_info]
+            unless file_info['type'].eql?('folder')
+              # a single file
+              return {type: :object_list, data: [file_info], fields: GEN4_LS_FIELDS}
             end
-            return {type: :object_list, data: items, fields: %w[name type recursive_size size modified_time access_level]}
+            return {type: :object_list, data: apifid[:api].list_files(apifid[:file_id]), fields: GEN4_LS_FIELDS}
           when :find
             apifid = apifid_from_next_arg(top_file_id)
-            test_block = Api::Node.file_matcher_from_argument(options)
-            return {type: :object_list, data: @api_node.find_files(apifid[:file_id], test_block), fields: ['path']}
+            find_lambda = Api::Node.file_matcher_from_argument(options)
+            return {type: :object_list, data: @api_node.find_files(apifid[:file_id], find_lambda), fields: ['path']}
           when :mkdir
             containing_folder_path = options.get_next_argument('path').split(Api::Node::PATH_SEPARATOR)
             new_folder = containing_folder_path.pop
@@ -608,12 +603,12 @@ module Aspera
             command_perm = options.get_next_command(%i[list create delete])
             case command_perm
             when :list
-              # generic options : TODO: as arg ? query_read_delete
-              list_options ||= {'include' => Rest.array_params(%w[access_level permission_count])}
-              # add which one to get
-              list_options['file_id'] = apifid[:file_id]
-              list_options['inherited'] ||= false
-              items = apifid[:api].read('permissions', list_options)
+              list_query = query_read_delete(default: {'include' => Rest.array_params(%w[access_level permission_count])})
+              # specify file to get permissions for unless not specified
+              list_query['file_id'] = apifid[:file_id] unless apifid[:file_id].to_s.empty?
+              list_query['inherited'] = false if list_query.key?('file_id') && !list_query.key?('inherited')
+              # NOTE: supports per_page and page and header X-Total-Count
+              items = apifid[:api].read('permissions', list_query)
               return {type: :object_list, data: items}
             when :delete
               return do_bulk_operation(command: command_perm, descr: 'identifier', values: :identifier) do |one_id|
@@ -802,42 +797,53 @@ module Aspera
             end
             case command
             when :list
+              transfer_filter = query_read_delete(default: {})
+              last_iteration_token = nil
               iteration_persistency = nil
-              iteration_data = []
               if options.get_option(:once_only, mandatory: true)
                 iteration_persistency = PersistencyActionOnce.new(
                   manager: persistency,
-                  data:    iteration_data,
+                  data:    [],
                   id:      IdGenerator.from_list([
                     'node_transfers',
                     options.get_option(:url, mandatory: true),
                     options.get_option(:username, mandatory: true)
                   ]))
+                if transfer_filter.delete('reset')
+                  iteration_persistency.data.clear
+                  iteration_persistency.save
+                  return Main.result_status('Persistency reset')
+                end
+                last_iteration_token = iteration_persistency.data.first
               end
-              transfer_filter = query_read_delete(default: {})
-              if transfer_filter.delete('reset')
-                iteration_data.clear
-                iteration_persistency&.save
-                return Main.result_status('Persistency reset')
-              end
+              raise 'reset only with once_only' if transfer_filter.key?('reset') && iteration_persistency.nil?
               max_items = transfer_filter.delete(MAX_ITEMS)
-              transfer_filter['iteration_token'] = iteration_persistency.data[0] unless iteration_data.empty?
               transfers_data = []
               loop do
+                transfer_filter['iteration_token'] = last_iteration_token unless last_iteration_token.nil?
                 result = @api_node.call(operation: 'GET', subpath: res_class_path, query: transfer_filter)
-                data = result[:data]
-                transfers_data.concat(data)
-                if !max_items.nil? && (transfers_data.length >= max_items)
+                # no data
+                break if result[:data].empty?
+                # get next iteration token from link
+                next_iteration_token = nil
+                link_info = result[:http]['Link']
+                unless link_info.nil?
+                  m = link_info.match(/<([^>]+)>/)
+                  raise "Cannot parse iteration in Link: #{link_info}" if m.nil?
+                  next_iteration_token = CGI.parse(URI.parse(m[1]).query)['iteration_token']&.first
+                end
+                # same as last iteration: stop
+                break if next_iteration_token&.eql?(last_iteration_token)
+                last_iteration_token = next_iteration_token
+                transfers_data.concat(result[:data])
+                if max_items&.<=(transfers_data.length)
+                  # if !max_items.nil? && (transfers_data.length >= max_items)
                   transfers_data = transfers_data.slice(0, max_items)
                   break
                 end
-                link_info = result[:http]['Link']
-                break if iteration_persistency.nil? || data.empty? || link_info.nil?
-                m = link_info.match(/<([^>]+)>/)
-                raise "Problem with iteration: #{link_info}" if m.nil?
-                iteration_token = CGI.parse(URI.parse(m[1]).query)['iteration_token']&.first
-                iteration_data[0] = transfer_filter['iteration_token'] = iteration_token
+                break if last_iteration_token.nil?
               end
+              iteration_persistency&.data&.[]=(0, last_iteration_token)
               iteration_persistency&.save
               return {
                 type:   :object_list,
@@ -1019,7 +1025,7 @@ module Aspera
             raise 'Missing key: url' unless parameters.key?(:url)
             uri = URI.parse(parameters[:url])
             server = WebServerSimple.new(uri, certificate: parameters[:certificate])
-            server.mount(uri.path, NodeSimulatorServlet, parameters[:credentials], transfer)
+            server.mount(uri.path, NodeSimulatorServlet, parameters[:credentials], NodeSimulator.new)
             server.start
             return Main.result_status('Simulator terminated')
           end

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.20.0'
+    VERSION = '4.21.0'
   end
 end

data/lib/aspera/command_line_builder.rb

@@ -77,7 +77,7 @@ module Aspera
       @param_hash.each_pair{|key, val|Log.log.warn{"unrecognized parameter: #{key} = \"#{val}\""} if !@used_param_names.include?(key)}
       # set result
       env_args[:env].merge!(@result[:env])
-      env_args[:args].push(*@result[:args])
+      env_args[:args].concat(@result[:args])
       return nil
     end
 

data/lib/aspera/environment.rb

@@ -46,8 +46,7 @@ module Aspera
           return OS_LINUX
         when /aix/
           return OS_AIX
-        else
-          raise "Unknown OS: #{RbConfig::CONFIG['host_os']}"
+        else Aspera.error_unexpected_value(RbConfig::CONFIG['host_os']){'host_os'}
         end
       end
 
@@ -62,8 +61,8 @@ module Aspera
           return CPU_S390
         when /arm/, /aarch64/
           return CPU_ARM64
+        else Aspera.error_unexpected_value(RbConfig::CONFIG['host_cpu']){'host_cpu'}
         end
-        raise "Unknown CPU: #{RbConfig::CONFIG['host_cpu']}"
       end
 
       # normalized architecture name
@@ -73,9 +72,9 @@ module Aspera
       end
 
       # executable file extension for current OS
-      def exe_extension
-        return '.exe' if os.eql?(OS_WINDOWS)
-        return ''
+      def exe_file(name='')
+        return "#{name}.exe" if os.eql?(OS_WINDOWS)
+        return name
       end
 
       # on Windows, the env var %USERPROFILE% provides the path to user's home more reliably than %HOMEDRIVE%%HOMEPATH%