aspera-cli 4.27.2 → 4.27.3

data/lib/aspera/cli/wizard.rb

@@ -4,6 +4,8 @@ require 'aspera/oauth/jwt'
 require 'aspera/assert'
 require 'aspera/cli/option_declarator'
 require 'aspera/cli/plugins/factory'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Cli
@@ -60,7 +62,7 @@ module Aspera
           detection_info = nil
           begin
             Log.log.debug { "detecting #{plugin_name_sym} at #{app_url}" }
-            RestParameters.instance.spinner_cb.call(plugin_name_sym.to_s)
+            Rest::Parameters.instance.spinner_cb.call(plugin_name_sym.to_s)
             detection_info = plugin_klass.detect(app_url)
           rescue OpenSSL::SSL::SSLError => e
             Log.log.warn(e.message)
@@ -76,7 +78,7 @@ module Aspera
           # If there is a redirect, then the detector can override the url.
           found_apps.push({product: plugin_name_sym, name: app_name, url: app_url, version: 'unknown'}.merge(detection_info))
         end
-        RestParameters.instance.spinner_cb.call(action: :success)
+        Rest::Parameters.instance.spinner_cb.call(action: :success)
         Aspera.assert(!found_apps.empty?) { "No known application found at #{app_url}" }
         Aspera.assert(found_apps.all? { |a| a.keys.all?(Symbol) }, 'all app info keys must be symbols')
         return found_apps

data/lib/aspera/coverage.rb

@@ -4,6 +4,7 @@
 if ENV.key?('ENABLE_COVERAGE')
   require 'simplecov'
   require 'securerandom'
+  require 'fileutils'
   # compute development top folder based on this source location
   development_root = File.dirname(File.realpath(__FILE__), 3)
   coverage_dir = 'tmp/coverage'

data/lib/aspera/environment.rb

@@ -8,6 +8,8 @@ require 'singleton'
 require 'open3'
 require 'English'
 require 'shellwords'
+require 'aspera/rainbow'
+using Rainbow
 
 # cspell:words MEBI mswin bccwin
 
@@ -201,12 +203,16 @@ module Aspera
         I18N_VARS.each { |var| ENV[var] = 'C' }
       end
 
+      # Override detection of Unicode support: `true` or `false`, or `nil` for auto-detection
+      attr_writer :unicode
+
       # @return [Boolean] true if we can display Unicode characters
       # Uses Encoding.locale_charmap for OS-independent detection.
       # Falls back to locale env vars for systems where charmap is not available.
       # https://www.gnu.org/software/libc/manual/html_node/Locale-Categories.html
       # https://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html
       def terminal_supports_unicode?
+        return @unicode unless @unicode.nil?
         return false unless terminal?
         locale_charmap_utf8? || I18N_VARS.any? { |var| ENV[var]&.include?('UTF-8') }
       end

data/lib/aspera/faspex_gw.rb

@@ -2,6 +2,7 @@
 
 require 'aspera/log'
 require 'aspera/assert'
+require 'aspera/mime'
 require 'webrick'
 require 'json'
 
@@ -10,7 +11,7 @@ module Aspera
   class Faspex4GWServlet < WEBrick::HTTPServlet::AbstractServlet
     AOC_API = 'Aspera::Api::AoC'
     FX_API = 'Aspera::Api::Faspex'
-    # @param app_api     [Rest]   API object
+    # @param app_api     [Rest::Client]   API object
     # @param app_context [String] workspace id (aoc only)
     def initialize(server, app_api, app_context)
       Aspera.assert_values(app_api.class.name, [AOC_API, FX_API])

data/lib/aspera/faspex_postproc.rb

@@ -6,6 +6,7 @@ require 'English'
 require 'webrick'
 require 'aspera/log'
 require 'aspera/assert'
+require 'aspera/mime'
 
 module Aspera
   # Start a Faspex-4 style post-processing script using Faspex-5 webhook

