aspera-cli 4.6.0 → 4.7.0

data/lib/aspera/fasp/installation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+require 'English'
 require 'singleton'
 require 'aspera/log'
 require 'aspera/environment'
@@ -6,6 +8,7 @@ require 'xmlsimple'
 require 'zlib'
 require 'base64'
 require 'fileutils'
+require 'openssl'
 
 module Aspera
   module Fasp
@@ -18,6 +21,7 @@ module Aspera
     # Installation.instance.ascp_path=""
     class Installation
       include Singleton
+      # known product names
       PRODUCT_CONNECT='Aspera Connect'
       PRODUCT_CLI_V1='Aspera CLI'
       PRODUCT_DRIVE='Aspera Drive'
@@ -25,23 +29,48 @@ module Aspera
       # protobuf generated files from sdk
       EXT_RUBY_PROTOBUF='_pb.rb'
       RB_SDK_FOLDER='lib'
-      MAX_REDIRECT_SDK=2
-      private_constant :MAX_REDIRECT_SDK
+      ONE_YEAR_SECONDS=365 * 24 * 60 * 60
+      DEFAULT_ASPERA_CONF=<<~END_OF_CONFIG_FILE
+        <?xml version='1.0' encoding='UTF-8'?>
+        <CONF version="2">
+        <default>
+            <file_system>
+                <resume_suffix>.aspera-ckpt</resume_suffix>
+                <partial_file_suffix>.partial</partial_file_suffix>
+            </file_system>
+        </default>
+        </CONF>
+      END_OF_CONFIG_FILE
+      private_constant :PRODUCT_CONNECT,:PRODUCT_CLI_V1,:PRODUCT_DRIVE,:PRODUCT_ENTSRV,:EXT_RUBY_PROTOBUF,:RB_SDK_FOLDER,:ONE_YEAR_SECONDS,:DEFAULT_ASPERA_CONF
       # set ascp executable path
       def ascp_path=(v)
         @path_to_ascp=v
       end
 
+      def ascp_path
+        path(:ascp)
+      end
+
       def sdk_ruby_folder
-        ruby_pb_folder=File.join(folder_path,RB_SDK_FOLDER)
+        ruby_pb_folder=File.join(sdk_folder,RB_SDK_FOLDER)
         FileUtils.mkdir_p(ruby_pb_folder) unless Dir.exist?(ruby_pb_folder)
         return ruby_pb_folder
       end
 
       # location of SDK files
-      def folder=(v)
-        @sdk_folder=v
-        folder_path
+      def sdk_folder=(v)
+        @sdk_dir=v
+        sdk_folder
+      end
+
+      # backward compatibility in sample program
+      alias folder= sdk_folder=
+
+      # @return the path to folder where SDK is installed
+      def sdk_folder
+        raise 'SDK path was ot initialized' if @sdk_dir.nil?
+        FileUtils.mkdir_p(@sdk_dir) unless Dir.exist?(@sdk_dir)
+        @sdk_dir
       end
 
       # find ascp in named product (use value : FIRST_FOUND='FIRST' to just use first one)
@@ -64,9 +93,9 @@ module Aspera
           scan_locations=product_locations.clone
           # add SDK as first search path
           scan_locations.unshift({
-            :expected =>'SDK',
-            :app_root =>folder_path,
-            :sub_bin =>''
+            expected: 'SDK',
+            app_root: sdk_folder,
+            sub_bin: ''
           })
           # search installed products: with ascp
           @found_products=scan_locations.select! do |item|
@@ -107,45 +136,36 @@ module Aspera
         when :transferd
           file=transferd_filepath
         when :ssh_bypass_key_dsa
-          file=File.join(folder_path,'aspera_bypass_dsa.pem')
+          file=File.join(sdk_folder,'aspera_bypass_dsa.pem')
           File.write(file,get_key('dsa',1)) unless File.exist?(file)
           File.chmod(0400,file)
         when :ssh_bypass_key_rsa
-          file=File.join(folder_path,'aspera_bypass_rsa.pem')
+          file=File.join(sdk_folder,'aspera_bypass_rsa.pem')
           File.write(file,get_key('rsa',2)) unless File.exist?(file)
           File.chmod(0400,file)
         when :aspera_license
