aspera-cli 4.24.2 → 4.25.0.pre

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

@@ -10,6 +10,7 @@ require 'aspera/cli/formatter'
 require 'aspera/cli/info'
 require 'aspera/cli/transfer_progress'
 require 'aspera/cli/wizard'
+require 'aspera/cli/sync_actions'
 require 'aspera/ascp/installation'
 require 'aspera/sync/operations'
 require 'aspera/products/transferd'
@@ -29,6 +30,7 @@ require 'aspera/oauth/jwt'
 require 'aspera/log'
 require 'aspera/assert'
 require 'aspera/oauth'
+require 'aspera/ssl'
 require 'openssl'
 require 'open3'
 require 'date'
@@ -39,6 +41,8 @@ module Aspera
     module Plugins
       # Manage the CLI config file
       class Config < Base
+        include SyncActions
+
         class << self
           # Folder containing plugins in the gem's main folder
           def gem_plugins_folder
@@ -89,7 +93,7 @@ module Aspera
           @option_cache_tokens = true
           @main_folder = nil
           @option_config_file = nil
-          # Store is used for ruby https
+          # Store is used for ruby https (OpenSSL::X509::Store)
           @certificate_store = nil
           # Paths are used for ascp
           @certificate_paths = nil
@@ -98,7 +102,6 @@ module Aspera
           options.declare(
             :home, 'Home folder for tool',
             handler: {o: self, m: :main_folder},
-            types: String,
             default: self.class.default_app_main_folder(app_name: Info::CMD_NAME)
           )
           options.parse_options!
@@ -118,65 +121,49 @@ module Aspera
           # Read config file (set @config_presets)
           read_config_file
           # Add preset handler (needed for smtp)
-          ExtendedValue.instance.set_handler(EXTEND_PRESET, lambda{ |v| preset_by_name(v)})
-          ExtendedValue.instance.set_handler(EXTEND_VAULT, lambda{ |v| vault_value(v)})
+          ExtendedValue.instance.on(EXTEND_PRESET){ |v| preset_by_name(v)}
+          ExtendedValue.instance.on(EXTEND_VAULT){ |v| vault_value(v)}
+          ExtendedValue.instance.on(EXTEND_ARGS){ |v| options.args_as_extended(v)}
           # Load defaults before it can be overridden
           add_plugin_default_preset(CONF_GLOBAL_SYM)
           # Vault options
           options.declare(:secret, 'Secret for access keys')
-          options.declare(:vault, 'Vault for secrets', types: Hash, default: {})
+          options.declare(:vault, 'Vault for secrets', allowed: Hash)
           options.declare(:vault_password, 'Vault password')
           options.parse_options!
           # Declare generic plugin options only after handlers are declared
           Base.declare_options(options)
           # Configuration options
-          options.declare(:no_default, 'Do not load default configuration for plugin', values: :none, short: 'N'){@use_plugin_defaults = false}
+          options.declare(:no_default, 'Do not load default configuration for plugin', allowed: Allowed::TYPES_NONE, short: 'N'){@use_plugin_defaults = false}
           options.declare(:preset, 'Load the named option preset from current config file', short: 'P', handler: {o: self, m: :option_preset})
-          options.declare(:version_check_days, 'Period in days to check new version (zero to disable)', coerce: Integer, default: DEFAULT_CHECK_NEW_VERSION_DAYS)
+          options.declare(:version_check_days, 'Period in days to check new version (zero to disable)', allowed: Allowed::TYPES_INTEGER, default: DEFAULT_CHECK_NEW_VERSION_DAYS)
           options.declare(:plugin_folder, 'Folder where to find additional plugins', handler: {o: self, m: :option_plugin_folder})
           # Declare wizard options
           @wizard = Wizard.new(self, @main_folder)
           # Transfer SDK options
