aspera-cli 4.6.0 → 4.7.0

data/lib/aspera/fasp/agent_base.rb

@@ -1,30 +1,32 @@
+# frozen_string_literal: true
 module Aspera
   module Fasp
     # Base class for FASP transfer agents
     # sub classes shall implement start_transfer and shutdown
     class AgentBase
+      # fields description for JSON generation
+      INTEGER_FIELDS=%w[Bytescont FaspFileArgIndex StartByte Rate MinRate Port Priority RateCap MinRateCap TCPPort CreatePolicy TimePolicy DatagramSize XoptFlags VLinkVersion
+                        PeerVLinkVersion DSPipelineDepth PeerDSPipelineDepth ReadBlockSize WriteBlockSize ClusterNumNodes ClusterNodeId Size Written Loss FileBytes PreTransferBytes TransferBytes PMTU Elapsedusec ArgScansAttempted ArgScansCompleted PathScansAttempted FileScansCompleted TransfersAttempted TransfersPassed Delay].freeze
+      BOOLEAN_FIELDS=%w[Encryption Remote RateLock MinRateLock PolicyLock FilesEncrypt FilesDecrypt VLinkLocalEnabled VLinkRemoteEnabled MoveRange Keepalive TestLogin UseProxy
+                        Precalc RTTAutocorrect].freeze
+      EXPECTED_METHODS=%i[text struct enhanced].freeze
+      private_constant :INTEGER_FIELDS,:BOOLEAN_FIELDS,:EXPECTED_METHODS
 
       private
 
-      # fields description for JSON generation
-      IntegerFields=['Bytescont','FaspFileArgIndex','StartByte','Rate','MinRate','Port','Priority','RateCap','MinRateCap','TCPPort','CreatePolicy','TimePolicy','DatagramSize','XoptFlags','VLinkVersion','PeerVLinkVersion','DSPipelineDepth','PeerDSPipelineDepth','ReadBlockSize','WriteBlockSize','ClusterNumNodes','ClusterNodeId','Size','Written','Loss','FileBytes','PreTransferBytes','TransferBytes','PMTU','Elapsedusec','ArgScansAttempted','ArgScansCompleted','PathScansAttempted','FileScansCompleted','TransfersAttempted','TransfersPassed','Delay']
-      BooleanFields=['Encryption','Remote','RateLock','MinRateLock','PolicyLock','FilesEncrypt','FilesDecrypt','VLinkLocalEnabled','VLinkRemoteEnabled','MoveRange','Keepalive','TestLogin','UseProxy','Precalc','RTTAutocorrect']
-      ExpectedMethod=[:text,:struct,:enhanced]
-
       # translates legacy event into enhanced (JSON) event
       def enhanced_event_format(event)
-        return event.keys.inject({}) do |h,e|
+        return event.keys.each_with_object({}) do |e,h|
           # capital_to_snake_case
           new_name=e.
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          gsub(/([a-z\d])(usec)$/,'\1_\2').
-          downcase
+            gsub(/([a-z\d])([A-Z])/,'\1_\2').
+            gsub(/([a-z\d])(usec)$/,'\1_\2').
+            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+            downcase
           value=event[e]
-          value=value.to_i if IntegerFields.include?(e)
-          value=value.eql?('Yes') ? true : false if BooleanFields.include?(e)
+          value=value.to_i if INTEGER_FIELDS.include?(e)
+          value=value.eql?('Yes') if BOOLEAN_FIELDS.include?(e)
           h[new_name]=value
-          h
         end
       end
 
@@ -33,14 +35,14 @@ module Aspera
       end
 
       def notify_listeners(current_event_text,current_event_data)
-        Log.log.debug("send event to listeners")
+        Log.log.debug('send event to listeners')
         enhanced_event=nil
         @listeners.each do |listener|
-          listener.send(:event_text,current_event_text) if listener.respond_to?(:event_text)
-          listener.send(:event_struct,current_event_data) if listener.respond_to?(:event_struct)
+          listener.event_text(current_event_text) if listener.respond_to?(:event_text)
+          listener.event_struct(current_event_data) if listener.respond_to?(:event_struct)
           if listener.respond_to?(:event_enhanced)
             enhanced_event=enhanced_event_format(current_event_data) if enhanced_event.nil?
