aspera-cli 4.18.1 → 4.19.0

data/lib/aspera/cli/sync_actions.rb

@@ -7,11 +7,30 @@ module Aspera
   module Cli
     # Module for sync actions
     module SyncActions
-      SIMPLE_ARGUMENTS_SYNC = {
-        direction:  Transfer::Sync::DIRECTIONS,
-        local_dir:  String,
-        remote_dir: String
-      }.stringify_keys.freeze
+      # optional simple command line arguments for sync
+      # in Array to keep option order
+      # conf: key in option --conf
+      # args: key for command line args
+      # values: possible values for argument
+      # type: type for validation
+      SYNC_ARGUMENTS_INFO = [
+        {
+          conf:   'direction',
+          args:   'direction',
+          values: Transfer::Sync::DIRECTIONS
+        }, {
+          conf: 'remote.path',
+          args: 'remote_dir',
+          type: String
+        }, {
+          conf: 'local.path',
+          args: 'local_dir',
+          type: String
+        }
+      ].freeze
+      # name of minimal arguments required, also used to generate a session name
+      SYNC_SIMPLE_ARGS = SYNC_ARGUMENTS_INFO.map{|i|i[:conf]}.freeze
+      private_constant :SYNC_ARGUMENTS_INFO, :SYNC_SIMPLE_ARGS
 
       class << self
         def declare_options(options)
@@ -19,38 +38,60 @@ module Aspera
         end
       end
 
+      # Read command line arguments (3) and converts to sync_info format
+      def sync_args_to_params(async_params)
+        # sync session parameters can be provided on command line instead of sync_info
+        arguments = {}
+        SYNC_ARGUMENTS_INFO.each do |info|
+          value = options.get_next_argument(
+            info[:conf],
+            mandatory: false,
+            validation: info[:type],
+            accept_list: info[:values])
+          break if value.nil?
+          arguments[info[:conf]] = value.to_s
+        end
+        Log.log.debug{Log.dump('arguments', arguments)}
+        raise Cli::BadArgument, "Provide 0 or 3 arguments, not #{arguments.keys.length} for: #{SYNC_SIMPLE_ARGS.join(', ')}" unless
+          [0, 3].include?(arguments.keys.length)
+        if !arguments.empty?
+          session_info = async_params
+          param_path = :conf
+          if async_params.key?('sessions') || async_params.key?('instance')
+            async_params['sessions'] ||= [{}]
+            Aspera.assert(async_params['sessions'].length == 1){'Only one session is supported with arguments'}
+            session_info = async_params['sessions'][0]
+            param_path = :args
+          end
+          SYNC_ARGUMENTS_INFO.each do |info|
+            key_path = info[param_path].split('.')
+            hash_for_key = session_info
+            if key_path.length > 1
+              first = key_path.shift
+              async_params[first] ||= {}
+              hash_for_key = async_params[first]
+            end
+            raise "Parameter #{info[:conf]} is also set in sync_info, remove from sync_info" if hash_for_key.key?(key_path.last)
+            hash_for_key[key_path.last] = arguments[info[:conf]]
+          end
+          if !session_info.key?('name')
+            # if no name is specified, generate one from simple arguments
+            session_info['name'] = SYNC_SIMPLE_ARGS.map do |arg_name|
+              arguments[arg_name]&.gsub(/[^a-zA-Z0-9]/, '')
+            end.compact.reject(&:empty?).join('_')
+          end
+        end
+      end
+
       def execute_sync_action(&block)
         Aspera.assert(block){'No block given'}
         command = options.get_next_command(%i[start admin])
         # try to get 3 arguments as simple arguments
         case command
         when :start
-          simple_session_args = {}
-          SIMPLE_ARGUMENTS_SYNC.each do |arg, check|
-            value = options.get_next_argument(
-              arg,
-              mandatory: false,
-              validation: check.is_a?(Class) ? check : nil,
-              accept_list: check.is_a?(Class) ? nil : check)
-            break if value.nil?
-            simple_session_args[arg] = value.to_s
-          end
-          async_params = nil
-          if simple_session_args.empty?
-            async_params = options.get_option(:sync_info, mandatory: true)
-          else
-            raise Cli::BadArgument,
-              "Provide zero or 3 arguments: #{SIMPLE_ARGUMENTS_SYNC.keys.join(',')}" unless simple_session_args.keys.sort == SIMPLE_ARGUMENTS_SYNC.keys.sort
-            async_params = options.get_option(
-              :sync_info,
-              mandatory: false,
-              default: {'sessions' => [{'name' => File.basename(simple_session_args['local_dir'])}]})
-            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)}
+          # possibilities are:
+          async_params = options.get_option(:sync_info, default: {})
+          sync_args_to_params(async_params)
           Transfer::Sync.start(async_params, &block)
           return Main.result_success
         when :admin

