aspera-cli 4.24.0 → 4.24.2

data/lib/aspera/cli/main.rb

@@ -4,7 +4,7 @@ require 'aspera/cli/manager'
 require 'aspera/cli/formatter'
 require 'aspera/cli/plugins/config'
 require 'aspera/cli/extended_value'
-require 'aspera/cli/plugin_factory'
+require 'aspera/cli/plugins/factory'
 require 'aspera/cli/transfer_agent'
 require 'aspera/cli/version'
 require 'aspera/cli/info'
@@ -46,29 +46,13 @@ module Aspera
       STATUS_FIELD = 'status'
       COMMAND_CONFIG = :config
       COMMAND_HELP = :help
-      # types that go to result of type = text
+      # Types that go to result of type = text
       SCALAR_TYPES = [String, Integer, Symbol].freeze
       USER_INTERFACES = %i[text graphical].freeze
 
       private_constant :COMMAND_CONFIG, :COMMAND_HELP, :SCALAR_TYPES, :USER_INTERFACES
 
       class << self
-        # early debug for parser
-        # Note: does not accept shortcuts
-        def early_debug_setup(argv)
-          Log.instance.program_name = Info::CMD_NAME
-          argv.each do |arg|
-            case arg
-            when '--' then break
-            when /^--log-level=(.*)/ then Log.instance.level = Regexp.last_match(1).to_sym
-            when /^--logger=(.*)/ then Log.instance.logger_type = Regexp.last_match(1).to_sym
-            end
-          rescue => e
-            $stderr.puts("Error: #{e}") # rubocop:disable Style/StderrPuts
-            Process.exit(1)
-          end
-        end
-
         def result_special(how); {type: :special, data: how}; end
 
         # Expect some list, but nothing to display
@@ -81,13 +65,13 @@ module Aspera
         # @param status [String] The status
         def result_status(status); return {type: :status, data: status}; end
 
-        # text result coming from command result
+        # Text result coming from command result
         def result_text(data); return {type: :text, data: data}; end
 
         def result_success; return result_status('complete'); end
 
         # Process statuses of finished transfer sessions
-        # raise exception if there is one error
+        # @raise exception if there is one error
         # else returns an empty status
         def result_transfer(statuses)
           worst = TransferAgent.session_status(statuses)
@@ -98,10 +82,10 @@ module Aspera
         # Used when one command executes several transfer jobs (each job being possibly multi session)
         # @param status_table [Array] [{STATUS_FIELD=>[status array],...},...]
         # @return a status object suitable as command result
-        # each element has a key STATUS_FIELD which contains the result of possibly multiple sessions
+        # Each element has a key STATUS_FIELD which contains the result of possibly multiple sessions
         def result_transfer_multiple(status_table)
           global_status = :success
-          # transform status array into string and find if there was problem
+          # Transform status array into string and find if there was problem
           status_table.each do |item|
             worst = TransferAgent.session_status(item[STATUS_FIELD])
             global_status = worst unless worst.eql?(:success)
@@ -153,7 +137,7 @@ module Aspera
         end
       end
 
-      # minimum initialization, no exception raised
+      # Minimum initialization, no exception raised
       def initialize(argv)
         @argv = argv
         Log.dump(:argv, @argv, level: :trace2)
@@ -163,16 +147,16 @@ module Aspera
         @context = Context.new
       end
 
-      # this is the main function called by initial script just after constructor
+      # This is the main function called by initial script just after constructor
       def process_command_line
-        # catch exception information , if any
+        # Catch exception information , if any
         exception_info = nil
-        # false if command shall not be executed (e.g. --show-config)
+        # False if command shall not be executed (e.g. --show-config)
         execute_command = true
-        # catch exceptions
+        # Catch exceptions
         begin
           init_agents_options_plugins
-          # help requested without command ? (plugins must be known here)
+          # Help requested without command ? (plugins must be known here)
           show_usage if @option_help && @context.options.command_or_arg_empty?
           generate_bash_completion if @bash_completion
           @context.config.periodic_check_newer_gem_version
@@ -180,35 +164,35 @@ module Aspera
             if @option_show_config && @context.options.command_or_arg_empty?
               COMMAND_CONFIG
             else