-            listener.send(:event_enhanced,enhanced_event)
+            listener.event_enhanced(enhanced_event)
           end
         end
       end # notify_listeners
@@ -58,12 +60,13 @@ module Aspera
       end
 
       public
+
       LISTENER_SESSION_ID_B='ListenerSessionId'
       LISTENER_SESSION_ID_S='listener_session_id'
 
       # listener receives events
       def add_listener(listener)
-        raise "expect one of #{ExpectedMethod}" if ExpectedMethod.inject(0){|m,e|m+=listener.respond_to?("event_#{e}")?1:0;m}.eql?(0)
+        raise "expect one of #{EXPECTED_METHODS}" if EXPECTED_METHODS.inject(0){|m,e|m+=listener.respond_to?("event_#{e}")?1:0;m}.eql?(0)
         @listeners.push(listener)
         self
       end
@@ -72,14 +75,13 @@ module Aspera
       # it must be a list of :success or exception
       def self.validate_status_list(statuses)
         raise "internal error: bad statuses type: #{statuses.class}" unless statuses.is_a?(Array)
-        raise "internal error: bad statuses content: #{statuses}" unless statuses.select{|i|!i.eql?(:success) and !i.is_a?(StandardError)}.empty?
+        raise "internal error: bad statuses content: #{statuses}" unless statuses.select{|i|!i.eql?(:success) && !i.is_a?(StandardError)}.empty?
       end
 
       # the following methods must be implemented by subclass:
       # start_transfer(transfer_spec,options) : start and wait for completion
       # wait_for_transfers_completion : wait for termination of all transfers, @return list of : :success or error message
       # optional: shutdown
-
     end
   end
 end

data/lib/aspera/fasp/agent_connect.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'aspera/fasp/agent_base'
 require 'aspera/rest'
 require 'aspera/open_application'
@@ -10,7 +11,7 @@ module Aspera
       MAX_CONNECT_START_RETRY=3
       SLEEP_SEC_BETWEEN_RETRY=2
       private_constant :MAX_CONNECT_START_RETRY,:SLEEP_SEC_BETWEEN_RETRY