-          options.declare(:ascp_path, 'Ascp: Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
-          options.declare(:use_product, 'Ascp: Use ascp from specified product', handler: {o: self, m: :option_use_product})
           options.declare(:sdk_url, 'Ascp: URL to get Aspera Transfer Executables', default: SpecialValues::DEF)
-          options.declare(:locations_url, 'Ascp: URL to get locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
-          options.declare(:sdk_folder, 'Ascp: SDK folder path', handler: {o: Products::Transferd, m: :sdk_directory})
-          options.declare(:progress_bar, 'Display progress bar', values: :bool, default: Environment.terminal?)
+          options.parse_options!
+          set_sdk_dir
+          options.declare(:ascp_path, 'Ascp: Path to ascp (or product with "product:")', handler: {o: Ascp::Installation.instance, m: :ascp_path}, default: "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{Ascp::Installation::FIRST_FOUND}")
+          options.declare(:locations_url, 'Ascp: URL to get download locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
+          options.declare(:sdk_folder, 'Ascp: SDK installation folder path', handler: {o: Products::Transferd, m: :sdk_directory})
+          options.declare(:progress_bar, 'Display progress bar', allowed: Allowed::TYPES_BOOLEAN, default: Environment.terminal?)
           # Email options
-          options.declare(:smtp, 'Email: SMTP configuration', types: Hash)
+          options.declare(:smtp, 'Email: SMTP configuration', allowed: Hash)
           options.declare(:notify_to, 'Email: Recipient for notification of transfers')
           options.declare(:notify_template, 'Email: ERB template for notification of transfers')
           # HTTP options
-          options.declare(:insecure, 'HTTP/S: Do not validate any certificate', values: :bool, handler: {o: self, m: :option_insecure}, default: :no)
-          options.declare(:ignore_certificate, 'HTTP/S: Do not validate certificate for these URLs', types: Array, handler: {o: self, m: :option_ignore_cert_host_port})
-          options.declare(:warn_insecure, 'HTTP/S: Issue a warning if certificate is ignored', values: :bool, handler: {o: self, m: :option_warn_insecure_cert}, default: :yes)
-          options.declare(:cert_stores, 'HTTP/S: List of folder with trusted certificates', types: [Array, String], handler: {o: self, m: :trusted_cert_locations})
-          options.declare(:http_options, 'HTTP/S: Options for HTTP/S socket', types: Hash, handler: {o: self, m: :option_http_options}, default: {})
-          options.declare(:http_proxy, 'HTTP/S: URL for proxy with optional credentials', types: String, handler: {o: self, m: :option_http_proxy})
-          options.declare(:cache_tokens, 'Save and reuse OAuth tokens', values: :bool, handler: {o: self, m: :option_cache_tokens})
+          options.declare(:insecure, 'HTTP/S: Do not validate any certificate', allowed: Allowed::TYPES_BOOLEAN, handler: {o: self, m: :option_insecure}, default: false)
+          options.declare(:ignore_certificate, 'HTTP/S: Do not validate certificate for these URLs', allowed: [Array, NilClass], handler: {o: self, m: :option_ignore_cert_host_port})
+          options.declare(:warn_insecure, 'HTTP/S: Issue a warning if certificate is ignored', allowed: Allowed::TYPES_BOOLEAN, handler: {o: self, m: :option_warn_insecure_cert}, default: true)
+          options.declare(:cert_stores, 'HTTP/S: List of folder with trusted certificates', allowed: Allowed::TYPES_STRING_ARRAY, handler: {o: self, m: :trusted_cert_locations})
+          options.declare(:http_options, 'HTTP/S: Options for HTTP/S socket', allowed: Hash, handler: {o: self, m: :option_http_options}, default: {})
+          options.declare(:http_proxy, 'HTTP/S: URL for proxy with optional credentials', handler: {o: self, m: :option_http_proxy})
+          options.declare(:cache_tokens, 'Save and reuse OAuth tokens', allowed: Allowed::TYPES_BOOLEAN, handler: {o: self, m: :option_cache_tokens})
           options.declare(:fpac, 'Proxy auto configuration script')
-          options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', types: Array)
+          options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', allowed: [Array, NilClass])
           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_dir = Products::Transferd.sdk_directory rescue nil
-          if sdk_dir.nil?
-            @sdk_default_location = true
-            Log.log.debug('SDK folder is not set, checking default')
-            # New location
-            sdk_dir = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME)
-            Log.log.debug{"Checking: #{sdk_dir}"}
-            if !Dir.exist?(sdk_dir)
-              Log.log.debug{"No such folder: #{sdk_dir}"}
-              # Former location
-              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), TRANSFERD_APP_NAME)
-              Log.log.debug{"Checking: #{former_sdk_folder}"}
-              sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
-            end
-            Log.log.debug{"Using: #{sdk_dir}"}
-            Products::Transferd.sdk_directory = sdk_dir
-          end
           pac_script = options.get_option(:fpac)
           # Create PAC executor
           if !pac_script.nil?
