aspera-cli 4.16.0 → 4.17.0

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

@@ -7,9 +7,9 @@ require 'aspera/preview/options'
 require 'aspera/preview/utils'
 require 'aspera/preview/file_types'
 require 'aspera/preview/terminal'
-require 'aspera/fasp/transfer_spec'
+require 'aspera/transfer/spec'
 require 'aspera/persistency_action_once'
-require 'aspera/node'
+require 'aspera/api/node'
 require 'aspera/hash_ext'
 require 'aspera/timer_limiter'
 require 'aspera/id_generator'
@@ -20,7 +20,7 @@ require 'securerandom'
 module Aspera
   module Cli
     module Plugins
-      class Preview < Aspera::Cli::BasicAuthPlugin
+      class Preview < Cli::BasicAuthPlugin
         # special tag to identify transfers related to generator
         PREV_GEN_TAG = 'preview_generator'
         # defined by node API: suffix for folder containing previews
@@ -49,8 +49,8 @@ module Aspera
         attr_accessor :option_previews_folder
         attr_accessor :option_folder_reset_cache, :option_skip_folders, :option_overwrite, :option_file_access
 
-        def initialize(env)
-          super(env)
+        def initialize(**env)
+          super
           @skip_types = []
           @default_transfer_spec = nil
           # by default generate all supported formats (clone, as altered by options)
@@ -96,7 +96,7 @@ module Aspera
           end
 
           options.parse_options!
-          assert_type(@option_skip_folders, Array){'skip_folder'}
+          Aspera.assert_type(@option_skip_folders, Array){'skip_folder'}
           @tmp_folder = File.join(options.get_option(:temp_folder, mandatory: true), "#{TMP_DIR_PREFIX}.#{SecureRandom.uuid}")
           FileUtils.mkdir_p(@tmp_folder)
           Log.log.debug{"tmpdir: #{@tmp_folder}"}
@@ -106,7 +106,7 @@ module Aspera
           @skip_types = []
           value.split(',').each do |v|
             s = v.to_sym
-            assert_values(s, Aspera::Preview::FileTypes::CONVERSION_TYPES){'skip_types'}
+            Aspera.assert_values(s, Aspera::Preview::FileTypes::CONVERSION_TYPES){'skip_types'}
             @skip_types.push(s)
           end
         end
@@ -128,7 +128,7 @@ module Aspera
         def get_folder_entries(file_id, request_args=nil)
           headers = {'Accept' => 'application/json'}
           headers['X-Aspera-Cache-Control'] = 'no-cache' if @option_folder_reset_cache.eql?(:header)
-          return @api_node.call({operation: 'GET', subpath: "files/#{file_id}/files", headers: headers, url_params: request_args})[:data]
+          return @api_node.call(operation: 'GET', subpath: "files/#{file_id}/files", headers: headers, url_params: request_args)[:data]
           # return @api_node.read("files/#{file_id}/files",request_args)[:data]
         end
 
@@ -153,11 +153,11 @@ module Aspera
           end
           return if events.empty?
           events.each do |event|
-            if event['data']['direction'].eql?(Fasp::TransferSpec::DIRECTION_RECEIVE) &&
+            if event['data']['direction'].eql?(Transfer::Spec::DIRECTION_RECEIVE) &&
                 event['data']['status'].eql?('completed') &&
                 event['data']['error_code'].eql?(0) &&
-                event['data'].dig('tags', Fasp::TransferSpec::TAG_RESERVED, PREV_GEN_TAG).nil?
-              folder_id = event.dig('data', 'tags', Fasp::TransferSpec::TAG_RESERVED, 'node', 'file_id')
+                event['data'].dig('tags', Transfer::Spec::TAG_RESERVED, PREV_GEN_TAG).nil?
+              folder_id = event.dig('data', 'tags', Transfer::Spec::TAG_RESERVED, 'node', 'file_id')
               folder_id ||= event.dig('data', 'file_id')
               if !folder_id.nil?
                 folder_entry = @api_node.read("files/#{folder_id}")[:data] rescue nil
