aspera-cli 4.5.0 → 4.6.0

data/docs/doc_tools.rb

@@ -32,7 +32,7 @@ def prstt;opprst.capitalize;end
 
 def gemspec;Gem::Specification::load(ENV['GEMSPEC']) or raise "error loading #{ENV["GEMSPEC"]}";end
 
-def geminstadd;gemspec.version.to_s.match(/\.[^0-9]/)?' --pre':'';end
+def geminstadd;gemspec.version.to_s.match(/\.[^0-9]/) ? ' --pre' : '' ;end
 
 # transfer spec description generation
 def spec_table

data/docs/test_env.conf

@@ -143,6 +143,7 @@ misc:
   aoc_publink_folder: your value here
   aoc_shbx_ws: your value here
   aoc_shbx_name: your value here
+  aoc_shbx_meta: your value here
   aoc_node1_name: your value here
   aoc_node1_secret: your value here
   icos_bucket_key: your value here

data/lib/aspera/aoc.rb

@@ -428,5 +428,26 @@ module Aspera
       return result
     end
 
+    # @param entity_type path of entuty in API
+    # @param entity_name name of searched entity
+    # @param options additional search options
+    def lookup_entity_by_name(entity_type,entity_name,options={})
+      # returns entities whose name contains value (case insensitive)
+      matching_items=read(entity_type,options.merge({'q'=>entity_name}))[:data]
+      case matching_items.length
+      when 1; return matching_items.first
+      when 0; raise RuntimeError,'not found'
+      else
+        # multiple case insensitive partial matches, try case insensitive full match
+        # (anyway AoC does not allow creation of 2 entities with same case insensitive name)
+        icase_matches=matching_items.select{|i|i['name'].casecmp?(entity_name)}
+        case icase_matches.length
+        when 1; return icase_matches.first
+        when 0; raise "#{entity_type}: multiple case insensitive partial match for: \"#{entity_name}\": #{matching_items.map{|i|i['name']}} but no case insensitive full match. Please be more specific or give exact name."
+        else    raise "Two entities cannot have the same case insensitive name: #{icase_matches.map{|i|i['name']}}"
+        end
+      end
+    end
+
   end # AoC
 end # Aspera

data/lib/aspera/ascmd.rb

