aspera-cli 4.24.1 → 4.24.2

data/lib/aspera/cli/wizard.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require 'aspera/oauth/jwt'
+require 'aspera/assert'
+require 'aspera/cli/plugins/factory'
 
 module Aspera
   module Cli
+    # The wizard detects applications and generates a config
     class Wizard
       WIZARD_RESULT_KEYS = %i[preset_value test_args].freeze
       DEFAULT_PRIV_KEY_FILENAME = 'my_private_key.pem' # pragma: allowlist secret
@@ -13,13 +16,17 @@ module Aspera
       def initialize(parent, main_folder)
         @parent = parent
         @main_folder = main_folder
-        # wizard options
+        # Wizard options
         options.declare(:override, 'Wizard: override existing value', values: :bool, default: :no)
         options.declare(:default, 'Wizard: set as default configuration for specified plugin (also: update)', values: :bool, default: true)
-        options.declare(:test_mode, 'Wizard: skip private key check step', values: :bool, default: false)
         options.declare(:key_path, 'Wizard: path to private key for JWT')
       end
 
+      # @return false if in test mode to avoid interactive input
+      def required
+        !ENV['ASCLI_WIZ_TEST']
+      end
+
       def options
         @parent.options
       end
@@ -32,6 +39,10 @@ module Aspera
         @parent.config
       end
 
+      def check_email(email)
+        Aspera.assert(email =~ /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i, type: ParameterError){"Username shall be an email: #{email}"}
+      end
+
       # Find a plugin, and issue the "require"
       # @return [Hash] plugin info: { product:, name:, url:, version: }
       def identify_plugins_for_url
@@ -40,19 +51,19 @@ module Aspera
         check_only = check_only.to_sym unless check_only.nil?
         found_apps = []
         my_self_plugin_sym = self.class.name.split('::').last.downcase.to_sym
-        PluginFactory.instance.plugin_list.each do |plugin_name_sym|
-          # no detection for internal plugin
+        Plugins::Factory.instance.plugin_list.each do |plugin_name_sym|
+          # No detection for internal plugin
           next if plugin_name_sym.eql?(my_self_plugin_sym)
           next if check_only && !check_only.eql?(plugin_name_sym)
-          # load plugin class
-          detect_plugin_class = PluginFactory.instance.plugin_class(plugin_name_sym)
-          # requires detection method
-          next unless detect_plugin_class.respond_to?(:detect)
+          # Load plugin class
+          plugin_klass = Plugins::Factory.instance.plugin_class(plugin_name_sym)
+          # Requires detection method
+          next unless plugin_klass.respond_to?(:detect)
           detection_info = nil
           begin
             Log.log.debug{"detecting #{plugin_name_sym} at #{app_url}"}
             formatter.long_operation_running("#{plugin_name_sym}\r")
-            detection_info = detect_plugin_class.detect(app_url)
+            detection_info = plugin_klass.detect(app_url)
           rescue OpenSSL::SSL::SSLError => e
             Log.log.warn(e.message)
             Log.log.warn('Use option --insecure=yes to allow unchecked certificate') if e.message.include?('cert')
@@ -63,8 +74,8 @@ module Aspera
           next if detection_info.nil?
           Aspera.assert_type(detection_info, Hash)
           Aspera.assert_type(detection_info[:url], String) if detection_info.key?(:url)
-          app_name = detect_plugin_class.respond_to?(:application_name) ? detect_plugin_class.application_name : detect_plugin_class.name.split('::').last
-          # if there is a redirect, then the detector can override the url.
+          app_name = plugin_klass.respond_to?(:application_name) ? plugin_klass.application_name : plugin_klass.name.split('::').last
+          # 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
         raise "No known application found at #{app_url}" if found_apps.empty?
@@ -72,6 +83,39 @@ module Aspera
         return found_apps
       end
 