@@ -191,7 +191,7 @@ module Aspera
             if event.dig('data', 'type').eql?('file')
               file_entry = @api_node.read("files/#{event['data']['id']}")[:data] rescue nil
               if !file_entry.nil? &&
-                  @option_skip_folders.select{|d|file_entry['path'].start_with?(d)}.empty?
+                  @option_skip_folders.none?{|d|file_entry['path'].start_with?(d)}
                 file_entry['parent_file_id'] = event['data']['parent_file_id']
                 if event['types'].include?('file.deleted')
                   Log.log.error('TODO'.red)
@@ -213,10 +213,10 @@ module Aspera
         end
 
         def do_transfer(direction, folder_id, source_filename, destination='/')
-          assert(!(destination.nil? && direction.eql?(Fasp::TransferSpec::DIRECTION_RECEIVE)))
+          Aspera.assert(!(destination.nil? && direction.eql?(Transfer::Spec::DIRECTION_RECEIVE)))
           t_spec = @api_node.transfer_spec_gen4(folder_id, direction, {
             'paths' => [{'source' => source_filename}],
-            'tags'  => {Fasp::TransferSpec::TAG_RESERVED => {PREV_GEN_TAG => true}}
+            'tags'  => {Transfer::Spec::TAG_RESERVED => {PREV_GEN_TAG => true}}
           })
           # force destination, need to set this in transfer agent else it gets overwritten, not do: t_spec['destination_root']=destination
           transfer.option_transfer_spec_deep_merge({'destination_root' => destination})
@@ -318,7 +318,7 @@ module Aspera
           if @access_remote
             raise 'missing parent_file_id in entry' if entry['parent_file_id'].nil?
             #  download original file to temp folder
-            do_transfer(Fasp::TransferSpec::DIRECTION_RECEIVE, entry['parent_file_id'], entry['name'], @tmp_folder)
+            do_transfer(Transfer::Spec::DIRECTION_RECEIVE, entry['parent_file_id'], entry['name'], @tmp_folder)
           end
           Log.log.info{"source: #{entry['id']}: #{entry['path']}"}
           gen_infos.each do |gen_info|
@@ -326,7 +326,7 @@ module Aspera
           end
           if @access_remote
             # upload
-            do_transfer(Fasp::TransferSpec::DIRECTION_SEND, @previews_folder_entry['id'], local_entry_preview_dir)
+            do_transfer(Transfer::Spec::DIRECTION_SEND, @previews_folder_entry['id'], local_entry_preview_dir)
             # cleanup after upload
             FileUtils.rm_rf(local_entry_preview_dir)
             File.delete(File.join(@tmp_folder, entry['name']))
@@ -403,8 +403,8 @@ module Aspera
           command = options.get_next_command(ACTIONS)
           unless %i[check test show].include?(command)
             # this will use node api
-            @api_node = Aspera::Node.new(params: basic_auth_params)
-            @transfer_server_address = URI.parse(@api_node.params[:base_url]).host
+            @api_node = Api::Node.new(**basic_auth_params)
+            @transfer_server_address = URI.parse(@api_node.base_url).host
             # get current access key
             @access_key_self = @api_node.read('access_keys/self')[:data]
             # TODO: check events is activated here:
@@ -422,13 +422,13 @@ module Aspera
               raise Cli::Error, "Folder #{@option_previews_folder} does not exist on node. " \
                 'Please create it in the storage root, or specify an alternate name.' if @previews_folder_entry.nil?
             else
-              assert(@access_key_self['storage']['type'].eql?('local')){'only local storage allowed in this mode'}
+              Aspera.assert(@access_key_self['storage']['type'].eql?('local')){'only local storage allowed in this mode'}
               @local_storage_root = @access_key_self['storage']['path']
               # TODO: option to override @local_storage_root='xxx'
               @local_storage_root = @local_storage_root[PVCL_LOCAL_STORAGE.length..-1] if @local_storage_root.start_with?(PVCL_LOCAL_STORAGE)
               # TODO: windows could have "C:" ?
