aspera-cli 4.21.1 → 4.21.2

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

@@ -348,7 +348,7 @@ module Aspera
             transfer.agent_instance = Agent::Node.new(
               url:      client_apfid[:api].base_url,
               username: client_apfid[:api].app_info[:node_info]['access_key'],
-              password: client_apfid[:api].oauth.token,
+              password: client_apfid[:api].oauth.authorization,
               root_id:  client_apfid[:file_id]
             )
             # additional node to node TS info
@@ -473,60 +473,111 @@ module Aspera
           when :subscription
             org = aoc_api.read('organization')
             bss_graphql = api_from_options('bss/platform/graphql')
-            # cspell:disable
-            graphql_query = <<-GRAPHQL
-      query ($organization_id: ID!) {
-        aoc (organization_id: $organization_id) {
-          bssSubscription {
-            aocVersion
-            endDate
-            startDate
-            termMonths
-            plan
-            trial
-            termType
-            aocOrganizations {
-              id
-            }
-            additionalStorageVolumeGb
-            additionalEgressVolumeGb
-            term {
-              startDate
-              endDate
-              transferVolumeGb
-              egressVolumeGb
-              storageVolumeGb
-              transferVolumeOffsetGb
-            }
-            paygoRate {
-              transferRate
-              storageRate
-              currency
-            }
-            aocPlanData {
-              tier
-              trial
-              workspaces { max }
-              users {
-                planAmount
-                max
+            command_subscription = options.get_next_command(%i[account usage])
+            case command_subscription
+            when :account
+              # cspell:disable
+              graphql_query = <<-GRAPHQL
+              query ($organization_id: ID!) {
+                aoc (organization_id: $organization_id) {
+                  bssSubscription {
+                    aocVersion
+                    endDate
+                    startDate
+                    termMonths
+                    plan
+                    trial
+                    termType
+                    aocOrganizations {
+                      id
+                    }
+                    additionalStorageVolumeGb
+                    additionalEgressVolumeGb
+                    term {
+                      startDate
+                      endDate
+                      transferVolumeGb
+                      egressVolumeGb
+                      storageVolumeGb
+                      transferVolumeOffsetGb
+                    }
+                    paygoRate {
+                      transferRate
+                      storageRate
+                      currency
+                    }
+                    aocPlanData {
+                      tier
+                      trial
+                      workspaces { max }
+                      users {
+                        planAmount
+                        max
+                      }
+                      samlIntegration
+                      activity
+                      sharedInboxes
+                      uniqueUrls
+                      support
+                      watermarking
+                      byok
+                      automation { planAmount, max }
+                    }
+                  }
+                }
               }
-              samlIntegration
-              activity
-              sharedInboxes
-              uniqueUrls
-              support
-              watermarking
-              byok
-              automation { planAmount, max }
-            }
-          }
-        }
-      }
-            GRAPHQL
-            # cspell:enable
-            result = bss_graphql.create(nil, {query: graphql_query, variables: {organization_id: org['id']}})['data']
-            return {type: :single_object, data: result['aoc']['bssSubscription']}
+              GRAPHQL
+              # cspell:enable
+              result = bss_graphql.create(nil, {query: graphql_query, variables: {organization_id: org['id']}})['data']
+              return {type: :single_object, data: result['aoc']['bssSubscription']}
+            when :usage
+              # cspell:disable
+              graphql_query = <<-GRAPHQL
+              query ($organization_id: ID!, $startDate: Date!, $endDate: Date!, $aggregate: TransferUsageAggregateOption!) {
+                aoc (organization_id: $organization_id) {
+                  bssSubscription {
+                    aocOrganizations { id }
+                    additionalStorageVolumeGb
+                    additionalEgressVolumeGb
+                    aocPlanData {
+                      tier
+                      trial
+                    }
+                    term {
+                      transferVolumeGb
+                      egressVolumeGb
+                      storageVolumeGb
+                      startDate
+                      endDate
+                      transferVolumeOffsetGb
+                    }
+                    termMonths
+                    transferUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { mbTotal }
+                    egressUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { usageMb }
+                  }
+                  subscriptionEntitlements {
+                    id
+                    transferUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { mbTotal }
+                    egressUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { usageMb }
+                  }
+                }
+              }
+              GRAPHQL
+              aggregate = options.get_next_argument('aggregation', accept_list: %i[ALL MONTHLY], default: :ALL)
+              today = Date.today
+              start_date = options.get_next_argument('start date', mandatory: false, default: today.prev_year.strftime('%Y-%m-%d'))
+              end_date = options.get_next_argument('end date', mandatory: false, default: today.strftime('%Y-%m-%d'))
+              # cspell:enable
+              result = bss_graphql.create(
+                nil,
+                {query:     graphql_query,
+                 variables: {
+                   organization_id: org['id'],
+                   aggregate:       aggregate,
+                   startDate:       start_date,
+                   endDate:         end_date}})['data']
+              return {type: :single_object, data: result['aoc']}
+            end
           when :ats
             ats_api = Rest.new(**aoc_api.params.deep_merge({
               base_url: "#{aoc_api.base_url}/admin/ats/pub/v1",
@@ -690,7 +741,7 @@ module Aspera
           when :servers
             return {type: :object_list, data: Rest.new(base_url: "#{Api::AoC.api_base_url}/#{Api::AoC::API_V1}").read('servers')}
           when :bearer_token
-            return {type: :text, data: aoc_api.oauth.token}
+            return {type: :text, data: aoc_api.oauth.authorization}
           when :organization
             return { type: :single_object, data: aoc_api.read('organization') }
           when :tier_restrictions

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

@@ -54,8 +54,6 @@ module Aspera
         ASPERA = 'aspera'
         SERVER_COMMAND = 'server'
         DIR_SDK = 'sdk'
-        CONNECT_WEB_URL = 'https://d3gcli72yxqn2z.cloudfront.net/connect'
-        CONNECT_VERSIONS = 'connectversions.js' # cspell: disable-line
         DEMO_SERVER = 'demo'
         DEMO_PRESET = 'demoserver' # cspell: disable-line
         EMAIL_TEST_TEMPLATE = <<~END_OF_TEMPLATE
@@ -150,7 +148,6 @@ module Aspera
           @use_plugin_defaults = true
           @config_presets = nil
           @config_checksum_on_disk = nil
-          @connect_versions = nil
           @vault = nil
           @pac_exec = nil
           @sdk_default_location = false
@@ -213,7 +210,8 @@ module Aspera
           # Transfer SDK options
           options.declare(:ascp_path, 'Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
           options.declare(:use_product, 'Use ascp from specified product', handler: {o: self, m: :option_use_product})
-          options.declare(:sdk_url, 'URL to get SDK', default: SpecialValues::DEF)
+          options.declare(:sdk_url, 'URL to get Aspera Transfer Daemon', default: SpecialValues::DEF)
+          options.declare(:locations_url, 'URL to get locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
           options.declare(:sdk_folder, 'SDK folder path', handler: {o: Products::Transferd, m: :sdk_directory})
           options.declare(:progress_bar, 'Display progress bar', values: :bool, default: Environment.terminal?)
           # email options
@@ -439,23 +437,6 @@ module Aspera
           end if check_data[:need_update]
         end
 
-        # retrieve structure from cloud (CDN) with all versions available
-        def connect_versions
-          if @connect_versions.nil?
-            api_connect_cdn = Rest.new(base_url: CONNECT_WEB_URL)
-            javascript = api_connect_cdn.call(operation: 'GET', subpath: CONNECT_VERSIONS)
-            # get result on one line
-            connect_versions_javascript = javascript[:http].body.gsub(/\r?\n\s*/, '')
-            Log.log.debug{"javascript=[\n#{connect_versions_javascript}\n]"}
-            # get javascript object only
-            found = connect_versions_javascript.match(/^.*? = (.*);/)
-            raise Cli::Error, 'Problem when getting connect versions from internet' if found.nil?
-            all_data = JSON.parse(found[1])
-            @connect_versions = all_data['entries']
-          end
-          return @connect_versions
-        end
-
         # loads default parameters of plugin if no -P parameter
         # and if there is a section defined for the plugin in the "default" section
         # try to find: conf[conf["default"][plugin_str]]
@@ -659,12 +640,12 @@ module Aspera
           command = options.get_next_command(%i[list info version])
           if %i[info version].include?(command)
             connect_id = options.get_next_argument('id or title')
-            one_res = connect_versions.find{|i|i['id'].eql?(connect_id) || i['title'].eql?(connect_id)}
+            one_res = Products::Connect.instance.versions.find{|i|i['id'].eql?(connect_id) || i['title'].eql?(connect_id)}
             raise Cli::NoSuchIdentifier.new(:connect, connect_id) if one_res.nil?
           end
           case command
           when :list
-            return Main.result_object_list(connect_versions, fields: %w[id title version])
+            return Main.result_object_list(Products::Connect.instance.versions, fields: %w[id title version])
           when :info
             one_res.delete('links')
             return Main.result_single_object(one_res)
@@ -674,18 +655,16 @@ module Aspera
             if %i[download open].include?(command)
               link_title = options.get_next_argument('title or rel')
               one_link = all_links.find {|i| i['title'].eql?(link_title) || i['rel'].eql?(link_title)}
-              raise 'no such value' if one_link.nil?
+              raise "no such value: #{link_title}" if one_link.nil?
             end
             case command
             when :list
               return Main.result_object_list(all_links)
             when :download
-              folder_dest = transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE)
-              api_connect_cdn = Rest.new(base_url: CONNECT_WEB_URL)
-              file_url = one_link['href']
-              filename = file_url.gsub(%r{.*/}, '')
-              api_connect_cdn.call(operation: 'GET', subpath: file_url, save_to_file: File.join(folder_dest, filename))
-              return Main.result_status("Downloaded: #{filename}")
+              archive_path = one_link['href']
+              save_to_path = File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), archive_path.gsub(%r{.*/}, ''))
+              Products::Connect.instance.cdn_api.call(operation: 'GET', subpath: archive_path, save_to_file: save_to_path)
+              return Main.result_status("Downloaded: #{save_to_path}")
             when :open
               Environment.instance.open_uri(one_link['href'])
               return Main.result_status("Opened: #{one_link['href']}")
@@ -759,7 +738,7 @@ module Aspera
             n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: version)
             return Main.result_status("Installed #{n} version #{v}")
           when :list
-            sdk_list = Ascp::Installation.sdk_locations
+            sdk_list = Ascp::Installation.instance.sdk_locations
             return Main.result_object_list(
               sdk_list,
               fields: sdk_list.first.keys - ['url']

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

@@ -228,10 +228,8 @@ module Aspera
               config.progress_bar&.event(:transfer, session_id: id, info: status['bytes_written'].to_i)
             end
             if status_list.include?(status['upload_status'])
-              # if status['upload_status'].eql?('completed')
               config.progress_bar&.event(:end, session_id: id)
               return status
-              # end
             end
             sleep(1.0)
           end
@@ -467,7 +465,8 @@ module Aspera
             end
             return browse_folder("packages/#{package_id}/files/#{location}")
           when :status
-            status = wait_package_status(package_id, status_list: nil)
+            status_list = options.get_next_argument('list of states, or nothing', mandatory: false, validation: Array)
+            status = wait_package_status(package_id, status_list: status_list)
             return {type: :single_object, data: status}
           when :delete
             ids = package_id
@@ -600,7 +599,11 @@ module Aspera
 
             end
           when :browse
-            return browse_folder("#{res_path}/#{instance_identifier}/browse")
+            node_id = instance_identifier do |field, value|
+              lookup_entity_by_field(
+                type: res_type, value: value, field: field, real_path: res_path, item_list_key: list_key, query: res_id_query)['id']
+            end
+            return browse_folder("#{res_path}/#{node_id}/browse")
           when :invite_external_collaborator
             shared_inbox_id = instance_identifier { |field, value| lookup_entity_by_field(type: res_type.to_s, field: field, value: value, query: res_id_query)['id']}
             creation_payload = value_create_modify(command: res_command, type: [Hash, String])
@@ -744,7 +747,7 @@ fields: %w[event_type created_at application user.name]}
               end
             end
           when :bearer_token
-            return {type: :text, data: @api_v5.oauth.token}
+            return {type: :text, data: @api_v5.oauth.authorization}
           when :packages
             return package_action
           when :shared_folders

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

@@ -477,7 +477,7 @@ module Aspera
               result[:password] = apifid[:api].auth_params[:password]
             when :oauth2
               result[:username] = apifid[:api].params[:headers][Api::Node::HEADER_X_ASPERA_ACCESS_KEY]
-              result[:password] = apifid[:api].oauth.token
+              result[:password] = apifid[:api].oauth.authorization
             else Aspera.error_unreachable_line
             end
             return {type: :single_object, data: result} if command_repo.eql?(:node_info)
@@ -601,7 +601,7 @@ module Aspera
             return Main.result_image(result[:http].body, formatter: formatter)
           when :permission
             apifid = apifid_from_next_arg(top_file_id)
-            command_perm = options.get_next_command(%i[list create delete])
+            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])})
@@ -611,6 +611,9 @@ module Aspera
               # NOTE: supports per_page and page and header X-Total-Count
               items = apifid[:api].read('permissions', list_query)
               return {type: :object_list, data: items}