-      def initialize(options)
+      def initialize(_options)
         super()
         @connect_settings={
           'app_id' => SecureRandom.uuid
@@ -23,7 +24,7 @@ module Aspera
           @connect_api=Rest.new({base_url: "#{connect_url}/v5/connect",headers: {'Origin'=>Rest.user_agent}}) # could use v6 also now
           cinfo=@connect_api.read('info/version')[:data]
           Log.dump(:connect_version,cinfo)
-        rescue => e # Errno::ECONNREFUSED
+        rescue StandardError => e # Errno::ECONNREFUSED
           raise StandardError,"Unable to start connect after #{trynumber} try" if trynumber >= MAX_CONNECT_START_RETRY
           Log.log.warn("connect is not started. Retry ##{trynumber}, err=#{e}")
           trynumber+=1
@@ -36,11 +37,12 @@ module Aspera
         end
       end
 
-      def start_transfer(transfer_spec,options=nil)
+      def start_transfer(transfer_spec,_options=nil)
         if transfer_spec['direction'] == 'send'
           Log.log.warn("Connect requires upload selection using GUI, ignoring #{transfer_spec['paths']}".red)
           transfer_spec.delete('paths')
-          resdata=@connect_api.create('windows/select-open-file-dialog/',{'aspera_connect_settings'=>@connect_settings,'title'=>'Select Files','suggestedName'=>'','allowMultipleSelection'=>true,'allowedFileTypes'=>''})[:data]
+          resdata=@connect_api.create('windows/select-open-file-dialog/',
+{'aspera_connect_settings'=>@connect_settings,'title'=>'Select Files','suggestedName'=>'','allowMultipleSelection'=>true,'allowedFileTypes'=>''})[:data]
           transfer_spec['paths']=resdata['dataTransfer']['files'].map { |i| {'source'=>i['name']}}
         end
         @request_id=SecureRandom.uuid
@@ -50,10 +52,10 @@ module Aspera
         connect_transfer_args={
           'aspera_connect_settings'=>@connect_settings.merge({
           'request_id'               =>@request_id,
-          'allow_dialogs'            =>true,
+          'allow_dialogs'            =>true
           }),
           'transfer_specs'         =>[{
-          'transfer_spec'            =>transfer_spec,
+          'transfer_spec'            =>transfer_spec
           }]}
         # asynchronous anyway
         res=@connect_api.create('transfers/start',connect_transfer_args)[:data]
@@ -70,7 +72,7 @@ module Aspera
             if tr_info['transfer_info'].is_a?(Hash)
               trdata=tr_info['transfer_info']
               if trdata.nil?
-                Log.log.warn("no session in Connect")
+                Log.log.warn('no session in Connect')
                 break
               end
               # TODO: get session id
@@ -87,7 +89,7 @@ module Aspera
                 spinner.spin
               when 'running'
                 #puts "running: sessions:#{trdata['sessions'].length}, #{trdata['sessions'].map{|i| i['bytes_transferred']}.join(',')}"
-                if !started and trdata['bytes_expected'] != 0
+                if !started && (trdata['bytes_expected'] != 0)
                   spinner.success unless spinner.nil?
                   notify_begin(@connect_settings['app_id'],trdata['bytes_expected'])
                   started=true
@@ -96,14 +98,14 @@ module Aspera
                 end
               when 'failed'
                 spinner.error unless spinner.nil?
-                raise Fasp::Error.new(trdata['error_desc'])
+                raise Fasp::Error, trdata['error_desc']
               else
-                raise Fasp::Error.new("unknown status: #{trdata['status']}: #{trdata['error_desc']}")
+                raise Fasp::Error, "unknown status: #{trdata['status']}: #{trdata['error_desc']}"
               end
             end
             sleep 1
           end
-        rescue => e
+        rescue StandardError => e
           return [e]
         end
         return [:success]

data/lib/aspera/fasp/agent_direct.rb

@@ -1,20 +1,16 @@
-#!/bin/echo this is a ruby class:
-#
-# FASP manager for Ruby
-# Aspera 2016
-# Laurent Martin
-#
-##############################################################################
+# frozen_string_literal: true
+require 'English'
 require 'aspera/fasp/agent_base'
 require 'aspera/fasp/error'
 require 'aspera/fasp/parameters'
 require 'aspera/fasp/installation'
 require 'aspera/fasp/resume_policy'
-require 'aspera/fasp/default'
+require 'aspera/fasp/transfer_spec'
 require 'aspera/log'
 require 'socket'
 require 'timeout'
 require 'securerandom'
+require 'shellwords'
 
 module Aspera
   module Fasp
@@ -27,7 +23,7 @@ module Aspera
         wss:               false,
         multi_incr_udp:    true,
         resume:            {},
-        quiet:             true   # by default no interactive progress bar
+        quiet:             true # by default no interactive progress bar
       }
       private_constant :DEFAULT_OPTIONS
 
@@ -43,10 +39,11 @@ module Aspera
         # clone transfer spec because we modify it (first level keys)
         transfer_spec=transfer_spec.clone
         # if there is aspera tags
-        if transfer_spec['tags'].is_a?(Hash) and transfer_spec['tags']['aspera'].is_a?(Hash)
+        if transfer_spec['tags'].is_a?(Hash) && transfer_spec['tags']['aspera'].is_a?(Hash)
           # TODO: what is this for ? only on local ascp ?
           # NOTE: important: transfer id must be unique: generate random id
           # using a non unique id results in discard of tags in AoC, and a package is never finalized
+          # all sessions in a multi-session transfer must have the same xfer_id (see admin manual)
           transfer_spec['tags']['aspera']['xfer_id']||=SecureRandom.uuid
           Log.log.debug("xfer id=#{transfer_spec['xfer_id']}")
           # TODO: useful ? node only ?
@@ -55,8 +52,8 @@ module Aspera
         Log.dump('ts',transfer_spec)
 
         # add bypass keys when authentication is token and no auth is provided