@@ -200,27 +187,7 @@ module Aspera
               RestParameters.instance.send(method, v)
             elsif k.eql?('ssl_options')
               keys_to_delete.push(k)
-              # NOTE: here is a hack that allows setting SSLContext options
-              Aspera.assert_type(v, Array){'ssl_options'}
-              # Start with default options
-              ssl_options = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options]
-              v.each do |opt|
-                case opt
-                when Integer
-                  ssl_options = opt
-                when String
-                  name = "OP_#{opt.start_with?('-') ? opt[1..] : opt}".upcase
-                  raise Cli::BadArgument, "Unknown ssl_option: #{name}, use one of: #{OpenSSL::SSL.constants.grep(/^OP_/).map{ |c| c.to_s.sub(/^OP_/, '')}.join(', ')}" if !OpenSSL::SSL.const_defined?(name)
-                  if opt.start_with?('-')
-                    ssl_options &= ~OpenSSL::SSL.const_get(name)
-                  else
-                    ssl_options |= OpenSSL::SSL.const_get(name)
-                  end
-                else
-                  Aspera.error_unexpected_value(opt.class.name){'Expected String or Integer in ssl_options'}
-                end
-              end
-              OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] = ssl_options
+              Aspera::SSL.option_list = v
             elsif OAuth::Factory.instance.parameters.key?(k.to_sym)
               keys_to_delete.push(k)
               OAuth::Factory.instance.parameters[k.to_sym] = v
@@ -238,11 +205,31 @@ module Aspera
         attr_accessor :main_folder, :option_cache_tokens, :option_insecure, :option_warn_insecure_cert, :option_http_options
         attr_reader :option_ignore_cert_host_port, :progress_bar
 
+        def set_sdk_dir
+          # Check SDK folder is set or not, for compatibility, we check in two places
+          sdk_dir = Products::Transferd.sdk_directory rescue nil
+          if sdk_dir.nil?
+            @sdk_default_location = true
+            Log.log.debug('SDK folder is not set, checking default')
+            # New location
+            sdk_dir = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME)
+            Log.log.debug{"Checking: #{sdk_dir}"}
+            if !Dir.exist?(sdk_dir)
+              Log.log.debug{"No such folder: #{sdk_dir}"}
+              # Former location
+              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), TRANSFERD_APP_NAME)
+              Log.log.debug{"Checking: #{former_sdk_folder}"}
+              sdk_dir = former_sdk_folder if Dir.exist?(former_sdk_folder)
+            end
+            Log.log.debug{"Using: #{sdk_dir}"}
+            Products::Transferd.sdk_directory = sdk_dir
+          end
+        end
+
         # Add files, folders or default locations to the certificate store
-        # @param path_list [Array<String>] list of paths to add
+        # @param path_list [Array<String>] List of paths to add
         # @return the list of paths
         def trusted_cert_locations=(path_list)
-          path_list = [path_list] unless path_list.is_a?(Array)
           Aspera.assert_type(path_list, Array){'cert locations'}
           if @certificate_store.nil?
             Log.log.debug('Creating SSL Cert store')
@@ -273,6 +260,7 @@ module Aspera
                 pp = Dir.entries(p)
                   .map{ |e| File.realpath(File.join(p, e))}
                   .select{ |entry| File.file?(entry)}
+                  .select{ |entry| CERT_EXT.any?{ |ext| entry.end_with?(ext)}}
               end
               @certificate_paths.concat(pp)
             end
@@ -285,7 +273,7 @@ module Aspera
           locations = @certificate_paths
           if locations.nil?
             # Compute default locations
