aspera-cli 4.25.2 → 4.25.3

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

@@ -94,7 +94,7 @@ module Aspera
 
         def initialize(**_)
           super
-          options.declare(:box, "Package inbox, either shared inbox name or one of: #{Api::Faspex::API_LIST_MAILBOX_TYPES.join(', ')} or #{SpecialValues::ALL}", default: 'inbox')
+          options.declare(:box, "Package inbox, either shared inbox name or one of: #{Api::Faspex::API_LIST_MAILBOX_TYPES.join(', ')} or #{SpecialValues::ALL}", default: 'inbox_all')
           options.declare(:shared_folder, 'Send package with files from shared folder')
           options.declare(:group_type, 'Type of shared box', allowed: %i[shared_inboxes workgroups], default: :shared_inboxes)
           options.parse_options!
@@ -102,7 +102,7 @@ module Aspera
 
         def set_api
           # create an API object with the same options, but with a different subpath
-          @api_v5 = new_with_options(Api::Faspex)
+          @api_v5 = Api::Faspex.new(**Oauth.args_from_options(options))
           # in case user wants to use HTTPGW tell transfer agent how to get address
           transfer.httpgw_url_cb = lambda{@api_v5.read('account')['gateway_url']}
         end
@@ -118,7 +118,7 @@ module Aspera
             recipient_types = [recipient_types] unless recipient_types.is_a?(Array)
           end
           parameters['recipients'].map! do |recipient_data|
-            # if just a string, make a general lookup and build expected name/type hash
+            # If just a string, make a general lookup and build expected name/type hash
             if recipient_data.is_a?(String)
               matched = @api_v5.lookup_by_name('contacts', recipient_data, query: Rest.php_style({context: 'packages', type: recipient_types}))
               recipient_data = {
@@ -174,8 +174,8 @@ module Aspera
         # list all packages with optional filter
         def list_packages_with_filter(query: {})
           filter = options.get_next_argument('filter', mandatory: false, validation: Proc, default: ->(_x){true})
-          # translate box name to API prefix (with ending slash)
           box = options.get_option(:box)
+          # Translate box name to API prefix (with ending slash)
           entity =
             case box
             when SpecialValues::ALL then 'packages' # only admin can list all packages globally
@@ -236,17 +236,12 @@ module Aspera
           rescue Cli::BadArgument
             # paths is optional
           end
+          box = options.get_option(:box)
           download_params = {
-            type:          'received',
+            type:          Api::Faspex.box_type(box),
             transfer_type: Api::Faspex::TRANSFER_CONNECT
           }
-          box = options.get_option(:box)
-          case box
-          when /outbox/ then download_params[:type] = 'sent'
-          when *Api::Faspex::API_LIST_MAILBOX_TYPES then nil # nothing to do
-          else # shared inbox / workgroup
-            download_params[:recipient_workgroup_id] = lookup_entity_by_field(api: @api_v5, entity: options.get_option(:group_type), value: box)['id']
-          end
+          download_params[:recipient_workgroup_id] = lookup_entity_by_field(api: @api_v5, entity: options.get_option(:group_type), value: box)['id'] if !Api::Faspex::API_LIST_MAILBOX_TYPES.include?(box) && box != SpecialValues::ALL
           packages.each do |package|
             pkg_id = package['id']
             formatter.display_status("Receiving package #{pkg_id}")
@@ -255,9 +250,9 @@ module Aspera
               operation:    'POST',
               subpath:      "packages/#{pkg_id}/transfer_spec/download",
               query:        download_params,
-              content_type: Rest::MIME_JSON,
+              content_type: Mime::JSON,
               body:         param_file_list,
-              headers:      {'Accept' => Rest::MIME_JSON}
+              headers:      {'Accept' => Mime::JSON}
             )
             # delete flag for Connect Client
             transfer_spec.delete('authentication')
