aspera-cli 4.7.0 → 4.8.0

data/lib/aspera/environment.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'aspera/log'
 require 'rbconfig'
 
@@ -9,14 +10,14 @@ module Aspera
     OS_X = :osx
     OS_LINUX = :linux
     OS_AIX = :aix
-    OS_LIST=[OS_WINDOWS,OS_X,OS_LINUX,OS_AIX].freeze
-    CPU_X86_64=:x86_64 # rubocop:disable Naming/VariableNumber
-    CPU_PPC64=:ppc64
-    CPU_PPC64LE=:ppc64le
-    CPU_S390=:s390
-    CPU_LIST=[CPU_X86_64,CPU_PPC64,CPU_PPC64LE,CPU_S390].freeze
+    OS_LIST = [OS_WINDOWS,OS_X,OS_LINUX,OS_AIX].freeze
+    CPU_X86_64 = :x86_64
+    CPU_PPC64 = :ppc64
+    CPU_PPC64LE = :ppc64le
+    CPU_S390 = :s390
+    CPU_LIST = [CPU_X86_64,CPU_PPC64,CPU_PPC64LE,CPU_S390].freeze
 
-    class<<self
+    class << self
       def ruby_version
         return RbConfig::CONFIG['RUBY_PROGRAM_VERSION']
       end
@@ -63,9 +64,18 @@ module Aspera
       # so, tell Ruby the right way
       def fix_home
         return unless os.eql?(OS_WINDOWS) && ENV.has_key?('USERPROFILE') && Dir.exist?(ENV['USERPROFILE'])
-        ENV['HOME']=ENV['USERPROFILE']
+        ENV['HOME'] = ENV['USERPROFILE']
         Log.log.debug("Windows: set home to USERPROFILE: #{ENV['HOME']}")
       end
+
+      def empty_binding
+        return Kernel.binding
+      end
+
+      # secure execution of Ruby code
+      def secure_eval(code)
+        Kernel.send('lave'.reverse,code,empty_binding, __FILE__, __LINE__)
+      end
     end
   end
 end

data/lib/aspera/fasp/agent_base.rb

@@ -1,15 +1,18 @@
 # 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
+      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
@@ -18,55 +21,55 @@ module Aspera
       def enhanced_event_format(event)
         return event.keys.each_with_object({}) do |e,h|
           # capital_to_snake_case
-          new_name=e.
-            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 INTEGER_FIELDS.include?(e)
-          value=value.eql?('Yes') if BOOLEAN_FIELDS.include?(e)
-          h[new_name]=value
+          new_name = e.
+              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 INTEGER_FIELDS.include?(e)
+          value = value.eql?('Yes') if BOOLEAN_FIELDS.include?(e)
+          h[new_name] = value
         end
       end
 
       def initialize
-        @listeners=[]
+        @listeners = []
       end
 
       def notify_listeners(current_event_text,current_event_data)
         Log.log.debug('send event to listeners')
-        enhanced_event=nil
+        enhanced_event = nil
         @listeners.each do |listener|
           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?
+            enhanced_event = enhanced_event_format(current_event_data) if enhanced_event.nil?
             listener.event_enhanced(enhanced_event)
           end
         end
       end # notify_listeners
 
       def notify_begin(id,size)
-        notify_listeners('emulated',{LISTENER_SESSION_ID_B=>id,'Type'=>'NOTIFICATION','PreTransferBytes'=>size})
+        notify_listeners('emulated',{LISTENER_SESSION_ID_B => id,'Type' => 'NOTIFICATION','PreTransferBytes' => size})
       end
 
       def notify_progress(id,size)
-        notify_listeners('emulated',{LISTENER_SESSION_ID_B=>id,'Type'=>'STATS','Bytescont'=>size})
+        notify_listeners('emulated',{LISTENER_SESSION_ID_B => id,'Type' => 'STATS','Bytescont' => size})
       end
 
       def notify_end(id)
-        notify_listeners('emulated',{LISTENER_SESSION_ID_B=>id,'Type'=>'DONE'})
+        notify_listeners('emulated',{LISTENER_SESSION_ID_B => id,'Type' => 'DONE'})
       end
 
       public
 
