aspera-cli 4.15.0 → 4.16.0

data/bin/ascli

@@ -3,36 +3,18 @@
 
 Encoding.default_internal = Encoding::UTF_8
 Encoding.default_external = Encoding::UTF_8
-# coverage for tests
-if ENV.key?('ENABLE_COVERAGE')
-  require 'simplecov'
-  require 'securerandom'
-  # compute gem source root based on this script location, assuming it is in bin/
-  # use dirname instead of gsub, in case folder separator is not /
-  development_root = File.dirname(File.dirname(File.realpath(__FILE__)))
-  SimpleCov.root(development_root)
-  SimpleCov.enable_for_subprocesses if SimpleCov.respond_to?(:enable_for_subprocesses)
-  # keep cache data for 1 day (must be longer that time to run the whole test suite)
-  SimpleCov.merge_timeout(86400)
-  SimpleCov.command_name(SecureRandom.uuid)
-  SimpleCov.at_exit do
-    original_file_descriptor = $stdout
-    $stdout.reopen(File.join(development_root, 'simplecov.log'))
-    SimpleCov.result.format!
-    $stdout.reopen(original_file_descriptor)
-  end
-  SimpleCov.start
-end
-# if in development, add path to gem
-#
+
 begin
-  require 'aspera/cli/main'
-rescue LoadError
-  # development environment
-  development_root = File.dirname(File.dirname(File.realpath(__FILE__)))
-  $LOAD_PATH.unshift(File.join(development_root, 'lib'))
-  require 'aspera/cli/main'
+  gem_lib_folder = File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib')
+  Kernel.load(File.join(gem_lib_folder, 'aspera/coverage.rb'))
+  begin
+    require 'aspera/cli/main'
+  rescue LoadError
+    # if in development, add path toward gem
+    $LOAD_PATH.unshift(gem_lib_folder)
+    require 'aspera/cli/main'
+  end
+  require 'aspera/environment'
+  Aspera::Environment.fix_home
+  Aspera::Cli::Main.new(ARGV).process_command_line
 end
-require 'aspera/environment'
-Aspera::Environment.fix_home
-Aspera::Cli::Main.new(ARGV).process_command_line

data/bin/asession

@@ -75,10 +75,12 @@ client = Aspera::Fasp::AgentDirect.new({quiet: true})
 job_id = client.start_transfer(transfer_spec)
 # async commands
 Thread.new do
+  # we assume here a single session
+  session_id = client.sessions_by_job(job_id).first
   begin # rubocop:disable Style/RedundantBegin
     loop do
       data = JSON.parse($stdin.gets)
-      client.send_command(job_id, 0, data)
+      client.send_command(session_id, data)
     end
   rescue
     Process.exit(1)

data/examples/dascli

@@ -7,7 +7,7 @@
 : "${imgtag=$image:$version}"
 # set env var `docker` to podman, to use podman
 : "${docker:=docker}"
-# set env var docker_args to add options to docker run (transform var into array) # spellcheck disable=SC2086
+# set env var `docker_args` to add options to docker run (then, transform this var into array) # spellcheck disable=SC2086
 read -a add_dock_args <<< $docker_args
 # set env var ASCLI_HOME to set the config folder on host
 : "${ASCLI_HOME:=$HOME/.aspera/ascli}"
@@ -24,7 +24,7 @@ exec $docker run \
 --interactive \
 --user root \
 --env ASCLI_HOME="$ascli_home_container" \
---volume "$ASCLI_HOME:$ascli_home_container" \
+--volume "$ASCLI_HOME:$ascli_home_container:z" \
 "${add_dock_args[@]}" \
 "$imgtag" \
 "$@"

data/lib/aspera/aoc.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'aspera/log'
+require 'aspera/assert'
 require 'aspera/rest'
 require 'aspera/hash_ext'
 require 'aspera/data_repository'