+            when :show
+              perm_id = instance_identifier
+              return Main.result_single_object(apifid[:api].read("permissions/#{perm_id}"))
             when :delete
               return do_bulk_operation(command: command_perm, descr: 'identifier', values: :identifier) do |one_id|
                 apifid[:api].delete("permissions/#{one_id}")
@@ -1013,7 +1016,7 @@ module Aspera
             Environment.instance.open_uri("#{options.get_option(:asperabrowserurl)}?goto=#{encoded_params}")
             return Main.result_status('done')
           when :basic_token
-            return Main.result_status(Rest.basic_token(options.get_option(:username, mandatory: true), options.get_option(:password, mandatory: true)))
+            return Main.result_status(Rest.basic_authorization(options.get_option(:username, mandatory: true), options.get_option(:password, mandatory: true)))
           when :bearer_token
             private_key = OpenSSL::PKey::RSA.new(options.get_next_argument('private RSA key PEM value', validation: String))
             token_info = options.get_next_argument('user and group identification', validation: Hash)

data/lib/aspera/cli/version.rb

@@ -4,6 +4,6 @@ module Aspera
   module Cli
     # for beta add extension : .beta1
     # for dev version add extension : .pre
-    VERSION = '4.21.1'
+    VERSION = '4.21.2'
   end
 end