@@ -62,19 +62,19 @@ module Aspera
     # description of result structures (see ascmdtypes.h). Base types are big endian
     # key = name of type
     TYPES_DESCR={
-      :result  =>{:decode=>:field_list,:fields=>[{:name=>:file,:is_a=>:stat},{:name=>:dir,:is_a=>:stat,:special=>:substruct},{:name=>:size,:is_a=>:size},{:name=>:error,:is_a=>:error},{:name=>:info,:is_a=>:info},{:name=>:success,:is_a=>nil,:special=>:return_true},{:name=>:exit,:is_a=>nil},{:name=>:df,:is_a=>:mnt,:special=>:restart_on_first},{:name=>:md5sum,:is_a=>:md5sum}]},
-      :stat    =>{:decode=>:field_list,:fields=>[{:name=>:name,:is_a=>:zstr},{:name=>:size,:is_a=>:int64},{:name=>:mode,:is_a=>:int32,:check=>nil},{:name=>:zmode,:is_a=>:zstr},{:name=>:uid,:is_a=>:int32,:check=>nil},{:name=>:zuid,:is_a=>:zstr},{:name=>:gid,:is_a=>:int32,:check=>nil},{:name=>:zgid,:is_a=>:zstr},{:name=>:ctime,:is_a=>:epoch},{:name=>:zctime,:is_a=>:zstr},{:name=>:mtime,:is_a=>:epoch},{:name=>:zmtime,:is_a=>:zstr},{:name=>:atime,:is_a=>:epoch},{:name=>:zatime,:is_a=>:zstr},{:name=>:symlink,:is_a=>:zstr},{:name=>:errno,:is_a=>:int32},{:name=>:errstr,:is_a=>:zstr}]},
-      :info    =>{:decode=>:field_list,:fields=>[{:name=>:platform,:is_a=>:zstr},{:name=>:version,:is_a=>:zstr},{:name=>:lang,:is_a=>:zstr},{:name=>:territory,:is_a=>:zstr},{:name=>:codeset,:is_a=>:zstr},{:name=>:lc_ctype,:is_a=>:zstr},{:name=>:lc_numeric,:is_a=>:zstr},{:name=>:lc_time,:is_a=>:zstr},{:name=>:lc_all,:is_a=>:zstr},{:name=>:dev,:is_a=>:zstr,:special=>:multiple},{:name=>:browse_caps,:is_a=>:zstr},{:name=>:protocol,:is_a=>:zstr}]},
-      :size    =>{:decode=>:field_list,:fields=>[{:name=>:size,:is_a=>:int64},{:name=>:fcount,:is_a=>:int32},{:name=>:dcount,:is_a=>:int32},{:name=>:failed_fcount,:is_a=>:int32},{:name=>:failed_dcount,:is_a=>:int32}]},
-      :error   =>{:decode=>:field_list,:fields=>[{:name=>:errno,:is_a=>:int32},{:name=>:errstr,:is_a=>:zstr}]},
-      :mnt     =>{:decode=>:field_list,:fields=>[{:name=>:fs,:is_a=>:zstr},{:name=>:dir,:is_a=>:zstr},{:name=>:is_a,:is_a=>:zstr},{:name=>:total,:is_a=>:int64},{:name=>:used,:is_a=>:int64},{:name=>:free,:is_a=>:int64},{:name=>:fcount,:is_a=>:int64},{:name=>:errno,:is_a=>:int32},{:name=>:errstr,:is_a=>:zstr}]},
-      :md5sum  =>{:decode=>:field_list,:fields=>[{:name=>:md5sum,:is_a=>:zstr}]},
-      :int8    =>{:decode=>:base,:unpack=>'C',:size=>1},
-      :int32   =>{:decode=>:base,:unpack=>'L>',:size=>4},
-      :int64   =>{:decode=>:base,:unpack=>'Q>',:size=>8},
-      :epoch   =>{:decode=>:base,:unpack=>'Q>',:size=>8},
-      :zstr    =>{:decode=>:base,:unpack=>'Z*'},
-      :blist   =>{:decode=>:buffer_list}
+      result: {decode: :field_list,fields: [{name: :file,is_a: :stat},{name: :dir,is_a: :stat,special: :substruct},{name: :size,is_a: :size},{name: :error,is_a: :error},{name: :info,is_a: :info},{name: :success,is_a: nil,special: :return_true},{name: :exit,is_a: nil},{name: :df,is_a: :mnt,special: :restart_on_first},{name: :md5sum,is_a: :md5sum}]},
+      stat:   {decode: :field_list,fields: [{name: :name,is_a: :zstr},{name: :size,is_a: :int64},{name: :mode,is_a: :int32,check: nil},{name: :zmode,is_a: :zstr},{name: :uid,is_a: :int32,check: nil},{name: :zuid,is_a: :zstr},{name: :gid,is_a: :int32,check: nil},{name: :zgid,is_a: :zstr},{name: :ctime,is_a: :epoch},{name: :zctime,is_a: :zstr},{name: :mtime,is_a: :epoch},{name: :zmtime,is_a: :zstr},{name: :atime,is_a: :epoch},{name: :zatime,is_a: :zstr},{name: :symlink,is_a: :zstr},{name: :errno,is_a: :int32},{name: :errstr,is_a: :zstr}]},
+      info:   {decode: :field_list,fields: [{name: :platform,is_a: :zstr},{name: :version,is_a: :zstr},{name: :lang,is_a: :zstr},{name: :territory,is_a: :zstr},{name: :codeset,is_a: :zstr},{name: :lc_ctype,is_a: :zstr},{name: :lc_numeric,is_a: :zstr},{name: :lc_time,is_a: :zstr},{name: :lc_all,is_a: :zstr},{name: :dev,is_a: :zstr,special: :multiple},{name: :browse_caps,is_a: :zstr},{name: :protocol,is_a: :zstr}]},
+      size:   {decode: :field_list,fields: [{name: :size,is_a: :int64},{name: :fcount,is_a: :int32},{name: :dcount,is_a: :int32},{name: :failed_fcount,is_a: :int32},{name: :failed_dcount,is_a: :int32}]},
+      error:  {decode: :field_list,fields: [{name: :errno,is_a: :int32},{name: :errstr,is_a: :zstr}]},
+      mnt:    {decode: :field_list,fields: [{name: :fs,is_a: :zstr},{name: :dir,is_a: :zstr},{name: :is_a,is_a: :zstr},{name: :total,is_a: :int64},{name: :used,is_a: :int64},{name: :free,is_a: :int64},{name: :fcount,is_a: :int64},{name: :errno,is_a: :int32},{name: :errstr,is_a: :zstr}]},
+      md5sum: {decode: :field_list,fields: [{name: :md5sum,is_a: :zstr}]},
+      int8:   {decode: :base,unpack: 'C',size: 1},
+      int32:  {decode: :base,unpack: 'L>',size: 4},
+      int64:  {decode: :base,unpack: 'Q>',size: 8},
+      epoch:  {decode: :base,unpack: 'Q>',size: 8},
+      zstr:   {decode: :base,unpack: 'Z*'},
+      blist:  {decode: :buffer_list}
     }
 
     # protocol enum start at one, but array index start at zero
