aspera-cli 4.21.2 → 4.22.0

data/lib/aspera/cli/plugin.rb

@@ -12,15 +12,13 @@ module Aspera
       # operations with id
       INSTANCE_OPS = %i[modify delete show].freeze
       # all standard operations
-      ALL_OPS = [GLOBAL_OPS, INSTANCE_OPS].flatten.freeze
+      ALL_OPS = (GLOBAL_OPS + INSTANCE_OPS).freeze
       # special query parameter: max number of items for list command
       MAX_ITEMS = 'max'
       # special query parameter: max number of pages for list command
       MAX_PAGES = 'pmax'
       # special identifier format: look for this name to find where supported
       REGEX_LOOKUP_ID_BY_FIELD = /^%([^:]+):(.*)$/.freeze
-      # instance variables, also constructor parameters
-      INIT_PARAMS = %i[options transfer config formatter persistency only_manual].freeze
 
       class << self
         def declare_generic_options(options)
@@ -31,18 +29,17 @@ module Aspera
         end
       end
 
-      attr_accessor(*INIT_PARAMS)
+      def options; @broker.options; end
+      def transfer; @broker.transfer; end
+      def config; @broker.config; end
+      def formatter; @broker.formatter; end
+      def persistency; @broker.persistency; end
 
-      def initialize(options:, transfer:, config:, formatter:, persistency:, only_manual:, man_header: true)
+      def initialize(broker:, man_header: true)
         # check presence in descendant of mandatory method and constant
         Aspera.assert(respond_to?(:execute_action)){"Missing method 'execute_action' in #{self.class}"}
         Aspera.assert(self.class.constants.include?(:ACTIONS)){"Missing constant 'ACTIONS' in #{self.class}"}
-        @options = options
-        @transfer = transfer
-        @config = config
-        @formatter = formatter
-        @persistency = persistency
-        @only_manual = only_manual
+        @broker = broker
         add_manual_header if man_header
       end
 
@@ -56,7 +53,7 @@ module Aspera
 
       # @return a hash of instance variables
       def init_params
-        INIT_PARAMS.map{|p| [p, instance_variable_get("@#{p}".to_sym)]}.to_h
+        return {broker: @broker}
       end
 
       # must be called AFTER the instance action, ... folder browse <call instance_identifier>
@@ -121,10 +118,10 @@ module Aspera
         end
         display_fields = [id_result, 'status']
         if is_bulk
-          return {type: :object_list, data: result_list, fields: display_fields}
+          return Main.result_object_list(result_list, fields: display_fields)
         else
           display_fields = fields unless fields.eql?(:default)
-          return {type: :single_object, data: result_list.first, fields: display_fields}
+          return Main.result_single_object(result_list.first, fields: display_fields)
         end
       end
 
@@ -164,7 +161,13 @@ module Aspera
           if !delete_style.nil?
             one_res_id = [one_res_id] unless one_res_id.is_a?(Array)
             Aspera.assert_type(one_res_id, Array, exception_class: Cli::BadArgument)
-            rest_api.call(operation: 'DELETE', subpath: res_class_path, headers: {'Accept' => 'application/json'}, body: {delete_style => one_res_id}, body_type: :json)
+            rest_api.call(
+              operation:    'DELETE',
+              subpath:      res_class_path,
+              content_type: Rest::MIME_JSON,
+              body:         {delete_style => one_res_id},
+              headers:      {'Accept' => Rest::MIME_JSON}
+            )
             return Main.result_status('deleted')
           end
           return do_bulk_operation(command: command, descr: 'identifier', values: one_res_id) do |one_id|
@@ -172,9 +175,9 @@ module Aspera
             {'id' => one_id}
           end
         when :show
-          return {type: :single_object, data: rest_api.read(one_res_path), fields: display_fields}
+          return Main.result_single_object(rest_api.read(one_res_path), fields: display_fields)
         when :list
-          resp = rest_api.call(operation: 'GET', subpath: res_class_path, headers: {'Accept' => 'application/json'}, query: query_read_delete)
+          resp = rest_api.call(operation: 'GET', subpath: res_class_path, headers: {'Accept' => Rest::MIME_JSON}, query: query_read_delete)
           return Main.result_empty if resp[:http].code == '204'
           data = resp[:data]
           # TODO: not generic : which application is this for ?
@@ -190,10 +193,10 @@ module Aspera
           end
           case data
           when Hash
-            return {type: :single_object, data: data, fields: display_fields}
+            return Main.result_single_object(data, fields: display_fields)
           when Array
-            return {type: :object_list, data: data, fields: display_fields} if data.empty? || data.first.is_a?(Hash)
-            return {type: :value_list, data: data, name: 'id'}
+            return Main.result_object_list(data, fields: display_fields) if data.empty? || data.first.is_a?(Hash)
+            return Main.result_value_list(data, name: 'id')
           else
             raise "An error occurred: unexpected result type for list: #{data.class}"
           end

data/lib/aspera/cli/plugin_factory.rb

@@ -40,7 +40,7 @@ module Aspera
           next unless File.directory?(folder)
           # TODO: add gem root to load path ? and require short folder ?
           # $LOAD_PATH.push(folder) if i[:add_path]
-          Dir.entries(folder).select{|file|file.end_with?(RUBY_FILE_EXT)}.each do |source|
+          Dir.entries(folder).select{ |file| file.end_with?(RUBY_FILE_EXT)}.each do |source|
             add_plugin_info(File.join(folder, source))
           end
         end

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

@@ -27,7 +27,7 @@ module Aspera
             entitlement_id = options.get_option(:username, mandatory: true)
             customer_id = options.get_option(:password, mandatory: true)
             api_metering = Api::Alee.new(entitlement_id, customer_id)
-            return {type: :single_object, data: api_metering.read('entitlement')}
+            return Main.result_single_object(api_metering.read('entitlement'))
           end
         end
       end