data/lib/aspera/coverage.rb

@@ -20,14 +20,16 @@ if ENV.key?('ENABLE_COVERAGE')
   # lines with those words are ignored from coverage
   no_cov_functions = %w[error_unreachable_line error_unexpected_value Log.log.trace].freeze
   SimpleCov.start do
-    add_filter 'lib/aspera/cli/plugins/faspex.rb'
-    add_filter 'lib/aspera/node_simulator.rb'
-    add_filter 'lib/aspera/keychain/macos_security.rb'
+    # assert usually do not trigger
     add_filter do |source_file|
       source_file.lines.each do |line|
         line.skipped! if no_cov_functions.any?{|i|line.src.include?(i)}
       end
       false
     end
+    # no coverage test in those
+    add_filter 'lib/aspera/cli/plugins/faspex.rb'
+    add_filter 'lib/aspera/node_simulator.rb'
+    add_filter 'lib/aspera/keychain/macos_security.rb'
   end
 end

data/lib/aspera/environment.rb

@@ -109,23 +109,28 @@ module Aspera
         ].compact.flatten.join(' ')
       end
 
-      # start process in background, or raise exception
+      # Start process in background
       # caller can call Process.wait on returned value
-      # @param env [Hash, nil]   environment variables
-      # @param exec [String]     path to executable
-      # @param args [Array, nil] arguments
-      # @return [String] PID of process
-      def secure_spawn(exec:, args: nil, env: nil)
+      # @param exec    [String]     path to executable
+      # @param args    [Array, nil] arguments for executable
+      # @param env     [Hash, nil]  environment variables
+      # @param options [Hash, nil]  spawn options
+      # @return [String]            PID of process
+      # @raise  [Exception]         if problem
+      def secure_spawn(exec:, args: nil, env: nil, **options)
         Aspera.assert_type(exec, String)
         Aspera.assert_type(args, Array) unless args.nil?
         Aspera.assert_type(env, Hash) unless env.nil?