-            self.trusted_cert_locations = SpecialValues::DEF
+            self.trusted_cert_locations = [SpecialValues::DEF]
             locations = @certificate_paths
             # Restore defaults
             @certificate_paths = @certificate_store = nil
@@ -447,7 +435,7 @@ module Aspera
               Log.log.warn{"keeping same value for #{preset}: #{param_name}: #{param_value}"}
               return
             end
-            Log.log.warn{"overwriting value: #{selected_preset[param_name]}"}
+            Log.log.warn{"overwriting value for #{param_name}: #{selected_preset[param_name]}"}
           end
           selected_preset[param_name] = param_value
           formatter.display_status("Updated: #{preset}: #{param_name} <- #{param_value}")
@@ -479,21 +467,12 @@ module Aspera
             raise Cli::Error, "Unknown config preset: #{include_path}" if current.nil?
           end
           current = self.class.deep_clone(current) unless current.is_a?(String)
-          return ExtendedValue.instance.evaluate(current)
-        end
-
-        def option_use_product=(value)
-          Ascp::Installation.instance.use_ascp_from_product(value)
-        end
-
-        def option_use_product
-          'write-only option, see value of ascp_path'
+          return ExtendedValue.instance.evaluate(current, context: 'preset')
         end
 
         def option_plugin_folder=(value)
-          Aspera.assert_values(value.class, [String, Array]){'plugin folder'}
-          value = [value] if value.is_a?(String)
-          Aspera.assert(value.all?(String)){'plugin folder'}
+          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)}
         end
 
@@ -624,7 +603,7 @@ module Aspera
             # Collect info from ascp executable
             data = Ascp::Installation.instance.ascp_info
             # Add command line transfer spec
-            data['ts'] = transfer.option_transfer_spec
+            data['ts'] = transfer.user_transfer_spec
             # Add keys
             DataRepository::ELEMENTS.each_with_object(data){ |i, h| h[i.to_s] = DataRepository.instance.item(i)}
             # Declare those as secrets
@@ -638,7 +617,7 @@ module Aspera
             when :use
               default_product = options.get_next_argument('product name')
               Ascp::Installation.instance.use_ascp_from_product(default_product)
-              set_global_default(:ascp_path, Ascp::Installation.instance.path(:ascp))
+              set_global_default(:ascp_path, "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{default_product}")
               return Main.result_nothing
             end
           when :install
@@ -725,7 +704,7 @@ module Aspera
             value = @config_presets[name][param_name]
             raise "no such option in preset #{name} : #{param_name}" if value.nil?
             case value
-            when Numeric, String then return Main.result_text(ExtendedValue.instance.evaluate(value.to_s))
+            when Numeric, String then return Main.result_text(ExtendedValue.instance.evaluate(value.to_s, context: 'preset'))
             end
             return Main.result_single_object(value)
           when :unset
@@ -754,7 +733,7 @@ module Aspera
             options.ask_missing_mandatory = true
             @config_presets[name] ||= {}
             options.get_next_argument('option names', multiple: true).each do |option_name|
-              option_value = options.get_interactive(option_name, option: true)
+              option_value = options.get_interactive(option_name, check_option: true)
               @config_presets[name][option_name] = option_value
             end
             return Main.result_status("Updated: #{name}")
@@ -889,7 +868,7 @@ module Aspera
                 result.push({
                   plugin: name,
                   detect: Formatter.tick(plugin_class.respond_to?(:detect)),
-                  wizard: Formatter.tick(plugin_class.instance_methods.include?(:wizard)),
+                  wizard: Formatter.tick(plugin_class.method_defined?(:wizard)),
                   path:   Plugins::Factory.instance.plugin_source(name)
                 })
               end
@@ -930,10 +909,14 @@ module Aspera
           when :ascp
             execute_action_ascp
           when :sync
-            case options.get_next_command(%i[spec])
+            case options.get_next_command(%i[spec admin translate])
             when :spec
               fields, data = Transfer::SpecDoc.man_table(Formatter, include_option: true, agent_columns: false, schema: Sync::Operations::CONF_SCHEMA)
               return Main.result_object_list(data, fields: fields.map(&:to_s))