@@ -31,10 +32,9 @@ module Aspera
     PROD_DOMAIN = 'ibmaspera.com' # cspell:disable-line
     # to avoid infinite loop in pub link redirection
     MAX_AOC_URL_REDIRECT = 10
+    CLIENT_ID_PREFIX = 'aspera.'
     # Well-known AoC globals client apps
-    GLOBAL_CLIENT_APPS = %w[aspera.global-cli-client aspera.drive].freeze
-    # index offset in data repository of client app
-    DATA_REPO_INDEX_START = 4
+    GLOBAL_CLIENT_APPS = DataRepository::ELEMENTS.select{|i|i.to_s.start_with?(CLIENT_ID_PREFIX)}.freeze
     # cookie prefix so that console can decode identity
     COOKIE_PREFIX_CONSOLE_AOC = 'aspera.aoc'
     # path in URL of public links
@@ -50,7 +50,6 @@ module Aspera
 
     private_constant :MAX_AOC_URL_REDIRECT,
       :GLOBAL_CLIENT_APPS,
-      :DATA_REPO_INDEX_START,
       :COOKIE_PREFIX_CONSOLE_AOC,
       :PUBLIC_LINK_PATHS,
       :JWT_AUDIENCE,
@@ -71,10 +70,9 @@ module Aspera
     # class static methods
     class << self
       # strings /Applications/Aspera\ Drive.app/Contents/MacOS/AsperaDrive|grep -E '.{100}==$'|base64 --decode
-      def get_client_info(client_name=GLOBAL_CLIENT_APPS.first)
-        client_index = GLOBAL_CLIENT_APPS.index(client_name)
-        raise "no such pre-defined client: #{client_name}" if client_index.nil?
-        return client_name, Base64.urlsafe_encode64(DataRepository.instance.data(DATA_REPO_INDEX_START + client_index))
+      def get_client_info(client_name=nil)
+        client_key = client_name.nil? ? GLOBAL_CLIENT_APPS.first : client_name.to_sym
+        return client_key, DataRepository.instance.item(client_key)
       end
 
       # base API url depends on domain, which could be "qa.xxx"
@@ -93,7 +91,7 @@ module Aspera
       def url_parts(uri)
         raise "No host found in URL.Please check URL format: https://myorg.#{PROD_DOMAIN}" if uri.host.nil?
         parts = uri.host.split('.', 2)
-        raise "expecting a public FQDN for #{PRODUCT_NAME}" unless parts.length == 2
+        assert(parts.length == 2){"expecting a public FQDN for #{PRODUCT_NAME}"}
         return parts
       end
 
@@ -161,6 +159,7 @@ module Aspera
       @workspace_name = workspace
       @cache_user_info = nil
       @cache_url_token_info = nil
+      @context_cache = nil
       # init rest params
       aoc_rest_p = {auth: {type: :oauth2}}
       # shortcut to auth section
@@ -212,7 +211,7 @@ module Aspera
         aoc_auth_p[:aoc_pub_link][:json][:password] = password unless password.nil?
         # basic auth required for /token
         aoc_auth_p[:auth] = {type: :basic, username: aoc_auth_p[:client_id], password: aoc_auth_p[:client_secret]}
-      else raise "ERROR: unsupported auth method: #{aoc_auth_p[:grant_method]}"
+      else error_unexpected_value(aoc_auth_p[:grant_method])
       end
       super(aoc_rest_p)
     end
@@ -226,7 +225,7 @@ module Aspera
     end
 
     def assert_public_link_types(expected)
-      raise "public link type is #{public_link['purpose']} but action requires one of #{expected.join(',')}" unless expected.include?(public_link['purpose'])
+      assert_values(public_link['purpose'], expected){'public link type'}
     end
 
     def additional_persistence_ids
@@ -234,12 +233,6 @@ module Aspera
       return [] # TODO : public_link['id'] ?
     end
 