@@ -113,7 +113,7 @@ module Aspera
           length=parse(buffer,:int32,indent_level)
           raise "ERROR:not enough bytes" if buffer.length < length
           value=buffer.shift(length)
-          result.push({:btype=>btype,:buffer=>value})
+          result.push({btype: btype,buffer: value})
           Log.log.debug("#{"   ."*indent_level}:buffer_list[#{result.length-1}] #{result.last}")
         end
       when :field_list

data/lib/aspera/cli/formater.rb

@@ -19,18 +19,21 @@ module Aspera
       CSV_FIELD_SEPARATOR=","
 
       private_constant :FIELDS_ALL,:FIELDS_DEFAULT,:DISPLAY_FORMATS,:DISPLAY_LEVELS,:CSV_RECORD_SEPARATOR,:CSV_FIELD_SEPARATOR
-      attr_accessor :option_flat_hash
+      attr_accessor :option_flat_hash,:option_transpose_single
 
       def initialize(opt_mgr)
         @option_flat_hash=true
+        @option_transpose_single=true
         @opt_mgr=opt_mgr
         @opt_mgr.set_obj_attr(:flat_hash,self,:option_flat_hash)
+        @opt_mgr.set_obj_attr(:transpose_single,self,:option_transpose_single)
         @opt_mgr.add_opt_list(:format,DISPLAY_FORMATS,"output format")
         @opt_mgr.add_opt_list(:display,DISPLAY_LEVELS,"output only some information")
         @opt_mgr.add_opt_simple(:fields,"comma separated list of fields, or #{FIELDS_ALL}, or #{FIELDS_DEFAULT}")
         @opt_mgr.add_opt_simple(:select,"select only some items in lists, extended value: hash (column, value)")
         @opt_mgr.add_opt_simple(:table_style,"table display style")
         @opt_mgr.add_opt_boolean(:flat_hash,"display hash values as additional keys")
+        @opt_mgr.add_opt_boolean(:transpose_single,"single object fields output vertically")
         @opt_mgr.set_option(:format,:table)
         @opt_mgr.set_option(:display,:info)
         @opt_mgr.set_option(:fields,FIELDS_DEFAULT)
@@ -134,6 +137,10 @@ module Aspera
         when :yaml
           display_message(:data,res_data.to_yaml)
         when :table,:csv
+          if !@option_transpose_single and results[:type].eql?(:single_object)
+            results[:type]=:object_list
+            res_data=[res_data]
+          end
           case results[:type]
           when :object_list # goes to table display
             raise "internal error: unexpected type: #{res_data.class}, expecting Array" unless res_data.is_a?(Array)

data/lib/aspera/cli/main.rb

@@ -42,7 +42,7 @@ module Aspera
       def set_http_parameters(http)
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @option_insecure
         http.set_debug_output($stdout) if @option_rest_debug
-        raise "http_options expects Hash" unless @option_http_options.is_a?(Hash)
+        raise 'http_options expects Hash' unless @option_http_options.is_a?(Hash)
         @option_http_options.each do |k,v|
           method="#{k}=".to_sym
           # check if accessor is a method of Net::HTTP
@@ -122,11 +122,11 @@ module Aspera
 
       # define header for manual
       def init_global_options