+        Aspera.assert_type(options, Hash) unless options.nil?
         Log.log.debug {log_spawn(exec: exec, args: args, env: env)}
         # start ascp in separate process
         spawn_args = []
         spawn_args.push(env) unless env.nil?
         spawn_args.push([exec, exec])
         spawn_args.concat(args) unless args.nil?
-        ascp_pid = Process.spawn(*spawn_args, close_others: true)
+        opts = {close_others: true}
+        opts.merge!(options) unless options.nil?
+        ascp_pid = Process.spawn(*spawn_args, **opts)
         Log.log.debug{"pid: #{ascp_pid}"}
         return ascp_pid
       end
@@ -135,24 +140,28 @@ module Aspera
       # @param exec [String]     path to executable
       # @param args [Array, nil] arguments
       # @return [String] PID of process
-      def secure_execute(exec:, args: nil, env: nil)
+      def secure_execute(exec:, args: nil, env: nil, **system_args)
         Aspera.assert_type(exec, String)
         Aspera.assert_type(args, Array) unless args.nil?
         Aspera.assert_type(env, Hash) unless env.nil?
         Log.log.debug {log_spawn(exec: exec, args: args, env: env)}
-        # start ascp in separate process
+        # start in separate process
         spawn_args = []
         spawn_args.push(env) unless env.nil?