+      # To be called in public wizard method to get private key
+      # @return [Array] Private key path, pub key PEM
+      def ask_private_key(user:, url:, page:)
+        # Lets see if path to priv key is provided
+        private_key_path = options.get_option(:key_path)
+        # Give a chance to provide
+        if private_key_path.nil?
+          formatter.display_status('Path to private RSA key (leave empty to generate):')
+          private_key_path = options.get_option(:key_path, mandatory: true).to_s
+        end
+        # Else generate path
+        private_key_path = File.join(@main_folder, DEFAULT_PRIV_KEY_FILENAME) if private_key_path.empty?
+        if File.exist?(private_key_path)
+          formatter.display_status('Using existing key:')
+        else
+          formatter.display_status("Generating #{OAuth::Jwt::DEFAULT_PRIV_KEY_LENGTH} bit RSA key...")
+          OAuth::Jwt.generate_rsa_private_key(path: private_key_path)
+          formatter.display_status('Created key:')
+        end
+        formatter.display_status(private_key_path)
+        private_key_pem = File.read(private_key_path)
+        pub_key_pem = OpenSSL::PKey::RSA.new(private_key_pem).public_key.to_s
+        options.set_option(:private_key, private_key_pem)
+        formatter.display_status("Please Log in as user #{user.red} at: #{url.red}")
+        formatter.display_status("Navigate to: #{page}")
+        formatter.display_status("Check or update the value to (#{'including BEGIN/END lines'.red}):".blink)
+        formatter.display_status(pub_key_pem, hide_secrets: false)
+        formatter.display_status('Once updated or validated, press [Enter].')
+        Environment.instance.open_uri(url)
+        $stdin.gets if required
+        private_key_path
+      end
+
       # Wizard function, creates configuration
       # @param apps [Array] list of detected apps
       def find(apps)
@@ -88,49 +132,18 @@ module Aspera
         Log.dump(:identification, identification)
         wiz_url = identification[:url]
         formatter.display_status("Using: #{identification[:name]} at #{wiz_url}".bold)
-        # set url for instantiation of plugin
+        # Set url for instantiation of plugin
         options.add_option_preset({url: wiz_url}, 'wizard')
-        # instantiate plugin: command line options will be known and wizard can be called
-        wiz_plugin_class = PluginFactory.instance.plugin_class(identification[:product])
-        Aspera.assert(wiz_plugin_class.respond_to?(:wizard), type: Cli::BadArgument) do
+        # Instantiate plugin: command line options will be known, e.g. private_key, and wizard can be called
+        plugin_instance = Plugins::Factory.instance.plugin_class(identification[:product]).new(context: @parent.context)
+        Aspera.assert(plugin_instance.respond_to?(:wizard), type: Cli::BadArgument) do
           "Detected: #{identification[:product]}, but this application has no wizard"
         end
-        # instantiate plugin: command line options will be known, e.g. private_key
-        plugin_instance = wiz_plugin_class.new(context: @parent.context)
-        wiz_params = {
-          object: plugin_instance
-        }
-        # is private key needed ?
-        if options.known_options.key?(:private_key) &&
-            (!wiz_plugin_class.respond_to?(:private_key_required?) || wiz_plugin_class.private_key_required?(wiz_url))
-          # lets see if path to priv key is provided
-          private_key_path = options.get_option(:key_path)
-          # give a chance to provide
-          if private_key_path.nil?
-            formatter.display_status('Path to private RSA key (leave empty to generate):')
-            private_key_path = options.get_option(:key_path, mandatory: true).to_s
-          end
-          # else generate path
-          private_key_path = File.join(@main_folder, DEFAULT_PRIV_KEY_FILENAME) if private_key_path.empty?
-          if File.exist?(private_key_path)
-            formatter.display_status('Using existing key:')
-          else
-            formatter.display_status("Generating #{OAuth::Jwt::DEFAULT_PRIV_KEY_LENGTH} bit RSA key...")
-            OAuth::Jwt.generate_rsa_private_key(path: private_key_path)
-            formatter.display_status('Created key:')
-          end
-          formatter.display_status(private_key_path)
-          private_key_pem = File.read(private_key_path)
-          options.set_option(:private_key, private_key_pem)
-          wiz_params[:private_key_path] = private_key_path
-          wiz_params[:pub_key_pem] = OpenSSL::PKey::RSA.new(private_key_pem).public_key.to_s
-        end
-        Log.dump(:wiz_params, wiz_params)
-        # finally, call the wizard
-        wizard_result = wiz_plugin_class.wizard(**wiz_params)
+        # Call the wizard
+        wizard_result = plugin_instance.wizard(self, wiz_url)
         Log.log.debug{"wizard result: #{wizard_result}"}
         Aspera.assert(WIZARD_RESULT_KEYS.eql?(wizard_result.keys.sort)){"missing or extra keys in wizard result: #{wizard_result.keys}"}