-      LISTENER_SESSION_ID_B='ListenerSessionId'
-      LISTENER_SESSION_ID_S='listener_session_id'
+      LISTENER_SESSION_ID_B = 'ListenerSessionId'
+      LISTENER_SESSION_ID_S = 'listener_session_id'
 
       # listener receives events
       def add_listener(listener)
-        raise "expect one of #{EXPECTED_METHODS}" if EXPECTED_METHODS.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

data/lib/aspera/fasp/agent_connect.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'aspera/fasp/agent_base'
 require 'aspera/rest'
 require 'aspera/open_application'
@@ -8,26 +9,26 @@ require 'tty-spinner'
 module Aspera
   module Fasp
     class AgentConnect < AgentBase
-      MAX_CONNECT_START_RETRY=3
-      SLEEP_SEC_BETWEEN_RETRY=2
+      MAX_CONNECT_START_RETRY = 3
+      SLEEP_SEC_BETWEEN_RETRY = 2
       private_constant :MAX_CONNECT_START_RETRY,:SLEEP_SEC_BETWEEN_RETRY
       def initialize(_options)
         super()
-        @connect_settings={
+        @connect_settings = {
           'app_id' => SecureRandom.uuid
         }
         raise 'Using connect requires a graphical environment' if !OpenApplication.default_gui_mode.eql?(:graphical)
-        trynumber=0
+        trynumber = 0
         begin
-          connect_url=Installation.instance.connect_uri
+          connect_url = Installation.instance.connect_uri
           Log.log.debug("found: #{connect_url}")
-          @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]
+          @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 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
+          trynumber += 1
           if !OpenApplication.uri_graphical('fasp://initialize')
             OpenApplication.uri_graphical('https://downloads.asperasoft.com/connect2/')
             raise StandardError,'Connect is not installed'
@@ -41,36 +42,40 @@ module Aspera
         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]
-          transfer_spec['paths']=resdata['dataTransfer']['files'].map { |i| {'source'=>i['name']}}
+          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
+        @request_id = SecureRandom.uuid
         # if there is a token, we ask connect client to use well known ssh private keys
         # instead of asking password
