aspera-cli 4.18.1 → 4.20.0

data/lib/aspera/ascp/installation.rb

@@ -5,16 +5,16 @@ require 'aspera/environment'
 require 'aspera/data_repository'
 require 'aspera/ascp/products'
 require 'aspera/log'
+require 'aspera/rest'
 require 'aspera/assert'
 require 'aspera/web_server_simple'
 require 'English'
 require 'singleton'
 require 'xmlsimple'
-require 'zlib'
 require 'base64'
 require 'fileutils'
 require 'openssl'
-
+require 'yaml'
 module Aspera
   module Ascp
     # Singleton that tells where to find ascp and other local resources (keys..) , using the "path(:name)" method.
@@ -28,7 +28,7 @@ module Aspera
       include Singleton
       # protobuf generated files from sdk
       EXT_RUBY_PROTOBUF = '_pb.rb'
-      RB_SDK_FOLDER = 'lib'
+      RB_SDK_SUBFOLDER = 'lib'
       DEFAULT_ASPERA_CONF = <<~END_OF_CONFIG_FILE
         <?xml version='1.0' encoding='UTF-8'?>
         <CONF version="2">
@@ -41,8 +41,15 @@ module Aspera
         </CONF>
       END_OF_CONFIG_FILE
       # all ascp files (in SDK)
-      FILES = %i[ascp ascp4 transferd ssh_private_dsa ssh_private_rsa aspera_license aspera_conf fallback_certificate fallback_private_key].freeze
-      private_constant :EXT_RUBY_PROTOBUF, :RB_SDK_FOLDER, :DEFAULT_ASPERA_CONF, :FILES
+      EXE_FILES = %i[ascp ascp4 async].freeze
+      FILES = %i[transferd ssh_private_dsa ssh_private_rsa aspera_license aspera_conf fallback_certificate fallback_private_key].unshift(*EXE_FILES).freeze
+      TRANSFER_SDK_LOCATION_URL = 'https://ibm.biz/sdk_location'
+      FILE_SCHEME_PREFIX = 'file:///'
+      SDK_ARCHIVE_FOLDERS = ['/bin/', '/aspera/'].freeze
+      private_constant :EXT_RUBY_PROTOBUF, :RB_SDK_SUBFOLDER, :DEFAULT_ASPERA_CONF, :FILES, :TRANSFER_SDK_LOCATION_URL, :FILE_SCHEME_PREFIX
+      # options for SSH client private key
+      CLIENT_SSH_KEY_OPTIONS = %i{dsa_rsa rsa per_client}.freeze
+
       # set ascp executable path
       def ascp_path=(v)
         @path_to_ascp = v
@@ -52,12 +59,6 @@ module Aspera
         path(:ascp)
       end
 
-      def sdk_ruby_folder
-        ruby_pb_folder = File.join(sdk_folder, RB_SDK_FOLDER)
-        FileUtils.mkdir_p(ruby_pb_folder)
-        return ruby_pb_folder
-      end
-
       # location of SDK files
       def sdk_folder=(v)
         Log.log.debug{"sdk_folder=#{v}"}
@@ -80,7 +81,7 @@ module Aspera
       def use_ascp_from_product(product_name)
         if product_name.eql?(FIRST_FOUND)
           pl = Products.installed_products.first
-          raise "no FASP installation found\nPlease check manual on how to install FASP." if pl.nil?
+          raise "ascp found: no Aspera transfer module or SDK found.\nRefer to the manual or install SDK with command:\nascli conf ascp install" if pl.nil?
         else
           pl = Products.installed_products.find{|i|i[:name].eql?(product_name)}
           raise "no such product installed: #{product_name}" if pl.nil?
@@ -110,14 +111,14 @@ module Aspera
       def path(k)
         file_is_optional = false
         case k
-        when :ascp, :ascp4
+        when *EXE_FILES
+          file_is_optional = k.eql?(:async)
           use_ascp_from_product(FIRST_FOUND) if @path_to_ascp.nil?
-          file = @path_to_ascp
           # NOTE: that there might be a .exe at the end
-          file = file.gsub('ascp', 'ascp4') if k.eql?(:ascp4)
+          file = @path_to_ascp.gsub('ascp', k.to_s)
         when :transferd
-          file = transferd_filepath
           file_is_optional = true