data/lib/aspera/cli/transfer_agent.rb

@@ -116,6 +116,7 @@ module Aspera
           # by default do not display ascp native progress bar
           agent_options[:quiet] = true unless agent_options.key?(:quiet)
           agent_options[:check_ignore_cb] = ->(host, port){@config.ignore_cert?(host, port)}
+          # JRuby
           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?

data/lib/aspera/cli/transfer_progress.rb

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

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.18.1'
+    VERSION = '4.19.0'
   end
 end

data/lib/aspera/environment.rb

@@ -5,6 +5,7 @@ require 'aspera/log'
 require 'aspera/assert'
 require 'rbconfig'
 require 'singleton'
+require 'English'
 
 # cspell:words MEBI mswin bccwin
 
@@ -31,7 +32,6 @@ module Aspera
     BYTES_PER_MEBIBIT = MEBI / BITS_PER_BYTE
 
     class << self
-      @terminal_supports_unicode = nil
       def ruby_version
         return RbConfig::CONFIG['RUBY_PROGRAM_VERSION']
       end
@@ -66,10 +66,13 @@ module Aspera
         raise "Unknown CPU: #{RbConfig::CONFIG['host_cpu']}"
       end
 
+      # normalized architecture name
+      # see constants: OS_* and CPU_*
       def architecture
         return "#{os}-#{cpu}"
       end
 
+      # executable file extension for current OS
       def exe_extension
         return '.exe' if os.eql?(OS_WINDOWS)
         return ''
@@ -83,6 +86,7 @@ module Aspera
         Log.log.debug{"Windows: set HOME to USERPROFILE: #{Dir.home}"}
       end
 
+      # empty variable binding for secure eval
       def empty_binding
         return Kernel.binding
       end
@@ -92,7 +96,29 @@ module Aspera
         Kernel.send('lave'.reverse, code, empty_binding, file, line)
       end
 
-      # value is provided in block
+      # start process in background, or raise exception
+      # caller can call Process.wait on returned value
+      def secure_spawn(env:, exec:, args:, log_only: false)
+        Log.log.debug do
+          [
+            'execute:'.red,
+            env.map{|k, v| "#{k}=#{Shellwords.shellescape(v)}"},
+            Shellwords.shellescape(exec),
+            args.map{|a|Shellwords.shellescape(a)}
+          ].flatten.join(' ')
+        end
+        return if log_only
+        # start ascp in separate process
+        ascp_pid = Process.spawn(env, [exec, exec], *args, close_others: true)
+        Log.log.debug{"pid: #{ascp_pid}"}
+        return ascp_pid
+      end
+
+      # Write content to a file, with restricted access
+      # @param path [String] the file path
+      # @param force [Boolean] if true, overwrite the file
+      # @param mode [Integer] the file mode (permissions)
+      # @block [Proc] return the content to write to the file
       def write_file_restricted(path, force: false, mode: nil)
         Aspera.assert(block_given?, exception_class: Aspera::InternalError)
         if force || !File.exist?(path)
@@ -105,6 +131,7 @@ module Aspera
         return path
       end
 
+      # restrict access to a file or folder to user only
       def restrict_file_access(path, mode: nil)
         if mode.nil?
           # or FileUtils ?
@@ -121,18 +148,12 @@ module Aspera
         Log.log.warn(e.message)
       end
 
+      # @return true if we are in a terminal
       def terminal?
         $stdout.tty?
       end
 