-        transfer_spec['authentication']='token' if transfer_spec.has_key?('token')
-        connect_transfer_args={
-          'aspera_connect_settings'=>@connect_settings.merge({
-          'request_id'               =>@request_id,
-          'allow_dialogs'            =>true
+        transfer_spec['authentication'] = 'token' if transfer_spec.has_key?('token')
+        connect_transfer_args = {
+          'aspera_connect_settings' => @connect_settings.merge({
+            'request_id'    => @request_id,
+            'allow_dialogs' => true
           }),
-          'transfer_specs'         =>[{
-          'transfer_spec'            =>transfer_spec
+          'transfer_specs'          => [{
+            'transfer_spec' => transfer_spec
           }]}
         # asynchronous anyway
-        res=@connect_api.create('transfers/start',connect_transfer_args)[:data]
-        @xfer_id=res['transfer_specs'].first['transfer_spec']['tags']['aspera']['xfer_id']
+        res = @connect_api.create('transfers/start',connect_transfer_args)[:data]
+        @xfer_id = res['transfer_specs'].first['transfer_spec']['tags']['aspera']['xfer_id']
       end
 
       def wait_for_transfers_completion
-        connect_activity_args={'aspera_connect_settings'=>@connect_settings}
-        started=false
-        spinner=nil
+        connect_activity_args = {'aspera_connect_settings' => @connect_settings}
+        started = false
+        spinner = nil
         begin
           loop do
-            tr_info=@connect_api.create("transfers/info/#{@xfer_id}",connect_activity_args)[:data]
+            tr_info = @connect_api.create("transfers/info/#{@xfer_id}",connect_activity_args)[:data]
             if tr_info['transfer_info'].is_a?(Hash)
-              trdata=tr_info['transfer_info']
+              trdata = tr_info['transfer_info']
               if trdata.nil?
                 Log.log.warn('no session in Connect')
                 break
@@ -90,20 +95,20 @@ module Aspera
               when 'running'
                 #puts "running: sessions:#{trdata['sessions'].length}, #{trdata['sessions'].map{|i| i['bytes_transferred']}.join(',')}"
                 if !started && (trdata['bytes_expected'] != 0)
-                  spinner.success unless spinner.nil?
+                  spinner&.success
                   notify_begin(@connect_settings['app_id'],trdata['bytes_expected'])
-                  started=true
+                  started = true
                 else
                   notify_progress(@connect_settings['app_id'],trdata['bytes_written'])
                 end
               when 'failed'
-                spinner.error unless spinner.nil?
+                spinner&.error
                 raise Fasp::Error, trdata['error_desc']
               else
                 raise Fasp::Error, "unknown status: #{trdata['status']}: #{trdata['error_desc']}"
               end
             end
-            sleep 1
+            sleep(1)
           end
         rescue StandardError => e
           return [e]

data/lib/aspera/fasp/agent_direct.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'English'
 require 'aspera/fasp/agent_base'
 require 'aspera/fasp/error'
@@ -24,7 +25,7 @@ module Aspera
         multi_incr_udp:    true,
         resume:            {},
         quiet:             true # by default no interactive progress bar
-      }
+      }.freeze
       private_constant :DEFAULT_OPTIONS
 
       # start ascp transfer (non blocking), single or multi-session
@@ -37,17 +38,17 @@ module Aspera
         job_options[:resumer] ||= @resume_policy
         job_options[:job_id] ||= SecureRandom.uuid
         # clone transfer spec because we modify it (first level keys)
-        transfer_spec=transfer_spec.clone
+        transfer_spec = transfer_spec.clone
         # if there is aspera tags
         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
+          transfer_spec['tags']['aspera']['xfer_id'] ||= SecureRandom.uuid
           Log.log.debug("xfer id=#{transfer_spec['xfer_id']}")
           # TODO: useful ? node only ?
-          transfer_spec['tags']['aspera']['xfer_retry']||=3600
+          transfer_spec['tags']['aspera']['xfer_retry'] ||= 3600
         end
         Log.dump('ts',transfer_spec)
 
@@ -61,9 +62,9 @@ module Aspera
 
         # Compute this before using transfer spec because it potentially modifies the transfer spec
         # (even if the var is not used in single session)
-        multi_session_info=nil
+        multi_session_info = nil
         if transfer_spec.has_key?('multi_session')
-          multi_session_info={
+          multi_session_info = {
             count: transfer_spec['multi_session'].to_i
           }
           # Managed by multi-session, so delete from transfer spec
@@ -76,7 +77,7 @@ module Aspera
             multi_session_info = nil
           elsif @options[:multi_incr_udp] # multi_session_info[:count] > 0
             # if option not true: keep default udp port for all sessions
-            multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : TransferSpec::UDP_PORT
+            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
@@ -84,10 +85,10 @@ module Aspera
         end
 
         # compute known args
-        env_args=Parameters.ts_to_env_args(transfer_spec,wss: @options[:wss])
+        env_args = Parameters.ts_to_env_args(transfer_spec,wss: @options[:wss])
 
         # add fallback cert and key as arguments if needed
-        if ['1','force'].include?(transfer_spec['http_fallback'])
+        if %w[1 force].include?(transfer_spec['http_fallback'])
           env_args[:args].unshift('-Y',Installation.instance.path(:fallback_key))
           env_args[:args].unshift('-I',Installation.instance.path(:fallback_cert))
         end
@@ -95,19 +96,19 @@ module Aspera
         env_args[:args].unshift('-q') if @options[:quiet]
 
         # transfer job can be multi session
-        xfer_job={
-          id:             job_options[:job_id],
-          sessions:       [] # all sessions as below
+        xfer_job = {
+          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]
+        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]
         }
 
         if multi_session_info.nil?
@@ -121,12 +122,12 @@ module Aspera
             # do not delay the first session
             sleep(@options[:spawn_delay_sec]) unless i.eql?(1)
             # do deep copy (each thread has its own copy because it is modified here below and in thread)
-            this_session=session.clone()
-            this_session[:env_args]=this_session[:env_args].clone()
-            this_session[:env_args][:args]=this_session[:env_args][:args].clone()
+            this_session = session.clone
+            this_session[:env_args] = this_session[:env_args].clone
+            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).to_s) 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
@@ -134,7 +135,7 @@ module Aspera
         Log.log.debug('started session thread(s)')
 
         # add job to list of jobs
-        @jobs[job_options[:job_id]]=xfer_job
+        @jobs[job_options[:job_id]] = xfer_job
         Log.log.debug("jobs: #{@jobs.keys.count}")
 
         return job_options[:job_id]
@@ -145,7 +146,7 @@ module Aspera
       def wait_for_transfers_completion
         Log.log.debug('wait_for_transfers_completion')
         # set to non-nil to exit loop
-        result=[]
+        result = []
         @jobs.each do |_id,job|
           job[:sessions].each do |session|
             Log.log.debug("join #{session[:thread]}")
@@ -176,11 +177,11 @@ module Aspera
         raise 'env_args must be Hash' unless env_args.is_a?(Hash)
         raise 'session must be Hash' unless session.is_a?(Hash)
         # by default we assume an exception will be raised (for ensure block)
-        exception_raised=true
+        exception_raised = true
         begin
           Log.log.debug("env_args=#{env_args.inspect}")
           # get location of ascp executable
-          ascp_path=@mutex.synchronize do
+          ascp_path = @mutex.synchronize do
             Fasp::Installation.instance.path(env_args[:ascp_version])
           end
           # (optional) check it exists
@@ -188,17 +189,24 @@ module Aspera
           # 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
-          ascp_arguments=env_args[:args].clone
+          ascp_arguments = env_args[:args].clone
           # 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}=#{Shellwords.shellescape(v)}"}.join(' ')} #{Shellwords.shellescape(ascp_path)} #{ascp_arguments.map{|a|Shellwords.shellescape(a)}.join(' ')}")
+          Log.log.debug do
+            'execute: '+
+            env_args[:env].map{|k,v| "#{k}=#{Shellwords.shellescape(v)}"}.join(' ')+
+            ' '+
+            Shellwords.shellescape(ascp_path)+
+            ' '+
+            ascp_arguments.map{|a|Shellwords.shellescape(a)}.join(' ')
+          end
           # 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
           Log.log.debug("before accept for pid (#{ascp_pid})")
           # init management socket
-          ascp_mgt_io=nil
+          ascp_mgt_io = nil
           Timeout.timeout(@options[:spawn_timeout_sec]) do
             ascp_mgt_io = mgt_sock.accept
             # management messages include file names which may be utf8
@@ -207,20 +215,20 @@ module Aspera
             ascp_mgt_io.set_encoding(Encoding::UTF_8)
           end
           Log.log.debug("after accept (#{ascp_mgt_io})")
-          session[:io]=ascp_mgt_io
+          session[:io] = ascp_mgt_io
           # exact text for event, with \n
-          current_event_text=''
+          current_event_text = ''
           # parsed event (hash)
-          current_event_data=nil
+          current_event_data = nil
           # this is the last full status
-          last_status_event=nil
+          last_status_event = nil
           # read management port
           loop do
             # TODO: timeout here ?
             line = ascp_mgt_io.gets
             # nil when ascp process exits
             break if line.nil?
-            current_event_text+=line
+            current_event_text += line
             line.chomp!
             Log.log.debug("line=[#{line}]")
             case line
@@ -234,11 +242,11 @@ module Aspera
             when ''
               # empty line is separator to end event information
               raise 'unexpected empty line' if current_event_data.nil?
-              current_event_data[AgentBase::LISTENER_SESSION_ID_B]=ascp_pid
+              current_event_data[AgentBase::LISTENER_SESSION_ID_B] = ascp_pid
               notify_listeners(current_event_text,current_event_data)
               case current_event_data['Type']
               when 'INIT'
-                session[:id]=current_event_data['SessionId']
+                session[:id] = current_event_data['SessionId']
                 Log.log.debug("session id: #{session[:id]}")
               when 'DONE','ERROR'
                 # TODO: check if this is always the last event
@@ -253,15 +261,15 @@ module Aspera
             case last_status_event['Type']
             when 'DONE'
               # all went well
-              exception_raised=false
+              exception_raised = false
             when 'ERROR'
               Log.log.error("code: #{last_status_event['Code']}")
-              if last_status_event['Description'] =~ /bearer token/i
+              if /bearer token/i.match?(last_status_event['Description'])
                 Log.log.error('need to regenerate token'.red)
                 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)