@@ -272,6 +267,56 @@ module Aspera
           return Main.result_transfer_multiple(result_transfer)
         end
 
+        def package_send
+          parameters = value_create_modify(command: :send)
+          # autofill recipient for public url
+          if @api_v5.pub_link_context&.key?('recipient_type') && !parameters.key?('recipients')
+            parameters['recipients'] = [{
+              name:           @api_v5.pub_link_context['name'],
+              recipient_type: @api_v5.pub_link_context['recipient_type']
+            }]
+          end
+          normalize_recipients(parameters)
+          # User specified content prot in tspec, but faspex requires in package creation
+          # `transfer_spec/upload` will set `content_protection`
+          if transfer.user_transfer_spec['content_protection'] && !parameters.key?('ear_enabled')
+            transfer.user_transfer_spec.delete('content_protection')
+            parameters['ear_enabled'] = true
+          end
+          package = @api_v5.create('packages', parameters)
+          shared_folder = options.get_option(:shared_folder)
+          if shared_folder.nil?
+            # send from local files
+            transfer_spec = @api_v5.create(
+              "packages/#{package['id']}/transfer_spec/upload",
+              {paths: transfer.source_list},
+              query: {transfer_type: Api::Faspex::TRANSFER_CONNECT}
+            )
+            # well, we asked a TS for connect, but we actually want a generic one
+            transfer_spec.delete('authentication')
+            return Main.result_transfer(transfer.start(transfer_spec))
+          else
+            # send from remote shared folder
+            if (m = Base.percent_selector(shared_folder))
+              shared_folder = lookup_entity_by_field(
+                api: @api_v5,
+                entity: 'shared_folders',
+                field: m[:field],
+                value: m[:value]
+              )['id']
+            end
+            transfer_request = {shared_folder_id: shared_folder, paths: transfer.source_list}
+            # start remote transfer and get first status
+            result = @api_v5.create("packages/#{package['id']}/remote_transfer", transfer_request)
+            result['id'] = package['id']
+            unless result['status'].eql?('completed')
+              formatter.display_status("Package #{package['id']}")
+              result = wait_package_status(package['id'])
+            end
+            return Main.result_single_object(result)
+          end
+        end
+
         # Browse a folder
         # @param browse_endpoint [String] the endpoint to browse
         def browse_folder(browse_endpoint)
@@ -300,9 +345,9 @@ module Aspera
                 operation:    'POST',
                 subpath:      browse_endpoint,
                 query:        query,
-                content_type: Rest::MIME_JSON,
+                content_type: Mime::JSON,
                 body:         {'path' => path, 'filters' => filters},
-                headers:      {'Accept' => Rest::MIME_JSON},
+                headers:      {'Accept' => Mime::JSON},
                 ret:          :both
               )
               all_items.concat(data['items'])
@@ -339,12 +384,7 @@ module Aspera
           when :show
             return Main.result_single_object(@api_v5.read("packages/#{package_id}"))
           when :browse
-            location = case options.get_option(:box)
-            when 'inbox' then 'received'
-            when 'outbox' then 'sent'
-            else raise BadArgument, 'Browse only available for inbox and outbox'
-            end
-            return browse_folder("packages/#{package_id}/files/#{location}")
+            return browse_folder("packages/#{package_id}/files/#{Api::Faspex.box_type(options.get_option(:box))}")
           when :status
             status_list = options.get_next_argument('list of states, or nothing', mandatory: false, validation: Array)
             status = wait_package_status(package_id, status_list: status_list)
@@ -357,64 +397,21 @@ module Aspera
             @api_v5.call(
               operation:    'DELETE',
               subpath:      'packages',
-              content_type: Rest::MIME_JSON,
+              content_type: Mime::JSON,
               body:         {ids: ids},
-              headers:      {'Accept' => Rest::MIME_JSON}
+              headers:      {'Accept' => Mime::JSON}
             )
             return Main.result_status('Package(s) deleted')
           when :receive
             return package_receive(package_id)
           when :send