-              @context.options.get_next_command(PluginFactory.instance.plugin_list.unshift(COMMAND_HELP))
+              @context.options.get_next_command(Plugins::Factory.instance.plugin_list.unshift(COMMAND_HELP))
             end
-          # command will not be executed, but we need manual
+          # Command will not be executed, but we need manual
           @context.options.fail_on_missing_mandatory = false if @option_help || @option_show_config
-          # main plugin is not dynamically instantiated
+          # Main plugin is not dynamically instantiated
           case command_sym
           when COMMAND_HELP
             show_usage
           when COMMAND_CONFIG
             command_plugin = @context.config
           else
-            # get plugin, set options, etc
+            # Get plugin, set options, etc
             command_plugin = get_plugin_instance_with_options(command_sym)
-            # parse plugin specific options
+            # Parse plugin specific options
             @context.options.parse_options!
           end
-          # help requested for current plugin
+          # Help requested for current plugin
           show_usage(all: false) if @option_help
           if @option_show_config
             @context.formatter.display_results(type: :single_object, data: @context.options.known_options(only_defined: true).stringify_keys)
             execute_command = false
           end
-          # locking for single execution (only after "per plugin" option, in case lock port is there)
+          # Locking for single execution (only after "per plugin" option, in case lock port is there)
           lock_port = @context.options.get_option(:lock_port)
           if !lock_port.nil?
             begin
-              # no need to close later, will be freed on process exit. must save in member else it is garbage collected
+              # No need to close later, will be freed on process exit. must save in member else it is garbage collected
               Log.log.debug{"Opening lock port #{lock_port}"}
-              # loopback address, could also be 'localhost'
+              # Loopback address, could also be 'localhost'
               @tcp_server = TCPServer.new('127.0.0.1', lock_port)
             rescue StandardError => e
               execute_command = false
@@ -221,11 +205,11 @@ module Aspera
             Log.log.debug{"Wrote pid #{Process.pid} to #{pid_file}"}
             at_exit{File.delete(pid_file)}
           end
-          # execute and display (if not exclusive execution)
+          # Execute and display (if not exclusive execution)
           @context.formatter.display_results(**command_plugin.execute_action) if execute_command
-          # save config file if command modified it
+          # Save config file if command modified it
           @context.config.save_config_file_if_needed
-          # finish
+          # Finish
           @context.transfer.shutdown
         rescue Net::SSH::AuthenticationFailed => e; exception_info = {e: e, t: 'SSH', security: true}
         rescue OpenSSL::SSL::SSLError => e;         exception_info = {e: e, t: 'SSL'}
@@ -238,7 +222,7 @@ module Aspera
         rescue StandardError => e;                  exception_info = {e: e, t: "Other(#{e.class.name})", debug: true}
         rescue Interrupt => e;                      exception_info = {e: e, t: 'Interruption', debug: true}
         end
-        # cleanup file list files
+        # Cleanup file list files
         TempFileManager.instance.cleanup
         # 1- processing of error condition
         unless exception_info.nil?
@@ -252,15 +236,15 @@ module Aspera
         if execute_command || @option_show_config
           @context.options.final_errors.each do |msg|
             @context.formatter.display_message(:error, "#{Formatter::ERROR_FLASH} Argument: #{msg}")
-            # add code as exception if there is not already an error
+            # Add code as exception if there is not already an error
             exception_info = {e: Exception.new(msg), t: 'UnusedArg'} if exception_info.nil?
           end
         end
         # 3- in case of error, fail the process status
         unless exception_info.nil?
-          # show stack trace in debug mode
+          # Show stack trace in debug mode
           raise exception_info[:e] if Log.log.debug?
-          # else give hint and exit
+          # Else give hint and exit
           @context.formatter.display_message(:error, 'Use --log-level=debug to get more details.') if exception_info[:debug]
           Process.exit(1)
         end
@@ -269,24 +253,24 @@ module Aspera
 
       def init_agents_options_plugins
         init_agents_and_options
-        # find plugins, shall be after parse! ?
-        PluginFactory.instance.add_plugins_from_lookup_folders
+        # Find plugins, shall be after parse! ?
+        Plugins::Factory.instance.add_plugins_from_lookup_folders
       end
 
       def show_usage(all: true, exit: true)
-        # display main plugin options (+config)
+        # Display main plugin options (+config)
         @context.formatter.display_message(:error, @context.options.parser)
         if all
           @context.only_manual