-              assert(@local_storage_root.start_with?('/')){"not local storage: #{@local_storage_root}"}
-              assert(File.directory?(@local_storage_root), exception_class: Cli::Error){"Local storage root folder #{@local_storage_root} does not exist."}
+              Aspera.assert(@local_storage_root.start_with?('/')){"not local storage: #{@local_storage_root}"}
+              Aspera.assert(File.directory?(@local_storage_root), exception_class: Cli::Error){"Local storage root folder #{@local_storage_root} does not exist."}
               @local_preview_folder = File.join(@local_storage_root, @option_previews_folder)
               raise Cli::Error, "Folder #{@local_preview_folder} does not exist locally. " \
                 'Please create it, or specify an alternate name.' unless File.directory?(@local_preview_folder)
@@ -437,7 +437,7 @@ module Aspera
               Log.log.debug{"marker file: #{marker_file}"}
               if File.exist?(marker_file)
                 ak = File.read(marker_file).chomp
-                assert(@access_key_self['id'].eql?(ak)){"mismatch access key in #{marker_file}: contains #{ak}, using #{@access_key_self['id']}"}
+                Aspera.assert(@access_key_self['id'].eql?(ak)){"mismatch access key in #{marker_file}: contains #{ak}, using #{@access_key_self['id']}"}
               else
                 File.write(marker_file, @access_key_self['id'])
               end
@@ -461,15 +461,15 @@ module Aspera
               else
                 @api_node.read("files/#{scan_id}")[:data]
               end
-            @filter_block = Aspera::Node.file_matcher_from_argument(options)
+            @filter_block = Api::Node.file_matcher_from_argument(options)
             scan_folder_files(folder_info, scan_path)
             return Main.result_status('scan finished')
           when :events, :trevents
-            @filter_block = Aspera::Node.file_matcher_from_argument(options)
+            @filter_block = Api::Node.file_matcher_from_argument(options)
             iteration_persistency = nil
             if options.get_option(:once_only, mandatory: true)
               iteration_persistency = PersistencyActionOnce.new(
-                manager: @agents[:persistency],
+                manager: persistency,
                 data:    [],
                 id:      IdGenerator.from_list([
                   'preview_iteration',
@@ -479,7 +479,7 @@ module Aspera
                 ]))
             end
             # call processing method specified by command line command
-            send("process_#{command}", iteration_persistency)
+            send(:"process_#{command}", iteration_persistency)
             return Main.result_status("#{command} finished")
           when :check
             return Main.result_status('Tools validated')
@@ -501,8 +501,8 @@ module Aspera
         ensure
           Log.log.debug{"cleaning up temp folder #{@tmp_folder}"}
           FileUtils.rm_rf(@tmp_folder)
-        end # execute_action
-      end # Preview
-    end # Plugins
-  end # Cli
-end # Aspera
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 # cspell:ignore ascmd zmode zuid zgid fasping
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/sync_actions'
-require 'aspera/fasp/transfer_spec'
+require 'aspera/transfer/spec'
 require 'aspera/ascmd'
 require 'aspera/ssh'
 require 'aspera/nagios'
@@ -16,7 +16,7 @@ module Aspera
   module Cli
     module Plugins
       # implement basic remote access with FASP/SSH
-      class Server < Aspera::Cli::BasicAuthPlugin
+      class Server < Cli::BasicAuthPlugin
         include SyncActions
         SSH_SCHEME = 'ssh'
         LOCAL_SCHEME = 'local'
@@ -53,27 +53,27 @@ module Aspera
               [address_or_url]
             else
               [
-                "ssh://#{address_or_url}:33001",
-                "ssh://#{address_or_url}:22"
+                "#{SSH_SCHEME}://#{address_or_url}:33001",
+                "#{SSH_SCHEME}://#{address_or_url}:22"
               ]
               # wss not practical as it requires a token
             end
-
+            error = nil
             urls.each do |base_url|
               server_uri = URI.parse(base_url)
               Log.log.debug{"URI=#{server_uri}, host=#{server_uri.hostname}, port=#{server_uri.port}, scheme=#{server_uri.scheme}"}
               next unless server_uri.scheme.eql?(SSH_SCHEME)