-        Log.log.debug("init_global_options")
-        @opt_mgr.add_opt_switch(:help,"-h","Show this message.") { @option_help=true }
-        @opt_mgr.add_opt_switch(:bash_comp,"generate bash completion for command") { @bash_completion=true }
-        @opt_mgr.add_opt_switch(:show_config, "Display parameters used for the provided action.") { @option_show_config=true }
-        @opt_mgr.add_opt_switch(:rest_debug,"-r","more debug for HTTP calls") { @option_rest_debug=true }
+        Log.log.debug('init_global_options')
+        @opt_mgr.add_opt_switch(:help,'-h','Show this message.') { @option_help=true }
+        @opt_mgr.add_opt_switch(:bash_comp,'generate bash completion for command') { @bash_completion=true }
+        @opt_mgr.add_opt_switch(:show_config, 'Display parameters used for the provided action.') { @option_show_config=true }
+        @opt_mgr.add_opt_switch(:rest_debug,'-r','more debug for HTTP calls') { @option_rest_debug=true }
         @opt_mgr.add_opt_switch(:version,'-v','display version') { @plugin_env[:formater].display_message(:data,Aspera::Cli::VERSION);Process.exit(0) }
         @opt_mgr.add_opt_switch(:warnings,'-w','check for language warnings') { $VERBOSE=true }
         # handler must be set before declaration
@@ -137,14 +137,14 @@ module Aspera
         @opt_mgr.set_obj_attr(:http_options,self,:option_http_options)
         @opt_mgr.set_obj_attr(:log_passwords,Log.instance,:log_passwords)
         @opt_mgr.add_opt_list(:ui,OpenApplication.user_interfaces,'method to start browser')
-        @opt_mgr.add_opt_list(:log_level,Log.levels,"Log level")
-        @opt_mgr.add_opt_list(:logger,Log.logtypes,"log method")
-        @opt_mgr.add_opt_simple(:lock_port,"prevent dual execution of a command, e.g. in cron")
-        @opt_mgr.add_opt_simple(:query,"additional filter for API calls (extended value) (some commands)")
-        @opt_mgr.add_opt_simple(:http_options,"options for http socket (extended value)")
-        @opt_mgr.add_opt_boolean(:insecure,"do not validate HTTPS certificate")
-        @opt_mgr.add_opt_boolean(:once_only,"process only new items (some commands)")
-        @opt_mgr.add_opt_boolean(:log_passwords,"show passwords in logs")
+        @opt_mgr.add_opt_list(:log_level,Log.levels,'Log level')
+        @opt_mgr.add_opt_list(:logger,Log.logtypes,'log method')
+        @opt_mgr.add_opt_simple(:lock_port,'prevent dual execution of a command, e.g. in cron')
+        @opt_mgr.add_opt_simple(:query,'additional filter for API calls (extended value) (some commands)')
+        @opt_mgr.add_opt_simple(:http_options,'options for http socket (extended value)')
+        @opt_mgr.add_opt_boolean(:insecure,'do not validate HTTPS certificate')
+        @opt_mgr.add_opt_boolean(:once_only,'process only new items (some commands)')
+        @opt_mgr.add_opt_boolean(:log_passwords,'show passwords in logs')
         @opt_mgr.set_option(:ui,OpenApplication.default_gui_mode)
         @opt_mgr.set_option(:once_only,:false)
         # parse declared options
@@ -167,10 +167,10 @@ module Aspera
       end
 
       def generate_bash_completion
-        if @opt_mgr.get_next_argument("",:multiple,:optional).nil?
+        if @opt_mgr.get_next_argument('',:multiple,:optional).nil?
           @plugin_env[:config].plugins.keys.each{|p|puts p.to_s}
         else
-          Log.log.warn("only first level completion so far")
+          Log.log.warn('only first level completion so far')
         end
         Process.exit(0)
       end
@@ -186,7 +186,7 @@ module Aspera
       def self.result_success; return result_status('complete'); end
 
       def exit_with_usage(all_plugins)
-        Log.log.debug("exit_with_usage".bg_red)
+        Log.log.debug('exit_with_usage'.bg_red)
         # display main plugin options
         @plugin_env[:formater].display_message(:error,@opt_mgr.parser)
         if all_plugins
@@ -288,6 +288,8 @@ module Aspera
           else
             command_sym=@opt_mgr.get_next_command(@plugin_env[:config].plugins.keys.dup.unshift(:help))
           end
+          # command will not be executed, but we need manual
+          @opt_mgr.fail_on_missing_mandatory=false if @option_help
           # main plugin is not dynamically instanciated
           case command_sym
           when :help
@@ -335,8 +337,8 @@ module Aspera
         TempFileManager.instance.cleanup
         # 1- processing of error condition
         unless exception_info.nil?