-        if transfer_spec.has_key?('token') and
-        !transfer_spec.has_key?('remote_password') and
+        if transfer_spec.has_key?('token') &&
+        !transfer_spec.has_key?('remote_password') &&
         !transfer_spec.has_key?('EX_ssh_key_paths')
           # transfer_spec['remote_password'] = Installation.instance.bypass_pass # not used
           transfer_spec['EX_ssh_key_paths'] = Installation.instance.bypass_keys
@@ -67,24 +64,22 @@ module Aspera
         multi_session_info=nil
         if transfer_spec.has_key?('multi_session')
           multi_session_info={
-            count: transfer_spec['multi_session'].to_i,
+            count: transfer_spec['multi_session'].to_i
           }
           # Managed by multi-session, so delete from transfer spec
           transfer_spec.delete('multi_session')
-          if multi_session_info[:count] < 0
+          if multi_session_info[:count].negative?
             Log.log.error("multi_session(#{transfer_spec['multi_session']}) shall be integer >= 0")
             multi_session_info = nil
           elsif multi_session_info[:count].eql?(0)
-            Log.log.debug("multi_session count is zero: no multisession")
+            Log.log.debug('multi_session count is zero: no multisession')
             multi_session_info = nil
-          else # multi_session_info[:count] > 0
+          elsif @options[:multi_incr_udp] # multi_session_info[:count] > 0
             # if option not true: keep default udp port for all sessions
-            if @options[:multi_incr_udp]
-              # override if specified, else use default value
-              multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : Default::UDP_PORT
-              # delete from original transfer spec, as we will increment values
-              transfer_spec.delete('fasp_port')
-            end
+            multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : TransferSpec::UDP_PORT
+            # delete from original transfer spec, as we will increment values
+            transfer_spec.delete('fasp_port')
+            # override if specified, else use default value
           end
         end
 
@@ -101,18 +96,18 @@ module Aspera
 
         # transfer job can be multi session
         xfer_job={
-          :id            => job_options[:job_id],
-          :sessions      => [] # all sessions as below
+          id:             job_options[:job_id],
+          sessions:       [] # all sessions as below
         }
 
         # generic session information
         session={
-          :thread   => nil,         # Thread object monitoring management port, not nil when pushed to :sessions
-          :error    => nil,         # exception if failed
-          :io       => nil,         # management port server socket
-          :id       => nil,         # SessionId from INIT message in mgt port
-          :env_args => env_args,    # env vars and args to ascp (from transfer spec)
-          :options  => job_options  # [Hash]
+          thread:    nil,         # Thread object monitoring management port, not nil when pushed to :sessions
+          error:     nil,         # exception if failed
+          io:        nil,         # management port server socket
+          id:        nil,         # SessionId from INIT message in mgt port
+          env_args:  env_args,    # env vars and args to ascp (from transfer spec)
+          options:   job_options  # [Hash]
         }
 
         if multi_session_info.nil?
@@ -131,7 +126,7 @@ module Aspera
             this_session[:env_args][:args]=this_session[:env_args][:args].clone()
             this_session[:env_args][:args].unshift("-C#{i}:#{multi_session_info[:count]}")
             # option: increment (default as per ascp manual) or not (cluster on other side ?)
-            this_session[:env_args][:args].unshift('-O',"#{multi_session_info[:udp_base]+i-1}") if @options[:multi_incr_udp]
+            this_session[:env_args][:args].unshift('-O',(multi_session_info[:udp_base]+i-1).to_s) if @options[:multi_incr_udp]
             this_session[:thread] = Thread.new(this_session) {|s|transfer_thread_entry(s)}
             xfer_job[:sessions].push(this_session)
           end
@@ -151,11 +146,11 @@ module Aspera
         Log.log.debug('wait_for_transfers_completion')
         # set to non-nil to exit loop
         result=[]
-        @jobs.each do |id,job|
+        @jobs.each do |_id,job|
           job[:sessions].each do |session|
             Log.log.debug("join #{session[:thread]}")
             session[:thread].join
-            result.push(session[:error] ? session[:error] : :success)
+            result.push(session[:error] || :success)
           end
         end
         Log.log.debug('all transfers joined')
@@ -189,7 +184,7 @@ module Aspera
             Fasp::Installation.instance.path(env_args[:ascp_version])
           end
           # (optional) check it exists
