aspera-cli 4.24.1 → 4.24.2

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # cspell:ignore snid fnid bidi ssync asyncs rund asnodeadmin mkfile mklink asperabrowser asperabrowserurl watchfolders watchfolderd entsrv
-require 'aspera/cli/basic_auth_plugin'
+require 'aspera/cli/plugins/basic_auth'
 require 'aspera/cli/sync_actions'
 require 'aspera/cli/special_values'
 require 'aspera/transfer/spec'
@@ -9,7 +9,6 @@ require 'aspera/nagios'
 require 'aspera/hash_ext'
 require 'aspera/id_generator'
 require 'aspera/api/node'
-require 'aspera/api/aoc'
 require 'aspera/oauth'
 require 'aspera/node_simulator'
 require 'aspera/assert'
@@ -19,7 +18,7 @@ require 'zlib'
 module Aspera
   module Cli
     module Plugins
-      class Node < Cli::BasicAuthPlugin
+      class Node < BasicAuth
         include SyncActions
 
         class << self
@@ -62,18 +61,6 @@ module Aspera
             return
           end
 
-          def wizard(object:, _private_key_path: nil, _pub_key_pem: nil)
-            options = object.options
-            return {
-              preset_value: {
-                url:      options.get_option(:url, mandatory: true),
-                username: options.get_option(:username, mandatory: true),
-                password: options.get_option(:password, mandatory: true)
-              },
-              test_args:    'info'
-            }
-          end
-
           def declare_options(options)
             return if @options_declared
             @options_declared = true
@@ -100,6 +87,20 @@ module Aspera
           end
         end
 
+        # @param wizard  [Wizard] The wizard object
+        # @param app_url [Wizard] The wizard object
+        # @return [Hash] :preset_value, :test_args
+        def wizard(wizard, app_url)
+          return {
+            preset_value: {
+              url:      app_url,
+              username: options.get_option(:username, mandatory: true),
+              password: options.get_option(:password, mandatory: true)
+            },
+            test_args:    'info'
+          }
+        end
+
         # spellchecker: disable
         # SOAP API call to test central API
         CENTRAL_SOAP_API_TEST = '<?xml version="1.0" encoding="UTF-8"?>' \
@@ -395,9 +396,9 @@ module Aspera
           when *COMMANDS_GEN3
             execute_command_gen3(command)
           when :access_keys
-            ak_command = options.get_next_command(%i[do set_bearer_key].concat(Plugin::ALL_OPS))
+            ak_command = options.get_next_command(%i[do set_bearer_key].concat(ALL_OPS))
             case ak_command