-          @plugin_env[:formater].display_message(:error,"ERROR:".bg_red.gray.blink+" "+exception_info[1]+": "+exception_info[0].message)
-          @plugin_env[:formater].display_message(:error,"Use '-h' option to get help.") if exception_info[2].eql?(:usage)
+          @plugin_env[:formater].display_message(:error,"#{'ERROR:'.bg_red.gray.blink} #{exception_info[1]}: #{exception_info[0].message}")
+          @plugin_env[:formater].display_message(:error,'Use option -h to get help.') if exception_info[2].eql?(:usage)
           if exception_info.first.is_a?(Fasp::Error) and exception_info.first.message.eql?('Remote host is not who we expected')
             @plugin_env[:formater].display_message(:error,"For this specific error, refer to:\n#{SRC_URL}#error-remote-host-is-not-who-we-expected\nAdd this to arguments:\n--ts=@json:'{\"sshfp\":null}'")
           end
@@ -344,7 +346,7 @@ module Aspera
         # 2- processing of command not processed (due to exception or bad command line)
         if execute_command
           @opt_mgr.final_errors.each do |msg|
-            @plugin_env[:formater].display_message(:error,"ERROR:".bg_red.gray.blink+" Argument: "+msg)
+            @plugin_env[:formater].display_message(:error,"#{'ERROR:'.bg_red.gray.blink} Argument: #{msg}")
             # add code as exception if there is not already an error
             exception_info=[Exception.new(msg),'UnusedArg'] if exception_info.nil?
           end
@@ -355,7 +357,7 @@ module Aspera
             # will force to show stack trace
             raise exception_info[0]
           else
-            @plugin_env[:formater].display_message(:error,"Use '--log-level=debug' to get more details.") if exception_info[2].eql?(:debug)
+            @plugin_env[:formater].display_message(:error,'Use --log-level=debug to get more details.') if exception_info[2].eql?(:debug)
             Process.exit(1)
           end
         end

data/lib/aspera/cli/manager.rb

@@ -77,6 +77,7 @@ module Aspera
       attr_reader :parser
       attr_accessor :ask_missing_mandatory
       attr_accessor :ask_missing_optional
+      attr_writer :fail_on_missing_mandatory
 
       #
       def initialize(program_name,argv=nil)
@@ -92,6 +93,7 @@ module Aspera
         @ask_missing_mandatory=false # STDIN.isatty
         # ask optional options if not provided and in interactive
         @ask_missing_optional=false
+        @fail_on_missing_mandatory=true
         # those must be set before parse, parse consumes those defined only
         @unprocessed_defaults=[]
         @unprocessed_env=[]
@@ -232,7 +234,7 @@ module Aspera
       def set_option(option_symbol,value,where="default")
         if ! @declared_options.has_key?(option_symbol)
           Log.log.debug("set unknown option: #{option_symbol}")
-          raise "ERROR"
+          raise "ERROR: cannot set undeclared option"
           #declare_option(option_symbol)
         end
         value=ExtendedValue.instance.evaluate(value)
@@ -267,6 +269,8 @@ module Aspera
           end
           Log.log.debug("get #{option_symbol} (#{@declared_options[option_symbol][:type]}) : #{result}")
         end
+        # do not fail for manual generation if option mandatory but not set
+        result||='' unless @fail_on_missing_mandatory
         Log.log.debug("interactive=#{@ask_missing_mandatory}")
         if result.nil?
           if !@ask_missing_mandatory

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

@@ -372,34 +372,34 @@ module Aspera
           return {type: :object_list,data: result_list,fields: [id_result,'status']}
         end
 
-        NOT_FOUND="not found"
-
-        def lookup_single(entity_type,entity_name,options={})
-          # returns entities whose name contains value (case insensitive)
-          matching_items=@api_aoc.read(entity_type,options.merge({'q'=>entity_name}))[:data]
-          case matching_items.length
-          when 1; return matching_items.first
-          when 0; raise RuntimeError,NOT_FOUND
-          else
-            # multiple case insensitive partial matches, try case insensitive full match
-            # (anyway AoC does not allow creation of 2 entities with same case insensitive name)
-            icase_matches=matching_items.select{|i|i['name'].casecmp?(entity_name)}
-            case icase_matches.length
-            when 1; return icase_matches.first
-            when 0; raise CliBadArgument,"#{entity_type}: multiple case insensitive partial match for: \"#{entity_name}\": #{matching_items.map{|i|i['name']}} but no case insensitive full match. Please be more specific or give exact name."
-            else    raise "Two entities cannot have the same case insensitive name: #{icase_matches.map{|i|i['name']}}"
-            end
+        # get identifier or name from command line
+        # @return identifier
+        def get_resource_id_from_args(resource_class_path)
+          l_res_id=self.options.get_option(:id)
+          l_res_name=self.options.get_option(:name)
+          raise "Provide either option id or name, not both" unless l_res_id.nil? or l_res_name.nil?
+          # try to find item by name (single partial match or exact match)
+          l_res_id=@api_aoc.lookup_entity_by_name(resource_class_path,l_res_name)['id'] unless l_res_name.nil?
+          # if no name or id option, taken on command line (after command)
+          if l_res_id.nil?
+            l_res_id=self.options.get_next_argument('identifier')
+            l_res_id=@api_aoc.lookup_entity_by_name(resource_class_path,self.options.get_next_argument('identifier'))['id'] if l_res_id.eql?('name')
           end