-          raise Fasp::Error.new("no such file: #{ascp_path}") unless File.exist?(ascp_path)
+          raise Fasp::Error, "no such file: #{ascp_path}" unless File.exist?(ascp_path)
           # open random local TCP port for listening for ascp management
           mgt_sock = TCPServer.new('127.0.0.1',0)
           # clone arguments as we eed to modify with mgt port
@@ -197,7 +192,7 @@ module Aspera
           # add management port
           ascp_arguments.unshift('-M', mgt_sock.addr[1].to_s)
           # start ascp in sub process
-          Log.log.debug("execute: #{env_args[:env].map{|k,v| "#{k}=\"#{v}\""}.join(' ')} \"#{ascp_path}\" \"#{ascp_arguments.join('" "')}\"")
+          Log.log.debug("execute: #{env_args[:env].map{|k,v| "#{k}=#{Shellwords.shellescape(v)}"}.join(' ')} #{Shellwords.shellescape(ascp_path)} #{ascp_arguments.map{|a|Shellwords.shellescape(a)}.join(' ')}")
           # start process
           ascp_pid = Process.spawn(env_args[:env],[ascp_path,ascp_path],*ascp_arguments)
           # in parent, wait for connection to socket max 3 seconds
@@ -225,17 +220,17 @@ module Aspera
             line = ascp_mgt_io.gets
             # nil when ascp process exits
             break if line.nil?
-            current_event_text=current_event_text+line
+            current_event_text+=line
             line.chomp!
             Log.log.debug("line=[#{line}]")
             case line
             when 'FASPMGR 2'
               # begin event
-              current_event_data = Hash.new
+              current_event_data = {}
               current_event_text = ''
             when /^([^:]+): (.*)$/
               # event field
-              current_event_data[$1] = $2
+              current_event_data[Regexp.last_match(1)] = Regexp.last_match(2)
             when ''
               # empty line is separator to end event information
               raise 'unexpected empty line' if current_event_data.nil?
@@ -261,9 +256,9 @@ module Aspera
               exception_raised=false
             when 'ERROR'
               Log.log.error("code: #{last_status_event['Code']}")
-              if last_status_event['Description']  =~ /bearer token/i
+              if last_status_event['Description'] =~ /bearer token/i
                 Log.log.error('need to regenerate token'.red)
-                if session[:options].is_a?(Hash) and session[:options].has_key?(:regenerate_token)
+                if session[:options].is_a?(Hash) && session[:options].has_key?(:regenerate_token)
                   # regenerate token here, expired, or error on it
                   # Note: in multi-session, each session will have a different one.
                   env_args[:env]['ASPERA_SCP_TOKEN']=session[:options][:regenerate_token].call(true)
@@ -279,27 +274,25 @@ module Aspera
           end
         rescue SystemCallError => e
           # Process.spawn
-          raise Fasp::Error.new(e.message)
-        rescue Timeout::Error => e
-          raise Fasp::Error.new('timeout waiting mgt port connect')
-        rescue Interrupt => e
-          raise Fasp::Error.new('transfer interrupted by user')
+          raise Fasp::Error, e.message
+        rescue Timeout::Error
+          raise Fasp::Error, 'timeout waiting mgt port connect'
+        rescue Interrupt
+          raise Fasp::Error, 'transfer interrupted by user'
         ensure
           # if ascp was successfully started
           unless ascp_pid.nil?
             # "wait" for process to avoid zombie
             Process.wait(ascp_pid)
-            status=$?
+            status=$CHILD_STATUS
             ascp_pid=nil
             session.delete(:io)
             if !status.success?
               message="ascp failed with code #{status.exitstatus}"
-              if exception_raised
-                # just debug, as main exception is already here
-                Log.log.debug(message)
-              else
-                raise Fasp::Error.new(message)
-              end
+              # raise error only if there was not already an exception
+              raise Fasp::Error, message unless exception_raised
+              # else just debug, as main exception is already here
+              Log.log.debug(message)
             end
           end
         end # begin-ensure
@@ -341,11 +334,8 @@ module Aspera
         if !options.nil?
           raise "expecting Hash (or nil), but have #{options.class}" unless options.is_a?(Hash)
           options.each do |k,v|
-            if DEFAULT_OPTIONS.has_key?(k)
-              @options[k]=v
-            else
-              raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map{|i|i.to_s}.join(",")}"
-            end
+            raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map(&:to_s).join(',')}" unless DEFAULT_OPTIONS.has_key?(k)
+            @options[k]=v
           end
         end
         Log.log.debug("local options= #{options}")