-          file=File.join(folder_path,'aspera-license')
-          File.write(file,Base64.strict_encode64("#{Zlib::Inflate.inflate(DataRepository.instance.get_bin(6))}==SIGNATURE==\n#{Base64.strict_encode64(DataRepository.instance.get_bin(7))}")) unless File.exist?(file)
+          file=File.join(sdk_folder,'aspera-license')
+          File.write(file,Base64.strict_encode64("#{Zlib::Inflate.inflate(DataRepository.instance.data(6))}==SIGNATURE==\n#{Base64.strict_encode64(DataRepository.instance.data(7))}")) unless File.exist?(file)
           File.chmod(0400,file)
         when :aspera_conf
-          file=File.join(folder_path,'aspera.conf')
-          File.write(file,%Q{<?xml version='1.0' encoding='UTF-8'?>
-<CONF version="2">
-<default>
-    <file_system>
-        <resume_suffix>.aspera-ckpt</resume_suffix>
-        <partial_file_suffix>.partial</partial_file_suffix>
-    </file_system>
-</default>
-</CONF>
-}) unless File.exist?(file)
+          file=File.join(sdk_folder,'aspera.conf')
+          File.write(file,DEFAULT_ASPERA_CONF) unless File.exist?(file)
           File.chmod(0400,file)
         when :fallback_cert,:fallback_key
-          file_key=File.join(folder_path,'aspera_fallback_key.pem')
-          file_cert=File.join(folder_path,'aspera_fallback_cert.pem')
-          if !File.exist?(file_key) or !File.exist?(file_cert)
+          file_key=File.join(sdk_folder,'aspera_fallback_key.pem')
+          file_cert=File.join(sdk_folder,'aspera_fallback_cert.pem')
+          if !File.exist?(file_key) || !File.exist?(file_cert)
             require 'openssl'
             # create new self signed certificate for http fallback
             private_key = OpenSSL::PKey::RSA.new(1024)
             cert = OpenSSL::X509::Certificate.new
-            cert.subject = cert.issuer = OpenSSL::X509::Name.parse("/C=US/ST=California/L=Emeryville/O=Aspera Inc./OU=Corporate/CN=Aspera Inc./emailAddress=info@asperasoft.com")
+            cert.subject = cert.issuer = OpenSSL::X509::Name.parse('/C=US/ST=California/L=Emeryville/O=Aspera Inc./OU=Corporate/CN=Aspera Inc./emailAddress=info@asperasoft.com')
             cert.not_before = Time.now
-            cert.not_after = Time.now + 365 * 24 * 60 * 60
+            cert.not_after = Time.now + ONE_YEAR_SECONDS
             cert.public_key = private_key.public_key
             cert.serial = 0x0
             cert.version = 2
-            cert.sign(private_key, OpenSSL::Digest::SHA1.new)
+            cert.sign(private_key, OpenSSL::Digest.new('SHA1'))
             File.write(file_key,private_key.to_pem)
             File.write(file_cert,cert.to_pem)
             File.chmod(0400,file_key)
@@ -167,7 +187,7 @@ module Aspera
           uri_file=File.join(folder,"http#{ext}.uri")
           Log.log.debug("checking connect port file: #{uri_file}")
           if File.exist?(uri_file)
-            return File.open(uri_file){|f|f.gets}.strip
+            return File.open(uri_file, &:gets).strip
           end
         end
         raise "no connect uri file found in #{folder}"
@@ -181,7 +201,7 @@ module Aspera
 
       # default bypass key phrase
       def bypass_pass
-        return "%08x-%04x-%04x-%04x-%04x%08x" % DataRepository.instance.get_bin(3).unpack("NnnnnN")
+        return format('%08x-%04x-%04x-%04x-%04x%08x',*DataRepository.instance.data(3).unpack('NnnnnN'))
       end
 
       def bypass_keys
@@ -195,13 +215,13 @@ module Aspera
 
       # Check that specified path is ascp and get version
       def get_exe_version(exe_path,vers_arg)
-        raise "ERROR: nil arg" if exe_path.nil?
+        raise 'ERROR: nil arg' if exe_path.nil?
         return nil unless File.exist?(exe_path)
         exe_version=nil