-      # @return true if we can display Unicode characters
-      # https://www.gnu.org/software/libc/manual/html_node/Locale-Categories.html
-      # https://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html
-      def terminal_supports_unicode?
-        @terminal_supports_unicode = terminal? && %w(LC_ALL LC_CTYPE LANG).any?{|var|ENV[var]&.include?('UTF-8')} if @terminal_supports_unicode.nil?
-        return @terminal_supports_unicode
-      end
-
+      # @return :text or :graphical depending on the environment
       def default_gui_mode
         # assume not remotely connected on macos and windows
         return :graphical if [Environment::OS_WINDOWS, Environment::OS_MACOS].include?(Environment.os)
@@ -141,6 +162,7 @@ module Aspera
         return :text
       end
 
+      # open a URI in a graphical browser
       # command must be non blocking
       def open_uri_graphical(uri)
         case Environment.os
@@ -152,6 +174,7 @@ module Aspera
         end
       end
 
+      # open a file in an editor
       def open_editor(file_path)
         if ENV.key?('EDITOR')
           system(ENV['EDITOR'], file_path.to_s)
@@ -166,8 +189,18 @@ module Aspera
 
     def initialize
       @url_method = self.class.default_gui_mode
+      @terminal_supports_unicode = nil
     end
 
+          # @return true if we can display Unicode characters
+      # https://www.gnu.org/software/libc/manual/html_node/Locale-Categories.html
+      # https://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html
+      def terminal_supports_unicode?
+        @terminal_supports_unicode = self.class.terminal? && %w(LC_ALL LC_CTYPE LANG).any?{|var|ENV[var]&.include?('UTF-8')} if @terminal_supports_unicode.nil?
+        return @terminal_supports_unicode
+      end
+
+
     # Allows a user to open a Url
     # if method is "text", then URL is displayed on terminal
     # if method is "graphical", then the URL will be opened with the default browser.

data/lib/aspera/faspex_gw.rb

@@ -29,7 +29,7 @@ module Aspera
         'recipients'   => faspex_pkg_delivery['recipients'],
         'workspace_id' => @app_context
       }