-              begin
-                socket = TCPSocket.new(server_uri.hostname, server_uri.port)
-                socket.puts('SSH-2.0-Ascli_0.0')
-                version = socket.gets.chomp
-                if version.match?(/^SSH-2.0-/)
-                  return {version: version.gsub(/^SSH-2.0-/, ''), url: base_url}
-                end
-              rescue StandardError => e
-                Log.log.debug{"detect error: #{e}"}
+              socket = TCPSocket.new(server_uri.hostname, server_uri.port)
+              socket.puts('SSH-2.0-Ascli_0.0')
+              version = socket.gets.chomp
+              if version.match?(/^SSH-2.0-/)
+                return {version: version.gsub(/^SSH-2.0-/, ''), url: base_url}
               end
+            rescue StandardError => e
+              error = e
+              Log.log.debug{"detect error: #{e}"}
             end
+            raise error if error
             return nil
           end
 
@@ -90,8 +90,8 @@ module Aspera
           end
         end
 
-        def initialize(env)
-          super(env)
+        def initialize(**env)
+          super
           options.declare(:ssh_keys, 'SSH key path list (Array or single)')
           options.declare(:passphrase, 'SSH private key passphrase')
           options.declare(:ssh_options, 'SSH options', types: Hash, default: {})
@@ -127,14 +127,14 @@ module Aspera
           if !server_uri.scheme.eql?(SSH_SCHEME)
             Log.log.warn('URL scheme is https but no token was provided in transfer spec.')
             Log.log.warn("If you want to access the server, not using WSS for session, then use a URL with scheme \"#{SSH_SCHEME}\" and proper SSH port")
-            assumed_url = "#{SSH_SCHEME}://#{server_transfer_spec['remote_host']}:#{Aspera::Fasp::TransferSpec::SSH_PORT}"
+            assumed_url = "#{SSH_SCHEME}://#{server_transfer_spec['remote_host']}:#{Transfer::Spec::SSH_PORT}"
             Log.log.warn{"Assuming proper URL is: #{assumed_url}"}
             server_uri = URI.parse(assumed_url)
           end
           # Scheme is SSH
           if options.get_option(:username).nil?
-            options.set_option(:username, Aspera::Fasp::TransferSpec::ACCESS_KEY_TRANSFER_USER)
-            Log.log.info{"No username provided: Assuming default transfer user: #{Aspera::Fasp::TransferSpec::ACCESS_KEY_TRANSFER_USER}"}
+            options.set_option(:username, Transfer::Spec::ACCESS_KEY_TRANSFER_USER)
+            Log.log.info{"No username provided: Assuming default transfer user: #{Transfer::Spec::ACCESS_KEY_TRANSFER_USER}"}
           end
           server_transfer_spec['remote_user'] = options.get_option(:username, mandatory: true)
           if !server_uri.port.nil?
@@ -151,16 +151,14 @@ module Aspera
           ssh_key_list = options.get_option(:ssh_keys)
           if !ssh_key_list.nil?
             ssh_key_list = [ssh_key_list] if ssh_key_list.is_a?(String)
-            assert_type(ssh_key_list, Array){'ssh_keys'}
-            assert(ssh_key_list.all?(String))
+            Aspera.assert_type(ssh_key_list, Array){'ssh_keys'}
+            Aspera.assert(ssh_key_list.all?(String))
             ssh_key_list.map!{|p|File.expand_path(p)}
             Log.log.debug{"SSH keys=#{ssh_key_list}"}
             if !ssh_key_list.empty?
               @ssh_opts[:keys] = ssh_key_list
-              server_transfer_spec['EX_ssh_key_paths'] = ssh_key_list
-              ssh_key_list.each do |k|
-                Log.log.warn{"No such key file: #{k}"} unless File.exist?(k)
-              end
+              server_transfer_spec['ssh_private_key'] = File.read(ssh_key_list.first)
+              Log.log.warn{'Using only first SSH key for transfers'} unless ssh_key_list.length.eql?(1)
               cred_set = true
             end
           end
@@ -178,7 +176,7 @@ module Aspera
         def execute_transfer(command, transfer_spec)
           case command
           when :upload, :download
-            Fasp::TransferSpec.action_to_direction(transfer_spec, command)
+            Transfer::Spec.action_to_direction(transfer_spec, command)
             return Main.result_transfer(transfer.start(transfer_spec))
           when :sync
             # lets ignore the arguments provided by execute_sync_action, we just give the transfer spec