-            when *Plugin::ALL_OPS
+            when *ALL_OPS
               return entity_execute(
                 api: @api_node,
                 entity: 'access_keys',
@@ -437,7 +438,7 @@ module Aspera
               nagios.add_ok('node api', 'accessible')
               nagios.check_time_offset(info['current_time'], 'node api')
               nagios.check_product_version('node api', 'entsrv', info['version'])
-            rescue StandardError => e
+            rescue RestCallError => e
               nagios.add_critical('node api', e.to_s)
             end
             begin
@@ -475,7 +476,7 @@ module Aspera
         # Allows to specify a file by its path or by its id on the node in command line
         # @return [Hash] api and main file id for given path or id in next argument
         def apifid_from_next_arg(top_file_id)
-          file_path = instance_identifier(description: 'path or %id:<id>') do |attribute, value|
+          file_path = instance_identifier(description: 'path or %id:<id> or %id:') do |attribute, value|
             raise BadArgument, 'Only selection "id" is supported (file id)' unless attribute.eql?('id')
             # directly return result for method
             return {api: @api_node, file_id: value}
@@ -517,12 +518,12 @@ module Aspera
             return Main.result_text(result[:password])
           when :browse
             apifid = apifid_from_next_arg(top_file_id)
-            file_info = apifid[:api].read_with_cache("files/#{apifid[:file_id]}")
+            file_info = apifid[:api].read("files/#{apifid[:file_id]}", **Api::Node.cache_control)
             unless file_info['type'].eql?('folder')
               # a single file
               return Main.result_object_list([file_info], fields: GEN4_LS_FIELDS)
             end
-            return Main.result_object_list(apifid[:api].list_files(apifid[:file_id]), fields: GEN4_LS_FIELDS)
+            return Main.result_object_list(apifid[:api].list_files(apifid[:file_id], query: query_read_delete), fields: GEN4_LS_FIELDS)
           when :find
             apifid = apifid_from_next_arg(top_file_id)
             find_lambda = Api::Node.file_matcher_from_argument(options)
@@ -628,7 +629,7 @@ module Aspera
             command_perm = options.get_next_command(%i[list show create delete])
             case command_perm
             when :list
-              list_query = query_read_delete(default: {'include' => Rest.array_params(%w[access_level permission_count])})
+              list_query = query_read_delete(default: Rest.php_style({'include' => %w[access_level permission_count]}))
               # specify file to get permissions for unless not specified
               list_query['file_id'] = apifid[:file_id] unless apifid[:file_id].to_s.empty?
               list_query['inherited'] = false if list_query.key?('file_id') && !list_query.key?('inherited')
@@ -820,9 +821,9 @@ module Aspera
           when :async then return execute_async # former API
           when :ssync
             # Node API: /asyncs (newer)
-            sync_command = options.get_next_command(%i[start stop bandwidth counters files state summary] + Plugin::ALL_OPS - %i[modify])
+            sync_command = options.get_next_command(%i[start stop bandwidth counters files state summary] + ALL_OPS - %i[modify])
             case sync_command
-            when *Plugin::ALL_OPS
+            when *ALL_OPS
               return entity_execute(
                 api: @api_node,
                 entity: :asyncs,
@@ -893,21 +894,22 @@ module Aspera
               return Main.result_object_list(transfers_data, fields: %w[id status start_spec.direction start_spec.remote_user start_spec.remote_host start_spec.destination_path])
             when :sessions
               transfers_data = @api_node.read('ops/transfers', query_read_delete)
-              sessions = transfers_data.map{ |t| t['sessions']}.flatten
+              sessions = transfers_data.flat_map{ |t| t['sessions']}
               sessions.each do |session|
-                session['start_time'] = Time.at(session['start_time_usec'] / 1_000_000.0).utc.iso8601(0)
-                session['end_time'] = Time.at(session['end_time_usec'] / 1_000_000.0).utc.iso8601(0)
+                %i[start end].each do |what|
+                  session["#{what}_time"] = session["#{what}_time_usec"] ? Time.at(session["#{what}_time_usec"] / 1_000_000.0).utc.iso8601(0) : nil
+                end
               end
               return Main.result_object_list(sessions, fields: %w[id status start_time end_time target_rate_kbps])
             when :cancel
-              resp = @api_node.cancel("ops/transfers/#{instance_identifier}")
-              return Main.result_single_object(resp)
+              @api_node.cancel("ops/transfers/#{instance_identifier}")
+              return Main.result_status('Cancelled')
             when :show
               resp = @api_node.read("ops/transfers/#{instance_identifier}")
               return Main.result_single_object(resp)
             when :modify
-              resp = @api_node.update("ops/transfers/#{instance_identifier}", options.get_next_argument('update value', validation: Hash))
-              return Main.result_single_object(resp)
+              @api_node.update("ops/transfers/#{instance_identifier}", options.get_next_argument('update value', validation: Hash))
+              return Main.result_status('Modified')
             when :bandwidth_average
               transfers_data = @api_node.read('ops/transfers', query_read_delete)
               # collect all key dates
@@ -1148,7 +1150,7 @@ module Aspera
             unless link_info.nil?
               m = link_info.match(/<([^>]+)>/)
               Aspera.assert(m){"Cannot parse iteration in Link: #{link_info}"}
-              next_iteration_token = CGI.parse(URI.parse(m[1]).query)['iteration_token']&.first
+              next_iteration_token = Rest.query_to_h(URI.parse(m[1]).query)['iteration_token']
             end
             # same as last iteration: stop
             break if next_iteration_token&.eql?(query_token[:iteration_token])

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'aspera/cli/plugins/basic_auth'
+
+module Aspera
+  module Cli
+    module Plugins
+      # base class for applications supporting OAuth 2.0 authentication
+      class Oauth < BasicAuth
+        # OAuth methods supported
+        AUTH_TYPES = %i[web jwt boot].freeze
+        # Options used for authentication
+        AUTH_OPTIONS = %i[url auth client_id client_secret scope redirect_uri private_key passphrase username password].freeze
+        def initialize(**_)
+          super
+          options.declare(:auth, 'OAuth type of authentication', values: AUTH_TYPES, default: :jwt)
+          options.declare(:client_id, 'OAuth client identifier')
+          options.declare(:client_secret, 'OAuth client secret')
+          options.declare(:redirect_uri, 'OAuth (Web) redirect URI for web authentication')
+          options.declare(:private_key, 'OAuth (JWT) RSA private key PEM value (prefix file path with @file:)')
+          options.declare(:passphrase, 'OAuth (JWT) RSA private key passphrase')
+          options.declare(:scope, 'OAuth scope for API calls')
+        end
+
+        # Get all options specified by AUTH_OPTIONS and add.keys
+        # Adds those not nil to the `base`.
+        # Instantiate the provided `klass` with those kwargs.
+        # `add` can specify a default value (not `nil`)
+        # @param klass [Class] API object to create
+        # @param base  [Hash] The base options for creation
+        # @param add   [Hash] Additional options, key=symbol, value:default value or nil
+        def new_with_options(klass, base: {}, add: {})
+          klass.new(**
+            (AUTH_OPTIONS + add.keys).each_with_object(base) do |i, m|
+              v = options.get_option(i)
+              m[i] = v unless v.nil?
+              m[i] = add[i] unless !m[i].nil? || add[i].nil?
+            end)
+        rescue ::ArgumentError => e
+          if (m = e.message.match(/missing keyword: :(.*)$/))
+            raise Cli::Error, "Missing option: #{m[1]}"
+          end
+          raise
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aspera/cli/basic_auth_plugin'
+require 'aspera/cli/plugins/basic_auth'
 require 'aspera/cli/special_values'
 require 'aspera/nagios'
 require 'aspera/log'
@@ -10,7 +10,7 @@ require 'xmlsimple'
 module Aspera
   module Cli
     module Plugins
-      class Orchestrator < Cli::BasicAuthPlugin
+      class Orchestrator < BasicAuth
         STANDARD_PATH = '/aspera/orchestrator'
         TEST_ENDPOINT = 'api/remote_node_ping'
         private_constant :STANDARD_PATH, :TEST_ENDPOINT
@@ -37,18 +37,20 @@ module Aspera
             raise error if error
             return
           end
+        end
 
-          def wizard(object:)
-            options = object.options
-            return {
-              preset_value: {
-                url:      options.get_option(:url, mandatory: true),
-                username: options.get_option(:username, mandatory: true),
-                password: options.get_option(:password, mandatory: true)
-              },
-              test_args:    'workflow list'
-            }
-          end
+        # @param wizard  [Wizard] The wizard object
+        # @param app_url [Wizard] The wizard object
+        # @return [Hash] :preset_value, :test_args
+        def wizard(wizard, app_url)
+          return {
+            preset_value: {
+              url:      app_url,
+              username: options.get_option(:username, mandatory: true),
+              password: options.get_option(:password, mandatory: true)
+            },
+            test_args:    'workflow list'
+          }
         end
 
         def initialize(**_)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # cspell:ignore trevents
-require 'aspera/cli/basic_auth_plugin'
+require 'aspera/cli/plugins/basic_auth'
 require 'aspera/preview/generator'
 require 'aspera/preview/options'
 require 'aspera/preview/utils'
@@ -9,6 +9,7 @@ require 'aspera/preview/file_types'
 require 'aspera/preview/terminal'
 require 'aspera/transfer/spec'
 require 'aspera/persistency_action_once'
+require 'aspera/temp_file_manager'
 require 'aspera/api/node'
 require 'aspera/hash_ext'
 require 'aspera/timer_limiter'
@@ -20,7 +21,7 @@ require 'securerandom'
 module Aspera
   module Cli
     module Plugins
-      class Preview < Cli::BasicAuthPlugin
+      class Preview < BasicAuth
         # special tag to identify transfers related to generator
         PREV_GEN_TAG = 'preview_generator'
         # defined by node API: suffix for folder containing previews
@@ -74,7 +75,6 @@ module Aspera
           )
           options.declare(:skip_types, 'Skip types in comma separated list', handler: {o: self, m: :option_skip_types})
           options.declare(:previews_folder, 'Preview folder in storage root', handler: {o: self, m: :option_previews_folder}, default: DEFAULT_PREVIEWS_FOLDER)
-          options.declare(:temp_folder, 'Path to temp folder', default: Dir.tmpdir)
           options.declare(:skip_folders, 'List of folder to skip', handler: {o: self, m: :option_skip_folders}, default: [])
           options.declare(:base, 'Basename of output for for test')
           options.declare(:scan_path, 'Subpath in folder id to start scan in (default=/)')
@@ -100,7 +100,7 @@ module Aspera
 
           options.parse_options!
           Aspera.assert_type(@option_skip_folders, Array){'skip_folder'}
-          @tmp_folder = File.join(options.get_option(:temp_folder, mandatory: true), "#{TMP_DIR_PREFIX}.#{SecureRandom.uuid}")
+          @tmp_folder = File.join(TempFileManager.instance.global_temp, "#{TMP_DIR_PREFIX}.#{SecureRandom.uuid}")
           FileUtils.mkdir_p(@tmp_folder)
           Log.log.debug{"tmpdir: #{@tmp_folder}"}
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # cspell:ignore ascmd zmode zuid zgid fasping
-require 'aspera/cli/basic_auth_plugin'
+require 'aspera/cli/plugins/basic_auth'
 require 'aspera/cli/sync_actions'
 require 'aspera/transfer/spec'
 require 'aspera/ascmd'
@@ -14,7 +14,7 @@ module Aspera
   module Cli
     module Plugins
       # Operations on HSTS with SSH/FASP (ascmd/ascp)
-      class Server < Cli::BasicAuthPlugin
+      class Server < BasicAuth
         include SyncActions
 
         SSH_SCHEME = 'ssh'
@@ -67,18 +67,20 @@ module Aspera
             raise error if error
             return
           end
+        end
 
-          def wizard(object:)
-            options = object.options
-            return {
-              preset_value: {
-                url:      options.get_option(:url, mandatory: true),
-                username: options.get_option(:username, mandatory: true),
-                password: options.get_option(:password, mandatory: true)
-              },
-              test_args:    'files br /'
-            }
-          end
+        # @param wizard  [Wizard] The wizard object
+        # @param app_url [Wizard] The wizard object
+        # @return [Hash] :preset_value, :test_args
+        def wizard(wizard, app_url)
+          return {
+            preset_value: {
+              url:      app_url,
+              username: options.get_option(:username, mandatory: true),
+              password: options.get_option(:password, mandatory: true)
+            },
+            test_args:    'files browse /'
+          }
         end
 
         def initialize(**_)

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

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
+require 'aspera/cli/plugins/basic_auth'
 require 'aspera/cli/plugins/node'
 require 'aspera/assert'
 module Aspera
   module Cli
     module Plugins
       # Plugin for Aspera Shares v1
-      class Shares < Cli::BasicAuthPlugin
+      class Shares < BasicAuth
         # path for node API after base url
         NODE_API_PATH = 'node_api'
         # path for node admin after base url
@@ -34,18 +35,20 @@ module Aspera
               url:     address_or_url
             }
           end