-          # list plugins that have a "require" field, i.e. all but main plugin
-          PluginFactory.instance.plugin_list.each do |plugin_name_sym|
-            # config was already included in the global options
+          # List plugins that have a "require" field, i.e. all but main plugin
+          Plugins::Factory.instance.plugin_list.each do |plugin_name_sym|
+            # Config was already included in the global options
             next if plugin_name_sym.eql?(COMMAND_CONFIG)
-            # override main option parser with a brand new, to avoid having global options
+            # Override main option parser with a brand new, to avoid having global options
             @context.options = Manager.new(Info::CMD_NAME)
-            @context.options.parser.banner = '' # remove default banner
+            @context.options.parser.banner = '' # Remove default banner
             get_plugin_instance_with_options(plugin_name_sym)
-            # display generated help for plugin options
+            # Display generated help for plugin options
             @context.formatter.display_message(:error, @context.options.parser.help)
           end
         end
@@ -297,34 +281,34 @@ 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
-        # create formatter, in case there is an exception, it is used to display.
+        # Create formatter, in case there is an exception, it is used to display.
         @context.formatter = Formatter.new
-        # create command line manager with arguments
+        # Create command line manager with arguments
         @context.options = Manager.new(Info::CMD_NAME, @argv)
-        # formatter adds options
+        # Formatter adds options
         @context.formatter.declare_options(@context.options)
         ExtendedValue.instance.default_decoder = @context.options.get_option(:struct_parser)
-        # compare $0 with expected name
+        # Compare $0 with expected name
         current_prog_name = File.basename($PROGRAM_NAME)
         @context.formatter.display_message(
           :error,
           "#{Formatter::WARNING_FLASH} Please use '#{Info::CMD_NAME}' instead of '#{current_prog_name}'"
         ) unless current_prog_name.eql?(Info::CMD_NAME)
-        # declare and parse global options
+        # Declare and parse global options
         declare_global_options
-        # do not display config commands if help is asked
+        # Do not display config commands if help is asked
         @context.man_header = false
-        # the Config plugin adds the @preset parser, so declare before TransferAgent which may use it
+        # The Config plugin adds the @preset parser, so declare before TransferAgent which may use it
         @context.config = Plugins::Config.new(context: @context)
         @context.man_header = true
-        # data persistency is set in config
+        # Data persistency is set in config
         Aspera.assert(@context.persistency){'missing persistency object'}
-        # the TransferAgent plugin may use the @preset parser
+        # The TransferAgent plugin may use the @preset parser
         @context.transfer = TransferAgent.new(@context.options, @context.config)
-        # add commands for config plugin after all options have been added
+        # Add commands for config plugin after all options have been added
         @context.config.add_manual_header(false)
         @context.validate
-        # set banner when all environment is created so that additional extended value modifiers are known, e.g. @preset
+        # Set banner when all environment is created so that additional extended value modifiers are known, e.g. @preset
         @context.options.parser.banner = app_banner
       end
 
@@ -362,7 +346,7 @@ module Aspera
         END_OF_BANNER
       end
 
-      # define header for manual
+      # Define header for manual
       def declare_global_options
         Log.log.debug('declare_global_options')
         @context.options.declare(:help, 'Show this message', values: :none, short: 'h'){@option_help = true}
@@ -378,32 +362,33 @@ module Aspera
           :invalid_characters, 'Replacement character and invalid filename characters',
           handler: {o: Environment.instance, m: :file_illegal_characters}
         )
-        @context.options.declare(:log_level, 'Log level', values: Log.levels, handler: {o: Log.instance, m: :level})
+        @context.options.declare(:log_level, 'Log level', values: Log::LEVELS, handler: {o: Log.instance, m: :level})
         @context.options.declare(:log_format, 'Log formatter', types: [Proc, Logger::Formatter, String], handler: {o: Log.instance, m: :formatter})
         @context.options.declare(:logger, 'Logging method', values: Log::LOG_TYPES, handler: {o: Log.instance, m: :logger_type})
         @context.options.declare(:lock_port, 'Prevent dual execution of a command, e.g. in cron', coerce: Integer, types: Integer)
         @context.options.declare(:once_only, 'Process only new items (some commands)', values: :bool, default: false)
         @context.options.declare(:log_secrets, 'Show passwords in logs', values: :bool, handler: {o: SecretHider.instance, m: :log_secrets})
         @context.options.declare(:clean_temp, 'Cleanup temporary files on exit', values: :bool, handler: {o: TempFileManager.instance, m: :cleanup_on_exit})