+            when :admin
+              return execute_sync_admin
+            when :translate
+              return Main.result_single_object(Sync::Operations.args_to_conf(options.get_next_argument('async arguments', multiple: true)))
             else Aspera.error_unreachable_line
             end
           when :transferd
@@ -1227,6 +1210,7 @@ module Aspera
         # Special extended values
         EXTEND_PRESET = :preset
         EXTEND_VAULT = :vault
+        EXTEND_ARGS = :''
         PRESET_DIG_SEPARATOR = '.'
         DEFAULT_CHECK_NEW_VERSION_DAYS = 7
         COFFEE_IMAGE_URL = 'https://enjoyjava.com/wp-content/uploads/2018/01/How-to-make-strong-coffee.jpg'
@@ -1235,7 +1219,7 @@ module Aspera
         SELF_SIGNED_CERT = OpenSSL::SSL.const_get(:enon_yfirev.to_s.upcase.reverse) # cspell: disable-line
         CONF_OVERVIEW_KEYS = %w[preset parameter value].freeze
         SMTP_CONF_PARAMS = %i[server tls ssl port domain username password from_name from_email].freeze
-
+        CERT_EXT = %w[crt cer pem der].freeze
         private_constant :ASPERA_HOME_FOLDER_NAME,
           :DEFAULT_CONFIG_FILENAME,
           :CONF_PRESET_CONFIG,
@@ -1260,7 +1244,8 @@ module Aspera
           :TRANSFERD_APP_NAME,
           :GLOBAL_DEFAULT_KEYWORD,
           :CONF_GLOBAL_SYM,
-          :GEM_CHECK_DATE_FMT
+          :GEM_CHECK_DATE_FMT,
+          :CERT_EXT
       end
     end
   end

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

@@ -22,17 +22,18 @@ module Aspera
               next unless base_url.start_with?('https://')
               api = Rest.new(base_url: base_url, redirect_max: 2)
               test_endpoint = 'login'