+                  env_args[:env]['ASPERA_SCP_TOKEN'] = session[:options][:regenerate_token].call(true)
                 end
               end
               raise Fasp::Error.new(last_status_event['Description'],last_status_event['Code'].to_i)
@@ -269,7 +277,7 @@ module Aspera
               raise "unexpected last event type: #{last_status_event['Type']}"
             end
           else
-            exception_raised=false
+            exception_raised = false
             Log.log.debug('no status read from ascp mgt port')
           end
         rescue SystemCallError => e
@@ -284,11 +292,11 @@ module Aspera
           unless ascp_pid.nil?
             # "wait" for process to avoid zombie
             Process.wait(ascp_pid)
-            status=$CHILD_STATUS
-            ascp_pid=nil
+            status = $CHILD_STATUS
+            ascp_pid = nil
             session.delete(:io)
             if !status.success?
-              message="ascp failed with code #{status.exitstatus}"
+              message = "ascp failed with code #{status.exitstatus}"
               # 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
@@ -305,18 +313,18 @@ module Aspera
       # {'type'=>'START','source'=>_path_,'destination'=>_path_}
       # {'type'=>'DONE'}
       def send_command(job_id,session_index,data)
-        job=@jobs[job_id]
+        job = @jobs[job_id]
         raise 'no such job' if job.nil?