-        cmd_out=%x{"#{exe_path}" #{vers_arg}}
-        raise "An error occured when testing #{ascp_filename}: #{cmd_out}" unless $? == 0
+        cmd_out=%x("#{exe_path}" #{vers_arg})
+        raise "An error occured when testing #{ascp_filename}: #{cmd_out}" unless $CHILD_STATUS == 0
         # get version from ascp, only after full extract, as windows requires DLLs (SSL/TLS/etc...)
-        m=cmd_out.match(/ version ([0-9\.]+)/)
+        m=cmd_out.match(/ version ([0-9.]+)/)
         exe_version=m[1] unless m.nil?
         return exe_version
       end
@@ -220,9 +240,9 @@ module Aspera
           Aspera::Rest.new(base_url: sdk_url, redirect_max: 3).call(operation: 'GET',save_to_file: sdk_zip_path)
         end
         # rename old install
-        if ! Dir.empty?(folder_path)
-          Log.log.warn("Previous install exists, renaming folder.")
-          File.rename(folder_path,"#{folder_path}.#{Time.now.strftime("%Y%m%d%H%M%S")}")
+        if !Dir.empty?(sdk_folder)
+          Log.log.warn('Previous install exists, renaming folder.')
+          File.rename(sdk_folder,"#{sdk_folder}.#{Time.now.strftime('%Y%m%d%H%M%S')}")
           # TODO: delete old archives ?
         end
         # SDK is organized by architecture
@@ -234,31 +254,30 @@ module Aspera
             next if entry.name.end_with?('/')
             dest_folder=nil
             # binaries
-            dest_folder=folder_path if entry.name.include?(arch_filter)
+            dest_folder=sdk_folder if entry.name.include?(arch_filter)
             # ruby adapters
             dest_folder=sdk_ruby_folder if entry.name.end_with?(EXT_RUBY_PROTOBUF)
-            if !dest_folder.nil?
-              File.open(File.join(dest_folder,File.basename(entry.name)), 'wb') do |output_stream|
-                IO.copy_stream(entry.get_input_stream, output_stream)
-              end
+            next if dest_folder.nil?
+            File.open(File.join(dest_folder,File.basename(entry.name)), 'wb') do |output_stream|
+              IO.copy_stream(entry.get_input_stream, output_stream)
             end
           end
         end
         File.unlink(sdk_zip_path) rescue nil # Windows may give error
         # ensure license file are generated so that ascp invokation for version works
-        self.path(:aspera_license)
-        self.path(:aspera_conf)
-        ascp_path=File.join(folder_path,ascp_filename)
+        path(:aspera_license)
+        path(:aspera_conf)
+        ascp_path=File.join(sdk_folder,ascp_filename)
         raise "No #{ascp_filename} found in SDK archive" unless File.exist?(ascp_path)
         FileUtils.chmod(0755,ascp_path)
         FileUtils.chmod(0755,ascp_path.gsub('ascp','ascp4'))
-        ascp_version=get_ascp_version(File.join(folder_path,ascp_filename))
+        ascp_version=get_ascp_version(File.join(sdk_folder,ascp_filename))
         trd_path=transferd_filepath
         Log.log.warn("No #{trd_path} in SDK archive") unless File.exist?(trd_path)
         FileUtils.chmod(0755,trd_path) if File.exist?(trd_path)
         transferd_version=get_exe_version(trd_path,'version')
         sdk_version = transferd_version||ascp_version
-        File.write(File.join(folder_path,PRODUCT_INFO),"<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
+        File.write(File.join(sdk_folder,PRODUCT_INFO),"<product><name>IBM Aspera SDK</name><version>#{sdk_version}</version></product>")
         return sdk_version
       end
 
@@ -276,7 +295,7 @@ module Aspera
 
       def initialize
         @path_to_ascp=nil
-        @sdk_folder=nil
+        @sdk_dir=nil
         @found_products=nil
       end
 
@@ -288,20 +307,13 @@ module Aspera
         return found.first
       end
 
-      # @return the path to folder where SDK is installed
-      def folder_path
-        raise "Undefined path to SDK" if @sdk_folder.nil?
-        FileUtils.mkdir_p(@sdk_folder) unless Dir.exist?(@sdk_folder)
-        @sdk_folder
-      end
-
       # filename for ascp with optional extension (Windows)
       def ascp_filename
         return 'ascp'+Environment.exe_extension
       end
 
       def transferd_filepath
-        return File.join(folder_path,'asperatransferd'+Environment.exe_extension)
+        return File.join(sdk_folder,'asperatransferd'+Environment.exe_extension)
       end
 
       # @return product folders depending on OS fields
@@ -313,49 +325,49 @@ module Aspera
       def product_locations
         case Aspera::Environment.os
         when Aspera::Environment::OS_WINDOWS; return [{
-            :expected =>PRODUCT_CONNECT,
-            :app_root =>File.join(ENV['LOCALAPPDATA'],'Programs','Aspera','Aspera Connect'),
-            :log_root =>File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect','var','log'),
-            :run_root =>File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect')
+            expected: PRODUCT_CONNECT,
+            app_root: File.join(ENV['LOCALAPPDATA'],'Programs','Aspera','Aspera Connect'),
+            log_root: File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect','var','log'),
+            run_root: File.join(ENV['LOCALAPPDATA'],'Aspera','Aspera Connect')
             },{
-            :expected =>PRODUCT_CLI_V1,
-            :app_root =>File.join('C:','Program Files','Aspera','cli'),
-            :log_root =>File.join('C:','Program Files','Aspera','cli','var','log'),
+            expected: PRODUCT_CLI_V1,
+            app_root: File.join('C:','Program Files','Aspera','cli'),
+            log_root: File.join('C:','Program Files','Aspera','cli','var','log')
             },{
-            :expected =>PRODUCT_ENTSRV,
-            :app_root =>File.join('C:','Program Files','Aspera','Enterprise Server'),
-            :log_root =>File.join('C:','Program Files','Aspera','Enterprise Server','var','log'),
+            expected: PRODUCT_ENTSRV,
+            app_root: File.join('C:','Program Files','Aspera','Enterprise Server'),
+            log_root: File.join('C:','Program Files','Aspera','Enterprise Server','var','log')
             }]
         when Aspera::Environment::OS_X; return [{
-            :expected =>PRODUCT_CONNECT,
-            :app_root =>File.join(Dir.home,'Applications','Aspera Connect.app'),
-            :log_root =>File.join(Dir.home,'Library','Logs','Aspera_Connect'),
-            :run_root =>File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
-            :sub_bin  =>File.join('Contents','Resources'),
+            expected: PRODUCT_CONNECT,
+            app_root: File.join(Dir.home,'Applications','Aspera Connect.app'),
+            log_root: File.join(Dir.home,'Library','Logs','Aspera_Connect'),
+            run_root: File.join(Dir.home,'Library','Application Support','Aspera','Aspera Connect'),
+            sub_bin: File.join('Contents','Resources')
             },{
-            :expected =>PRODUCT_CLI_V1,
-            :app_root =>File.join(Dir.home,'Applications','Aspera CLI'),
-            :log_root =>File.join(Dir.home,'Library','Logs','Aspera')
+            expected: PRODUCT_CLI_V1,
+            app_root: File.join(Dir.home,'Applications','Aspera CLI'),
+            log_root: File.join(Dir.home,'Library','Logs','Aspera')
             },{
-            :expected =>PRODUCT_ENTSRV,
-            :app_root =>File.join('','Library','Aspera'),
-            :log_root =>File.join(Dir.home,'Library','Logs','Aspera'),
+            expected: PRODUCT_ENTSRV,
+            app_root: File.join('','Library','Aspera'),
+            log_root: File.join(Dir.home,'Library','Logs','Aspera')
             },{
-            :expected =>PRODUCT_DRIVE,
-            :app_root =>File.join('','Applications','Aspera Drive.app'),
-            :log_root =>File.join(Dir.home,'Library','Logs','Aspera_Drive'),
-            :sub_bin  =>File.join('Contents','Resources'),
+            expected: PRODUCT_DRIVE,
+            app_root: File.join('','Applications','Aspera Drive.app'),
+            log_root: File.join(Dir.home,'Library','Logs','Aspera_Drive'),
+            sub_bin: File.join('Contents','Resources')
             }]
-        else; return [{  # other: Linux and Unix family
-            :expected =>PRODUCT_CONNECT,
-            :app_root =>File.join(Dir.home,'.aspera','connect'),
-            :run_root =>File.join(Dir.home,'.aspera','connect')
+        else; return [{ # other: Linux and Unix family
+            expected: PRODUCT_CONNECT,
+            app_root: File.join(Dir.home,'.aspera','connect'),
+            run_root: File.join(Dir.home,'.aspera','connect')
             },{
-            :expected =>PRODUCT_CLI_V1,
-            :app_root =>File.join(Dir.home,'.aspera','cli'),
+            expected: PRODUCT_CLI_V1,
+            app_root: File.join(Dir.home,'.aspera','cli')
             },{
-            :expected =>PRODUCT_ENTSRV,
-            :app_root =>File.join('','opt','aspera'),
+            expected: PRODUCT_ENTSRV,
+            app_root: File.join('','opt','aspera')
             }]
         end
       end
@@ -365,10 +377,10 @@ module Aspera
       # @param id in repository 1 for dsa, 2 for rsa
       def get_key(type,id)
         hf=['begin','end'].map{|t|"-----#{t} #{type} private key-----".upcase}
-        bin=Base64.strict_encode64(DataRepository.instance.get_bin(id))
-        hf.insert(1,bin).join("\n")
+        bin=Base64.strict_encode64(DataRepository.instance.data(id))
+        # validate valie and generate key in connonical format
+        OpenSSL::PKey.const_get(type.upcase).send(:new,hf.insert(1,bin).join("\n")).to_pem
       end
-
     end # Installation
   end
 end

data/lib/aspera/fasp/listener.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Aspera
   module Fasp
     # imlement this class to get transfer events

data/lib/aspera/fasp/parameters.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'aspera/log'
 require 'aspera/command_line_builder'
 require 'aspera/temp_file_manager'
@@ -5,7 +6,6 @@ require 'securerandom'
 require 'base64'
 require 'json'
 require 'yaml'
-require 'securerandom'
 require 'fileutils'
 require 'openssl'
 
@@ -13,68 +13,79 @@ module Aspera
   module Fasp
     # translate transfer specification to ascp parameter list
     class Parameters
-      private
-      # Temp folder for file lists, must contain only file lists
-      # because of garbage collection takes any file there
-      # this could be refined, as , for instance, on macos, temp folder is already user specific
-      @@file_list_folder=TempFileManager.instance.new_file_path_global('asession_filelists')
-      @@param_description_cache=nil
-      # @return normaiwed description of transfer spec parameters
-      def self.description
-        return @@param_description_cache unless @@param_description_cache.nil?
-        # config file in same folder with same name as this source
-        @@param_description_cache=YAML.load_file("#{__FILE__[0..-3]}yaml")
-        Aspera::CommandLineBuilder.normalize_description(@@param_description_cache)
-      end
-
       # Agents shown in manual for parameters (sub list)
       SUPPORTED_AGENTS=[:direct,:node,:connect]
       # Short names of columns in manual
       SUPPORTED_AGENTS_SHORT=SUPPORTED_AGENTS.map{|a|a.to_s[0].to_sym}
 
-      # @return a table suitable to display a manual
-      def self.man_table
-        result=[]
-        description.keys.map do |k|
-          i=description[k]
-          param={name: k, type: [i[:accepted_types]].flatten.join(','),description: i[:desc]}
-          SUPPORTED_AGENTS.each do |a|
-            param[a.to_s[0].to_sym]=i[:context].nil? || i[:context].include?(a) ? 'Y' : ''
-          end
-          # only keep lines that are usable in supported agents
-          next if SUPPORTED_AGENTS_SHORT.inject(true){|m,i|m and param[i].empty?}
-          param[:cli]=case i[:cltype]
-          when :envvar; 'env:'+i[:clvarname]
-          when :opt_without_arg,:opt_with_arg; i[:option_switch]
-          else ''
-          end
-          if i.has_key?(:enum)
-            param[:description] << "\nAllowed values: #{i[:enum].join(', ')}"
+      class << self
+        # Temp folder for file lists, must contain only file lists
+        # because of garbage collection takes any file there
+        # this could be refined, as , for instance, on macos, temp folder is already user specific
+        @file_list_folder=TempFileManager.instance.new_file_path_global('asession_filelists')
+        @param_description_cache=nil
+        # @return normalized description of transfer spec parameters, direct from yaml
+        def description
+          return @param_description_cache unless @param_description_cache.nil?
+          # config file in same folder with same name as this source
+          @param_description_cache=YAML.load_file("#{__FILE__[0..-3]}yaml")
+          Aspera::CommandLineBuilder.normalize_description(@param_description_cache)
+        end
+
+        # @return a table suitable to display in manual
+        def man_table
+          result=[]
+          description.each do |k,i|
+            param={name: k, type: [i[:accepted_types]].flatten.join(','),description: i[:desc]}
+            SUPPORTED_AGENTS.each do |a|
+              param[a.to_s[0].to_sym]=i[:tragents].nil? || i[:tragents].include?(a) ? 'Y' : ''
+            end
+            # only keep lines that are usable in supported agents
+            next if SUPPORTED_AGENTS_SHORT.inject(true){|m,j|m && param[j].empty?}
+            param[:cli]=
+            case i[:cltype]
+            when :envvar then 'env:'+i[:clvarname]
+            when :opt_without_arg,:opt_with_arg then i[:clswitch]
+            else ''
+            end
+            if i.has_key?(:enum)
+              param[:description] += "\nAllowed values: #{i[:enum].join(', ')}"
+            end
+            result.push(param)
           end
-          result.push(param)
+          return result
         end
-        return result
-      end
 
-      # special encoding methods used in YAML (key: :encode)
-      def self.encode_cipher(v)
-        v.tr('-','')
-      end
+        # special encoding methods used in YAML (key: :clconvert)
+        def clconv_remove_hyphen(v); v.tr('-',''); end
 
-      # special encoding methods used in YAML (key: :encode)
-      def self.encode_source_root(v)
-        Base64.strict_encode64(v)
-      end
+        # special encoding methods used in YAML (key: :clconvert)
+        def clconv_json64(v); Base64.strict_encode64(JSON.generate(v)); end
 
-      # special encoding methods used in YAML (key: :encode)
-      def self.encode_tags(v)
-        Base64.strict_encode64(JSON.generate(v))
-      end
+        # special encoding methods used in YAML (key: :clconvert)
+        def clconv_base64(v); Base64.strict_encode64(v); end
 
-      def self.ts_has_file_list(ts)
-        ts.has_key?('EX_ascp_args') and ts['EX_ascp_args'].is_a?(Array) and ['--file-list','--file-pair-list'].any?{|i|ts['EX_ascp_args'].include?(i)}
-      end
+        def ts_has_file_list(ts)
+          ts.has_key?('EX_ascp_args') and ts['EX_ascp_args'].is_a?(Array) and ['--file-list','--file-pair-list'].any?{|i|ts['EX_ascp_args'].include?(i)}
+        end
 
+        def ts_to_env_args(transfer_spec,options)
+          return Parameters.new(transfer_spec,options).ascp_args()
+        end
+
+        # temp file list files are created here
+        def file_list_folder=(v)
+          @file_list_folder=v
+          return if @file_list_folder.nil?
+          FileUtils.mkdir_p(@file_list_folder)
+          TempFileManager.instance.cleanup_expired(@file_list_folder)
+        end
+
+        # static methods
+        attr_reader :file_list_folder
+      end # self
+
+      # @param options [Hash] key: :wss: bool
       def initialize(job_spec,options)
         @job_spec=job_spec
         @options=options
@@ -82,28 +93,26 @@ module Aspera
         Log.log.debug("agent options: #{@options}")
       end
 
-      public
-
       # translate transfer spec to env vars and command line arguments for ascp
       # NOTE: parameters starting with "EX_" (extended) are not standard
-      def ascp_args()
+      def ascp_args
         env_args={
-          :args=>[],
-          :env=>{},
-          :ascp_version=>:ascp
+          args: [],
+          env: {},
+          ascp_version: :ascp
         }
         # some ssh credentials are required to avoid interactive password input
-        if !@job_spec.has_key?('remote_password') and
-        !@job_spec.has_key?('ssh_private_key') and
-        !@job_spec.has_key?('EX_ssh_key_paths') then
-          raise Fasp::Error.new('required: password or ssh key (value or path)')
+        if !@job_spec.has_key?('remote_password') &&
+        !@job_spec.has_key?('ssh_private_key') &&
+        !@job_spec.has_key?('EX_ssh_key_paths')
+          raise Fasp::Error, 'required: password or ssh key (value or path)'
         end
 
         # special cases
-        @job_spec.delete('source_root') if @job_spec.has_key?('source_root') and @job_spec['source_root'].empty?
+        @job_spec.delete('source_root') if @job_spec.has_key?('source_root') && @job_spec['source_root'].empty?
 
         # use web socket session initiation ?
-        if @builder.process_param('wss_enabled',:get_value) and ( @options[:wss] or !@job_spec.has_key?('fasp_port') )
+        if @builder.process_param('wss_enabled',:get_value) && (@options[:wss] || !@job_spec.has_key?('fasp_port'))
           # by default use web socket session if available, unless removed by user
           @builder.add_command_line_options(['--ws-connect'])
           # TODO: option to give order ssh,ws (legacy http is implied bu ssh)
@@ -112,9 +121,9 @@ module Aspera
           @job_spec.delete('fasp_port')
           @job_spec.delete('EX_ssh_key_paths')
           @job_spec.delete('sshfp')
-          # set default location for CA bundle, see env var SSL_CERT_FILE / SSL_CERT_DIR
+          # set location for CA bundle to be the one of Ruby, see env var SSL_CERT_FILE / SSL_CERT_DIR
           @job_spec['EX_ssh_key_paths']=[OpenSSL::X509::DEFAULT_CERT_FILE]
-          Log.log.debug("CA certs: EX_ssh_key_paths <- DEFAULT_CERT_FILE from openssl")
+          Log.log.debug('CA certs: EX_ssh_key_paths <- DEFAULT_CERT_FILE from openssl')
         else
           # remove unused parameter (avoid warning)
           @job_spec.delete('wss_port')
@@ -135,17 +144,17 @@ module Aspera
         file_list_provided=self.class.ts_has_file_list(@job_spec)
         @builder.params_definition['paths'][:mandatory]=!@job_spec.has_key?('keepalive') and !file_list_provided
         paths_array=@builder.process_param('paths',:get_value)
-        if file_list_provided and ! paths_array.nil?
-          Log.log.warn("file list provided both in transfer spec and ascp file list. Keeping file list only.")
+        if file_list_provided && !paths_array.nil?
+          Log.log.warn('file list provided both in transfer spec and ascp file list. Keeping file list only.')
           paths_array=nil
         end
-        if ! paths_array.nil?
+        if !paths_array.nil?
           # it's an array
-          raise "paths is empty in transfer spec" if paths_array.empty?
+          raise 'paths is empty in transfer spec' if paths_array.empty?
           # use file list if there is storage defined for it.
-          if @@file_list_folder.nil?
+          if self.class.file_list_folder.nil?
             # not safe for special characters ? (maybe not, depends on OS)
-            Log.log.debug("placing source file list on command line (no file list file)")
+            Log.log.debug('placing source file list on command line (no file list file)')
             @builder.add_command_line_options(paths_array.map{|i|i['source']})
           else
             file_list_file=@builder.process_param('EX_file_list',:get_value)
@@ -161,13 +170,13 @@ module Aspera
                 # TODO: well, we test only the first one, but anyway it shall be consistent
                 if paths_array.first.has_key?('destination')
                   option='--file-pair-list'
-                  lines=paths_array.inject([]){|m,e|m.push(e['source'],e['destination']);m}
+                  lines=paths_array.each_with_object([]){|e,m|m.push(e['source'],e['destination']);}
                 else
                   option='--file-list'
                   lines=paths_array.map{|i|i['source']}
                 end
-                file_list_file=Aspera::TempFileManager.instance.new_file_path_in_folder(@@file_list_folder)
-                File.open(file_list_file, 'w+'){|f|f.write(lines.join("\n"))}
+                file_list_file=Aspera::TempFileManager.instance.new_file_path_in_folder(self.class.file_list_folder)
+                File.write(file_list_file, lines.join("\n"))
                 Log.log.debug{"#{option}=\n#{File.read(file_list_file)}".red}
               end
             end
@@ -187,24 +196,6 @@ module Aspera
 
         return env_args
       end
-
-      # temp file list files are created here
-      def self.file_list_folder=(v)
-        @@file_list_folder=v
-        if !@@file_list_folder.nil?
-          FileUtils.mkdir_p(@@file_list_folder)
-          TempFileManager.instance.cleanup_expired(@@file_list_folder)
-        end
-      end
-
-      # static methods
-      class << self
-        def file_list_folder; @@file_list_folder;end
-
-        def ts_to_env_args(transfer_spec,options)
-          return Parameters.new(transfer_spec,options).ascp_args()
-        end
-      end
     end # Parameters
   end
 end