+        # ensure no shell expansion
         spawn_args.push([exec, exec])
         spawn_args.concat(args) unless args.nil?
-        Kernel.system(*spawn_args, exception: true)
+        kwargs = {exception: true}
+        kwargs.merge!(system_args)
+        Kernel.system(*spawn_args, **kwargs)
         nil
       end
 
+      # Execute process and capture stdout
       # @param exec [String] path to executable
       # @param args [Array] arguments to executable
       # @param opts [Hash] options to capture3
-      # @return stdout of executable or raise expcetion
+      # @return stdout of executable or raise exception
       def secure_capture(exec:, args: [], **opts)
         Aspera.assert_type(exec, String)
         Aspera.assert_type(args, Array)

data/lib/aspera/faspex_postproc.rb

@@ -39,7 +39,7 @@ module Aspera
           response.body = {status: 'error', message: 'Empty request'}.to_json
           return
         end
-        # build script path by removing domain, and adding script folder
+        # build script path by removing domain and adding script folder
         script_file = request.path[@parameters[:root].size..]
         Log.log.debug{"script file=#{script_file}"}
         script_path = File.join(@parameters[:script_folder], script_file)
@@ -48,11 +48,9 @@ module Aspera
         Log.log.debug{Log.dump(:webhook_parameters, webhook_parameters)}
         # env expects only strings
         environment = webhook_parameters.each_with_object({}) { |(k, v), h| h[k] = v.to_s }