-    # def secret_finder=(secret_finder)
-    #  raise 'secret finder already set' unless @secret_finder.nil?
-    #  raise 'secret finder must have lookup_secret' unless secret_finder.respond_to?(:lookup_secret)
-    #  @secret_finder = secret_finder
-    # end
-
     # cached user information
     def current_user_info(exception: false)
       return @cache_user_info unless @cache_user_info.nil?
@@ -252,7 +245,7 @@ module Aspera
           Log.log.debug{"ignoring error: #{e}"}
           {}
         end
-      USER_INFO_FIELDS_MIN.each{|f|@cache_user_info[f] = 'unknown' if @cache_user_info[f].nil?}
+      USER_INFO_FIELDS_MIN.each{|f|@cache_user_info[f] = nil if @cache_user_info[f].nil?}
       return @cache_user_info
     end
 
@@ -260,7 +253,8 @@ module Aspera
     # @return [Hash] current context information: workspace, and home node/file if app is "Files"
     def context(application = nil)
       return @context_cache unless @context_cache.nil?
-      raise 'context must be initialized with application' if application.nil?
+      assert(!application.nil?){'application must be set once'}
+      assert_values(application, %i[files packages])
       ws_id =
         if !public_link.nil?
           Log.log.debug('Using workspace of public link')
@@ -323,7 +317,7 @@ module Aspera
     # @param package_info [Hash] created package information
     # @returns [Aspera::Node] a node API for access key
     def node_api_from(node_id:, workspace_id: nil, workspace_name: nil, scope: Aspera::Node::SCOPE_USER, package_info: nil)
-      raise 'invalid type for node_id' unless node_id.is_a?(String)
+      assert_type(node_id, String)
       node_info = read("nodes/#{node_id}")[:data]
       if workspace_name.nil? && !workspace_id.nil?
         workspace_name = read("workspaces/#{workspace_id}")[:data]['name']
@@ -370,16 +364,16 @@ module Aspera
         Log.log.debug('no metadata in shared inbox')
         return
       end
+      assert(pkg_data.key?('metadata')){"package requires metadata: #{meta_schema}"}
       pkg_meta = pkg_data['metadata']
-      raise "package requires metadata: #{meta_schema}" unless pkg_data.key?('metadata')
-      raise 'metadata must be an Array' unless pkg_meta.is_a?(Array)
+      assert_type(pkg_meta, Array){'metadata'}
       Log.log.debug{Log.dump(:metadata, pkg_meta)}
       pkg_meta.each do |field|
-        raise 'metadata field must be Hash' unless field.is_a?(Hash)
-        raise 'metadata field must have name' unless field.key?('name')
-        raise 'metadata field must have values' unless field.key?('values')
-        raise 'metadata values must be an Array' unless field['values'].is_a?(Array)
-        raise "unknown metadata field: #{field['name']}" if meta_schema.select{|i|i['name'].eql?(field['name'])}.empty?
+        assert_type(field, Hash){'metadata field'}
+        assert(field.key?('name')){'metadata field must have name'}
+        assert(field.key?('values')){'metadata field must have values'}
+        assert_type(field['values'], Array){'metadata field values'}
+        assert(!meta_schema.select{|i|i['name'].eql?(field['name'])}.empty?){"unknown metadata field: #{field['name']}"}
       end
       meta_schema.each do |field|
         provided = pkg_meta.select{|i|i['name'].eql?(field['name'])}
@@ -396,15 +390,15 @@ module Aspera
     # @return nil package_data is modified
     def resolve_package_recipients(package_data, ws_id, recipient_list_field, new_user_option)
       return unless package_data.key?(recipient_list_field)
-      raise "#{recipient_list_field} must be an Array" unless package_data[recipient_list_field].is_a?(Array)
+      assert_type(package_data[recipient_list_field], Array){recipient_list_field}
       new_user_option = {'package_contact' => true} if new_user_option.nil?
-      raise 'new_user_option must be a Hash' unless new_user_option.is_a?(Hash)
+      assert_type(new_user_option, Hash){'new_user_option'}
       # list with resolved elements
       resolved_list = []
       package_data[recipient_list_field].each do |short_recipient_info|
         case short_recipient_info
         when Hash # native API information, check keys