-              test_page = api.call(
+              http = api.call(
                 operation: 'GET',
                 subpath:   test_endpoint,
-                query:     {local: true}
+                query:     {local: true},
+                ret:       :resp
               )
-              next unless test_page[:http].body.include?('Aspera Console')
+              next unless http.body.include?('Aspera Console')
               version = 'unknown'
-              if (m = test_page[:http].body.match(/\(v([1-9]\..*)\)/))
+              if (m = http.body.match(/\(v([1-9]\..*)\)/))
                 version = m[1]
               end
-              url = test_page[:http].uri.to_s
+              url = http.uri.to_s
               return {
                 version: version,
                 url:     url[0..url.index(test_endpoint) - 2]
@@ -44,6 +45,10 @@ module Aspera
             raise error if error
             return
           end
+
+          def time_to_string(time)
+            return time.strftime('%Y-%m-%d %H:%M:%S')
+          end
         end
 
         # @param wizard  [Wizard] The wizard object
@@ -91,7 +96,7 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('console api', e.to_s)
             end
-            return nagios.result
+            Main.result_object_list(nagios.status_list)
           when :transfer
             command = options.get_next_command(%i[current smart])
             case command
@@ -113,8 +118,8 @@ module Aspera
                 query = query_read_delete(default: {})
                 if query['from'].nil? && query['to'].nil?
                   time_now = Time.now
-                  query['from'] = Manager.time_to_string(time_now - DEFAULT_FILTER_AGE_SECONDS)
-                  query['to'] = Manager.time_to_string(time_now)
+                  query['from'] = self.class.time_to_string(time_now - DEFAULT_FILTER_AGE_SECONDS)
+                  query['to'] = self.class.time_to_string(time_now)
                 end
                 if (filter = query.delete('filter'))
                   parse_extended_filter(filter, query)

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

@@ -15,7 +15,7 @@ module Aspera
           options.declare(:endpoint, 'Storage endpoint (URL)')
           options.declare(:apikey, 'Storage API key')
           options.declare(:crn, 'Resource instance id (CRN)')
-          options.declare(:service_credentials, 'IBM Cloud service credentials', types: Hash)
+          options.declare(:service_credentials, 'IBM Cloud service credentials', allowed: [Hash, NilClass])
           options.declare(:region, 'Storage region')
           options.declare(:identity, "Authentication URL (#{Api::CosNode::IBM_CLOUD_TOKEN_URL})", default: Api::CosNode::IBM_CLOUD_TOKEN_URL)
           options.parse_options!

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

@@ -47,22 +47,23 @@ module Aspera
             urls.each do |base_url|
               next unless base_url.start_with?('https://')
               api = Rest.new(base_url: base_url, redirect_max: 1)
-              result = api.call(
+              http = api.call(
                 operation:        'POST',
                 headers:          {
                   'Content-type' => Rest::MIME_TEXT,
                   'Accept'       => 'application/xrds+xml'
-                }
+                },
+                ret: :resp
               )
               # 4.x
-              next unless result[:http].body.start_with?('<?xml')
-              res_s = XmlSimple.xml_in(result[:http].body, {'ForceArray' => false})
-              Log.log.debug{"version: #{result[:http][HEADER_FASPEX_VERSION]}"}
+              next unless http.body.start_with?('<?xml')
+              res_s = XmlSimple.xml_in(http.body, {'ForceArray' => false})
+              Log.log.debug{"version: #{http[HEADER_FASPEX_VERSION]}"}
               version = res_s['XRD']['application']['version']
               # take redirect if any
               return {
                 version: version,
-                url:     result[:http].uri.to_s
+                url:     http.uri.to_s
               }
             rescue StandardError => e
               error = e
@@ -125,11 +126,11 @@ module Aspera
           @api_v3 = nil
           @api_v4 = nil
           options.declare(:link, 'Public link for specific operation')
-          options.declare(:delivery_info, 'Package delivery information', types: Hash)
+          options.declare(:delivery_info, 'Package delivery information', allowed: Hash)
           options.declare(:remote_source, 'Remote source for package send (id or %name:)')
           options.declare(:storage, 'Faspex local storage definition (for browsing source)')
           options.declare(:recipient, 'Use if recipient is a dropbox (with *)')
-          options.declare(:box, 'Package box', values: ATOM_MAILBOXES, default: :inbox)
+          options.declare(:box, 'Package box', allowed: ATOM_MAILBOXES, default: :inbox)
           options.parse_options!
         end
 
@@ -184,8 +185,9 @@ module Aspera
               operation: 'GET',
               subpath:   "#{mailbox}.atom",
               headers:   {'Accept' => 'application/xml'},
-              query:     mailbox_query
-            )[:http].body
+              query:     mailbox_query,
+              ret:       :resp
+            ).body
             box_data = XmlSimple.xml_in(atom_xml, {'ForceArray' => %w[entry field link to]})
             Log.dump(:box_data, box_data)
             items = box_data.key?('entry') ? box_data['entry'] : []
@@ -251,8 +253,9 @@ module Aspera
             subpath:      create_path,
             content_type: Rest::MIME_JSON,
             body:         package_create_params,