-        session=job[:sessions][session_index]
+        session = job[:sessions][session_index]
         raise 'no such session' if session.nil?
         Log.log.debug("command: #{data}")
         # build command
-        command=data.
-        keys.
-        map{|k|"#{k.capitalize}: #{data[k]}"}.
-        unshift('FASPMGR 2').
-        push('','').
-        join("\n")
+        command = data.
+          keys.
+          map{|k|"#{k.capitalize}: #{data[k]}"}.
+          unshift('FASPMGR 2').
+          push('','').
+          join("\n")
         session[:io].puts(command)
       end
 
@@ -326,20 +334,20 @@ module Aspera
       def initialize(options=nil)
         super()
         # all transfer jobs, key = SecureRandom.uuid, protected by mutex, condvar on change
-        @jobs={}
+        @jobs = {}
         # mutex protects global data accessed by threads
-        @mutex=Mutex.new
+        @mutex = Mutex.new
         # set default options and override if specified
-        @options=DEFAULT_OPTIONS.clone
+        @options = DEFAULT_OPTIONS.dup
         if !options.nil?
           raise "expecting Hash (or nil), but have #{options.class}" unless options.is_a?(Hash)
           options.each do |k,v|
             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
+            @options[k] = v
           end
         end
         Log.log.debug("local options= #{options}")
-        @resume_policy=ResumePolicy.new(@options[:resume].symbolize_keys)
+        @resume_policy = ResumePolicy.new(@options[:resume].symbolize_keys)
       end
 
       # transfer thread entry
@@ -347,15 +355,15 @@ module Aspera
       def transfer_thread_entry(session)
         begin
           # set name for logging
-          Thread.current[:name]='transfer'
+          Thread.current[:name] = 'transfer'
           Log.log.debug("ENTER (#{Thread.current[:name]})")
           # start transfer with selected resumer policy
-          session[:options][:resumer].process do
+          session[:options][:resumer].execute_with_resume do
             start_transfer_with_args_env(session[:env_args],session)
           end
           Log.log.debug('transfer ok'.bg_green)
         rescue StandardError => e
-          session[:error]=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]})")