-          raise "#{recipient_list_field} element shall have fields: id and type" unless short_recipient_info.keys.sort.eql?(%w[id type])
+          assert(short_recipient_info.keys.sort.eql?(%w[id type])){"#{recipient_list_field} element shall have fields: id and type"}
         when String # CLI helper: need to resolve provided name to type/id
           # email: user, else dropbox
           entity_type = short_recipient_info.include?('@') ? 'contacts' : 'dropboxes'
@@ -450,7 +444,7 @@ module Aspera
           })
         end
         pkg_data['metadata'] = api_meta
-      else raise "metadata field if not of expected type: #{pkg_meta.class}"
+      else error_unexpected_value(pkg_meta.class)
       end
       return nil
     end
@@ -513,7 +507,7 @@ module Aspera
       # Console cookie
       ################
       # we are sure that fields are not nil
-      cookie_elements = [app_info[:app], current_user_info['name'], current_user_info['email']].map{|e|Base64.strict_encode64(e)}
+      cookie_elements = [app_info[:app], current_user_info['name'] || 'public link', current_user_info['email'] || 'none'].map{|e|Base64.strict_encode64(e)}
       cookie_elements.unshift(COOKIE_PREFIX_CONSOLE_AOC)
       transfer_spec['cookie'] = cookie_elements.join(':')
       # Application tags
@@ -590,7 +584,8 @@ module Aspera
     # @param app_info [Hash] hash with app info
     # @param types [Array] event types
     def permissions_send_event(created_data:, app_info:, types: PERMISSIONS_CREATED)