+          return l_res_id
+        end
+
+        def get_resource_path_from_args(resource_class_path)
+          return "#{resource_class_path}/#{get_resource_id_from_args(resource_class_path)}"
         end
 
         # package creation params can give just email, and full hash is created
-        def resolve_package_recipients(package_creation,recipient_list_field)
-          return unless package_creation.has_key?(recipient_list_field)
-          raise CliBadArgument,"#{recipient_list_field} must be an Array" unless package_creation[recipient_list_field].is_a?(Array)
+        def resolve_package_recipients(package_data,recipient_list_field)
+          return unless package_data.has_key?(recipient_list_field)
+          raise CliBadArgument,"#{recipient_list_field} must be an Array" unless package_data[recipient_list_field].is_a?(Array)
           new_user_option=self.options.get_option(:new_user_option,:mandatory)
           # list with resolved elements
           resolved_list=[]
-          package_creation[recipient_list_field].each do |short_recipient_info|
+          package_data[recipient_list_field].each do |short_recipient_info|
             case short_recipient_info
             when Hash # native api information, check keys
               raise "#{recipient_list_field} element shall have fields: id and type" unless short_recipient_info.keys.sort.eql?(['id','type'])
@@ -407,9 +407,9 @@ module Aspera
               # email: user, else dropbox
               entity_type=short_recipient_info.include?('@') ? 'contacts' : 'dropboxes'
               begin
-                full_recipient_info=lookup_single(entity_type,short_recipient_info,{'current_workspace_id'=>@workspace_id})
+                full_recipient_info=@api_aoc.lookup_entity_by_name(entity_type,short_recipient_info,{'current_workspace_id'=>@workspace_id})
               rescue RuntimeError => e
-                raise e unless e.message.eql?(NOT_FOUND)
+                raise e unless e.message.eql?('not found')
                 if entity_type.eql?('contacts')
                   full_recipient_info=@api_aoc.create('contacts',{'current_workspace_id'=>@workspace_id,'email'=>short_recipient_info}.merge(new_user_option))[:data]
                 else
@@ -428,7 +428,27 @@ module Aspera
             resolved_list.push(short_recipient_info)
           end
           # replace with resolved elements
-          package_creation[recipient_list_field]=resolved_list
+          package_data[recipient_list_field]=resolved_list
+        end
+
+        def normalize_metadata(pkg_data)
+          case pkg_data['metadata']
+          when NilClass;return
+          when Array;return
+          when Hash
+            api_meta=[]
+            pkg_data['metadata'].each do |k,v|
+              api_meta.push({
+                #'input_type' => 'single-dropdown',
+                'name'       => k,
+                'values'     => v.is_a?(Array) ? v : [v]
+              })
+            end
+            pkg_data['metadata']=api_meta
+
+          else raise "metadata field if not of expected type: #{pkg_meta.class}"
+          end
+          nil
         end
 
         # private
@@ -623,16 +643,7 @@ module Aspera
             command=self.options.get_next_command(supported_operations)
             # require identifier for non global commands
             if !singleton_object and !global_operations.include?(command)
-              res_id=self.options.get_option(:id)
-              res_name=self.options.get_option(:name)
-              raise "Provide id or name, not both" unless res_id.nil? or res_name.nil?
-              # try to find item by name (single partial match or exact match)
-              res_id=lookup_single(resource_class_path,res_name)['id'] if !res_name.nil?
-              # if no name or id option, taken on command line (after command)
-              if res_id.nil?
-                res_id=self.options.get_next_argument('identifier')
-                res_id=lookup_single(resource_class_path,self.options.get_next_argument('identifier'))['id'] if res_id.eql?('name')
-              end
+              res_id=get_resource_id_from_args(resource_class_path)
               resource_instance_path="#{resource_class_path}/#{res_id}"
             end
             resource_instance_path=resource_class_path if singleton_object