@@ -189,7 +187,7 @@ module Aspera
         # actions without ascmd
         BASE_ACTIONS = %i[health].concat(TRANSFER_COMMANDS).freeze
         # all actions
-        ACTIONS = [BASE_ACTIONS, Aspera::AsCmd::OPERATIONS, ASCMD_ALIASES.keys].flatten.freeze
+        ACTIONS = [BASE_ACTIONS, AsCmd::OPERATIONS, ASCMD_ALIASES.keys].flatten.freeze
 
         def execute_action
           server_transfer_spec = options_to_base_transfer_spec
@@ -228,16 +226,16 @@ module Aspera
               else
                 nagios.add_critical('transfer', statuses.reject{|i|i.eql?(:success)}.first.to_s)
               end
-            else error_unexpected_value(command_nagios)
+            else Aspera.error_unexpected_value(command_nagios)
             end
             return nagios.result
           when *TRANSFER_COMMANDS
             return execute_transfer(command, server_transfer_spec)
-          when *Aspera::AsCmd::OPERATIONS
+          when *AsCmd::OPERATIONS
             command_arguments = options.get_next_argument('ascmd command arguments', expected: :multiple, mandatory: false)
-            ascmd = Aspera::AsCmd.new(ascmd_executor)
+            ascmd = AsCmd.new(ascmd_executor)
             begin
-              result = ascmd.send(:execute_single, command, command_arguments)
+              result = ascmd.execute_single(command, command_arguments)
               case command
               when :mkdir, :mv, :cp, :rm
                 return Main.result_success
@@ -248,10 +246,10 @@ module Aspera
               when :du, :md5sum, :info
                 return {type: :single_object, data: result.stringify_keys}
               end
-            rescue Aspera::AsCmd::Error => e
+            rescue AsCmd::Error => e
               raise Cli::BadArgument, e.extended_message
             end
-          else error_unreachable_line
+          else Aspera.error_unreachable_line
           end
         end # execute_action
       end # Server

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

@@ -6,7 +6,7 @@ module Aspera
   module Cli
     module Plugins
       # Plugin for Aspera Shares v1
-      class Shares < Aspera::Cli::BasicAuthPlugin
+      class Shares < Cli::BasicAuthPlugin
         API_BASE = 'node_api'
         class << self
           def detect(address_or_url)
@@ -24,7 +24,7 @@ module Aspera
             end
             return nil unless found
             version = 'unknown'
-            test_page = api.call({ operation: 'GET', subpath: 'login' })
+            test_page = api.call(operation: 'GET', subpath: 'login')
             if (m = test_page[:http].body.match(/\(v(1\..*)\)/))
               version = m[1]
             end
@@ -47,8 +47,8 @@ module Aspera
           end
         end
 
-        def initialize(env)
-          super(env)
+        def initialize(**env)
+          super
         end
 
         SAML_IMPORT_MANDATORY = %w[id name_id].freeze
@@ -79,7 +79,7 @@ module Aspera
           when :repository, :files
             api_shares_node = basic_auth_api(API_BASE)
             repo_command = options.get_next_command(Node::COMMANDS_SHARES)
-            return Node.new(@agents, api: api_shares_node).execute_action(repo_command)
+            return Node.new(**init_params, api: api_shares_node).execute_action(repo_command)
           when :admin
             api_shares_admin = basic_auth_api('api/v1')
             admin_command = options.get_next_command(%i[node share transfer_settings user group].freeze)
@@ -102,17 +102,19 @@ module Aspera
             when :user, :group
               entity_type = admin_command
               entities_location = options.get_next_command(%i[all local ldap saml])
-              entities_path = "data/#{entities_location}_#{entity_type}s"
+              entities_prefix = entities_location.eql?(:all) ? '' : "#{entities_location}_"
+              entities_path = "data/#{entities_prefix}#{entity_type}s"
               entity_action = nil
               case entities_location
               when :all
-                entities_path = "data/#{entity_type}s"
                 entity_action = %i[list show delete]
                 entity_action.concat(USR_GRP_SETTINGS)
                 entity_action.push(:users) if entity_type.eql?(:group)
                 entity_action.freeze
               when :local