data/lib/aspera/graphql.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'aspera/rest_call_error'
+require 'aspera/rest/call_error'
 
 module Aspera
-  # Helper to execute GraphQL queries via a Rest object.
+  # Helper to execute GraphQL queries via a Rest::Client object.
   # Follows the GraphQL-over-HTTP convention: POST {query, variables} to endpoint,
   # parse top-level `data` key, raise on top-level `errors` array.
   module GraphQL
@@ -12,16 +12,16 @@ module Aspera
 
     class << self
       # Execute a GraphQL query loaded from a .graphql file in lib/aspera/api/queries/
-      # @param rest      [Rest]   API object pointing at the GraphQL endpoint
+      # @param rest      [Rest::Client]   API object pointing at the GraphQL endpoint
       # @param name      [String] Base filename without extension (e.g. 'my_query')
       # @param variables [Hash]   GraphQL variables
       # @return [Hash]   The `data` object from the response
-      # @raise [RestCallError] if the response contains GraphQL errors
+      # @raise [Rest::CallError] if the response contains GraphQL errors
       def execute(rest, name, variables = {})
         query = load_query(name)
         response = rest.create(nil, {query: query, variables: variables})
         errors = response['errors']
-        raise RestCallError, errors.map { |e| e['message'] }.join("\n") if errors.is_a?(Array) && !errors.empty?
+        raise Rest::CallError, errors.map { |e| e['message'] }.join("\n") if errors.is_a?(Array) && !errors.empty?
         response['data']
       end
 

data/lib/aspera/json_rpc/client.rb

@@ -2,19 +2,19 @@
 
 # cspell:ignore blankslate jsonrpc
 
-require 'aspera/rest_error_analyzer'
+require 'aspera/rest/error_analyzer'
 require 'aspera/assert'
 require 'aspera/json_rpc/version'
 require 'blankslate'
 
-Aspera::RestErrorAnalyzer.instance.add_simple_handler(name: 'JSON RPC', path: %w[error message], always: true)
+Aspera::Rest::ErrorAnalyzer.instance.add_simple_handler(name: 'JSON RPC', path: %w[error message], always: true)
 
 module Aspera
   module JsonRpc
-    # JSON-RPC 2.0 client over an Aspera::Rest HTTP endpoint.
+    # JSON-RPC 2.0 client over an Aspera::Rest::Client HTTP endpoint.
     # Methods are dispatched dynamically via method_missing.
     # Example:
-    #   client = JsonRpc::Client.new(Rest.new(base_url: 'http://127.0.0.1:33024'))
+    #   client = JsonRpc::Client.new(Rest::Client.new(base_url: 'http://127.0.0.1:33024'))
     #   client.get_info
     #   client.start_transfer(app_id: '...', transfer_spec: {...})
     class Client < BlankSlate
@@ -22,7 +22,7 @@ module Aspera
       reveal :inspect
       reveal :to_s
 
-      # @param api       [Rest]   Aspera REST object pointing at the JSON-RPC endpoint
+      # @param api       [Rest::Client]   Aspera REST object pointing at the JSON-RPC endpoint
       # @param namespace [String, nil] optional method prefix, e.g. "myns."
       def initialize(api, namespace = nil)
         super()

data/lib/aspera/keychain/encrypted_hash.rb

@@ -138,7 +138,7 @@ module Aspera
         end
       end
 
-      # Derive an AES key from +new_password+.
+      # Derive an AES key from `new_password`.
       # @legacy_key is true for vaults created by v4.26.0 or earlier (no kdf field):
       #   key = password truncated/zero-padded to key_bytes (same as symmetric-encryption did).
       # Otherwise PBKDF2 is used. When @kdf_params is nil (new vault or password change)

data/lib/aspera/keychain/one_password_api.rb

@@ -16,7 +16,7 @@ module Aspera
       def initialize(url:, token:, vault_id:)
         super()
         @vault_id = vault_id