@@ -697,7 +708,7 @@ module Aspera
               when :node;{'include'=>['[]','access_level','permission_count'],'created_by_id'=>ID_AK_ADMIN}
               else raise 'error'
               end
-              res_data=@api_aoc.read("#{resource_class_path}/#{res_id}/permissions",read_params)[:data]
+              res_data=@api_aoc.read("#{resource_instance_path}/permissions",read_params)[:data]
               fields=case resource_type
               when :node;['id','file_id','file.path','access_type']
               when :workspace;['id','node_id','file_id','node_name','file.path','tags.aspera.files.workspace.share_as']
@@ -743,10 +754,11 @@ module Aspera
         end
 
         # must be public
-        ACTIONS=[ :reminder, :bearer_token, :organization, :tier_restrictions, :user, :workspace, :packages, :files, :gateway, :admin, :automation, :servers].freeze
+        ACTIONS=[ :reminder, :servers, :bearer_token, :organization, :tier_restrictions, :user, :packages, :files, :admin, :automation, :gateway].freeze
 
         def execute_action
           command=self.options.get_next_command(ACTIONS)
+          # all commands require to login, but those 2
           get_api unless [:reminder,:servers].include?(command)
           case command
           when :reminder
@@ -754,6 +766,8 @@ module Aspera
             user_email=options.get_option(:username,:mandatory)
             Rest.new(base_url: "#{AoC.api_base_url}/#{AoC::API_V1}").create('organization_reminders',{email: user_email})[:data]
             return Main.result_status("List of organizations user is member of, has been sent by e-mail to #{user_email}")
+          when :servers
+            return {type: :object_list,data: Rest.new(base_url: "#{AoC.api_base_url}/#{AoC::API_V1}").read('servers')[:data]}
           when :bearer_token
             return {type: :text,data: @api_aoc.oauth_token}
           when :organization
@@ -761,22 +775,19 @@ module Aspera
           when :tier_restrictions
             return { type: :single_object, data: @api_aoc.read('tier_restrictions')[:data] }
           when :user
-            command=self.options.get_next_command([ :workspaces,:info,:shared_inboxes ])
-            case command
+            case self.options.get_next_command([ :workspaces,:profile ])
+            # when :settings
+            # return {type: :object_list,data: @api_aoc.read('client_settings/')[:data]}
             when :workspaces
-              return {type: :object_list,data: @api_aoc.read('workspaces')[:data],fields: ['id','name']}
-              #              when :settings
-              #                return {type: :object_list,data: @api_aoc.read('client_settings/')[:data]}
-            when :shared_inboxes
-              query=option_url_query(nil)
-              if query.nil?
+              case self.options.get_next_command([ :list,:current ])
+              when :list
+                return {type: :object_list,data: @api_aoc.read('workspaces')[:data],fields: ['id','name']}
+              when :current
                 set_workspace_info
-                query={'embed[]'=>'dropbox','workspace_id'=>@workspace_id,'aggregate_permissions_by_dropbox'=>true,'sort'=>'dropbox_name'}
+                return { type: :single_object, data: @workspace_data }
               end
-              return {type: :object_list,data: @api_aoc.read('dropbox_memberships',query)[:data],fields: ['dropbox_id','dropbox.name']}
-            when :info
-              command=self.options.get_next_command([ :show,:modify ])
-              case command
+            when :profile
+              case self.options.get_next_command([ :show,:modify ])
               when :show
                 return { type: :single_object, data: @api_aoc.user_info }
               when :modify
@@ -784,45 +795,55 @@ module Aspera
                 return Main.result_status('modified')
               end
             end
-          when :workspace # show current workspace parameters
-            set_workspace_info
-            return { type: :single_object, data: @workspace_data }
           when :packages
             set_workspace_info if @url_token_data.nil?
-            command_pkg=self.options.get_next_command([ :send, :recv, :list, :show, :delete ])
-            case command_pkg
+            case self.options.get_next_command([ :shared_inboxes, :send, :recv, :list, :show, :delete ])
+            when :shared_inboxes
+              case self.options.get_next_command([ :list, :show ])
+              when :list
+                query=option_url_query(nil)
+                if query.nil?
+                  query={'embed[]'=>'dropbox','workspace_id'=>@workspace_id,'aggregate_permissions_by_dropbox'=>true,'sort'=>'dropbox_name'}
+                end
+                return {type: :object_list,data: @api_aoc.read('dropbox_memberships',query)[:data],fields: ['dropbox_id','dropbox.name']}
+              when :show
+                return {type: :single_object,data: @api_aoc.read(get_resource_path_from_args('dropboxes'),query)[:data]}
+              end
             when :send