@@ -364,13 +354,12 @@ module Aspera
             start_transfer_with_args_env(session[:env_args],session)
           end
           Log.log.debug('transfer ok'.bg_green)
-        rescue => e
+        rescue StandardError => e
           session[:error]=e
           Log.log.error("Transfer thread error: #{e.class}:\n#{e.message}:\n#{e.backtrace.join("\n")}".red) if Log.instance.level.eql?(:debug)
         end
         Log.log.debug("EXIT (#{Thread.current[:name]})")
       end
-
     end # AgentDirect
   end
 end

data/lib/aspera/fasp/agent_httpgw.rb

@@ -1,5 +1,6 @@
-#!/bin/echo this is a ruby class:
+# frozen_string_literal: true
 require 'aspera/fasp/agent_base'
+require 'aspera/fasp/transfer_spec'
 require 'aspera/log'
 require 'aspera/rest'
 require 'websocket-client-simple'
@@ -29,7 +30,7 @@ module Aspera
         # we need to keep track of actual file path because transfer spec is modified to be sent in web socket
         source_paths=[]
         # get source root or nil
-        source_root = (transfer_spec.has_key?('source_root') and !transfer_spec['source_root'].empty?) ? transfer_spec['source_root'] : nil
+        source_root = transfer_spec.has_key?('source_root') && !transfer_spec['source_root'].empty? ? transfer_spec['source_root'] : nil
         # source root is ignored by GW, used only here
         transfer_spec.delete('source_root')
         # compute total size of files to upload (for progress)
@@ -61,27 +62,23 @@ module Aspera
             received+=1
           else
             message.chomp!
-            if message[0].eql?('"') and message[-1].eql?('"')
-              error=JSON.parse(Base64.strict_decode64(message.chomp[1..-2]))['message']
-            else
-              error="expecting quotes in [#{message}]"
-            end
+            error=message.start_with?('"') && message.end_with?('"') ? JSON.parse(Base64.strict_decode64(message.chomp[1..-2]))['message'] : "expecting quotes in [#{message}]"
           end
         end
         ws.on :error do |e|
           error=e
         end
         ws.on :open do
-          Log.log.info("ws: open")
+          Log.log.info('ws: open')
         end
         ws.on :close do
-          Log.log.info("ws: close")
+          Log.log.info('ws: close')
         end
         # open web socket to end point
         ws.connect("#{@gw_api.params[:base_url]}/upload")
         # async wait ready
-        while !ws.open? and error.nil? do
-          Log.log.info("ws: wait")
+        while !ws.open? && error.nil?
+          Log.log.info('ws: wait')
           sleep(0.2)
         end
         # notify progress bar
@@ -101,11 +98,11 @@ module Aspera
           file_size=item['file_size']
           file_name=File.basename(item[item['destination'].nil? ? 'source' : 'destination'])
           # compute total number of slices
-          numslices=1+(file_size-1)/@upload_chunksize
+          numslices=1+((file_size-1)/@upload_chunksize)
           File.open(source_paths[file_index]) do |file|
             # current slice index
             slicenum=0
-            while !file.eof? do
+            while !file.eof?
               data=file.read(@upload_chunksize)
               slice_data={
                 name: file_name,
@@ -117,11 +114,11 @@ module Aspera
                 fileIndex: file_index
               }
               # log without data
-              Log.dump(:slide_data,slice_data.keys.inject({}){|m,i|m[i]=i.eql?(:data)?'base64 data':slice_data[i];m}) if slicenum.eql?(0)
+              Log.dump(:slide_data,slice_data.keys.each_with_object({}){|i,m|m[i]=i.eql?(:data)?'base64 data':slice_data[i];}) if slicenum.eql?(0)
               ws_send(ws,:slice_upload, slice_data)
               sent_bytes+=data.length
               currenttime=Time.now