-                entity_action = %i[list show delete create modify].freeze
+                entity_action = %i[list show delete create modify]
+                entity_action.push(:users) if entity_type.eql?(:group)
+                entity_action.freeze
               when :ldap
                 entity_action = %i[add].freeze
               when :saml
@@ -131,7 +133,7 @@ module Aspera
               when :import # saml
                 return do_bulk_operation(command: entity_verb, descr: 'user information') do |entity_parameters|
                   entity_parameters = entity_parameters.transform_keys{|k|k.gsub(/\s+/, '_').downcase}
-                  assert_type(entity_parameters, Hash)
+                  Aspera.assert_type(entity_parameters, Hash)
                   SAML_IMPORT_MANDATORY.each{|p|raise "missing mandatory field: #{p}" if entity_parameters[p].nil?}
                   entity_parameters.each_key do |p|
                     raise "unsupported field: #{p}, use: #{SAML_IMPORT_ALLOWED.join(',')}" unless SAML_IMPORT_ALLOWED.include?(p)
@@ -143,8 +145,8 @@ module Aspera
                   api_shares_admin.create(entities_path, {entity_type=>entity_name})[:data]
                 end
               when :users # group
-                raise "TODO, not implemented"
-              else error_unexpected_value(entity_verb)
+                return entity_action(api_shares_admin, "#{entities_path}/#{instance_identifier}/#{entities_prefix}users")
+              else Aspera.error_unexpected_value(entity_verb)
               end
             end
           end

data/lib/aspera/cli/sync_actions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aspera/fasp/sync'
+require 'aspera/transfer/sync'
 require 'aspera/assert'
 
 module Aspera
@@ -8,7 +8,7 @@ module Aspera
     # Module for sync actions
     module SyncActions
       SIMPLE_ARGUMENTS_SYNC = {
-        direction:  Aspera::Fasp::Sync::DIRECTIONS,
+        direction:  Transfer::Sync::DIRECTIONS,
         local_dir:  String,
         remote_dir: String
       }.stringify_keys.freeze
@@ -20,7 +20,7 @@ module Aspera
       end
 
       def execute_sync_action(&block)
-        assert(block){'No block given'}
+        Aspera.assert(block){'No block given'}
         command = options.get_next_command(%i[start admin])
         # try to get 3 arguments as simple arguments
         case command
@@ -45,13 +45,13 @@ module Aspera
               :sync_info,
               mandatory: false,
               default: {'sessions' => [{'name' => File.basename(simple_session_args['local_dir'])}]})
-            assert_type(async_params, Hash){'sync_info'}
-            assert_type(async_params['sessions'], Array){'sync_info[sessions]'}
-            assert_type(async_params['sessions'].first, Hash){'sync_info[sessions][0]'}
+            Aspera.assert_type(async_params, Hash){'sync_info'}
+            Aspera.assert_type(async_params['sessions'], Array){'sync_info[sessions]'}
+            Aspera.assert_type(async_params['sessions'].first, Hash){'sync_info[sessions][0]'}
             async_params['sessions'].first.merge!(simple_session_args)
           end
           Log.log.debug{Log.dump('async_params', async_params)}
-          Aspera::Fasp::Sync.start(async_params, &block)
+          Transfer::Sync.start(async_params, &block)
           return Main.result_success
         when :admin
           command2 = options.get_next_command([:status])
@@ -59,7 +59,7 @@ module Aspera
           when :status
             sync_session_name = options.get_next_argument('name of sync session', mandatory: false, type: String)
             async_params = options.get_option(:sync_info, mandatory: true)
-            return {type: :single_object, data: Aspera::Fasp::Sync.admin_status(async_params, sync_session_name)}
+            return {type: :single_object, data: Transfer::Sync.admin_status(async_params, sync_session_name)}
           end # command2
         end # command
       end # execute_action

data/lib/aspera/cli/transfer_agent.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'aspera/fasp/agent_base'
-require 'aspera/fasp/transfer_spec'
+require 'aspera/agent/base'
+require 'aspera/transfer/spec'
 require 'aspera/cli/info'
 require 'aspera/log'
 require 'aspera/assert'