-            parameters = value_create_modify(command: command)
-            # autofill recipient for public url
-            if @api_v5.pub_link_context&.key?('recipient_type') && !parameters.key?('recipients')
-              parameters['recipients'] = [{
-                name:           @api_v5.pub_link_context['name'],
-                recipient_type: @api_v5.pub_link_context['recipient_type']
-              }]
-            end
-            normalize_recipients(parameters)
-            # User specified content prot in tspec, but faspex requires in package creation
-            # `transfer_spec/upload` will set `content_protection`
-            if transfer.user_transfer_spec['content_protection'] && !parameters.key?('ear_enabled')
-              transfer.user_transfer_spec.delete('content_protection')
-              parameters['ear_enabled'] = true
-            end
-            package = @api_v5.create('packages', parameters)
-            shared_folder = options.get_option(:shared_folder)
-            if shared_folder.nil?
-              # send from local files
-              transfer_spec = @api_v5.create(
-                "packages/#{package['id']}/transfer_spec/upload",
-                {paths: transfer.source_list},
-                query: {transfer_type: Api::Faspex::TRANSFER_CONNECT}
-              )
-              # well, we asked a TS for connect, but we actually want a generic one
-              transfer_spec.delete('authentication')
-              return Main.result_transfer(transfer.start(transfer_spec))
-            else
-              # send from remote shared folder
-              if (m = Base.percent_selector(shared_folder))
-                shared_folder = lookup_entity_by_field(
-                  api: @api_v5,
-                  entity: 'shared_folders',
-                  field: m[:field],
-                  value: m[:value]
-                )['id']
-              end
-              transfer_request = {shared_folder_id: shared_folder, paths: transfer.source_list}
-              # start remote transfer and get first status
-              result = @api_v5.create("packages/#{package['id']}/remote_transfer", transfer_request)
-              result['id'] = package['id']
-              unless result['status'].eql?('completed')
-                formatter.display_status("Package #{package['id']}")
-                result = wait_package_status(package['id'])
-              end
-              return Main.result_single_object(result)
-            end
+            return package_send
           when :list
             list, total = list_packages_with_filter
-            return Main.result_object_list(list, total: total, fields: %w[id title release_date total_bytes total_files created_time state])
+            fields = %w[id title status sender.name recipients.0.name release_date total_bytes total_files]
+            fields.delete('recipients.0.name') if %w[inbox inbox_history].include?(options.get_option(:box))
+            fields.delete('sender.name') if %w[outbox outbox_history].include?(options.get_option(:box))
+            return Main.result_object_list(list, total: total, fields: fields)
           end
         end
 
@@ -687,7 +684,7 @@ module Aspera
                 @api_v5.create(invitation_endpoint, params)
               end
             when :resend