-              package_creation=self.options.get_option(:value,:mandatory)
-              raise CliBadArgument,'value must be hash, refer to doc' unless package_creation.is_a?(Hash)
+              package_data=self.options.get_option(:value,:mandatory)
+              raise CliBadArgument,'value must be hash, refer to doc' unless package_data.is_a?(Hash)
 
               if !@url_token_data.nil?
                 assert_public_link_types(['send_package_to_user','send_package_to_dropbox'])
                 box_type=@url_token_data['purpose'].split('_').last
-                package_creation['recipients']=[{'id'=>@url_token_data['data']["#{box_type}_id"],'type'=>box_type}]
+                package_data['recipients']=[{'id'=>@url_token_data['data']["#{box_type}_id"],'type'=>box_type}]
                 @workspace_id=@url_token_data['data']['workspace_id']
               end
 
-              package_creation['workspace_id']=@workspace_id
+              package_data['workspace_id']=@workspace_id
 
               # list of files to include in package, optional
-              #package_creation['file_names']=self.transfer.ts_source_paths.map{|i|File.basename(i['source'])}
+              #package_data['file_names']=self.transfer.ts_source_paths.map{|i|File.basename(i['source'])}
 
               # lookup users
-              resolve_package_recipients(package_creation,'recipients')
-              resolve_package_recipients(package_creation,'bcc_recipients')
+              resolve_package_recipients(package_data,'recipients')
+              resolve_package_recipients(package_data,'bcc_recipients')
+              normalize_metadata(package_data)
 
               #  create a new package container
-              package_info=@api_aoc.create('packages',package_creation)[:data]
+              package_info=@api_aoc.create('packages',package_data)[:data]
 
               #  get node information for the node on which package must be created
               node_info=@api_aoc.read("nodes/#{package_info['node_id']}")[:data]
 
-              # tell Aspera what to expect in package: 1 transfer (can also be done after transfer)
+              # tell AoC what to expect in package: 1 transfer (can also be done after transfer)
+              # TODO: if multisession was used we should probably tell
+              # also, currently no "multi-source" , i.e. only from client-side files, unless "node" agent is used
               @api_aoc.update("packages/#{package_info['id']}",{'sent'=>true,'transfers_expected'=>1})[:data]
 
-              # execute transfer
+              # get destination: package folder
               node_file = {node_info: node_info, file_id: package_info['contents_file_id']}
-              # raise exception if at least one error
+              # execute transfer, raise exception if at least one error
               Main.result_transfer(transfer_start(AoC::PACKAGES_APP,'send',node_file,AoC.package_tags(package_info,'upload')))
               # return all info on package
               return { type: :single_object, data: package_info}
@@ -874,6 +895,12 @@ module Aspera
               return { type: :single_object, data: package_info }
             when :list
               query=option_url_query({'archived'=>false,'exclude_dropbox_packages'=>true,'has_content'=>true,'received'=>true})
+              if query.has_key?('dropbox_name')
+                # convenience: specify name instead of id
+                raise 'not both dropbox_name and dropbox_id' if query.has_key?('dropbox_id')
+                query['dropbox_id']=@api_aoc.lookup_entity_by_name('dropboxes',query['dropbox_name'])['id']
+                query.delete('dropbox_name')
+              end
               raise 'option must be Hash' unless query.is_a?(Hash)
               query['workspace_id']||=@workspace_id
               packages=@api_aoc.read('packages',query)[:data]
@@ -991,14 +1018,12 @@ module Aspera
                 return {type: :single_object,data: wf}
               end
             end
+          when :admin
+            return execute_admin_action
           when :gateway
             set_workspace_info
             require 'aspera/faspex_gw'
             FaspexGW.new(@api_aoc,@workspace_id).start_server
-          when :admin
-            return execute_admin_action
-          when :servers
-            return {type: :object_list,data: Rest.new(base_url: "#{AoC.api_base_url}/#{AoC::API_V1}").read('servers')[:data]}
           else
             raise "internal error: #{command}"
           end # action