@@ -31,7 +31,7 @@ module Aspera
         :FILE_LIST_FROM_TRANSFER_SPEC,
         :FILE_LIST_OPTIONS,
         :DEFAULT_TRANSFER_NOTIFY_TEMPLATE
-      TRANSFER_AGENTS = Fasp::AgentBase.agent_list.freeze
+      TRANSFER_AGENTS = Agent::Base.agent_list.freeze
 
       class << self
         # @return :success if all sessions statuses returned by "start" are success
@@ -55,6 +55,8 @@ module Aspera
         @agent = nil
         # source/destination pair, like "paths" of transfer spec
         @transfer_paths = nil
+        # HTTPGW URL provided by webapp
+        @httpgw_url_lambda = nil
         @opt_mgr.declare(:ts, 'Override transfer spec values', types: Hash, handler: {o: self, m: :option_transfer_spec})
         @opt_mgr.declare(:to_folder, 'Destination folder for transferred files')
         @opt_mgr.declare(:sources, "How list of transferred files is provided (#{FILE_LIST_OPTIONS.join(',')})")
@@ -68,7 +70,7 @@ module Aspera
 
       # multiple option are merged
       def option_transfer_spec=(value)
-        assert_type(value, Hash){'ts'}
+        Aspera.assert_type(value, Hash){'ts'}
         @transfer_spec_command_line.deep_merge!(value)
       end
 
@@ -95,11 +97,12 @@ module Aspera
       end
 
       # analyze options and create new agent if not already created or set
+      # TODO: make a Factory pattern
       def agent_instance
         return @agent unless @agent.nil?
         agent_type = @opt_mgr.get_option(:transfer, mandatory: true)
         # agent plugin is loaded on demand to avoid loading unnecessary dependencies
-        require "aspera/fasp/agent_#{agent_type}"
+        require "aspera/agent/#{agent_type}"
         # set keys as symbols
         agent_options = @opt_mgr.get_option(:transfer_info).symbolize_keys
         # special cases
@@ -113,12 +116,17 @@ module Aspera
         when :direct
           # by default do not display ascp native progress bar
           agent_options[:quiet] = true unless agent_options.key?(:quiet)
-          agent_options[:check_ignore] = ->(host, port){@config.ignore_cert?(host, port)}
-          agent_options[:trusted_certs] = @config.trusted_cert_locations(files_only: true) unless agent_options.key?(:trusted_certs)
+          agent_options[:check_ignore_cb] = ->(host, port){@config.ignore_cert?(host, port)}
+          agent_options[:trusted_certs] = @config.trusted_cert_locations unless agent_options.key?(:trusted_certs)
+        when :httpgw
+          unless agent_options.key?(:url) || @httpgw_url_lambda.nil?
+            Log.log.debug('retrieving HTTPGW URL from webapp')
+            agent_options[:url] = @httpgw_url_lambda.call
+          end
         end
         agent_options[:progress] = @config.progress_bar
         # get agent instance
-        new_agent = Kernel.const_get("Aspera::Fasp::Agent#{agent_type.capitalize}").new(agent_options)
+        new_agent = Kernel.const_get("Aspera::Agent::#{agent_type.capitalize}").new(agent_options)
         self.agent_instance = new_agent
         Log.log.debug{"transfer agent is a #{@agent.class}"}
         return @agent
@@ -135,9 +143,9 @@ module Aspera
         return dest_folder unless dest_folder.nil?
         # default: / on remote, . on local
         case direction.to_s
-        when Fasp::TransferSpec::DIRECTION_SEND then dest_folder = '/'
-        when Fasp::TransferSpec::DIRECTION_RECEIVE then dest_folder = '.'
-        else error_unexpected_value(direction)
+        when Transfer::Spec::DIRECTION_SEND then dest_folder = '/'
+        when Transfer::Spec::DIRECTION_RECEIVE then dest_folder = '.'
+        else Aspera.error_unexpected_value(direction)
         end
         return dest_folder
       end
@@ -149,6 +157,11 @@ module Aspera
         end
       end
 