-              if lastevent.nil? or (currenttime-lastevent)>UPLOAD_REFRESH_SEC
+              if lastevent.nil? || ((currenttime-lastevent)>UPLOAD_REFRESH_SEC)
                 notify_progress(session_id,sent_bytes)
                 lastevent=currenttime
               end
@@ -146,37 +143,37 @@ module Aspera
           dname=dname.gsub(/\.@gw_api.*$/,'')
           # ands add indication of number of files if there is more than one
           if transfer_spec['paths'].length > 1
-            dname=dname+" #{transfer_spec['paths'].length} Files"
+            dname+=" #{transfer_spec['paths'].length} Files"
           end
           transfer_spec['download_name']=dname
         end
         creation=@gw_api.create('download',{'transfer_spec'=>transfer_spec})[:data]
         transfer_uuid=creation['url'].split('/').last
-        if transfer_spec['zip_required'] or transfer_spec['paths'].length > 1
-          # it is a zip file if zip is required or there is more than 1 file
-          file_dest=transfer_spec['download_name']+'.zip'
-        else
-          # it is a plain file if we don't require zip and there is only one file
-          file_dest=File.basename(transfer_spec['paths'].first['source'])
+        file_dest=if transfer_spec['zip_required'] || transfer_spec['paths'].length > 1
+                    # it is a zip file if zip is required or there is more than 1 file
+                    transfer_spec['download_name']+'.zip'
+                  else
+                    # it is a plain file if we don't require zip and there is only one file
+                    File.basename(transfer_spec['paths'].first['source'])
         end
         file_dest=File.join(transfer_spec['destination_root'],file_dest)
-        @gw_api.call({:operation=>'GET',:subpath=>"download/#{transfer_uuid}",:save_to_file=>file_dest})
+        @gw_api.call({operation: 'GET',subpath: "download/#{transfer_uuid}",save_to_file: file_dest})
       end
 
       # start FASP transfer based on transfer spec (hash table)
       # note that it is asynchronous
       # HTTP download only supports file list
       def start_transfer(transfer_spec,options={})
-        raise "GW URL must be set" unless !@gw_api.nil?
-        raise "option: must be hash (or nil)" unless options.is_a?(Hash)
-        raise "paths: must be Array" unless transfer_spec['paths'].is_a?(Array)
-        raise "only token based transfer is supported in GW" unless transfer_spec['token'].is_a?(String)
+        raise 'GW URL must be set' if @gw_api.nil?
+        raise 'option: must be hash (or nil)' unless options.is_a?(Hash)
+        raise 'paths: must be Array' unless transfer_spec['paths'].is_a?(Array)
+        raise 'only token based transfer is supported in GW' unless transfer_spec['token'].is_a?(String)
         Log.dump(:user_spec,transfer_spec)
         transfer_spec['authentication']||='token'
         case transfer_spec['direction']
-        when 'send'
+        when Fasp::TransferSpec::DIRECTION_SEND
           upload(transfer_spec)
-        when 'receive'
+        when Fasp::TransferSpec::DIRECTION_RECEIVE
           download(transfer_spec)
         else
           raise "unexpected direction: [#{transfer_spec['direction']}]"
@@ -190,25 +187,22 @@ module Aspera
       end
 
       # terminates monitor thread
-      def shutdown
-      end
+      def shutdown; end
 
-      def url=(api_url)
-      end
+      def url=(api_url); end
 
       private
 
       def initialize(params)
-        raise "params must be Hash" unless params.is_a?(Hash)
+        raise 'params must be Hash' unless params.is_a?(Hash)
         params=params.symbolize_keys
-        raise "must have only one param: url" unless params.keys.eql?([:url])
+        raise 'must have only one param: url' unless params.keys.eql?([:url])
         super()
-        @gw_api=Rest.new({:base_url => params[:url]})
+        @gw_api=Rest.new({base_url: params[:url]})
         api_info = @gw_api.read('info')[:data]
-        Log.log.info("#{api_info}")
-        @upload_chunksize=128000 # TODO: configurable ?
+        Log.log.info(api_info.to_s)
+        @upload_chunksize=128_000 # TODO: configurable ?
       end
-
     end # AgentHttpgw
   end
 end