-        post_proc_pid = Process.spawn(environment, [script_path, script_path])
-        Log.log.debug{"pid=#{post_proc_pid}"}
-        raise 'no pid' if post_proc_pid.nil?
-        # "wait" for process to avoid zombie
+        post_proc_pid = Environment.secure_spawn(env: environment, exec: script_path)
         Timeout.timeout(@parameters[:timeout_seconds]) do
+          # "wait" for process to avoid zombie
           Process.wait(post_proc_pid)
           post_proc_pid = nil
         end

data/lib/aspera/hash_ext.rb

@@ -20,17 +20,7 @@ class ::Hash
   end
 end
 
-# in 2.5
-unless Hash.method_defined?(:transform_keys)
-  class Hash
-    def transform_keys
-      raise 'missing block' unless block_given?
-      return each_with_object({}){|(k, v), memo|memo[yield(k)] = v}
-    end
-  end
-end
-
-# rails
+# Exists in Rails
 unless Hash.method_defined?(:symbolize_keys)
   class Hash
     def symbolize_keys
@@ -39,7 +29,7 @@ unless Hash.method_defined?(:symbolize_keys)
   end
 end
 
-# rails
+# Exists in Rails
 unless Hash.method_defined?(:stringify_keys)
   class Hash
     def stringify_keys

data/lib/aspera/oauth/base.rb

@@ -79,6 +79,11 @@ module Aspera
         return call_params
       end
 
+      # @return value suitable for Authorization header
+      def authorization(**kwargs)
+        return OAuth::Factory.bearer_build(token(**kwargs))
+      end
+
       # get an OAuth v2 token (generated, cached, refreshed)
       # call token() to get a token.
       # if a token is expired (api returns 4xx), call again token(refresh: true)
@@ -129,7 +134,7 @@ module Aspera
         end
         Aspera.assert(token_data.key?(@token_field)){"API error: No such field in answer: #{@token_field}"}
         # ok we shall have a token here
-        return OAuth::Factory.bearer_build(token_data[@token_field])
+        return token_data[@token_field]
       end
     end
   end

data/lib/aspera/preview/generator.rb

@@ -4,7 +4,6 @@
 # spellchecker:ignore pauseframes libx264 trunc bufsize muxer apng libmp3lame maxrate posterize movflags faststart
 # spellchecker:ignore palettegen paletteuse pointsize bordercolor repage lanczos unoconv optipng reencode conv transframes
 
-require 'open3'
 require 'aspera/preview/options'
 require 'aspera/preview/utils'
 require 'aspera/preview/file_types'
@@ -24,17 +23,18 @@ module Aspera
       # one of CONVERSION_TYPES
       attr_reader :conversion_type
 
-      # @param src source file path
-      # @param dst destination file path
-      # @param api_mime_type optional mime type as provided by node api (or nil)
       # node API mime types are from: http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
-      # supported preview type is one of Preview::PREVIEW_FORMATS
       # the resulting preview file type is taken from destination file extension.
       # conversion methods are provided by private methods: convert_<conversion_type>_to_<preview_format>
       #   -> conversion_type is one of FileTypes::CONVERSION_TYPES
       #   -> preview_format is one of Generator::PREVIEW_FORMATS
       # the conversion video->mp4 is implemented in methods: convert_video_to_mp4_using_<video_conversion>
       #  -> conversion method is one of Generator::VIDEO_CONVERSION_METHODS
+      # @param src           [String]  source file path
+      # @param dst           [String]  destination file path
+      # @param options       [Options] All conversion options
+      # @param main_temp_dir [String]  Main temp folder, sub folder will be created for generation
+      # @param api_mime_type [String,nil] Optional mime type as provided by node api (or nil)
       def initialize(src, dst, options, main_temp_dir, api_mime_type)
         @source_file_path = src
         @destination_file_path = dst
@@ -54,7 +54,7 @@ module Aspera
         end
         @processing_method = @processing_method.to_sym
         Log.log.debug{"method: #{@processing_method}"}