-      created_package = @app_api.create_package_simple(package_data, true, @new_user_option)
+      created_package = @app_api.create_package_simple(package_data, true, nil)
       # but we place it in a Faspex package creation response
       return {
         'links'         => { 'status' => 'unused' },

data/lib/aspera/keychain/encrypted_hash.rb

@@ -16,10 +16,12 @@ module Aspera
       FILE_TYPE = 'encrypted_hash_vault'
       CONTENT_KEYS = %i[label username password url description].freeze
       FILE_KEYS = %w[version type cipher data].sort.freeze
+      private_constant :LEGACY_CIPHER_NAME, :DEFAULT_CIPHER_NAME, :FILE_TYPE, :CONTENT_KEYS, :FILE_KEYS
       def initialize(path, current_password)
         Aspera.assert_type(path, String){'path to vault file'}
         @path = path
         @all_secrets = {}
+        @cipher_name = DEFAULT_CIPHER_NAME
         vault_encrypted_data = nil
         if File.exist?(@path)
           vault_file = File.read(@path)

data/lib/aspera/log.rb

@@ -6,6 +6,7 @@ require 'logger'
 require 'pp'
 require 'json'
 require 'singleton'
+require 'stringio'
 
 old_verbose = $VERBOSE
 $VERBOSE = nil

data/lib/aspera/node_simulator.rb

@@ -39,7 +39,7 @@ module Aspera
         set_json_response(response, {
           application:                           'node',
           current_time:                          Time.now.utc.iso8601(0),
-          version:                               info['ascp_version'].gsub(/ .*$/, ''),
+          version:                               info['sdk_ascp_version'].gsub(/ .*$/, ''),
           license_expiration_date:               info['expiration_date'],
           license_max_rate:                      info['maximum_bandwidth'],
           os:                                    %x(uname -srv).chomp,

data/lib/aspera/oauth/jwt.rb

@@ -35,7 +35,7 @@ module Aspera
       def create_token
         require 'jwt'
         seconds_since_epoch = Time.new.to_i
-        Log.log.info{"seconds=#{seconds_since_epoch}"}
+        Log.log.debug{"seconds_since_epoch=#{seconds_since_epoch}"}
         jwt_payload = {
           exp: seconds_since_epoch + OAuth::Factory.instance.parameters[:jwt_expiry_offset_sec], # expiration time
           nbf: seconds_since_epoch - OAuth::Factory.instance.parameters[:jwt_accepted_offset_sec], # not before

data/lib/aspera/oauth/url_json.rb

@@ -6,6 +6,8 @@ module Aspera
   module OAuth
     # This class is used to create a token using a JSON body and a URL
     class UrlJson < Base
+      # @param url  URL to send the JSON body
+      # @param json JSON body to send
       def initialize(
         url:,
         json:,

data/lib/aspera/oauth/web.rb

@@ -8,8 +8,8 @@ module Aspera
   module OAuth
     # Authentication using Web browser
     class Web < Base
-      # @param g_o:redirect_uri    [M] for type :web
-      # @param g_o:path_authorize  [D] for type :web
+      # @param redirect_uri    url to receive the code after auth (to be exchanged for token)
+      # @param path_authorize  path to login page on web app
       def initialize(
         redirect_uri:,
         path_authorize: 'authorize',
@@ -21,11 +21,12 @@ module Aspera
         uri = URI.parse(@redirect_uri)
         Aspera.assert(%w[http https].include?(uri.scheme)){'redirect_uri scheme must be http or https'}
         Aspera.assert(!uri.port.nil?){'redirect_uri must have a port'}
-        # TODO: we could check that host is localhost or local address
+        # TODO: we could check that host is localhost or local address, as we are going to listen locally
       end
 
       def create_token
-        random_state = SecureRandom.uuid # used to check later
+        # generate secure state to check later
+        random_state = SecureRandom.uuid
         login_page_url = Rest.build_uri(
           "#{@base_url}/#{@path_authorize}",
           optional_scope_client_id.merge(response_type: 'code', redirect_uri: @redirect_uri, state: random_state))

data/lib/aspera/secret_hider.rb

@@ -16,17 +16,18 @@ module Aspera
     KEY_SECRETS = %w[password secret passphrase _key apikey crn token].freeze
     HTTP_SECRETS = %w[Authorization].freeze
     ALL_SECRETS = [ASCP_ENV_SECRETS, KEY_SECRETS, HTTP_SECRETS].flatten.freeze
+    ALL_SECRETS2 = [KEY_SECRETS, HTTP_SECRETS].flatten.freeze
     KEY_FALSE_POSITIVES = [/^access_key$/, /^fallback_private_key$/].freeze
     # regex that define named captures :begin and :end
     REGEX_LOG_REPLACES = [
       # CLI manager get/set options
       /(?<begin>[sg]et (?:#{KEY_SECRETS.join('|')})=).*(?<end>)/,
       # env var ascp exec
-      /(?<begin> (?:#{ASCP_ENV_SECRETS.join('|')})=)(\\.|[^ ])*(?<end> )/,
+      /(?<begin> (?:#{ASCP_ENV_SECRETS.join('|')})=)[^ ]+(?<end> )/,
       # rendered JSON or Ruby
       /(?<begin>(?:(?<quote>["'])|:)[^"':=]*(?:#{ALL_SECRETS.join('|')})[^"':=]*\k<quote>?(?:=>|:) *")[^"]+(?<end>")/,
       # logged data
-      /(?<begin>(?:#{ALL_SECRETS.join('|')})[ =:]+).*(?<end>$)/,
+      /(?<begin>(?:#{ALL_SECRETS2.join('|')})[ =:]+).*(?<end>$)/,
       # private key values
       /(?<begin>--+BEGIN [^-]+ KEY--+)[[:ascii:]]+?(?<end>--+?END [^-]+ KEY--+)/,
       # cred in http dump

data/lib/aspera/ssh.rb

@@ -14,7 +14,7 @@ if ENV.fetch('ASCLI_ENABLE_ED25519', 'false').eql?('false')
   $VERBOSE = old_verbose
 end
 
-if RUBY_ENGINE == 'jruby' && ENV.fetch('ASCLI_ENABLE_ECDSHA2', 'false').eql?('false')
+if defined?(JRUBY_VERSION) && ENV.fetch('ASCLI_ENABLE_ECDSHA2', 'false').eql?('false')
   Net::SSH::Transport::Algorithms::ALGORITHMS.each_value { |a| a.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
   Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
 end

data/lib/aspera/transfer/faux_file.rb

@@ -8,19 +8,21 @@ module Aspera
       PREFIX = 'faux:///'
       # size suffix
       SUFFIX = %w[k m g t p e]
+      private_constant :PREFIX, :SUFFIX
       class << self
-        def open(name)
+        # @return nil if not a faux: scheme, else a FauxFile instance
+        def create(name)
           return nil unless name.start_with?(PREFIX)
-          parts = name[PREFIX.length..-1].split('?')
-          raise 'Format: #{PREFIX}<file path>?<size>' unless parts.length.eql?(2)
-          raise "Format: <integer>[#{SUFFIX.join(',')}]" unless (m = parts[1].downcase.match(/^(\d+)([#{SUFFIX.join('')}])$/))
+          url_parts = name[PREFIX.length..-1].split('?')
+          raise 'Format: #{PREFIX}<file path>?<size>' unless url_parts.length.eql?(2)
+          raise "Format: <integer>[#{SUFFIX.join(',')}]" unless (m = url_parts[1].downcase.match(/^(\d+)([#{SUFFIX.join('')}])$/))
           size = m[1].to_i
           suffix = m[2]
           SUFFIX.each do |s|
             size *= 1024
             break if s.eql?(suffix)
           end
-          return FauxFile.new(parts[0], size)
+          return FauxFile.new(url_parts[0], size)
         end
       end
       attr_reader :path, :size

data/lib/aspera/transfer/parameters.rb

@@ -21,9 +21,10 @@ module Aspera
     class Parameters
       # Agents shown in manual for parameters (sub list)
       SUPPORTED_AGENTS = %i[direct node connect trsdk httpgw].freeze
+      FILE_LIST_OPTIONS = ['--file-list', '--file-pair-list'].freeze
       # Short names of columns in manual
       SUPPORTED_AGENTS_SHORT = SUPPORTED_AGENTS.map{|agent_sym|agent_sym.to_s[0].to_sym}
-      FILE_LIST_OPTIONS = ['--file-list', '--file-pair-list'].freeze
+      HTTP_FALLBACK_ACTIVATION_VALUES = ['1', 1, true, 'force'].freeze
 
       private_constant :SUPPORTED_AGENTS, :FILE_LIST_OPTIONS
 
@@ -106,21 +107,25 @@ module Aspera
       # @param options [Hash] key: :wss: bool, :ascp_args: array of strings
       def initialize(
         job_spec,
-        ascp_args:,
-        wss:,
-        quiet:,
-        trusted_certs:,
-        check_ignore_cb:
+        ascp_args:       nil,
+        wss:             true,
+        quiet:           true,
+        trusted_certs:   nil,
+        client_ssh_key:  nil,
+        check_ignore_cb: nil
       )
         @job_spec = job_spec
-        @ascp_args = ascp_args
+        @ascp_args = ascp_args.nil? ? [] : ascp_args
         @wss = wss
         @quiet = quiet
-        @trusted_certs = trusted_certs
+        @trusted_certs = trusted_certs.nil? ? [] : trusted_certs
+        @client_ssh_key = client_ssh_key.nil? ? :rsa : client_ssh_key.to_sym
         @check_ignore_cb = check_ignore_cb
-        Aspera.assert_type(job_spec, Hash)
+        Aspera.assert_type(@job_spec, Hash)
         Aspera.assert_type(@ascp_args, Array){'ascp_args'}
-        Aspera.assert(@ascp_args.all?(String)){'ascp arguments must be Strings'}
+        Aspera.assert(@ascp_args.all?(String)){'all ascp arguments must be String'}
+        Aspera.assert_type(@trusted_certs, Array){'trusted_certs'}
+        Aspera.assert_values(@client_ssh_key, Ascp::Installation::CLIENT_SSH_KEY_OPTIONS)
         @builder = CommandLineBuilder.new(@job_spec, Spec::DESCRIPTION)
       end
 
@@ -162,6 +167,7 @@ module Aspera
         @builder.add_command_line_options(["#{file_list_option}=#{file_list_file}"]) unless file_list_option.nil?
       end
 
+      # @return the list of certificates to use when token/ssh or wss are used
       def remote_certificates
         certificates_to_use = []
         # use web socket secure for session ?
@@ -174,7 +180,7 @@ module Aspera
           @job_spec.delete('fasp_port')
           @job_spec.delete('sshfp')
           # set location for CA bundle to be the one of Ruby, see env var SSL_CERT_FILE / SSL_CERT_DIR
-          certificates_to_use.concat(@trusted_certs) if @trusted_certs.is_a?(Array)
+          certificates_to_use.concat(@trusted_certs)
           # ignore cert for wss ?
           if @check_ignore_cb&.call(@job_spec['remote_host'], @job_spec['wss_port'])
             wss_cert_file = TempFileManager.instance.new_file_path_global('wss_cert')
@@ -191,7 +197,7 @@ module Aspera
           # add SSH bypass keys when authentication is token and no auth is provided
           if @job_spec.key?('token') && !@job_spec.key?('remote_password')
             # @job_spec['remote_password'] = Ascp::Installation.instance.ssh_cert_uuid # not used: no passphrase
-            certificates_to_use.concat(Ascp::Installation.instance.aspera_token_ssh_key_paths)
+            certificates_to_use.concat(Ascp::Installation.instance.aspera_token_ssh_key_paths(@client_ssh_key))
           end
         end
         return certificates_to_use
@@ -200,9 +206,9 @@ module Aspera
       # translate transfer spec to env vars and command line arguments for ascp
       def ascp_args
         env_args = {
-          args:         [],
-          env:          {},
-          ascp_version: :ascp
+          args: [],
+          env:  {},
+          name: :ascp
         }
 
         # special cases
@@ -213,7 +219,7 @@ module Aspera
 
         # add ssh or wss certificates
         # (reverse, to keep order, as we unshift)
-        remote_certificates.reverse_each do |cert|
+        remote_certificates&.reverse_each do |cert|
           env_args[:args].unshift('-i', cert)
         end
 
@@ -223,9 +229,9 @@ module Aspera
         base64_destination = false
         # symbol must be index of Ascp::Installation.paths
         if @builder.read_param('use_ascp4')
-          env_args[:ascp_version] = :ascp4
+          env_args[:name] = :ascp4
         else
-          env_args[:ascp_version] = :ascp
+          env_args[:name] = :ascp
           base64_destination = true
         end
         # destination will be base64 encoded, put this before source path arguments
@@ -243,10 +249,12 @@ module Aspera
         @builder.add_env_args(env_args)
         env_args[:args].unshift('-q') if @quiet
         # add fallback cert and key as arguments if needed
-        if ['1', 1, true, 'force'].include?(@job_spec['http_fallback'])
+        if HTTP_FALLBACK_ACTIVATION_VALUES.include?(@job_spec['http_fallback'])
           env_args[:args].unshift('-Y', Ascp::Installation.instance.path(:fallback_private_key))
           env_args[:args].unshift('-I', Ascp::Installation.instance.path(:fallback_certificate))
         end
+        # disable redis in client
+        env_args[:env]['ASPERA_TEST_REDIS_DISABLE'] = 'true'
         Log.log.debug{"ascp args: #{env_args}"}
         return env_args
       end

data/lib/aspera/transfer/spec.rb

@@ -22,23 +22,21 @@ module Aspera
       # reserved tag for Aspera
       TAG_RESERVED = 'aspera'
       class << self
-        def action_to_direction(tspec, command)
-          Aspera.assert_type(tspec, Hash){'transfer spec'}
-          tspec['direction'] = case command.to_sym
+        # translate upload/download to send/receive
+        def transfer_type_to_direction(transfer_type)
+          case transfer_type.to_sym
           when :upload then DIRECTION_SEND
           when :download then DIRECTION_RECEIVE
-          else Aspera.error_unexpected_value(command.to_sym)
+          else Aspera.error_unexpected_value(transfer_type.to_sym)
           end
-          return tspec
         end
 
-        def action(tspec)
-          Aspera.assert_type(tspec, Hash){'transfer spec'}
-          Aspera.assert_values(tspec['direction'], [DIRECTION_SEND, DIRECTION_RECEIVE]){'direction'}
-          case tspec['direction']
+        # translate send/receive to upload/download
+        def direction_to_transfer_type(direction)
+          case direction
           when DIRECTION_SEND then :upload
           when DIRECTION_RECEIVE then :download
-          else Aspera.error_unexpected_value(tspec['direction'])
+          else Aspera.error_unexpected_value(direction)
           end
         end
       end