+        @context.options.declare(:temp_folder, 'Temporary folder', handler: {o: TempFileManager.instance, m: :global_temp})
         @context.options.declare(:pid_file, 'Write process identifier to file, delete on exit', types: String)
-        # parse declared options
+        # Parse declared options
         @context.options.parse_options!
       end
 
       # @return the plugin instance, based on name
-      # also loads the plugin options, and default values from conf file
+      # Also loads the plugin options, and default values from conf file
       # @param plugin_name_sym : symbol for plugin name
       def get_plugin_instance_with_options(plugin_name_sym)
         Log.log.debug{"get_plugin_instance_with_options(#{plugin_name_sym})"}
-        # load default params only if no param already loaded before plugin instantiation
+        # Load default params only if no param already loaded before plugin instantiation
         @context.config.add_plugin_default_preset(plugin_name_sym)
-        command_plugin = PluginFactory.instance.create(plugin_name_sym, context: @context)
+        command_plugin = Plugins::Factory.instance.create(plugin_name_sym, context: @context)
         return command_plugin
       end
 
       def generate_bash_completion
         if @context.options.get_next_argument('', multiple: true, mandatory: false).nil?
-          PluginFactory.instance.plugin_list.each{ |p| puts p}
+          Plugins::Factory.instance.plugin_list.each{ |p| puts p}
         else
           Log.log.warn('only first level completion so far')
         end

data/lib/aspera/cli/manager.rb

@@ -141,6 +141,7 @@ module Aspera
         @ask_missing_mandatory = false # STDIN.isatty
         # ask optional options if not provided and in interactive
         @ask_missing_optional = false
+        # get_option fails if a mandatory parameter is asked
         @fail_on_missing_mandatory = true
         # Array of [key(sym), value]
         # those must be set before parse
@@ -182,7 +183,7 @@ module Aspera
         declare(:interactive, 'Use interactive input of missing params', values: :bool, handler: {o: self, m: :ask_missing_mandatory})
         declare(:ask_options, 'Ask even optional options', values: :bool, handler: {o: self, m: :ask_missing_optional})
         declare(:struct_parser, 'Default parser when expected value is a struct', values: %i[json ruby])
-        # do not parse options yet, let's wait for option `-h` to be overriden
+        # do not parse options yet, let's wait for option `-h` to be overridden
       end
 
       # @param descr [String] description for help
@@ -254,7 +255,7 @@ module Aspera
         Log.log.trace1{"(#{attributes[:read_write]}) get #{option_symbol}=#{result}"}
         result = default if result.nil?
         # do not fail for manual generation if option mandatory but not set
-        result = '' if result.nil? && mandatory && !@fail_on_missing_mandatory
+        result = :skip_missing_mandatory if result.nil? && mandatory && !@fail_on_missing_mandatory
         # Log.log.debug{"interactive=#{@ask_missing_mandatory}"}
         if result.nil?
           if !@ask_missing_mandatory
@@ -436,6 +437,8 @@ module Aspera
         @declared_options.each_key do |option_symbol|
           v = get_option(option_symbol)
           result[option_symbol] = v unless only_defined && v.nil?
+        rescue => e
+          result[option_symbol] = e.to_s
         end
         return result
       end
@@ -536,10 +539,10 @@ module Aspera
         return true  if value == 'true'
         return false if value == 'false'
         Integer(value)
-      rescue ArgumentError
+      rescue ::ArgumentError
         begin
           Float(value)
-        rescue ArgumentError
+        rescue ::ArgumentError
           evaluate_extended_value(value, nil)
         end
       end

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

@@ -2,11 +2,12 @@
 
 require 'aspera/api/alee'
 require 'aspera/nagios'
+require 'aspera/cli/plugins/basic_auth'
 
 module Aspera
   module Cli
     module Plugins
-      class Alee < Cli::BasicAuthPlugin
+      class Alee < BasicAuth
         ACTIONS = %i[health entitlement].freeze
 
         def execute_action