-              @api_v5.create("#{invitation_endpoint}/#{instance_identifier}/resend")
+              @api_v5.create("#{invitation_endpoint}/#{instance_identifier}/resend", nil)
               return Main.result_status('Invitation resent')
             else
               return entity_execute(

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

@@ -450,7 +450,7 @@ module Aspera
               @api_node.call(
                 operation:    'POST',
                 subpath:      'services/soap/Transfer-201210',
-                content_type: Rest::MIME_TEXT,
+                content_type: Mime::TEXT,
                 body:         CENTRAL_SOAP_API_TEST,
                 headers:      {'Content-Type' => 'text/xml;charset=UTF-8', 'SOAPAction' => 'FASPSessionNET-200911#GetSessionInfo'},
                 ret:          :resp
@@ -471,9 +471,7 @@ module Aspera
             return Main.result_single_object(nd_info)
           when :license
             # requires: asnodeadmin -mu <node user> --acl-add=internal --internal
-            node_license = @api_node.read('license')
-            Log.log.error('server must have: asnodeadmin -mu <node user> --acl-add=internal --internal') if node_license['failure'].is_a?(String) && node_license['failure'].include?('ACL')
-            return Main.result_single_object(node_license)
+            return Main.result_single_object(@api_node.read('license'))
           when :api_details
             return Main.result_single_object({base_url: @api_node.base_url}.merge(@api_node.params))
           end
@@ -837,7 +835,7 @@ module Aspera
                 @api_node.call(
                   operation:    'POST',
                   subpath:      "asyncs/#{asyncs_id}/#{sync_command}",
-                  content_type: Rest::MIME_TEXT,
+                  content_type: Mime::TEXT,
                   body:         '',
                   ret:          :resp
                 ).body

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

@@ -7,9 +7,33 @@ module Aspera
     module Plugins
       # base class for applications supporting OAuth 2.0 authentication
       class Oauth < BasicAuth
-        # OAuth methods supported
+        class << self
+          # Get command line options specified by `AUTH_OPTIONS` and `defaults.keys` (value is default).
+          # Adds those not nil to the `kwargs`.
+          # Instantiate the provided `klass` with those `kwargs`.
+          # `defaults` can specify a default value (not `nil`)
+          # @param options  [Cli::Manager] Object to get command line options.
+          # @param kwargs   [Hash]  Object creation arguments
+          # @param defaults [Hash]  Additional options, key=symbol, value=default value or nil
+          # @return [Object] instance of `klass`
+          # @raise [Cli::Error] if a required option is missing
+          def args_from_options(options, defaults: nil, **kwargs)
+            defaults ||= {}
+            (AUTH_OPTIONS + defaults.keys).each_with_object(kwargs) do |i, m|
+              v = options.get_option(i)
+              m[i] = v unless v.nil?
+              m[i] = defaults[i] if m[i].nil? && !defaults[i].nil?
+            end
+          rescue ::ArgumentError => e
+            if (m = e.message.match(/missing keyword: :(.*)$/))
+              raise Cli::Error, "Missing option: #{m[1]}"
+            end
+            raise
+          end
+        end
+        # OAuth methods supported (web, jwt)
         AUTH_TYPES = %i[web jwt boot].freeze
-        # Options used for authentication
+        # Options used for authentication (url, auth, client_id, etc...)
         AUTH_OPTIONS = %i[url auth client_id client_secret redirect_uri private_key passphrase username password].freeze
         def initialize(**_)
           super
@@ -20,29 +44,6 @@ module Aspera
           options.declare(:private_key, 'OAuth (JWT) RSA private key PEM value (prefix file path with @file:)')
           options.declare(:passphrase, 'OAuth (JWT) RSA private key passphrase')
         end
-
-        # Get command line options specified by `AUTH_OPTIONS` and `option.keys` (value is default).
-        # Adds those not nil to the `kwargs`.
-        # Instantiate the provided `klass` with those kwargs.
-        # `option` can specify a default value (not `nil`)
-        # @param klass   [Class] API object to create
-        # @param kwargs  [Hash] The fixed keyword arguments for creation
-        # @param option [Hash] Additional options, key=symbol, value:default value or nil
-        # @return [Object] instance of `klass`
-        # @raise [Cli::Error] if a required option is missing
-        def new_with_options(klass, kwargs: {}, option: {})
-          klass.new(**
-            (AUTH_OPTIONS + option.keys).each_with_object(kwargs) do |i, m|
-              v = options.get_option(i)
-              m[i] = v unless v.nil?
-              m[i] = option[i] unless !m[i].nil? || option[i].nil?
-            end)
-        rescue ::ArgumentError => e
-          if (m = e.message.match(/missing keyword: :(.*)$/))
-            raise Cli::Error, "Missing option: #{m[1]}"
-          end
-          raise
-        end
       end
     end
   end

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

@@ -90,8 +90,8 @@ module Aspera
           Aspera::Preview::Options::DESCRIPTIONS.each do |opt|
             values = if opt.key?(:values)
               opt[:values]
-            elsif Cli::Manager::BOOLEAN_SIMPLE.include?(opt[:default])
-              Allowed::TYPES_BOOLEAN
+            elsif BoolValue.symbol?(opt[:default])
+              BoolValue::TYPES
             end
             options.declare(opt[:name], opt[:description].capitalize, allowed: values, handler: {o: @gen_options, m: opt[:name]}, default: opt[:default])
           end
@@ -109,7 +109,7 @@ module Aspera
         # /files/id/files is normally cached in Redis, but we can discard the cache
         # but /files/id is not cached
         def get_folder_entries(file_id, request_args = nil)
-          headers = {'Accept' => Rest::MIME_JSON}
+          headers = {'Accept' => Mime::JSON}
           headers['X-Aspera-Cache-Control'] = 'no-cache' if @option_folder_reset_cache.eql?(:header)
           return @api_node.read("files/#{file_id}/files", request_args, headers: headers)
         end

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

@@ -17,20 +17,21 @@ module Aspera
           # @return [Hash] with version, ping, api
           def health_check(url)
             result = {}
+            # Get version from main page
             result[:version] =
               begin
                 version = nil
                 login_page = Rest
                   .new(base_url: url, redirect_max: 2)
                   .read('', headers: {'Accept'=>'text/html'})
+                raise 'not Shares' unless login_page.include?('aspera-Shares')
                 if (m = login_page.match(/\(v([0-9a-f\.]+)\)/))
                   version = m[1]
                   if (m = login_page.match(/Patch level ([0-9]+)/))
-                    version = "#{result[:version]} #{m[0]}"
+                    version = "#{version} #{m[0]}"
                   end
                 end
-                raise 'no version' if version.nil?
-                version
+                version.nil? ? 'no version' : version
               rescue => e
                 e
               end
@@ -45,10 +46,15 @@ module Aspera
               end
             result[:api] =
               begin
-                resp = Rest.new(base_url: url, redirect_max: 1).read("#{NODE_API_PATH}/app", exception: false, ret: :resp)
+                data, resp = Rest
+                  .new(base_url: "#{url}/#{NODE_API_PATH}", redirect_max: 1)
+                  .read('info', exception: false, ret: :both)
                 # shall fail: shares requires auth, but we check error message
-                raise 'not found' unless resp.code.to_s.eql?('401') && resp.body.eql?('{"error":{"user_message":"API user authentication failed"}}')
-                'available'
+                if resp.code.to_s.eql?('401') && data&.dig('error', 'user_message')&.include?('authentication failed')
+                  'available'
+                else
+                  raise "not found (#{resp.code})"
+                end
               rescue => e
                 e
               end
@@ -88,7 +94,7 @@ module Aspera
         SAML_IMPORT_MANDATORY = %w[id name_id].freeze
         SAML_IMPORT_ALLOWED = %w[email given_name surname].concat(SAML_IMPORT_MANDATORY).freeze
 
-        ACTIONS = %i[health files admin].freeze
+        ACTIONS = %i[health info files admin].freeze
         # common to users and groups
         USR_GRP_SETTINGS = %i[transfer_settings app_authorizations share_permissions].freeze
 
@@ -111,6 +117,8 @@ module Aspera
               nagios.add_critical('API', health[:api].to_s)
             end
             Main.result_object_list(nagios.status_list)
+          when :info
+            return Main.result_single_object(basic_auth_api(NODE_API_PATH).read('info', headers: {'Content-Type'=>'application/json'}))
           when :files
             api_shares_node = basic_auth_api(NODE_API_PATH)
             repo_command = options.get_next_command(Node::COMMANDS_SHARES)

data/lib/aspera/cli/version.rb

@@ -4,6 +4,6 @@ module Aspera
   module Cli
     # For beta add extension : .beta1
     # For dev version add extension : .pre
-    VERSION = '4.25.2'
+    VERSION = '4.25.3'
   end
 end

data/lib/aspera/colors.rb

@@ -58,6 +58,13 @@ class String
     end
   end
 
+  # Applies the provided list of string decoration (colors).
+  # @param colors [Array<Symbol>] List of decorations.
+  # @return [String] Enhanced String.
+  def apply(*colors)
+    colors.reduce(self){ |s, c| s.public_send(c)}
+  end
+
   # Transform capitalized to snake case
   def capital_to_snake
     return gsub(/([a-z\d])([A-Z])/, '\1_\2')

data/lib/aspera/faspex_gw.rb

@@ -52,9 +52,9 @@ module Aspera
         operation:    'POST',
         subpath:      "packages/#{package['id']}/transfer_spec/upload",
         query:        {transfer_type: Api::Faspex::TRANSFER_CONNECT},
-        content_type: Rest::MIME_JSON,
+        content_type: Mime::JSON,
         body:         {paths: [{'destination'=>'/'}]},
-        headers:      {'Accept' => Rest::MIME_JSON}
+        headers:      {'Accept' => Mime::JSON}
       )
       transfer_spec.delete('authentication')
       # but we place it in a Faspex package creation response
@@ -82,18 +82,18 @@ module Aspera
             end
           Log.log.debug{"faspex_package_create_result=#{faspex_package_create_result}"}
           response.status = 200
-          response.content_type = Rest::MIME_JSON
+          response.content_type = Mime::JSON
           response.body = JSON.generate(faspex_package_create_result)
         rescue => e
           response.status = 500
-          response['Content-Type'] = Rest::MIME_JSON
+          response['Content-Type'] = Mime::JSON
           response.body = {error: e.message, stacktrace: e.backtrace}.to_json
           Log.log.error(e.message)
           Log.log.debug{e.backtrace.join("\n")}
         end
       else
         response.status = 400
-        response['Content-Type'] = Rest::MIME_JSON
+        response['Content-Type'] = Mime::JSON
         response.body = {error: 'Unsupported endpoint'}.to_json
       end
     end

data/lib/aspera/faspex_postproc.rb

@@ -32,13 +32,13 @@ module Aspera
         # Only accept requests on the root
         if !request.path.start_with?(@parameters[:root])
           response.status = 400
-          response['Content-Type'] = Rest::MIME_JSON
+          response['Content-Type'] = Mime::JSON
           response.body = {status: 'error', message: 'Request outside domain'}.to_json
           return
         end
         if request.body.nil?
           response.status = 400
-          response['Content-Type'] = Rest::MIME_JSON
+          response['Content-Type'] = Mime::JSON
           response.body = {status: 'error', message: 'Empty request'}.to_json
           return
         end
@@ -65,7 +65,7 @@ module Aspera
           raise "script #{script_path} failed with code #{process_status.exitstatus}" if !process_status.success? && @parameters[:fail_on_error]
         end
         response.status = 200
-        response.content_type = Rest::MIME_JSON
+        response.content_type = Mime::JSON
         response.body = JSON.generate({status: 'success', script: script_path, exit_code: process_status.exitstatus})
         Log.log.debug{'Script executed successfully'}
       rescue => e
@@ -76,7 +76,7 @@ module Aspera
           Log.log.error("Killed process: #{post_proc_pid}")
         end
         response.status = 500
-        response['Content-Type'] = Rest::MIME_JSON
+        response['Content-Type'] = Mime::JSON
         response.body = {status: 'error', script: script_path, message: e.message}.to_json
       end
     end

data/lib/aspera/log.rb

@@ -65,11 +65,8 @@ module Aspera
 
     # Class methods
     class << self
-      # Applies the provided list of string decoration (colors) to the value.
-      # @param value [String]         Value to enhance.
-      # @param colors [Array(Symbol)] List of decorations
-      def apply_colors(value, colors)
-        colors.inject(value){ |s, c| s.send(c)}
+      def short_levl(level)
+        "#{level[0, 3]}#{level[-1]}"
       end
 
       # Get the logger object of singleton
@@ -154,8 +151,8 @@ module Aspera
 
     def formatter=(formatter)
       if formatter.is_a?(String)
-        raise Error, "Unknown formatter #{formatter}, use one of: #{FORMATTERS.keys.join(', ')}" unless FORMATTERS.key?(formatter.to_sym)
-        formatter = FORMATTERS[formatter.to_sym]
+        raise Error, "Unknown formatter #{formatter}, use one of: #{FORMATTERS.join(', ')}" unless FORMATTER_LAMBDAS.key?(formatter.to_sym)
+        formatter = FORMATTER_LAMBDAS[formatter.to_sym]
       elsif !formatter.respond_to?(:call) && !formatter.is_a?(Logger::Formatter)
         raise Error, 'Formatter must be a String, a Logger::Formatter or a Proc'
       end
@@ -226,18 +223,22 @@ module Aspera
       UNKNOWN: %i{blink}
     }.freeze
 