-        Aspera.assert(respond_to?(@processing_method, true)){"no processing know for #{conversion_type} -> #{@preview_format_sym}"}
+        Aspera.assert(respond_to?(@processing_method, true)){"no processing known for #{conversion_type} -> #{@preview_format_sym}"}
       end
 
       # create preview as specified in constructor
@@ -215,7 +215,8 @@ module Aspera
 
       def convert_pdf_to_png(source_file_path=nil)
         source_file_path ||= @source_file_path
-        Utils.external_command(:convert, [
+        Utils.external_command(:magick, [
+          'convert',
           '-size', "x#{@options.thumb_img_size}",
           '-background', 'white',
           '-flatten',
@@ -224,7 +225,8 @@ module Aspera
       end
 
       def convert_image_to_png
-        Utils.external_command(:convert, [
+        Utils.external_command(:magick, [
+          'convert',
           '-auto-orient',
           '-thumbnail', "#{@options.thumb_img_size}x#{@options.thumb_img_size}>",
           '-quality', 95,
@@ -239,7 +241,8 @@ module Aspera
       def convert_plaintext_to_png
         # get 100 first lines of text file
         first_lines = File.open(@source_file_path){|f|Array.new(100){f.readline rescue ''}.join}
-        Utils.external_command(:convert, [
+        Utils.external_command(:magick, [
+          'convert',
           '-size', "#{@options.thumb_img_size}x#{@options.thumb_img_size}",
           'xc:white', # define canvas with background color (xc, or canvas) of preceding size
           '-font', @options.thumb_text_font,

data/lib/aspera/preview/options.rb

@@ -19,10 +19,10 @@ module Aspera
         { name: :thumb_vid_scale,      default: "-1:'min(ih,100)'", description: 'png: video: size (ffmpeg scale argument)' },
         { name: :thumb_vid_fraction,   default: 0.1,                description: 'png: video: time percent position of snapshot' },
         { name: :thumb_img_size,       default: 800,                description: 'png: non-video: height (and width)' },
-        { name: :thumb_text_font,      default: 'Courier',          description: 'png: plaintext: font to render text with imagemagick convert (identify -list font)'},
+        { name: :thumb_text_font,      default: 'Courier',          description: 'png: plaintext: font for text rendering: `magick identify -list font`'},
         { name: :video_conversion,     default: :reencode,          description: 'mp4: method for preview generation', values: VIDEO_CONVERSION_METHODS },
         { name: :video_png_conv,       default: :fixed,             description: 'mp4: method for thumbnail generation', values: VIDEO_THUMBNAIL_METHODS },
-        { name: :video_scale,          default: "'min(iw,360)':-2", description: 'mp4: all: video scale (ffmpeg)' },
+        { name: :video_scale,          default: "'min(iw,360)':-2", description: 'mp4: all: video scale (ffmpeg scale argument)' },
         { name: :video_start_sec,      default: 10,                 description: 'mp4: all: start offset (seconds) of video preview' },
         { name: :reencode_ffmpeg,      default: {},                 description: 'mp4: reencode: options to ffmpeg' },
         { name: :blend_keyframes,      default: 30,                 description: 'mp4: blend: # key frames' },

data/lib/aspera/preview/terminal.rb

@@ -44,7 +44,7 @@ module Aspera
           fit_term_ratio = [term_rows.to_f * font_ratio / image.rows.to_f, term_columns.to_f / image.columns.to_f].min
           height_ratio = double ? 2.0 : 1.0
           image = image.scale((image.columns * fit_term_ratio).to_i, (image.rows * fit_term_ratio * height_ratio / font_ratio).to_i)
-          # quantum depth is 8 or 16, see: `convert xc: -format "%q" info:`
+          # quantum depth is 8 or 16, see: `magick xc: -format "%q" info:`
           shift_for_8_bit = Magick::MAGICKCORE_QUANTUM_DEPTH - 8
           # get all pixel colors, adjusted for Rainbow
           pixel_colors = []