-      raise "INTERNAL: (assert) Invalid event types: #{types}" unless types.is_a?(Array) && !types.empty?
+      assert_type(types, Array)
+      assert(!types.empty?)
       event_creation = {
         'types'        => types,
         'node_id'      => app_info[:node_info]['id'],

data/lib/aspera/ascmd.rb

@@ -2,6 +2,7 @@
 
 # cspell:ignore ascmd smode errstr zstr zmode zuid zgid zctime zatime zmtime fcount dcount btype blist codeset lc_ctype ascmdtypes
 require 'aspera/log'
+require 'aspera/assert'
 
 module Aspera
   # Run +ascmd+ commands using specified executor (usually, remotely on transfer node)
@@ -52,7 +53,7 @@ module Aspera
         end
       end
       # for info, second overrides first, so restore it
-      case result.keys.length; when 0 then result = system_info; when 1 then result = result[result.keys.first]; else raise 'error'; end
+      case result.keys.length; when 0 then result = system_info; when 1 then result = result[result.keys.first]; else error_unexpected_value(result.keys.length); end
       # raise error as exception
       raise Error.new(result[:errno], result[:errstr], action_sym, arguments) if
         result.is_a?(Hash) && (result.keys.sort == TYPES_DESCR[:error][:fields].map{|i|i[:name]}.sort)
@@ -65,10 +66,6 @@ module Aspera
         super(); @errno = errno; @errstr = errstr; @command = cmd; @arguments = arguments; end # rubocop:disable Style/Semicolon
 
       def message; "ascmd: #{@errstr} (#{@errno})"; end
-
-      # TODO : delete : attr_reader :errno #, :errstr, :command
-      # TODO : delete :def args; @arguments; end
-
       def extended_message; "ascmd: errno=#{@errno} errstr=\"#{@errstr}\" command=#{@command} arguments=#{@arguments.join(',')}"; end
     end # Error
 
@@ -177,7 +174,7 @@ module Aspera
               end
             end
           end
-        else raise "error: unknown decode:#{type_descr[:decode]}"
+        else error_unexpected_value(type_descr[:decode])
         end # is_a
         return result
       end

data/lib/aspera/assert.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Aspera
+  class InternalError < StandardError
+  end
+
+  class AssertError < StandardError
+  end
+end
+
+class Object
+  def assert(assertion, info = nil, level: 2, exception_class: Aspera::AssertError)
+    raise Aspera::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}"
+    raise exception_class, message
+  end
+
+  # assert that value has the given type
+  # @param value [Object] the value to check
+  # @param type [Class] the expected type
+  def assert_type(value, type, exception_class: Aspera::AssertError)
+    assert(value.is_a?(type), level: 3, exception_class: exception_class){"#{block_given? ? "#{yield}: " : nil}expecting #{type}, but have #{value.inspect}"}
+  end
+
+  # assert that value is one of the given values
+  def assert_values(value, values, exception_class: Aspera::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}"
+    end
+  end
+
+  # the line with this shall never be reached
+  def error_unreachable_line
+    raise Aspera::InternalError, "unreachable line reached: #{caller(2..2).first}"
+  end
+
+  # the value is not one of the expected values
+  def error_unexpected_value(value, exception_class: Aspera::InternalError)
+    raise exception_class, "#{block_given? ? "#{yield}: " : nil}unexpected value: #{value.inspect}"
+  end
+end

data/lib/aspera/cli/extended_value.rb

@@ -4,6 +4,7 @@
 require 'aspera/uri_reader'
 require 'aspera/environment'
 require 'aspera/log'
+require 'aspera/assert'
 require 'json'
 require 'base64'
 require 'zlib'
@@ -17,6 +18,7 @@ module Aspera
       include Singleton
 
       # special values
+      INIT = 'INIT'
       ALL = 'ALL'
       DEF = 'DEF'
 
@@ -30,9 +32,7 @@ module Aspera
             if col_titles.nil?
               col_titles = values
             else
-              entry = {}
-              col_titles.each{|title|entry[title] = values.shift}
-              hash_array.push(entry)
+              hash_array.push(col_titles.zip(values).to_h)
             end
           end
           Log.log.warn('Titled CSV file without any line') if hash_array.empty?
@@ -63,7 +63,7 @@ module Aspera
           path:   lambda{|v|File.expand_path(v)},
           re:     lambda{|v|Regexp.new(v)},
           ruby:   lambda{|v|Environment.secure_eval(v, __FILE__, __LINE__)},
-          secret: lambda{|v|ExtendedValue.assert_no_value(v, :secret); $stdin.getpass('secret> ')}, # rubocop:disable Style/Semicolon
+          secret: lambda{|v|prompt = v.empty? ? 'secret' : v; $stdin.getpass("#{prompt}> ")}, # rubocop:disable Style/Semicolon
           stdin:  lambda{|v|ExtendedValue.assert_no_value(v, :stdin); $stdin.read}, # rubocop:disable Style/Semicolon
           yaml:   lambda{|v|YAML.load(v)},
           zlib:   lambda{|v|Zlib::Inflate.inflate(v)},
@@ -78,7 +78,7 @@ module Aspera
       # add a new handler
       def set_handler(name, method)
         Log.log.debug{"setting handler for #{name}"}
-        raise 'name must be Symbol' unless name.is_a?(Symbol)
+        assert_type(name, Symbol){'name'}
         @handlers[name] = method
       end
 

data/lib/aspera/cli/formatter.rb

@@ -3,6 +3,8 @@
 # cspell:ignore jsonpp
 require 'aspera/secret_hider'
 require 'aspera/environment'
+require 'aspera/log'
+require 'aspera/assert'
 require 'terminal-table'
 require 'yaml'
 require 'pp'
@@ -18,7 +20,7 @@ module Aspera
 
       # General method
       def flatten(something)
-        raise 'only Hash' unless something.is_a?(Hash)
+        assert_type(something, Hash)
         @result = {}
         flatten_any(something, '')
         return @result
@@ -94,6 +96,7 @@ module Aspera
       DISPLAY_FORMATS = %i[text nagios ruby json jsonpp yaml table csv].freeze
       # user output levels
       DISPLAY_LEVELS = %i[info data error].freeze
+      RESULT_PARAMS = %i[type data total fields name].freeze
 
       private_constant :DISPLAY_FORMATS, :DISPLAY_LEVELS, :CSV_RECORD_SEPARATOR, :CSV_FIELD_SEPARATOR
       # prefix to display error messages in user messages (terminal)
@@ -155,16 +158,26 @@ module Aspera
       end
 
       def option_handler(option_symbol, operation, value=nil)
+        assert_values(operation, %i[set get])
         case operation
-        when :set then @options[option_symbol] = value
+        when :set
+          @options[option_symbol] = value
+          if option_symbol.eql?(:output)
+            $stdout = if value.eql?('-')
+              STDOUT # rubocop:disable Style/GlobalStdStream
+            else
+              File.open(value, 'w')
+            end
+          end
         when :get then return @options[option_symbol]
-        else raise "internal error: no such operation: #{operation}"
+        else error_unreachable_line
         end
         nil
       end
 
       def declare_options(options)
         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)
         options.declare(
           :fields, "Comma separated list of: fields, or #{ExtendedValue::ALL}, or #{ExtendedValue::DEF}", handler: {o: self, m: :option_handler},
@@ -186,7 +199,7 @@ module Aspera
         when :data then $stdout.puts(message) unless @options[:display].eql?(:error)
         when :info then $stdout.puts(message) if @options[:display].eql?(:info)
         when :error then $stderr.puts(message)
-        else raise "wrong message_level:#{message_level}"
+        else error_unexpected_value(message_level)
         end
       end
 
@@ -219,7 +232,7 @@ module Aspera
           when Array then @options[:fields]
           when Regexp then return all_fields(data).select{|i|i.match(@options[:fields])}
           when Proc then return all_fields(data).select{|i|@options[:fields].call(i)}
-          else raise "internal error: option: fields: #{@options[:fields]}"
+          else error_unexpected_value(@options[:fields])
           end
         result = []
         until request.empty?
@@ -252,7 +265,7 @@ module Aspera
       # object_array: array of hash
       # fields: list of column names
       def display_table(object_array, fields)
-        raise 'internal error: no field specified' if fields.nil?
+        assert(!fields.nil?){'missing fields parameter'}
         case @options[:select]
         when Proc
           object_array.select!{|i|@options[:select].call(i)}
@@ -296,12 +309,12 @@ module Aspera
 
       # this method displays the results, especially the table format
       def display_results(results)
-        raise "INTERNAL ERROR, result unsupported key: #{results.keys - %i[type data fields name]}" unless (results.keys - %i[type data fields name]).empty?
-        # :type :data :fields :name
-        raise "INTERNAL ERROR, result must be Hash (got: #{results.class}: #{results})" unless results.is_a?(Hash)
-        raise "INTERNAL ERROR, result must have type (#{results})" unless results.key?(:type)
-        raise 'INTERNAL ERROR, result must have data' unless results.key?(:data) || %i[empty nothing].include?(results[:type])
+        assert_type(results, Hash)
+        assert((results.keys - RESULT_PARAMS).empty?){"result unsupported key: #{results.keys - RESULT_PARAMS}"}
+        assert(results.key?(:type)){"result must have type (#{results})"}
+        assert(results.key?(:data) || %i[empty nothing].include?(results[:type])){'result must have data'}
         Log.log.debug{"display_results: #{results[:data].class} #{results[:type]}"}
+        display_item_count(results[:data].length, results[:total]) if results.key?(:total)
         SecretHider.deep_remove_secret(results[:data]) unless @options[:show_secrets] || @options[:display].eql?(:data)
         case @options[:format]
         when :text
@@ -323,8 +336,8 @@ module Aspera
           when :object_list, :single_object
             obj_list = results[:data]
             obj_list = [obj_list] if results[:type].eql?(:single_object)
-            raise "internal error: expecting Array: got #{obj_list.class}" unless obj_list.is_a?(Array)
-            raise 'internal error: expecting Array of Hash' unless obj_list.all?(Hash)
+            assert_type(obj_list, Array)
+            assert(obj_list.all?(Hash)){"expecting Array of Hash: #{obj_list.inspect}"}
             # :object_list is an array of hash tables, where key=colum name
             obj_list = obj_list.map{|obj|Flattener.new.flatten(obj)} if @options[:flat_hash]
             display_table(obj_list, compute_fields(obj_list, results[:fields]))

data/lib/aspera/cli/hints.rb

@@ -2,6 +2,8 @@
 
 require 'aspera/fasp/error'
 require 'aspera/rest'
+require 'aspera/log'
+require 'aspera/assert'
 require 'net/ssh'
 require 'openssl'
 
@@ -58,14 +60,13 @@ module Aspera
             matches = hint[:match]
             matches = [matches] unless matches.is_a?(Array)
             matches.each do |m|
+              assert_values(m.class, [String, Regexp])
               case m
               when String
                 next unless message.eql?(m)
               when Regexp
                 next unless message.match?(m)
-              else
-                Log.log.warn("Internal error: hint is a #{m.class}")
-                next
+              else error_unexpected_value(m)
               end
               remediation = hint[:remediation]
               remediation = [remediation] unless remediation.is_a?(Array)

data/lib/aspera/cli/main.rb

@@ -8,8 +8,10 @@ require 'aspera/cli/transfer_agent'
 require 'aspera/cli/version'
 require 'aspera/cli/info'
 require 'aspera/cli/hints'
+require 'aspera/preview/terminal'
 require 'aspera/secret_hider'
 require 'aspera/log'
+require 'aspera/assert'
 
 module Aspera
   module Cli
@@ -53,6 +55,14 @@ module Aspera
           raise global_status unless global_status.eql?(:success)
           return {type: :object_list, data: status_table}
         end
+
+        def result_picture_in_terminal(options, blob)
+          terminal_options = options.get_option(:query, default: {}).symbolize_keys
+          allowed_options = Preview::Terminal.method(:build).parameters.select{|i|i[0].eql?(:key)}.map{|i|i[1]}
+          unknown_options = terminal_options.keys - allowed_options
+          raise "invalid options: #{unknown_options.join(', ')}, use #{allowed_options.join(', ')}" unless unknown_options.empty?
+          return Main.result_status(Preview::Terminal.build(blob, **terminal_options))
+        end
       end # self
 
       private
@@ -78,9 +88,10 @@ module Aspera
 
       # This can throw exception if there is a problem with the environment, needs to be caught by execute method
       def init_agents_and_options
-        # first thing : manage debug level (allows debugging of option parser)
-        early_debug_setup
+        # create formatter, in case there is an exception, it is used to display.
         @agents[:formatter] = Formatter.new
+        # second : manage debug level (allows debugging of option parser)
+        early_debug_setup
         @agents[:options] = Manager.new(PROGRAM_NAME)
         # give command line arguments to option manager
         options.parse_command_line(@argv)
@@ -96,7 +107,7 @@ module Aspera
         # the Config plugin adds the @preset parser, so declare before TransferAgent which may use it
         @agents[:config] = Plugins::Config.new(@agents, gem: GEM_NAME, name: PROGRAM_NAME, help: DOC_URL, version: Aspera::Cli::VERSION)
         # data persistency
-        raise 'internal error: missing persistency object' unless @agents[:persistency]
+        assert(@agents[:persistency]){'missing persistency object'}
         # the TransferAgent plugin may use the @preset parser
         @agents[:transfer] = TransferAgent.new(options, config)
         Log.log.debug('plugin env created'.red)
@@ -219,6 +230,8 @@ module Aspera
           when /^--log-level=(.*)/ then Aspera::Log.instance.level = Regexp.last_match(1).to_sym
           when /^--logger=(.*)/ then Aspera::Log.instance.logger_type = Regexp.last_match(1).to_sym
           end
+        rescue => e
+          $stderr.puts("Error: #{e}")
         end
       end