-    # Short levels with color
-    LVL_COLOR = LVL_DECO.map{ |k, v| [k, apply_colors("#{k[..2]}#{k[-1]}", v)]}.to_h.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"}
 
     # pre-defined formatters
-    FORMATTERS = {
+    FORMATTER_LAMBDAS = {
       standard: Logger::Formatter.new,
       default:  DEFAULT_FORMATTER,
       caller:   ->(s, _d, _p, m){"#{LVL_COLOR[s]} #{Log.caller_method}\n#{m}\n"}
     }.freeze
 
-    private_constant :LVL_DECO, :LVL_COLOR, :DEFAULT_FORMATTER, :FORMATTERS
+    FORMATTERS = FORMATTER_LAMBDAS.keys
+
+    private_constant :LVL_DECO, :DEFAULT_FORMATTER, :FORMATTER_LAMBDAS
   end
 end

data/lib/aspera/markdown.rb

@@ -40,6 +40,11 @@ module Aspera
         "```#{type}\n#{lines.join("\n")}\n```\n\n"
       end
 
+      # inline code
+      def icode(text)
+        "`#{text}`"
+      end
+
       def paragraph(text)
         "#{text}\n\n"
       end

data/lib/aspera/node_simulator.rb

@@ -328,7 +328,7 @@ module Aspera
 
     def set_json_response(request, response, json, code: 200)
       response.status = code
-      response['Content-Type'] = Rest::MIME_JSON
+      response['Content-Type'] = Mime::JSON
       response.body = json.to_json
       Log.log.trace1{Log.obj_dump("response for #{request.request_method} #{request.path}", json)}
     end

data/lib/aspera/oauth/base.rb

@@ -53,7 +53,7 @@ module Aspera
       def create_token_call(creation_params)
         Log.log.debug{'Generating a new token'.bg_green}
         return @api.create(@path_token, nil, query: creation_params, ret: :resp) if @use_query
-        return @api.create(@path_token, creation_params, content_type: Rest::MIME_WWW, ret: :resp)
+        return @api.create(@path_token, creation_params, content_type: Mime::WWW, ret: :resp)
       end
 
       # Create base parameters for token creation calls

data/lib/aspera/oauth/url_json.rb

@@ -24,9 +24,9 @@ module Aspera
           operation:    'POST',
           subpath:      path_token,
           query:        @query.merge(scope: params[:scope]), # scope is here because it may change over time (node)
-          content_type: Rest::MIME_JSON,
+          content_type: Mime::JSON,
           body:         @body,
-          headers:      {'Accept' => Rest::MIME_JSON},
+          headers:      {'Accept' => Mime::JSON},
           ret:          :resp
         )
       end