+      def httpgw_url_cb=(httpgw_url_proc)
+        Aspera.assert_type(httpgw_url_proc, Proc){'httpgw_url_cb'}
+        @httpgw_url_lambda = httpgw_url_proc
+      end
+
       # This is how the list of files to be transferred is specified
       # get paths suitable for transfer spec from command line
       # @return [Hash] {source: (mandatory), destination: (optional)}
@@ -171,7 +184,7 @@ module Aspera
           Log.log.debug('assume list provided in transfer spec')
           special_case_direct_with_list =
             @opt_mgr.get_option(:transfer, mandatory: true).eql?(:direct) &&
-            Fasp::Parameters.ts_has_ascp_file_list(@transfer_spec_command_line, @opt_mgr.get_option(:transfer_info))
+            Transfer::Parameters.ascp_args_file_list?(@opt_mgr.get_option(:transfer_info)['ascp_args'])
           raise Cli::BadArgument, 'transfer spec on command line must have sources' if @transfer_paths.nil? && !special_case_direct_with_list
           # here we assume check of sources is made in transfer agent
           return @transfer_paths
@@ -185,15 +198,15 @@ module Aspera
         if !@transfer_paths.nil?
           Log.log.warn('--sources overrides paths from --ts')
         end
-        source_type=@opt_mgr.get_option(:src_type, mandatory: true)
+        source_type = @opt_mgr.get_option(:src_type, mandatory: true)
         case source_type
         when :list
           # when providing a list, just specify source
           @transfer_paths = file_list.map{|i|{'source' => i}}
         when :pair
-          assert(file_list.length.even?, exception_class: Cli::BadArgument){"When using pair, provide an even number of paths: #{file_list.length}"}
+          Aspera.assert(file_list.length.even?, exception_class: Cli::BadArgument){"When using pair, provide an even number of paths: #{file_list.length}"}
           @transfer_paths = file_list.each_slice(2).to_a.map{|s, d|{'source' => s, 'destination' => d}}
-        else error_unexpected_value(source_type)
+        else Aspera.error_unexpected_value(source_type)
         end
         Log.log.debug{"paths=#{@transfer_paths}"}
         return @transfer_paths
@@ -204,14 +217,14 @@ module Aspera
       # @param rest_token [Rest] if oauth token regeneration supported
       def start(transfer_spec, rest_token: nil)
         # check parameters
-        assert_type(transfer_spec, Hash){'transfer_spec'}
+        Aspera.assert_type(transfer_spec, Hash){'transfer_spec'}
         # process :src option
         case transfer_spec['direction']
-        when Fasp::TransferSpec::DIRECTION_RECEIVE
+        when Transfer::Spec::DIRECTION_RECEIVE
           # init default if required in any case
           @transfer_spec_command_line['destination_root'] ||= destination_folder(transfer_spec['direction'])
-        when Fasp::TransferSpec::DIRECTION_SEND
-          if transfer_spec.dig('tags', Fasp::TransferSpec::TAG_RESERVED, 'node', 'access_key')
+        when Transfer::Spec::DIRECTION_SEND
+          if transfer_spec.dig('tags', Transfer::Spec::TAG_RESERVED, 'node', 'access_key')
             # gen4
             @transfer_spec_command_line.delete('destination_root') if @transfer_spec_command_line.key?('destination_root_id')
           elsif transfer_spec.key?('token')

data/lib/aspera/cli/transfer_progress.rb

@@ -26,7 +26,7 @@ module Aspera
 
       def event(session_id:, type:, info: nil)
         Log.log.debug{"progress: #{type} #{session_id} #{info}"}
-        assert(!session_id.nil? || type.eql?(:pre_start)){'session_id is nil'}
+        Aspera.assert(!session_id.nil? || type.eql?(:pre_start)){'session_id is nil'}
         return if @completed
         if @progress_bar.nil?
           @progress_bar = ProgressBar.create(

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.16.0'
+    VERSION = '4.17.0'
   end
 end

data/lib/aspera/colors.rb

@@ -53,4 +53,9 @@ class String
       define_method(name){self}
     end
   end
+  def capital_to_snake
+    return gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .downcase
+  end
 end