-        # get preset name from user or default
+        # Get preset name from user or default
         if wiz_preset_name.empty?
           elements = [
             identification[:product],
@@ -139,18 +152,17 @@ module Aspera
           elements.push(options.get_option(:username, mandatory: true)) unless wizard_result[:preset_value].key?(:link) rescue nil
           wiz_preset_name = elements.join('_').strip.downcase.gsub(/[^a-z0-9]/, '_').squeeze('_')
         end
-        # test mode does not change conf file
-        return Main.result_single_object(wizard_result) if options.get_option(:test_mode)
         # Write configuration file
         formatter.display_status("Preparing preset: #{wiz_preset_name}")
-        # init defaults if necessary
+        # Init defaults if necessary
         option_override = options.get_option(:override, mandatory: true)
         option_default = options.get_option(:default, mandatory: true)
         config.defaults_set(identification[:product], wiz_preset_name, wizard_result[:preset_value].stringify_keys, option_default, option_override)
         test_args = wizard_result[:test_args]
         test_args = "-P#{wiz_preset_name} #{test_args}" unless option_default
         # TODO: actually test the command
-        return Main.result_status("You can test with:\n#{Info::CMD_NAME} #{identification[:product]} #{test_args}")
+        test_cmd = "#{Info::CMD_NAME} #{identification[:product]} #{test_args}"
+        return Main.result_status("You can test with:\n#{test_cmd.red}")
       end
     end
   end

data/lib/aspera/colors.rb

@@ -57,10 +57,16 @@ class String
       define_method(name){self}
     end
   end
+
   # Transform capitalized to snake case
   def capital_to_snake
     return gsub(/([a-z\d])([A-Z])/, '\1_\2')
         .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
         .downcase
   end
+
+  # Transform snake case to capitalized
+  def snake_to_capital
+    split('_').map(&:capitalize).join
+  end
 end

data/lib/aspera/command_line_builder.rb

@@ -4,43 +4,31 @@ require 'aspera/log'
 require 'aspera/assert'
 require 'yaml'
 module Aspera
-  # helper class to build command line from a parameter list (key-value hash)
-  # constructor takes hash: { 'param1':'value1', ...}
-  # process_param is called repeatedly with all known parameters
-  # add_env_args is called to get resulting param list and env var (also checks that all params were used)
+  # Helper class to build command line from a parameter list (key-value hash)
+  # Constructor takes hash: `{ 'param1':'value1', ...}`
+  # `process_param` is called repeatedly with all known parameters
+  # `add_env_args` is called to get resulting param list and env var (also checks that all params were used)
   class CommandLineBuilder
-    # description    [String]       Description
-    # type           [String,Array] Accepted type(s) for non-enum
-    # default        [String]       Default value if not specified
-    # enum           [Array]        Set with list of values for enum types accepted in transfer spec
-    # items          [Array]
-    # properties     [Array]
-    # x-cli-envvar   [String]       Name of env var
-    # x-cli-option   [String]       Command line option (starts with "-")
-    # x-cli-switch   [Bool]         true if option has no arg, else by default option has a value
-    # x-cli-special  [Bool]         true if special handling (defered)
-    # x-cli-convert  [String,Hash]  Method name for Convert object or Conversion for enum ts to arg
-    # x-agents       [Array]        Supported agents (for doc only), if not specified: all
-    # x-ts-name      [Bool,String]  (async) true if same name in transfer spec, else real name in transfer spec, else ignored
-    # x-ts-convert   [String]       (async) Method name for Convert object
-    # x-deprecation  [String]       Deprecation message for doc
-    PROPERTY_KEYS = %w[
-      description
-      type
-      default
-      enum
-      items
-      properties
-      required
-      $comment
-      x-cli-envvar
-      x-cli-option
-      x-cli-switch
-      x-cli-special
-      x-cli-convert
-      x-agents
-      x-ts-name
-      x-deprecation
+    # Supported keys in JSON schema
+    PROPERTY_KEYS = [
+      'description',    # [String]       Description
+      'type',           # [String,Array] Accepted type(s) for non-enum
+      'default',        # [String]       Default value if not specified
+      'enum',           # [Array]        Set with list of values for enum types accepted in transfer spec
+      'items',          # [Array]
+      'properties',     # [Array]
+      'required',       # [Array]
+      '$comment',       # [String]
+      'x-cli-envvar',   # [String]       Name of env var
+      'x-cli-option',   # [String]       Command line option (starts with "-")
+      'x-cli-short',    # [String]       Command line option (starts with "-")
+      'x-cli-switch',   # [Bool]         `true` if option has no arg, else by default option has a value
+      'x-cli-special',  # [Bool]         `true` if special handling (deferred)
+      'x-cli-convert',  # [String,Hash]  Method name for Convert object or Conversion for enum ts to arg
+      'x-agents',       # [Array]        Supported agents (for doc only), if not specified: all
+      'x-ts-name',      # [Bool,String]  (async) true if same name in transfer spec, else real name in transfer spec, else ignored
+      'x-ts-convert',   # [String]       (async) Name of methods to convert value from transfer spec to `conf` API.
+      'x-deprecation'   # [String]       Deprecation message for doc
     ].freeze
 
     CLI_AGENT = 'direct'
@@ -53,17 +41,23 @@ module Aspera
         !properties.key?('x-agents') || properties['x-agents'].include?(agent)
       end
 
-      # fill default values
-      def adjust_properties_defaults(properties)
-        properties.each do |name, info|
+      # Fill default values for some fields in the schema
+      # @param schema [Hash] The JSON schema
+      def validate_schema(schema, ascp: false)
+        schema['properties'].each do |name, info|
           Aspera.assert_type(info, Hash){"#{info.class} for #{name}"}
           unsupported_keys = info.keys - PROPERTY_KEYS
           Aspera.assert(unsupported_keys.empty?){"Unsupported definition keys: #{unsupported_keys}"}
-          # by default : string, unless it's without arg
-          info['type'] ||= info['x-cli-switch'] ? 'boolean' : 'string'
-          # add default cli option name if not present, and if supported in "direct".
-          info['x-cli-option'] = "--#{name.to_s.tr('_', '-')}" if !info.key?('x-cli-option') && !info['x-cli-envvar'] && (info.key?('x-cli-switch') || supported_by_agent(CLI_AGENT, info))
+          # By default : string, unless it's without arg (switch)
+          # info['type'] ||= info['x-cli-switch'] ? 'boolean' : 'string'
+          Aspera.assert(info.key?('type') || info.key?('enum')){"Missing type for #{name} in #{schema['description']}"}
+          Aspera.assert(info['type'].eql?('boolean')){"switch must be bool: #{name}"} if info['x-cli-switch']
+          # Add default cli option name if not present, and if supported in "direct".
+          info['x-cli-option'] = "--#{name.to_s.tr('_', '-')}" if info['x-cli-option'].eql?(true) || (info['x-cli-switch'].eql?(true) && !info.key?('x-cli-option'))
+          Aspera.assert(%w[x-cli-option x-cli-envvar x-cli-special].any?{ |i| info.key?(i)}, type: :warn){name} if ascp && supported_by_agent(CLI_AGENT, info)
+          # info['x-cli-option'] = "--#{name.to_s.tr('_', '-')}" if ascp && !info.key?('x-cli-option') && !info['x-cli-envvar'] && (info.key?('x-cli-switch') || supported_by_agent(CLI_AGENT, info))
           info.freeze
+          validate_schema(info, ascp: ascp) if info['type'].eql?('object') && info['properties']
         end
       end
 
@@ -98,10 +92,10 @@ module Aspera
     # Add processed parameters to env and args, warns about unused parameters
     # @param [Hash] env_args with :env and :args
     def add_env_args(env_args)
-      Log.log.debug{"add_env_args: ENV=#{@result[:env]}, ARGS=#{@result[:args]}"}
+      Log.dump(:env_args, @result)
       # warn about non translated arguments
       @object.each_pair do |name, value|
-        Log.log.warn{raise "Unknown transfer spec parameter: #{name} = \"#{value}\""} unless @processed_parameters.include?(name)
+        Log.log.warn{"Unknown transfer spec parameter: #{name} = \"#{value}\""} unless @processed_parameters.include?(name)
       end
       # set result
       env_args[:env].merge!(@result[:env])
@@ -109,9 +103,10 @@ module Aspera
       return
     end
 
-    # add options directly to command line
-    def add_command_line_options(options)
-      return if options.nil?
+    # Add options directly to command line
+    def add_command_line_options(*options)
+      options = options.first if options.first.is_a?(Array) && options.length.eql?(1)
+      Aspera.assert_type(options, Array)
       options.each{ |o| @result[:args].push(o.to_s)}
     end
 
@@ -198,13 +193,13 @@ module Aspera
         else Aspera.error_unexpected_value(parameter_value){name}
         end
         # add_param = !add_param if properties[:add_on_false]
-        add_command_line_options([properties['x-cli-option']]) if add_param
+        add_command_line_options(properties['x-cli-option']) if add_param
       else
         # transform into command line option with value
         # parameter_value=parameter_value.to_s if parameter_value.is_a?(Integer)
         parameter_value = [parameter_value] unless parameter_value.is_a?(Array)
         # if transfer_spec value is an array, applies option many times
-        parameter_value.each{ |v| add_command_line_options([properties['x-cli-option'], v])}
+        parameter_value.each{ |v| add_command_line_options(properties['x-cli-option'], v)}
       end
     end
   end

data/lib/aspera/command_line_converter.rb

@@ -23,8 +23,9 @@ module Aspera
         end
       end
 
+      # Kbps to bps
       def kbps_to_bps(value)
-        1000 * value
+        1000 * value.to_i
       end
     end
   end

data/lib/aspera/coverage.rb

@@ -5,7 +5,7 @@ if ENV.key?('ENABLE_COVERAGE')
   require 'simplecov'
   require 'securerandom'
   # compute development top folder based on this source location
-  development_root = 3.times.inject(File.realpath(__FILE__)){ |p, _| File.dirname(p)}
+  development_root = File.dirname(File.realpath(__FILE__), 3)
   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)

data/lib/aspera/data_repository.rb

@@ -19,7 +19,7 @@ module Aspera
     # @return [String] decoded data
     def item(name)
       index = ELEMENTS.index(name)
-      raise ArgumentError, "unknown data item #{name} (#{name.class})" unless index
+      raise ParameterError, "Unknown data item #{name} (#{name.class})" unless index
       raw_data = data(START_INDEX + index)
       case name
       when :dsa, :rsa

data/lib/aspera/environment.rb

@@ -38,6 +38,8 @@ module Aspera
     WINDOWS_FILENAME_INVALID_CHARACTERS = '<>:"/\\|?*'
     REPLACE_CHARACTER = '_'
 
+    RB_EXT = '.rb'
+
     class << self
       def ruby_version
         return RbConfig::CONFIG['RUBY_PROGRAM_VERSION']
@@ -186,7 +188,7 @@ module Aspera
       end
     end
     attr_accessor :url_method, :file_illegal_characters
-    attr_reader :os, :cpu, :executable_extension, :default_gui_mode
+    attr_reader :os, :cpu, :default_gui_mode
 
     def initialize
       initialize_fields
@@ -218,7 +220,7 @@ module Aspera
           CPU_ARM64
         else Aspera.error_unexpected_value(RbConfig::CONFIG['host_cpu']){'host_cpu'}
         end
-      @executable_extension = @os.eql?(OS_WINDOWS) ? 'exe' : nil
+      @executable_extension = @os.eql?(OS_WINDOWS) ? '.exe' : nil
       # :text or :graphical depending on the environment
       @default_gui_mode =
         if [Environment::OS_WINDOWS, Environment::OS_MACOS].include?(os) ||
@@ -239,8 +241,10 @@ module Aspera
       "#{@os}-#{@cpu}"
     end
 
-    # executable file extension for current OS
-    def exe_file(name)
+    # Add executable file extension (e.g. ".exe") for current OS
+    # @param name [String,nil] Path or file name
+    # @return [String] Executable name with extension
+    def exe_file(name = nil)
       return name unless @executable_extension
       return "#{name}#{@executable_extension}"
     end
@@ -314,9 +318,8 @@ module Aspera
       # Windows does not allow file name:
       # - with control characters anywhere
       # - ending with space or dot
-      filename = filename
-        .gsub(/[\x00-\x1F\x7F]/, safe_char)
-        .sub(/[. ]+\z/, safe_char)
+      filename = filename.gsub(/[\x00-\x1F\x7F]/, safe_char)
+      filename = filename.chop while filename.end_with?(' ', '.')
       if @file_illegal_characters&.size.to_i >= 2
         # replace all illegal characters with safe_char
         filename = filename.tr(@file_illegal_characters[1..-1], safe_char)

data/lib/aspera/faspex_gw.rb

@@ -8,10 +8,12 @@ require 'json'
 module Aspera
   # Simulate the Faspex 4 /send API and creates a package on Aspera on Cloud or Faspex 5
   class Faspex4GWServlet < WEBrick::HTTPServlet::AbstractServlet
+    AOC_API = 'Aspera::Api::AoC'
+    FX_API = 'Aspera::Api::Faspex'
     # @param app_api     [Rest]   API object
     # @param app_context [String] workspace id (aoc only)
     def initialize(server, app_api, app_context)
-      Aspera.assert_values(app_api.class.name, ['Aspera::Api::AoC', 'Aspera::Rest'])
+      Aspera.assert_values(app_api.class.name, [AOC_API, FX_API])
       super(server)
       @app_api = app_api
       @app_context = app_context
@@ -49,7 +51,7 @@ module Aspera
       transfer_spec = @app_api.call(
         operation:    'POST',
         subpath:      "packages/#{package['id']}/transfer_spec/upload",
-        query:        {transfer_type: Cli::Plugins::Faspex5::TRANSFER_CONNECT},
+        query:        {transfer_type: Api::Faspex::TRANSFER_CONNECT},
         content_type: Rest::MIME_JSON,
         body:         {paths: [{'destination'=>'/'}]},
         headers:      {'Accept' => Rest::MIME_JSON}
@@ -72,9 +74,9 @@ module Aspera
           # compare string, as class is not yet known here
           faspex_package_create_result =
             case @app_api.class.name
-            when 'Aspera::Api::AoC'
+            when AOC_API
               faspex4_send_to_aoc(faspex_pkg_parameters)
-            when 'Aspera::Rest'
+            when FX_API
               faspex4_send_to_faspex5(faspex_pkg_parameters)
             else Aspera.error_unexpected_value(@app_api.class.name)
             end

data/lib/aspera/faspex_postproc.rb

@@ -8,7 +8,7 @@ require 'aspera/log'
 require 'aspera/assert'
 
 module Aspera
-  # this class answers the Faspex /send API and creates a package on Aspera on Cloud
+  # Start a Faspex-4 style post-processing script using Faspex-5 webhook
   class Faspex4PostProcServlet < WEBrick::HTTPServlet::AbstractServlet
     ALLOWED_PARAMETERS = %i[root script_folder fail_on_error timeout_seconds].freeze
     def initialize(server, parameters)

data/lib/aspera/keychain/macos_security.rb

@@ -73,7 +73,7 @@ module Aspera
           end
 
           def list(options = {})
-            Aspera.assert_values(options[:domain], DOMAINS, type: ArgumentError){'domain'} unless options[:domain].nil?
+            Aspera.assert_values(options[:domain], DOMAINS, type: ParameterError){'domain'} unless options[:domain].nil?
             key_chains(execute('list-keychains', options, LIST_OPTIONS))
           end
 

data/lib/aspera/log.rb

@@ -15,7 +15,7 @@ $VERBOSE = nil
 
 # Extend Ruby logger with trace levels
 class Logger
-  # Two additionnal trace levels
+  # Two additional trace levels
   TRACE_MAX = 2
 
   # Add custom level to logger severity, below debug level
@@ -23,9 +23,12 @@ class Logger
     1.upto(TRACE_MAX).each{ |level| const_set(:"TRACE#{level}", - level)}
   end
 
-  # Hash : key: log level int, value: uppercase log level label
+  # Hash
+  # key   [Integer] Log level (e.g. 0 for DEBUG)
+  # value [Symbol]  Uppercase log level label (e.g. :DEBUG)
   SEVERITY_LABEL = Severity.constants.each_with_object({}){ |name, hash| hash[Severity.const_get(name)] = name}
 
+  # Override
   # @param severity [Integer] Log severity as int
   # @return [String] Log severity upper case label
   def format_severity(severity)
@@ -106,6 +109,31 @@ module Aspera
       ensure
         $stderr = real_stderr
       end
+
+      # 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]
+        return '???' unless frame
+        # Extract the "Class::Module::Method" or "Class#method" part
+        full = frame[/'([^']+)'/, 1]
+        return '???' unless full
+        # Split into class/module and method parts
+        parts = full.split(/(::|#)/)
+        # Reconstruct keeping only last two class/module names + separator + method
+        if parts.include?('#')
+          sep_index = parts.index('#')
+          classes = parts[0...sep_index].join
+          method = parts[sep_index + 1]
+        else
+          classes = parts[0..-2].join
+          method = parts.last
+        end
+        class_parts = classes.split('::')
+        selected_classes = class_parts.last(2).join('::')
+        "#{selected_classes}.#{method}"
+      end
     end
 
     attr_reader :logger_type, :logger
@@ -119,6 +147,7 @@ module Aspera
     # Set log level of underlying logger given symbol level
     # @param new_level [Symbol] One of LEVELS
     def level=(new_level)
+      Aspera.assert_values(new_level, LEVELS)
       @logger.level = Logger::Severity.const_get(new_level.to_sym.upcase)
     end
 
@@ -140,10 +169,8 @@ module Aspera
     # Get symbol of debug level of underlying logger
     # @return [Symbol] One of LEVELS
     def level
-      Logger::Severity.constants.each do |name|
-        return name.downcase.to_sym if @logger.level.eql?(Logger::Severity.const_get(name))
-      end
-      Aspera.error_unexpected_value(@logger.level){'log level'}
+      Aspera.assert(Logger::SEVERITY_LABEL.key?(@logger.level))
+      Logger::SEVERITY_LABEL[@logger.level].downcase
     end
 
     # Change underlying logger, but keep log level
@@ -158,8 +185,8 @@ module Aspera
         @logger = Logger.new($stdout, progname: @program_name, formatter: DEFAULT_FORMATTER)
       when :syslog
         require 'syslog/logger'
-        # the syslog class automatically creates methods from the severity names
-        # we just need to add the mapping (but syslog lowest is DEBUG)
+        # The syslog class automatically creates methods from the severity names.
+        # We just need to add the mapping (but syslog lowest is DEBUG)
         1.upto(Logger::TRACE_MAX).each do |level|
           Syslog::Logger.const_get(:LEVEL_MAP)[Logger.const_get("TRACE#{level}")] = Syslog::LOG_DEBUG
         end
@@ -207,7 +234,8 @@ module Aspera
     # pre-defined formatters
     FORMATTERS = {
       standard: Logger::Formatter.new,
-      default:  DEFAULT_FORMATTER
+      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

data/lib/aspera/nagios.rb

@@ -57,7 +57,7 @@ module Aspera
     # compare remote time with local time
     def check_time_offset(remote_date, component)
       # check date if specified : 2015-10-13T07:32:01Z
-      remote_time = Time.strptime(remote_date)
+      remote_time = Time.parse(remote_date)
       diff_time = (remote_time - Time.now).abs
       diff_rounded = diff_time.round(-2)
       Log.log.debug{"DATE: #{remote_date} #{remote_time} diff=#{diff_rounded}"}