+          file = transferd_filepath
         when :ssh_private_dsa, :ssh_private_rsa
           # assume last 3 letters are type
           type = k.to_s[-3..-1].to_sym
@@ -151,8 +152,16 @@ module Aspera
         return DataRepository.instance.item(:uuid)
       end
 
-      def aspera_token_ssh_key_paths
-        return %i[ssh_private_dsa ssh_private_rsa].map{|i|Installation.instance.path(i)}
+      # get paths of SSH keys to use for ascp client
+      # @param types [Symbol] types to use
+      def aspera_token_ssh_key_paths(types)
+        Aspera.assert_values(types, CLIENT_SSH_KEY_OPTIONS)
+        return case types
+               when :dsa_rsa, :rsa
+                 types.to_s.split('_').map{|i|Installation.instance.path("ssh_private_#{i}".to_sym)}
+               when :per_client
+                 raise 'Not yet implemented'
+               end
       end
 
       # use in plugin `config`
@@ -166,16 +175,17 @@ module Aspera
         return nil unless File.exist?(exe_path)
         exe_version = nil
         cmd_out = %x("#{exe_path}" #{vers_arg})
-        raise "An error occurred when testing #{ascp_filename}: #{cmd_out}" unless $CHILD_STATUS == 0
+        raise "An error occurred when testing #{exe_path}: #{cmd_out}" unless $CHILD_STATUS == 0
         # get version from ascp, only after full extract, as windows requires DLLs (SSL/TLS/etc...)
         m = cmd_out.match(/ version ([0-9.]+)/)
-        exe_version = m[1] unless m.nil?
+        exe_version = m[1].gsub(/\.$/, '') unless m.nil?
         return exe_version
       end
 
-      def ascp_add_pvcl(data)
+      def ascp_pvcl_info
+        data = {}
         # read PATHs from ascp directly, and pvcl modules as well
-        Open3.popen3(data['ascp'], '-DDL-') do |_stdin, _stdout, stderr, thread|
+        Open3.popen3(ascp_path, '-DDL-') do |_stdin, _stdout, stderr, thread|
           last_line = ''
           while (line = stderr.gets)
             line.chomp!
@@ -194,88 +204,150 @@ module Aspera
               data['product_name'] = Regexp.last_match(1)
               data['product_version'] = Regexp.last_match(2)
             when /^LOG Initializing FASP version ([^,]+),/
-              data['ascp_version'] = Regexp.last_match(1)
+              data['sdk_ascp_version'] = Regexp.last_match(1)
             end
           end
           if !thread.value.exitstatus.eql?(1) && !data.key?('root')
             raise last_line
           end
         end
+        return data
       end
 
       # extract some stings from ascp binary
-      def ascp_add_openssl(data)
-        ascp_file = data['ascp']
-        File.binread(ascp_file).scan(/[\x20-\x7E]{10,}/) do |bin_string|
+      def ascp_ssl_info
+        data = {}
+        File.binread(ascp_path).scan(/[\x20-\x7E]{10,}/) do |bin_string|
           if (m = bin_string.match(/OPENSSLDIR.*"(.*)"/))
             data['openssldir'] = m[1]
           elsif (m = bin_string.match(/OpenSSL (\d[^ -]+)/))
             data['openssl_version'] = m[1]
           end
-        end if File.file?(ascp_file)
+        end if File.file?(ascp_path)
+        return data
       end
 
+      # information for `ascp info`
       def ascp_info
-        data = file_paths
-        ascp_add_pvcl(data)
-        ascp_add_openssl(data)
-        return data
+        ascp_data = file_paths
+        ascp_data.merge!(ascp_pvcl_info)
+        ascp_data['sdk_locations'] = TRANSFER_SDK_LOCATION_URL
+        ascp_data.merge!(ascp_ssl_info)
+        return ascp_data
+      end
+
+      # Loads YAML from cloud with locations of SDK archives for all platforms
+      # @return location structure
+      def sdk_locations
+        yaml_text = Aspera::Rest.new(base_url: TRANSFER_SDK_LOCATION_URL, redirect_max: 3).call(operation: 'GET')[:data]
+        YAML.load(yaml_text)
+      end
+
+      # @return the url for download of SDK archive for the given platform and version
+      def sdk_url_for_platform(platform: nil, version: nil)
+        locations = sdk_locations
+        platform = Environment.architecture if platform.nil?
+        locations = locations.select{|l|l['platform'].eql?(platform)}
+        raise "No SDK for platform: #{platform}" if locations.empty?
+        version = locations.max_by { |entry| Gem::Version.new(entry['version']) }['version'] if version.nil?
+        info = locations.select{|entry| entry['version'].eql?(version)}
+        raise "No such version: #{version} for #{platform}" if info.empty?
+        return info.first['url']
+      end
+
+      def extract_archive_files(sdk_archive_path)
+        raise 'missing block' unless block_given?
+        case sdk_archive_path
+        # Windows and Mac use zip
+        when /\.zip$/
+          require 'zip'
+          # extract files from archive
+          Zip::File.open(sdk_archive_path) do |zip_file|
+            zip_file.each do |entry|
+              next if entry.name.end_with?('/')
+              yield(entry.name, entry.get_input_stream)
+            end
+          end
+        # Other Unixes use tar.gz
+        when /\.tar\.gz/
+          require 'zlib'
+          require 'rubygems/package'
+          Zlib::GzipReader.open(sdk_archive_path) do |gzip|
+            Gem::Package::TarReader.new(gzip) do |tar|
+              tar.each do |entry|
+                next if entry.directory?
+                yield(entry.full_name, entry)
+              end
+            end
+          end
+        else
+          raise "unknown archive extension: #{sdk_archive_path}"
+        end
       end
 
       # download aspera SDK or use local file
       # extracts ascp binary for current system architecture
+      # @param url [String] URL to SDK archive, or SpecialValues::DEF
       # @return ascp version (from execution)
-      def install_sdk(sdk_url)
-        # SDK is organized by architecture, check this first, in case architecture is not supported
-        arch_filter = "#{Environment.architecture}/"
-        require 'zip'
-        sdk_zip_path = File.join(Dir.tmpdir, 'sdk.zip')
-        if sdk_url.start_with?('file:')
+      def install_sdk(url: nil, folder: nil, backup: true, with_exe: true, &block)
+        url = sdk_url_for_platform if url.nil? || url.eql?('DEF')
+        folder = sdk_folder if folder.nil?
+        subfolder_lambda = block
+        if subfolder_lambda.nil?
+          subfolder_lambda = ->(name) do
+            if SDK_ARCHIVE_FOLDERS.any?{|i|name.include?(i)}
+              '/'
+            elsif name.end_with?(EXT_RUBY_PROTOBUF)
+              RB_SDK_SUBFOLDER
+            end
+          end
+        end
+        if url.start_with?('file:')
           # require specific file scheme: the path part is "relative", or absolute if there are 4 slash
-          raise 'use format: file:///<path>' unless sdk_url.start_with?('file:///')
-          sdk_zip_path = sdk_url.gsub(%r{^file:///}, '')
+          raise 'use format: file:///<path>' unless url.start_with?(FILE_SCHEME_PREFIX)
+          sdk_archive_path = url[FILE_SCHEME_PREFIX.length..-1]
+          delete_archive = false
         else
-          Aspera::Rest.new(base_url: sdk_url, redirect_max: 3).call(operation: 'GET', save_to_file: sdk_zip_path)
+          sdk_archive_path = File.join(Dir.tmpdir, File.basename(url))
+          Aspera::Rest.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to_file: sdk_archive_path)
+          delete_archive = true
         end
         # rename old install
-        if !Dir.empty?(sdk_folder)
+        if backup && !Dir.empty?(folder)
           Log.log.warn('Previous install exists, renaming folder.')
-          File.rename(sdk_folder, "#{sdk_folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
+          File.rename(folder, "#{folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
           # TODO: delete old archives ?
         end
-        # extract files from archive
-        Zip::File.open(sdk_zip_path) do |zip_file|
-          zip_file.each do |entry|
-            # skip folder entries
-            next if entry.name.end_with?('/')
-            dest_folder = nil
-            # binaries
-            dest_folder = sdk_folder if entry.name.include?(arch_filter)
-            # ruby adapters
-            dest_folder = sdk_ruby_folder if entry.name.end_with?(EXT_RUBY_PROTOBUF)
-            next if dest_folder.nil?
-            File.open(File.join(dest_folder, File.basename(entry.name)), 'wb') do |output_stream|
-              IO.copy_stream(entry.get_input_stream, output_stream)
-            end
+        extract_archive_files(sdk_archive_path) do |entry_name, entry_stream|
+          subfolder = subfolder_lambda.call(entry_name)
+          next if subfolder.nil?
+          dest_folder = File.join(folder, subfolder)
+          FileUtils.mkdir_p(dest_folder)
+          File.open(File.join(dest_folder, File.basename(entry_name)), 'wb') do |output_stream|
+            IO.copy_stream(entry_stream, output_stream)
           end
         end
-        File.unlink(sdk_zip_path) rescue nil # Windows may give error
+        File.unlink(sdk_archive_path) rescue nil if delete_archive # Windows may give error
+        return unless with_exe
         # ensure license file are generated so that ascp invocation for version works
         path(:aspera_license)
         path(:aspera_conf)
-        ascp_file = Products.ascp_filename
-        ascp_path = File.join(sdk_folder, ascp_file)
-        raise "No #{ascp_file} found in SDK archive" unless File.exist?(ascp_path)
-        Environment.restrict_file_access(ascp_path, mode: 0o755)
-        Environment.restrict_file_access(ascp_path.gsub('ascp', 'ascp4'), mode: 0o755)
-        ascp_version = get_ascp_version(ascp_path)
-        trd_path = transferd_filepath
-        Log.log.warn{"No #{trd_path} in SDK archive"} unless File.exist?(trd_path)
-        Environment.restrict_file_access(trd_path, mode: 0o755) if File.exist?(trd_path)
-        transferd_version = get_exe_version(trd_path, 'version')
-        sdk_version = transferd_version || ascp_version
-        File.write(File.join(sdk_folder, Products::INFO_META_FILE), "<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
-        return sdk_version
+        sdk_ascp_file = Products.ascp_filename
+        sdk_ascp_path = File.join(folder, sdk_ascp_file)
+        raise "No #{sdk_ascp_file} found in SDK archive" unless File.exist?(sdk_ascp_path)
+        EXE_FILES.each do |exe_sym|
+          exe_path = sdk_ascp_path.gsub('ascp', exe_sym.to_s)
+          Environment.restrict_file_access(exe_path, mode: 0o755) if File.exist?(exe_path)
+        end
+        sdk_ascp_version = get_ascp_version(sdk_ascp_path)
+        sdk_daemon_path = transferd_filepath
+        Log.log.warn{"No #{sdk_daemon_path} in SDK archive"} unless File.exist?(sdk_daemon_path)
+        Environment.restrict_file_access(sdk_daemon_path, mode: 0o755) if File.exist?(sdk_daemon_path)
+        transferd_version = get_exe_version(sdk_daemon_path, 'version')
+        sdk_name = 'IBM Aspera Transfer SDK'
+        sdk_version = transferd_version || sdk_ascp_version
+        File.write(File.join(folder, Products::INFO_META_FILE), "<product><name>#{sdk_name}</name><version>#{sdk_version}</version></product>")
+        return sdk_name, sdk_version
       end
 
       private

data/lib/aspera/ascp/management.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'aspera/assert'
+
 module Aspera
   module Ascp
     # processing of ascp management port events
@@ -188,7 +190,7 @@ module Aspera
       # empty line is separator to end event information
       MGT_FRAME_SEPARATOR = ''
       # fields description for JSON generation
-      # spellchecker: disable
+      # cspell: disable
       INTEGER_FIELDS = %w[Bytescont FaspFileArgIndex StartByte Rate MinRate Port Priority RateCap MinRateCap TCPPort CreatePolicy TimePolicy
                           DatagramSize XoptFlags VLinkVersion PeerVLinkVersion DSPipelineDepth PeerDSPipelineDepth ReadBlockSize WriteBlockSize
                           ClusterNumNodes ClusterNodeId Size Written Loss FileBytes PreTransferBytes TransferBytes PMTU Elapsedusec ArgScansAttempted
@@ -219,6 +221,9 @@ module Aspera
       end
       attr_reader :last_event
 
+      # process line of mgt port event
+      # @param line [String] line of mgt port event
+      # @return [Hash] event hash or nil if event is not yet complete
       def process_line(line)
         # Log.log.debug{"line=[#{line}]"}
         case line
@@ -234,8 +239,7 @@ module Aspera
           @last_event = @event_build
           @event_build = nil
           return @last_event
-        else
-          raise "mgt port: unexpected line: [#{line}]"
+        else Aspera.error_unexpected_value(line){'mgt port'}
         end
         return nil
       end

data/lib/aspera/ascp/products.rb

@@ -56,6 +56,18 @@ module Aspera
               log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera_Connect'),
               run_root: File.join(Dir.home, 'Library', 'Application Support', 'Aspera', 'Aspera Connect'),
               sub_bin:  File.join('Contents', 'Resources')
+            }, {
+              expected: CONNECT,
+              app_root: File.join(Dir.home, 'Applications', 'IBM Aspera Connect.app'),
+              log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera_Connect'),
+              run_root: File.join(Dir.home, 'Library', 'Application Support', 'Aspera', 'Aspera Connect'),
+              sub_bin:  File.join('Contents', 'Resources')
+            }, {
+              expected: CONNECT,
+              app_root: File.join('', 'Applications', 'IBM Aspera Connect.app'),
+              log_root: File.join(Dir.home, 'Library', 'Logs', 'Aspera_Connect'),
+              run_root: File.join(Dir.home, 'Library', 'Application Support', 'Aspera', 'Aspera Connect'),
+              sub_bin:  File.join('Contents', 'Resources')
             }, {
               expected: CLI_V1,
               app_root: File.join(Dir.home, 'Applications', 'Aspera CLI'),
@@ -126,7 +138,7 @@ module Aspera
 
         # filename for ascp with optional extension (Windows)
         def ascp_filename
-          return 'ascp' + Environment.exe_extension
+          return "ascp#{Environment.exe_extension}"
         end
 
         # @return folder paths for specified applications
@@ -150,12 +162,6 @@ module Aspera
           end
           raise "no connect uri file found in #{folder}"
         end
-
-        # @ return path to configuration file of aspera CLI
-        # def cli_conf_file
-        #  connect = folders(PRODUCT_CLI_V1)
-        #  return File.join(connect[:app_root], BIN_SUBFOLDER, '.aspera_cli_conf')
-        # end
       end
     end
   end

data/lib/aspera/assert.rb

@@ -8,13 +8,13 @@ module Aspera
   end
   class << self
     # the block is executed in the context of the Aspera module
-    def assert(assertion, info = nil, level: 2, exception_class: AssertError)
+    def assert(assertion, info = nil, exception_class: AssertError)
       raise InternalError, 'bad assert: both info and block given' unless info.nil? || !block_given?
       return if assertion
       message = 'assertion failed'
       info = yield if block_given?
       message = "#{message}: #{info}" if info
-      message = "#{message}: #{caller(level..level).first}"
+      message = "#{message}: #{caller.find{|call|!call.start_with?(__FILE__)}}"
       raise exception_class, message
     end
 
@@ -22,13 +22,18 @@ module Aspera
     # @param value [Object] the value to check
     # @param type [Class] the expected type
     def assert_type(value, type, exception_class: AssertError)
-      assert(value.is_a?(type), level: 3, exception_class: exception_class){"#{block_given? ? "#{yield}: " : nil}expecting #{type}, but have #{value.inspect}"}
+      assert(value.is_a?(type), exception_class: exception_class){"#{block_given? ? "#{yield}: " : nil}expecting #{type}, but have #{value.inspect}"}
     end
 
     # assert that value is one of the given values
+    # @param value value to check
+    # @param values accepted values
+    # @param exception_class exception in case of no match
     def assert_values(value, values, exception_class: AssertError)
-      assert(values.include?(value), level: 3, exception_class: exception_class) do
-        "#{block_given? ? "#{yield}: " : nil}expecting one of #{values.inspect}, but have #{value.inspect}"
+      assert(values.include?(value), exception_class: exception_class) do
+        val_list = values.inspect
+        val_list = "one of #{val_list}" if values.is_a?(Array)
+        "#{block_given? ? "#{yield}: " : nil}expecting #{val_list}, but have #{value.inspect}"
       end
     end
 

data/lib/aspera/cli/formatter.rb

@@ -101,8 +101,9 @@ module Aspera
       DISPLAY_FORMATS = %i[text nagios ruby json jsonpp yaml table csv image].freeze
       # user output levels
       DISPLAY_LEVELS = %i[info data error].freeze
+      FIELD_VALUE_HEADINGS = %i[key value].freeze
 
-      private_constant :DISPLAY_FORMATS, :DISPLAY_LEVELS, :CSV_RECORD_SEPARATOR, :CSV_FIELD_SEPARATOR
+      private_constant :DISPLAY_FORMATS, :DISPLAY_LEVELS, :CSV_RECORD_SEPARATOR, :CSV_FIELD_SEPARATOR, :FIELD_VALUE_HEADINGS
       # prefix to display error messages in user messages (terminal)
       ERROR_FLASH = 'ERROR:'.bg_red.gray.blink.freeze
       WARNING_FLASH = 'WARNING:'.bg_brown.black.blink.freeze
@@ -116,7 +117,7 @@ module Aspera
 
         def tick(yes)
           result =
-            if Environment.terminal_supports_unicode?
+            if Environment.instance.terminal_supports_unicode?
               if yes
                 "\u2713"
               else
@@ -150,16 +151,9 @@ module Aspera
       end
 
       # Highlight special values
-      def special_format(what, use_colors: $stdout.isatty)
-        result = $stdout.isatty ? "<#{what}>" : "&lt;#{what}&gt;"
-        if use_colors
-          result = if %w[null empty].any?{|s|what.include?(s)}
-            result.dim
-          else
-            result.reverse_color
-          end
-        end
-        return result
+      def special_format(what)
+        result = "<#{what}>"
+        return %w[null empty].any?{|s|what.include?(s)} ? result.dim : result.reverse_color
       end
 
       # call this after REST calls if several api calls are expected
@@ -173,6 +167,11 @@ module Aspera
         @spinner.spin
       end
 
+      def long_operation_terminated
+        @spinner&.stop
+        @spinner = nil
+      end
+
       # options are: format, output, display, fields, select, table_style, flat_hash, transpose_single
       def option_handler(option_symbol, operation, value=nil)
         Aspera.assert_values(operation, %i[set get])
@@ -198,12 +197,11 @@ module Aspera
       end
 
       def declare_options(options)
-        default_table_style = if Environment.terminal_supports_unicode?
+        default_table_style = if Environment.instance.terminal_supports_unicode?
           {border: :unicode_round}
         else
           {}
         end
-
         options.declare(:format, 'Output format', values: DISPLAY_FORMATS, handler: {o: self, m: :option_handler}, default: :table)
         options.declare(:output, 'Destination for results', types: String, handler: {o: self, m: :option_handler})
         options.declare(:display, 'Output only some information', values: DISPLAY_LEVELS, handler: {o: self, m: :option_handler}, default: :info)
@@ -213,8 +211,9 @@ module Aspera
           default: SpecialValues::DEF)
         options.declare(:select, 'Select only some items in lists: column, value', types: [Hash, Proc], handler: {o: self, m: :option_handler})
         options.declare(:table_style, 'Table display style', types: [Hash], handler: {o: self, m: :option_handler}, default: default_table_style)
-        options.declare(:flat_hash, 'Display deep values as additional keys', values: :bool, handler: {o: self, m: :option_handler}, default: true)
-        options.declare(:transpose_single, 'Single object fields output vertically', values: :bool, handler: {o: self, m: :option_handler}, default: true)
+        options.declare(:flat_hash, '(Table) Display deep values as additional keys', values: :bool, handler: {o: self, m: :option_handler}, default: true)
+        options.declare(:transpose_single, '(Table) Single object fields output vertically', values: :bool, handler: {o: self, m: :option_handler}, default: true)
+        options.declare(:multi_table, '(Table) Each element of a table are displayed as a table', values: :bool, handler: {o: self, m: :option_handler}, default: false)
         options.declare(:show_secrets, 'Show secrets on command output', values: :bool, handler: {o: self, m: :option_handler}, default: false)
         options.declare(:image, 'Options for image display', types: Hash, handler: {o: self, m: :option_handler}, default: {})
       end
@@ -326,37 +325,52 @@ module Aspera
           display_message(:info, special_format('empty')) if @options[:format].eql?(:table)
           return
         end
+        # if table has only one element, and only one field, display the value
         if object_array.length == 1 && fields.length == 1
           display_message(:data, object_array.first[fields.first])
           return
         end
+        single_transposed = @options[:transpose_single] && object_array.length == 1
         # Special case if only one row (it could be object_list or single_object)
-        if @options[:transpose_single] && object_array.length == 1
-          new_columns = %i[key value]
+        if single_transposed
           single = object_array.first
-          object_array = fields.map { |i| new_columns.zip([i, single[i]]).to_h }
-          fields = new_columns
+          object_array = fields.map { |i| FIELD_VALUE_HEADINGS.zip([i, single[i]]).to_h }
+          fields = FIELD_VALUE_HEADINGS
         end
         Log.log.debug{Log.dump(:object_array, object_array)}
         # convert data to string, and keep only display fields
         final_table_rows = object_array.map { |r| fields.map { |c| r[c].to_s } }
+        # remove empty rows
+        final_table_rows.select!{|i| !(i.is_a?(Hash) && i.empty?)}
         # here : fields : list of column names
         case @options[:format]
         when :table
-          # display the table !
-          display_message(:data, Terminal::Table.new(
-            headings:  fields,
-            rows:      final_table_rows,
-            style:     @options[:table_style]&.symbolize_keys))
+          if @options[:multi_table] && !single_transposed
+            final_table_rows.each do |row|
+              Log.log.debug{Log.dump(:row, row)}
+              display_message(:data, Terminal::Table.new(
+                headings:  FIELD_VALUE_HEADINGS,
+                rows:      fields.zip(row),
+                style:     @options[:table_style]&.symbolize_keys))
+            end
+          else
+            # display the table !
+            display_message(:data, Terminal::Table.new(
+              headings:  fields,
+              rows:      final_table_rows,
+              style:     @options[:table_style]&.symbolize_keys))
+          end
         when :csv
           display_message(:data, final_table_rows.map{|t| t.join(CSV_FIELD_SEPARATOR)}.join(CSV_RECORD_SEPARATOR))
+        else
+          raise "not expected: #{@options[:format]}"
         end
       end
 
       # @return text suitable to display an image from url
       def status_image(blob)
         begin
-          raise URI::InvalidURIError, 'not uri' if !(blob =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/)
+          raise URI::InvalidURIError, 'not uri' if !(blob =~ /\A#{URI::RFC2396_PARSER.make_regexp}\z/)
           # it's a url
           url = blob
           unless Environment.instance.url_method.eql?(:text)
@@ -452,6 +466,8 @@ module Aspera
           else
             raise "unknown data type: #{type}"
           end
+        else
+          raise "not expected: #{@options[:format]}"
         end
       end
     end

data/lib/aspera/cli/hints.rb

@@ -4,6 +4,7 @@ require 'aspera/transfer/error'
 require 'aspera/rest'
 require 'aspera/log'
 require 'aspera/assert'
+require 'aspera/cli/info'
 require 'net/ssh'
 require 'openssl'
 
@@ -18,7 +19,7 @@ module Aspera
           match:       'Remote host is not who we expected',
           remediation: [
             'For this specific error, refer to:',
-            "#{SRC_URL}#error-remote-host-is-not-who-we-expected",
+            "#{Info::SRC_URL}#error-remote-host-is-not-who-we-expected",
             'Add this to arguments:',
             %q{--ts=@json:'{"sshfp":null}'"}
           ]

data/lib/aspera/cli/info.rb

@@ -2,15 +2,17 @@
 
 module Aspera
   module Cli
-    # name of command line tool, also used as foldername where config is stored
-    PROGRAM_NAME = 'ascli'
-    # name of the containing gem, same as in <gem name>.gemspec
-    GEM_NAME = 'aspera-cli'
-    DOC_URL  = "https://www.rubydoc.info/gems/#{GEM_NAME}"
-    GEM_URL  = "https://rubygems.org/gems/#{GEM_NAME}"
-    SRC_URL  = 'https://github.com/IBM/aspera-cli'
-    # set this to warn in advance when minimum required ruby version will increase
-    # see also required_ruby_version in gemspec file
-    RUBY_FUTURE_MINIMUM_VERSION = '3.0'
+    module Info
+      # name of command line tool, also used as foldername where config is stored
+      CMD_NAME = 'ascli'
+      # name of the containing gem, same as in <gem name>.gemspec
+      GEM_NAME = 'aspera-cli'
+      DOC_URL  = "https://www.rubydoc.info/gems/#{GEM_NAME}"
+      GEM_URL  = "https://rubygems.org/gems/#{GEM_NAME}"
+      SRC_URL  = 'https://github.com/IBM/aspera-cli'
+      # set this to warn in advance when minimum required ruby version will increase
+      # see also required_ruby_version in gemspec file
+      RUBY_FUTURE_MINIMUM_VERSION = '3.0'
+    end
   end
 end