+        end
 
-          def wizard(object:)
-            options = object.options
-            return {
-              preset_value: {
-                url:      options.get_option(:url, mandatory: true),
-                username: options.get_option(:username, mandatory: true),
-                password: options.get_option(:password, mandatory: true)
-              },
-              test_args:    'files br /'
-            }
-          end
+        # @param wizard  [Wizard] The wizard object
+        # @param app_url [Wizard] The wizard object
+        # @return [Hash] :preset_value, :test_args
+        def wizard(wizard, app_url)
+          return {
+            preset_value: {
+              url:      app_url,
+              username: options.get_option(:username, mandatory: true),
+              password: options.get_option(:password, mandatory: true)
+            },
+            test_args:    'files browse /'
+          }
         end
 
         def initialize(**_)
@@ -91,9 +94,9 @@ module Aspera
             when :node
               return entity_execute(api: api_shares_admin, entity: 'data/nodes')
             when :share
-              share_command = options.get_next_command(%i[user_permissions group_permissions].concat(Plugin::ALL_OPS))
+              share_command = options.get_next_command(%i[user_permissions group_permissions].concat(ALL_OPS))
               case share_command
-              when *Plugin::ALL_OPS
+              when *ALL_OPS
                 return entity_execute(
                   api: api_shares_admin,
                   entity: 'data/shares',
@@ -135,7 +138,7 @@ module Aspera
               end
               entity_verb = options.get_next_command(entity_commands)
               case entity_verb
-              when *Plugin::ALL_OPS # list, show, delete, create, modify
+              when *ALL_OPS # list, show, delete, create, modify
                 display_fields = entity_type.eql?(:user) ? %w[id username first_name last_name email] : nil
                 display_fields.push(:directory_user) if entity_type.eql?(:user) && entities_location.eql?(:all)
                 return entity_execute(

data/lib/aspera/cli/sync_actions.rb

@@ -9,7 +9,7 @@ module Aspera
   module Cli
     # Manage command line arguments to provide to Sync::Run, Sync::Database and Sync::Operations
     module SyncActions
-      # translate state id (int) to string
+      # Translate state id (int) to string
       STATE_STR = (['Nil'] +
         (1..18).map{ |i| "P(#{i})"} +
         %w[Syncd Error Confl Pconf] +

data/lib/aspera/cli/transfer_agent.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aspera/agent/base'
+require 'aspera/agent/factory'
 require 'aspera/transfer/spec'
 require 'aspera/cli/info'
 require 'aspera/log'
@@ -9,8 +9,8 @@ require 'aspera/assert'
 module Aspera
   module Cli
     # The Transfer agent is a common interface to start a transfer using
-    # one of the supported transfer agents
-    # provides CLI options to select one of the transfer agents (FASP/ascp client)
+    # one of the supported transfer agents.
+    # Provide CLI options to select one of the transfer agents (FASP/ascp client)
     class TransferAgent
       # @args special value for --sources : read file list from arguments
       FILE_LIST_FROM_ARGS = '@args'
@@ -27,12 +27,11 @@ module Aspera
         <%=ts.to_yaml%>
       END_OF_TEMPLATE
       CP4I_REMOTE_HOST_LB = 'N/A'
-      # % (formatting bug in eclipse)
       private_constant :FILE_LIST_FROM_ARGS,
         :FILE_LIST_FROM_TRANSFER_SPEC,
         :FILE_LIST_OPTIONS,
         :DEFAULT_TRANSFER_NOTIFY_TEMPLATE
-      TRANSFER_AGENTS = Agent::Base.agent_list.freeze
+      TRANSFER_AGENTS = Agent::Factory.instance.list.freeze
 
       class << self
         # @return :success if all sessions statuses returned by "start" are success
@@ -44,7 +43,8 @@ module Aspera
         end
       end
 
-      # @param env external objects: option manager, config file manager
+      # @param opt_mgr       [Manager] Option manager
+      # @param config_plugin [Config]  Config plugin
       def initialize(opt_mgr, config_plugin)
         @opt_mgr = opt_mgr
         @config = config_plugin
@@ -82,18 +82,20 @@ module Aspera
 
       def option_transfer_spec; @transfer_spec_command_line; end
 
-      # multiple option are merged
+      # Multiple option are merged
+      # @param value [Hash] Transfer spec
       def option_transfer_spec=(value)
         Aspera.assert_type(value, Hash){'ts'}
         @transfer_spec_command_line.deep_merge!(value)
       end
 
-      # add other transfer spec parameters
+      # Add other transfer spec parameters
       def option_transfer_spec_deep_merge(value); @transfer_spec_command_line.deep_merge!(value); end
 
       attr_reader :transfer_info
 
-      # multiple option are merged
+      # Multiple option are merged
+      # @param value [Hash]
       def transfer_info=(value)
         @transfer_info.deep_merge!(value)
       end
@@ -103,19 +105,20 @@ module Aspera
       end
 
       # analyze options and create new agent if not already created or set
-      # TODO: make a Factory pattern
       def agent_instance
         return @agent unless @agent.nil?
         agent_type = @opt_mgr.get_option(:transfer, mandatory: true)
         # set keys as symbols
         agent_options = @opt_mgr.get_option(:transfer_info).symbolize_keys
+        agent_options[:progress] = @config.progress_bar
+        agent_options[:config_dir] = @config.main_folder
         # special cases
         case agent_type
         when :node
-          if agent_options.empty?
+          if !agent_options.key?(:url)
             param_set_name = @config.get_plugin_default_config_name(:node)
             raise Cli::BadArgument, "No default node configured. Please specify #{Manager.option_name_to_line(:transfer_info)}" if param_set_name.nil?
-            agent_options = @config.preset_by_name(param_set_name).symbolize_keys
+            agent_options.merge!(@config.preset_by_name(param_set_name).symbolize_keys)
           end
         when :direct
           # by default do not display ascp native progress bar
@@ -129,16 +132,15 @@ module Aspera
             agent_options[:url] = @httpgw_url_lambda.call
           end
         end
-        agent_options[:progress] = @config.progress_bar
         # get agent instance
-        self.agent_instance = Agent::Base.factory_create(agent_type, agent_options)
+        self.agent_instance = Agent::Factory.instance.create(agent_type, agent_options)
         Log.log.debug{"transfer agent is a #{@agent.class}"}
         return @agent
       end
 
-      # return destination folder for transfers
-      # sets default if needed
-      # param: 'send' or 'receive'
+      # Get destination folder
+      # @param direction [String] `send`` or `receive``
+      # @return [String] Destination folder for transfers (with default based on direction)
       def destination_folder(direction)
         dest_folder = @opt_mgr.get_option(:to_folder)
         # do not expand path, if user wants to expand path: user @path:
@@ -161,12 +163,14 @@ module Aspera
         end
       end
 
+      # @param httpgw_url_proc [Proc]
       def httpgw_url_cb=(httpgw_url_proc)
         Aspera.assert_type(httpgw_url_proc, Proc){'httpgw_url_cb'}
         @httpgw_url_lambda = httpgw_url_proc
       end
 
-      # transform the list of paths to a list of hash with source/dest
+      # Transform the list of paths to a list of hash with source/dest
+      # @param file_list [Array]
       def list_to_paths(file_list)
         source_type = @opt_mgr.get_option(:src_type, mandatory: true)
         case source_type
@@ -220,9 +224,9 @@ module Aspera
         return @transfer_paths
       end
 
-      # start a transfer and wait for completion, plugins shall use this method
+      # Start a transfer and wait for completion, plugins shall use this method
       # @param transfer_spec [Hash]
-      # @param rest_token [Rest] if oauth token regeneration supported
+      # @param rest_token    [Rest] if oauth token regeneration supported
       def start(transfer_spec, rest_token: nil)
         # check parameters
         Aspera.assert_type(transfer_spec, Hash){'transfer_spec'}

data/lib/aspera/cli/transfer_progress.rb

@@ -13,7 +13,7 @@ module Aspera
     class TransferProgress
       def initialize
         @progress_bar = nil
-        # key is session id
+        # Key is session id
         @sessions = {}
         @completed = false
         @title = nil
@@ -42,21 +42,21 @@ module Aspera
         progress_provided = false
         case type
         when :sessions_init
-          # give opportunity to show progress of initialization with multiple status
+          # Give opportunity to show progress of initialization with multiple status
           Aspera.assert(session_id.nil?)
           Aspera.assert_type(info, String)
-          # initialization of progress bar
+          # Initialization of progress bar
           @title = info
         when :session_start
           Aspera.assert_type(session_id, String)
           Aspera.assert(info.nil?)
           raise "Session #{session_id} already started" if @sessions[session_id]
           @sessions[session_id] = {
-            job_size: 0, # total size of transfer (pre-calc)
+            job_size: 0, # Total size of transfer (pre-calc)
             current:  0,
             running:  true
           }
-          # remove last pre-start message if any
+          # Remove last pre-start message if any
           @title = nil
         when :session_size
           Aspera.assert_type(session_id, String)
@@ -77,7 +77,7 @@ module Aspera
         when :session_end
           Aspera.assert_type(session_id, String)
           Aspera.assert(info.nil?)
-          # a session may be too short and finish before it has been started
+          # A session may be too short and finish before it has been started
           @sessions[session_id][:running] = false if @sessions[session_id].is_a?(Hash)
         when :end
           Aspera.assert(session_id.nil?)

data/lib/aspera/cli/version.rb

@@ -2,8 +2,8 @@
 
 module Aspera
   module Cli
-    # for beta add extension : .beta1
-    # for dev version add extension : .pre
-    VERSION = '4.24.1'
+    # For beta add extension : .beta1
+    # For dev version add extension : .pre
+    VERSION = '4.24.2'
   end
 end