-            headers:      {'Accept' => 'text/javascript'}
-          )[:http].body
+            headers:      {'Accept' => 'text/javascript'},
+            ret:          :resp
+          ).body
           # get arguments of function call
           package_creation_data.delete!("\n") # one line
           package_creation_data.gsub!(/^[^"]+\("\{/, '{') # delete header
@@ -280,7 +283,7 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('faspex api', e.to_s)
             end
-            return nagios.result
+            Main.result_object_list(nagios.status_list)
           when :package
             command_pkg = options.get_next_command(%i[send receive list show], aliases: {recv: :receive})
             case command_pkg
@@ -300,10 +303,11 @@ module Aspera
                 delivery_info['sources'] ||= [{'paths' => []}]
                 first_source = delivery_info['sources'].first
                 first_source['paths'].concat(transfer.source_list)
-                source_id = instance_identifier(as_option: :remote_source) do |field, value|
-                  Aspera.assert(field.eql?('name'), type: Cli::BadArgument){'only name as selector, or give id'}
+                source_id = options.get_option(:remote_source)
+                if source_id && (m = Base.percent_selector(source_id))
+                  Aspera.assert(m[:field].eql?('name'), type: Cli::BadArgument){'only name as selector, or give id'}
                   source_list = api_v3.read('source_shares')['items']
-                  self.class.get_source_id_by_name(value, source_list)
+                  source_id = self.class.get_source_id_by_name(m[:value], source_list)
                 end
                 first_source['id'] = source_id.to_i unless source_id.nil?
                 pkg_created = api_v3.create('send', package_create_params)
@@ -362,7 +366,7 @@ module Aspera
                     when :inbox, :archive then'received'
                     when :sent then 'sent'
                     end
-                  entry_xml = api_v3.call(operation: 'GET', subpath: "#{endpoint}/#{delivery_id}", headers: {'Accept' => 'application/xml'})[:http].body
+                  entry_xml = api_v3.call(operation: 'GET', subpath: "#{endpoint}/#{delivery_id}", headers: {'Accept' => 'application/xml'}, ret: :resp).body
                   package_entry = XmlSimple.xml_in(entry_xml, {'ForceArray' => true})
                   pkg_id_uri = [{id: delivery_id, uri: self.class.get_fasp_uri_from_entry(package_entry)}]
                 end
@@ -373,17 +377,18 @@ module Aspera
                 raise Cli::BadArgument, "Pub link is #{link_data[:subpath]}. Expecting #{PUB_LINK_EXTERNAL_MATCH}" if !link_data[:subpath].start_with?(PUB_LINK_EXTERNAL_MATCH)
                 # NOTE: unauthenticated API (authorization is in url params)
                 api_public_link = Rest.new(base_url: link_data[:base_url])
-                package_creation_data = api_public_link.call(
+                pkg_xml = api_public_link.call(
                   operation: 'GET',
                   subpath:   link_data[:subpath],
                   headers:   {'Accept' => 'application/xml'},
-                  query:     {passcode: link_data[:query]['passcode']}
-                )
-                if !package_creation_data[:http].body.start_with?('<?xml ')
+                  query:     {passcode: link_data[:query]['passcode']},
+                  ret:       :resp
+                ).body
+                if !pkg_xml.start_with?('<?xml ')
                   Environment.instance.open_uri(link_url)
                   raise Cli::Error, 'Unexpected response: package not found ?'
                 end
-                package_entry = XmlSimple.xml_in(package_creation_data[:http].body, {'ForceArray' => false})
+                package_entry = XmlSimple.xml_in(pkg_xml, {'ForceArray' => false})
                 Log.dump(:package_entry, package_entry)
                 transfer_uri = self.class.get_fasp_uri_from_entry(package_entry)
                 pkg_id_uri = [{id: package_entry['id'], uri: transfer_uri}]
@@ -412,8 +417,9 @@ module Aspera
                       query:        {'direction' => 'down'},
                       content_type: Rest::MIME_TEXT,
                       body:         xml_payload,
-                      headers:      {'Accept' => Rest::MIME_TEXT, 'Content-Type' => 'application/vnd.aspera.url-list+xml'}
-                    )[:http].body
+                      headers:      {'Accept' => Rest::MIME_TEXT, 'Content-Type' => 'application/vnd.aspera.url-list+xml'},
+                      ret:          :resp
+                    ).body
                   end
                   transfer_spec['direction'] = Transfer::Spec::DIRECTION_RECEIVE
                   statuses = transfer.start(transfer_spec)
@@ -455,7 +461,7 @@ module Aspera
               when :info
                 return Main.result_single_object(source_info)
               when :node
-                node_config = ExtendedValue.instance.evaluate(source_info[KEY_NODE])
+                node_config = ExtendedValue.instance.evaluate(source_info[KEY_NODE], context: 'faspex node')
                 Log.log.debug{"node=#{node_config}"}
                 Aspera.assert_type(node_config, Hash, type: Cli::Error){source_info[KEY_NODE]}
                 api_node = Rest.new(
@@ -519,7 +525,7 @@ module Aspera
             end
             return Main.result_object_list(users)
           when :login_methods
-            login_meths = api_v3.call(operation: 'GET', subpath: 'login/new', headers: {'Accept' => 'application/xrds+xml'})[:http].body
+            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'])
           end