-        @api = Rest.new(
+        @api = Rest::Client.new(
           base_url: url,
           headers:  {'Authorization' => "Bearer #{token}"}
         )

data/lib/aspera/link_header.rb

@@ -31,7 +31,7 @@ module Aspera
       @links = links
     end
 
-    # Return the href of the first link whose +rel+ attribute matches +rel+.
+    # Return the href of the first link whose `rel` attribute matches `rel`.
     # Comparison is case-insensitive per RFC 7230 s.3.2 and RFC 8288 s.3.
     # Returns nil if no link with that relation exists.
     # @param rel [String]
@@ -41,7 +41,7 @@ module Aspera
     end
 
     class << self
-      # Parse a raw Link header value into a +LinkHeader+ instance.
+      # Parse a raw Link header value into a `LinkHeader` instance.
       # Uses StringScanner so that commas inside <URI> are not treated as separators.
       # @param raw [String, nil]
       # @return [LinkHeader]

data/lib/aspera/log.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 require 'aspera/assert'
-require 'aspera/colors'
 require 'aspera/secret_hider'
 require 'logger'
 require 'pp'
 require 'json'
 require 'singleton'
 require 'stringio'
+require 'aspera/rainbow'
+using Rainbow
 
 # Ignore warnings
 old_verbose = $VERBOSE
@@ -118,13 +119,13 @@ module Aspera
 
       # Returns the last 2 containers (module/class) and method caller
       def caller_method
-        stack = caller
-        i = stack.rindex { |line| line.include?('Logger') }
-        frame = stack[i + 1] if i && stack[i + 1]
+        locations = caller_locations
+        # Outermost frame of logging code: Ruby logger, or this file (level methods, dump)
+        i = locations.rindex { |loc| loc.path.end_with?('/logger.rb') || loc.path.eql?(__FILE__) }
+        frame = locations[i + 1] if i
         return '???' unless frame
-        # Extract the "Class::Module::Method" or "Class#method" part
-        full = frame[/'([^']+)'/, 1]
-        return '???' unless full
+        # "Class::Module#method" (Ruby >= 3.4) or "method" (Ruby < 3.4)
+        full = frame.label
         # Split into class/module and method parts
         parts = full.split(/(::|#)/)
         # Reconstruct keeping only last two class/module names + separator + method
@@ -138,6 +139,7 @@ module Aspera
         end
         class_parts = classes.split('::')
         selected_classes = class_parts.last(2).join('::')
+        return method if selected_classes.empty?
         "#{selected_classes}.#{method}"
       end
     end
@@ -230,34 +232,29 @@ module Aspera
       self.logger_type = @logger_type
     end
 
-    # Define decoration of levels
-    LVL_DECO = {
-      TRACE2:  %i{dim},
-      TRACE1:  %i{blue},
-      DEBUG:   %i{cyan},
-      INFO:    %i{green},
-      WARN:    %i{bg_brown black},
-      ERROR:   %i{bg_red blink},
-      FATAL:   %i{magenta},
-      UNKNOWN: %i{blink}
+    # Short (4-letters) levels with color (evaluated on each call, as colors can be enabled or disabled by option)
+    LVL_COLOR = {
+      TRACE2:  -> { short_levl(:TRACE2).faint },
+      TRACE1:  -> { short_levl(:TRACE1).blue },
+      DEBUG:   -> { short_levl(:DEBUG).cyan },
+      INFO:    -> { short_levl(:INFO).green },
+      WARN:    -> { short_levl(:WARN).bg(:yellow).black },
+      ERROR:   -> { short_levl(:ERROR).bg(:red).blink },
+      FATAL:   -> { short_levl(:FATAL).magenta },
+      UNKNOWN: -> { short_levl(:UNKNOWN).blink }
     }.freeze
 
-    # Short (4-letters) levels with color
-    LVL_COLOR = LVL_DECO.to_h do |k, v|
-      [k, short_levl(k).apply(*v)]
-    end.freeze
-
-    DEFAULT_FORMATTER = ->(s, _d, _p, m) { "#{LVL_COLOR[s]} #{m}\n" }
+    DEFAULT_FORMATTER = ->(s, _d, _p, m) { "#{LVL_COLOR[s]&.call} #{m}\n" }
 
     # pre-defined formatters
     FORMATTER_LAMBDAS = {
       standard: Logger::Formatter.new,
       default:  DEFAULT_FORMATTER,
-      caller:   ->(s, _d, _p, m) { "#{LVL_COLOR[s]} #{Log.caller_method}\n#{m}\n" }
+      caller:   ->(s, _d, _p, m) { "#{LVL_COLOR[s]&.call} #{Log.caller_method}\n#{m}\n" }
     }.freeze
 
     FORMATTERS = FORMATTER_LAMBDAS.keys
 
-    private_constant :LVL_DECO, :DEFAULT_FORMATTER, :FORMATTER_LAMBDAS
+    private_constant :DEFAULT_FORMATTER, :FORMATTER_LAMBDAS
   end
 end

data/lib/aspera/markdown.rb

@@ -82,6 +82,8 @@ module Aspera
         col_widths = table.transpose.map do |col|
           [col.flat_map { |c| c.to_s.delete('`').split(HTML_BREAK).map(&:size) }.max, COL_WIDTH].min
         end
+        # do not modify caller's table
+        table = table.dup
         headings = table.shift
         table.unshift(col_widths.map { |col_width| '-' * col_width })
         table.unshift(headings)

data/lib/aspera/mime.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Aspera
+  # MIME types used in `Content-Type` and `Accept`
+  module Mime
+    # JSON body
+    JSON = 'application/json'
+    # URL encoded form body
+    WWW = 'application/x-www-form-urlencoded'
+    # Plain text body
+    TEXT = 'text/plain'
+    # JSON:API body (https://jsonapi.org)
+    JSON_API = 'application/vnd.api+json'
+    # Check if a media type is JSON: `application/json` or structured syntax suffix `+json` (RFC 6839)
+    # @param mime [String] Media type, without parameters (see `Rest.parse_header`)
+    # @return [Boolean] `true` if JSON
+    def json?(mime) = mime == JSON || mime.end_with?(JSON_SUFFIX) || mime == LEGACY_JSON
+    module_function :json?
+    # Structured syntax suffix for JSON
+    JSON_SUFFIX = '+json'
+    # Non standard type used by some servers for JSON
+    LEGACY_JSON = 'application/x-javascript'
+    private_constant :JSON_SUFFIX, :LEGACY_JSON
+  end
+end

data/lib/aspera/node_simulator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'aspera/assert'
+require 'aspera/mime'
 require 'aspera/ascp/installation'
 require 'aspera/agent/direct'
 require 'aspera/log'

data/lib/aspera/oauth/base.rb

@@ -3,7 +3,10 @@
 require 'aspera/oauth/factory'
 require 'aspera/log'
 require 'aspera/assert'
+require 'aspera/mime'
 require 'date'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module OAuth
@@ -31,7 +34,7 @@ module Aspera
         Aspera.assert_type(params, Hash)
         Aspera.assert_type(cache_ids, Array)
         # This is the OAuth API
-        @api = Rest.new(**rest_params)
+        @api = Rest::Client.new(**rest_params)
         @params = params.dup.freeze
         @path_token = path_token
         @token_field = token_field
@@ -47,36 +50,39 @@ module Aspera
       # Sub path to generate token
       attr_reader :path_token
 
+      # Parameters for token creation call
+      # @param include_secret [Boolean] Add secret in default call parameters
+      # @param other_params [Hash] Other parameters to merge
+      # @return [Hash] Token creation parameters
+      def base_parameters(include_secret: false, **other_params)
+        call_params = @params.dup
+        call_params.delete(:client_secret) unless include_secret
+        call_params.merge(other_params)
+      end
+
       # Helper method to create token as per RFC
-      # @return [Net::HTTPResponse] raw HTTP response with token
-      # @raise [RestCallError] if not 2XX code
-      def create_token_call(creation_params)
-        Log.log.debug { 'Generating a new token'.bg_green }
+      # @param other_params [Hash] Additional parameter to base parameters
+      # @return [Net::HTTPResponse] Raw HTTP response with token
+      # @raise [Rest::CallError] If not 2XX code
+      def create_token_base(include_secret: false, **other_params)
+        Log.log.debug { 'Generating a new token'.bg(:green) }
+        creation_params = base_parameters(include_secret: include_secret, **other_params)
         return @api.create(@path_token, nil, query: creation_params, ret: :resp) if @use_query
         return @api.create(@path_token, creation_params, content_type: Mime::WWW, ret: :resp)
       end
 
-      # Create base parameters for token creation calls
-      # @param add_secret [Boolean] Add secret in default call parameters
-      # @return [Hash] Optional general parameters
-      def base_params(add_secret: false)
-        call_params = @params.dup
-        call_params.delete(:client_secret) unless add_secret
-        return call_params
-      end
-
-      # @return [String] value suitable for Authorization header
+      # @return [String] Value suitable for Authorization header: adds `Bearer `
       def authorization(**kwargs)
         return OAuth::Factory.bearer_authorization(token(**kwargs))
       end
 
-      # get an OAuth v2 token (generated, cached, refreshed)
-      # call token() to get a token.
-      # if a token is expired (api returns 4xx), call again token(refresh: true)
+      # Get a OAuth v2 token (generated, cached, refreshed)
+      # If a token is expired (api returns 4xx), call again token(refresh: true)
       # @param cache   [Boolean] set to false to disable cache
       # @param refresh [Boolean] set to true to force refresh or re-generation (if previous failed)
+      # @return [String] The bearer token
       def token(cache: true, refresh: false)
-        # get token info from cache (or nil), decoded with date and expiration status
+        # Get token info from cache (or nil), decoded with date and expiration status
         token_info = Factory.instance.get_token_info(@token_cache_id) if cache
         token_data = nil
         unless token_info.nil?
@@ -90,17 +96,21 @@ module Aspera
             Log.log.trace1 { "refresh: #{refresh} expired: #{token_info[:expired]}" }
             refresh_token = nil
             if token_data.key?('refresh_token') && !token_data['refresh_token'].eql?('not_supported')
-              # save possible refresh token, before deleting the cache
+              # Save possible refresh token, before deleting the cache
               refresh_token = token_data['refresh_token']
             end
-            # delete cache
+            # Delete cache
             Factory.instance.persist_mgr.delete(@token_cache_id)
             token_data = nil
-            # lets try the existing refresh token
+            # Lets try the existing refresh token
             # NOTE: AoC admin token has no refresh, and lives by default 1800secs
             if !refresh_token.nil?
               begin
-                http = create_token_call(base_params(add_secret: true).merge(grant_type: 'refresh_token', refresh_token: refresh_token))
+                http = create_token_base(
+                  include_secret: true,
+                  grant_type: 'refresh_token',
+                  refresh_token: refresh_token
+                )
                 # Save only if success
                 json_data = http.body
                 token_data = JSON.parse(json_data)
@@ -116,13 +126,13 @@ module Aspera
         # no cache, nor refresh: generate a token
         if token_data.nil?
           # Call the method-specific token creation
-          # which returns the result of create_token_call
+          # which returns the result of create_token_base
           json_data = create_token.body
           token_data = JSON.parse(json_data)
           Factory.instance.persist_mgr.put(@token_cache_id, json_data)
         end
         Aspera.assert(token_data.key?(@token_field)) { "API error: No such field in answer: #{@token_field}" } unless token_data.nil?
-        # ok we shall have a token here
+        # Ok we shall have a token here
         return token_data[@token_field]
       end
     end

data/lib/aspera/oauth/factory.rb

@@ -2,6 +2,7 @@
 
 require 'aspera/id_generator'
 require 'aspera/assert'
+require 'aspera/string_ext'
 require 'singleton'
 require 'base64'
 module Aspera

data/lib/aspera/oauth/generic.rb

@@ -23,7 +23,7 @@ module Aspera
       end
 
       def create_token
-        return create_token_call(base_params.merge(@create_params))
+        create_token_base(**@create_params)
       end
     end
     Factory.instance.register_token_creator(Generic)

data/lib/aspera/oauth/jwt.rb

@@ -59,7 +59,7 @@ module Aspera
         }.merge(@additional_payload)
         Log.dump(:jwt_payload, jwt_payload)
         assertion = JWT.encode(jwt_payload, @private_key_obj, 'RS256', @headers)
-        return create_token_call(base_params.merge(grant_type: GRANT_TYPE, assertion: assertion))
+        create_token_base(grant_type: GRANT_TYPE, assertion: assertion)
       end
     end
     Factory.instance.register_token_creator(Jwt)

data/lib/aspera/oauth/web.rb

@@ -2,7 +2,7 @@
 
 require 'aspera/oauth/base'
 require 'aspera/environment'
-require 'aspera/web_auth'
+require 'aspera/web_auth/server'
 require 'aspera/assert'
 module Aspera
   module OAuth
@@ -32,23 +32,24 @@ module Aspera
         random_state = SecureRandom.uuid
         login_page_url = Rest.build_uri(
           "#{api.base_url}/#{@path_authorize}",
-          base_params.merge(response_type: 'code', redirect_uri: @redirect_uri, state: random_state)
+          base_parameters(response_type: 'code', redirect_uri: @redirect_uri, state: random_state)
         )
         # here, we need a human to authorize on a web page
         Log.log.debug { "login_page_url=#{login_page_url}" }
         # start a web server to receive request code
-        web_server = WebAuth.new(@redirect_uri, self.class.additional_info)
+        web_server = WebAuth::Server.new(@redirect_uri, self.class.additional_info)
         # start browser on login page
         Environment.instance.open_uri(login_page_url)
         # wait for code in request
         received_params = web_server.received_request
         Aspera.assert(random_state.eql?(received_params['state'])) { 'wrong received state' }
         # exchange code for token
-        return create_token_call(base_params(add_secret: true).merge(
-          grant_type:   'authorization_code',
-          code:         received_params['code'],
-          redirect_uri: @redirect_uri
-        ))
+        create_token_base(
+          include_secret: true,
+          grant_type:     'authorization_code',
+          code:           received_params['code'],
+          redirect_uri:   @redirect_uri
+        )
       end
     end
     Factory.instance.register_token_creator(Web)

data/lib/aspera/preview/file_types.rb

@@ -57,11 +57,11 @@ module Aspera
 
       private_constant :SUPPORTED_MIME_TYPES
 
-      # @attr use_mimemagic [Boolean] `true` to use mimemagic to determine real mime type based on file content
-      attr_accessor :use_mimemagic
+      # @attr detect_mime [Boolean] `true` to determine real mime type based on file content
+      attr_accessor :detect_mime
 
       def initialize
-        @use_mimemagic = false
+        @detect_mime = false
       end
 
       # @param mimetype [String] mime type
@@ -81,7 +81,7 @@ module Aspera
       # @return [Symbol] file type, one of enum CONVERSION_TYPES
       # @raise [RuntimeError] if no conversion type found
       def conversion_type(filepath, mimetype)
-        Log.log.debug { "conversion_type(#{filepath},mime=#{mimetype},magic=#{@use_mimemagic})" }
+        Log.log.debug { "conversion_type(#{filepath},mime=#{mimetype},magic=#{@detect_mime})" }
         # Default type or empty means no type
         mimetype = TYPE_NOT_FOUND if mimetype.nil? || (mimetype.is_a?(String) && mimetype.empty?)
         mimetype = Marcel::MimeType.for(Pathname.new(filepath), name: File.basename(filepath), declared_type: mimetype)

data/lib/aspera/preview/generator.rb

@@ -251,6 +251,7 @@ module Aspera
         tmp_pdf_file = File.join(this_tmpdir, "#{File.basename(@source, File.extname(@source))}.pdf")
         case @options.office_conversion
         when :unoconv
+          # `unoconv` is a python wrapper over `soffice`
           Utils.silent_execute(
             :unoconv,
             '-f', 'pdf',
@@ -261,6 +262,12 @@ module Aspera
           Utils.silent_execute(
             :soffice,
             '--headless',
+            '--invisible',
+            '--nocrashreport',
+            '--nodefault',
+            '--nofirststartwizard',
+            '--nologo',
+            '--norestore',
             '--convert-to', 'pdf',
             '--outdir', File.dirname(tmp_pdf_file),
             @source

data/lib/aspera/preview/options.rb

@@ -10,19 +10,19 @@ module Aspera
       # types of generation for video files
       VIDEO_CONVERSION_METHODS = %i[reencode blend clips].freeze
       VIDEO_THUMBNAIL_METHODS = %i[fixed animated].freeze
-      # methods for office document conversion
+      # @type [Array<Symbol>] methods for office document conversion
       OFFICE_CONVERSION_METHODS = %i[soffice unoconv].freeze
-      # options used in generator
-      # for scaling see: https://trac.ffmpeg.org/wiki/Scaling
+      # Options used in generator
+      # For scaling see: https://trac.ffmpeg.org/wiki/Scaling
       # iw/ih : input width or height
       # -x : keep aspect ratio, having value a multiple of x
       DESCRIPTIONS = [
+        {name: :office_conversion,    default: :soffice,           description: 'office: method for office document conversion', values: OFFICE_CONVERSION_METHODS},
         {name: :max_size,             default: 1 << 24,            description: 'maximum size (in bytes) of preview file'},
         {name: :thumb_vid_scale,      default: '-1:min(ih,100)',   description: 'png: video: size (ffmpeg scale argument)'},
         {name: :thumb_vid_fraction,   default: 0.1,                description: 'png: video: time percent position of snapshot'},
         {name: :thumb_img_size,       default: 800,                description: 'png: non-video: height (and width)'},
         {name: :thumb_text_font,      default: 'Courier',          description: 'png: plaintext: font for text rendering: `magick identify -list font`'},
-        {name: :office_conversion,    default: :soffice,           description: 'office: method for office document conversion', values: OFFICE_CONVERSION_METHODS},
         {name: :video_conversion,     default: :reencode,          description: 'mp4: method for preview generation', values: VIDEO_CONVERSION_METHODS},
         {name: :video_png_conv,       default: :fixed,             description: 'mp4: method for thumbnail generation', values: VIDEO_THUMBNAIL_METHODS},
         {name: :video_scale,          default: 'min(iw,360):-2',   description: 'mp4: all: video scale (ffmpeg scale argument)'},

data/lib/aspera/preview/terminal.rb

@@ -2,11 +2,12 @@
 
 # cspell:words Magick MAGICKCORE ITERM mintty winsize termcap
 
-require 'rainbow'
 require 'base64'
 require 'io/console'
 require 'aspera/log'
 require 'aspera/environment'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Preview
@@ -155,9 +156,9 @@ module Aspera
             row_data.each_with_index do |pixel_rgb, col|
               text_pixels.push("\n") if col.eql?(0) && !row.eql?(0)
               if double
-                text_pixels.push(Rainbow('▄').background(pixel_rgb).foreground(pixel_colors[row + 1][col]))
+                text_pixels.push('▄'.bg(pixel_rgb).fg(pixel_colors[row + 1][col]))
               else
-                text_pixels.push(Rainbow(' ').background(pixel_rgb))
+                text_pixels.push(' '.bg(pixel_rgb))
               end
             end
           end