aspera-cli 4.5.0 → 4.6.0

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

@@ -64,6 +64,7 @@ END_OF_TEMPLATE
         # special extended values
         EXTV_INCLUDE_PRESETS='incps'
         EXTV_PRESET='preset'
+        PRESET_DIG_SEPARATOR='.'
         DEFAULT_CHECK_NEW_VERSION_DAYS=7
         DEFAULT_PRIV_KEY_FILENAME='aspera_aoc_key'
         DEFAULT_PRIVKEY_LENGTH=4096
@@ -71,7 +72,8 @@ END_OF_TEMPLATE
         :CONF_PRESET_GLOBAL,:PROGRAM_NAME_V1,:PROGRAM_NAME_V2,:DEFAULT_REDIRECT,:ASPERA_PLUGINS_FOLDERNAME,
         :RUBY_FILE_EXT,:AOC_COMMAND_V1,:AOC_COMMAND_V2,:AOC_COMMAND_V3,:AOC_COMMAND_CURRENT,:DEMO,
         :TRANSFER_SDK_ARCHIVE_URL,:AOC_PATH_API_CLIENTS,:DEMO_SERVER_PRESET,:EMAIL_TEST_TEMPLATE,:EXTV_INCLUDE_PRESETS,
-        :EXTV_PRESET,:DEFAULT_CHECK_NEW_VERSION_DAYS,:DEFAULT_PRIV_KEY_FILENAME,:SERVER_COMMAND,:CONF_PRESET_SECRETS
+        :EXTV_PRESET,:DEFAULT_CHECK_NEW_VERSION_DAYS,:DEFAULT_PRIV_KEY_FILENAME,:SERVER_COMMAND,:CONF_PRESET_SECRETS,
+        :PRESET_DIG_SEPARATOR
         def option_preset; nil; end
 
         def option_preset=(value)
@@ -81,7 +83,7 @@ END_OF_TEMPLATE
           when Hash
             self.options.add_option_preset(value)
           else
-            raise "Preset definition must be a String for name, or Hash for value"
+            raise 'Preset definition must be a String for name, or Hash for value'
           end
           nil
         end
@@ -102,8 +104,8 @@ END_OF_TEMPLATE
           @option_config_file=@conf_file_default
           Log.log.debug("#{tool_name} folder: #{@main_folder}")
           # set folder for FASP SDK
-          add_plugin_lookup_folder(File.join(@main_folder,ASPERA_PLUGINS_FOLDERNAME))
           add_plugin_lookup_folder(self.class.gem_plugins_folder)
+          add_plugin_lookup_folder(File.join(@main_folder,ASPERA_PLUGINS_FOLDERNAME))
           # do file parameter first
           self.options.set_obj_attr(:config_file,self,:option_config_file)
           self.options.add_opt_simple(:config_file,"read parameters from file in YAML format, current=#{@option_config_file}")
@@ -119,6 +121,7 @@ END_OF_TEMPLATE
           self.options.set_obj_attr(:ascp_path,self,:option_ascp_path)
           self.options.set_obj_attr(:use_product,self,:option_use_product)
           self.options.set_obj_attr(:preset,self,:option_preset)
+          self.options.set_obj_attr(:plugin_folder,self,:option_plugin_folder)
           self.options.add_opt_switch(:no_default,'-N','do not load default configuration for plugin') { @use_plugin_defaults=false }
           self.options.add_opt_boolean(:override,'Wizard: override existing value')
           self.options.add_opt_boolean(:use_generic_client,'Wizard: AoC: use global or org specific jwt client id')
@@ -137,6 +140,7 @@ END_OF_TEMPLATE
           self.options.add_opt_simple(:notif_to,'email recipient for notification of transfers')
           self.options.add_opt_simple(:notif_template,'email ERB template for notification of transfers')
           self.options.add_opt_simple(:version_check_days,Integer,'period in days to check new version (zero to disable)')
+          self.options.add_opt_simple(:plugin_folder,'folder where to find additional plugins')
           self.options.set_option(:use_generic_client,true)
           self.options.set_option(:test_mode,false)
           self.options.set_option(:default,true)
@@ -282,15 +286,30 @@ END_OF_TEMPLATE
         attr_accessor :option_config_file
 
         # @return the hash from name (also expands possible includes)
+        # @param config_name name of the preset in config file
+        # @param include_path used to detect and avoid include loops
         def preset_by_name(config_name, include_path=[])
-          raise CliError,"no such config preset: #{config_name}" unless @config_presets.has_key?(config_name)
           raise CliError,'loop in include' if include_path.include?(config_name)
-          return expanded_with_preset_includes(@config_presets[config_name],include_path.clone.push(config_name))
+          include_path=include_path.clone # avoid messing up if there are multiple branches
+          current=@config_presets
+          config_name.split(PRESET_DIG_SEPARATOR).each do |name|
+            raise CliError,"not a Hash: #{include_path} (#{current.class})" unless current.is_a?(Hash)
+            include_path.push(name)
+            current=current[name]
+            raise CliError,"no such config preset: #{include_path}" if nil?
+          end
+          case current
+          when Hash;return expanded_with_preset_includes(current,include_path)
+          when String; return ExtendedValue.instance.evaluate(current)
+          else return current
+          end
         end
 
+        # @return the hash value with 'incps' keys expanced to include other presets
         # @param hash_val
+        # @param include_path to avoid inclusion loop
         def expanded_with_preset_includes(hash_val, include_path=[])
-          raise CliError,"#{EXTV_INCLUDE_PRESETS} requires a Hash" unless hash_val.is_a?(Hash)
+          raise CliError,"#{EXTV_INCLUDE_PRESETS} requires a Hash, have #{hash_val.class}" unless hash_val.is_a?(Hash)
           if hash_val.has_key?(EXTV_INCLUDE_PRESETS)
             memory=hash_val.clone
             includes=memory[EXTV_INCLUDE_PRESETS]
@@ -322,6 +341,18 @@ END_OF_TEMPLATE
           'write-only value'
         end
 
+        def option_plugin_folder=(value)
+          case value
+          when String; add_plugin_lookup_folder(value)
+          when Array; value.each{|f|add_plugin_lookup_folder(f)}
+          else raise "folder shall be Array or String, not #{value.class}"
+          end
+        end
+
+        def option_plugin_folder
+          return @plugin_lookup_folders
+        end
+
         def convert_preset_path(old_name,new_name,files_to_copy)
           old_subpath=File.join('',ASPERA_HOME_FOLDER_NAME,old_name,'')
           new_subpath=File.join('',ASPERA_HOME_FOLDER_NAME,new_name,'')
@@ -442,7 +473,7 @@ END_OF_TEMPLATE
         end
 
         def add_plugin_lookup_folder(folder)
-          @plugin_lookup_folders.push(folder)
+          @plugin_lookup_folders.unshift(folder)
         end
 
         def add_plugin_info(path)
@@ -485,43 +516,40 @@ END_OF_TEMPLATE
         end
 
         def execute_connect_action
-          command=self.options.get_next_command([:list,:id])
-          case command
-          when :list
-            return {type: :object_list, data: connect_versions, fields: ['id','title','version']}
-          when :id
+          command=self.options.get_next_command([:list,:info,:version])
+          if [:info,:version].include?(command)
             connect_id=self.options.get_next_argument('id or title')
             one_res=connect_versions.select{|i|i['id'].eql?(connect_id) || i['title'].eql?(connect_id)}.first
             raise CliNoSuchId.new(:connect,connect_id) if one_res.nil?
-            command=self.options.get_next_command([:info,:links])
+          end
+          case command
+          when :list
+            return {type: :object_list, data: connect_versions, fields: ['id','title','version']}
+          when :info # shows files used
+            one_res.delete('links')
+            return {type: :single_object, data: one_res}
+          when :version # shows files used
+            all_links=one_res['links']
+            command=self.options.get_next_command([:list,:download,:open])
+            if [:download,:open].include?(command)
+              link_title=self.options.get_next_argument('title or rel')
+              one_link=all_links.select {|i| i['title'].eql?(link_title) or i['rel'].eql?(link_title)}.first
+              raise "no such value" if one_link.nil?
+            end
             case command
-            when :info # shows files used
-              one_res.delete('links')
-              return {type: :single_object, data: one_res}
-            when :links # shows files used
-              command=self.options.get_next_command([:list,:id])
-              all_links=one_res['links']
-              case command
-              when :list # shows files used
-                return {type: :object_list, data: all_links}
-              when :id
-                link_title=self.options.get_next_argument('title')
-                one_link=all_links.select {|i| i['title'].eql?(link_title)}.first
-                command=self.options.get_next_command([:download,:open])
-                case command
-                when :download #
-                  folder_dest=self.transfer.destination_folder('receive')
-                  #folder_dest=self.options.get_next_argument('destination folder')
-                  api_connect_cdn=Rest.new({base_url: CONNECT_WEB_URL})
-                  fileurl = one_link['href']
-                  filename=fileurl.gsub(%r{.*/},'')
-                  api_connect_cdn.call({operation: 'GET',subpath: fileurl,save_to_file: File.join(folder_dest,filename)})
-                  return Main.result_status("Downloaded: #{filename}")
-                when :open #
-                  OpenApplication.instance.uri(one_link['href'])
-                  return Main.result_status("Opened: #{one_link['href']}")
-                end
-              end
+            when :list # shows files used
+              return {type: :object_list, data: all_links}
+            when :download #
+              folder_dest=self.transfer.destination_folder('receive')
+              #folder_dest=self.options.get_next_argument('destination folder')
+              api_connect_cdn=Rest.new({base_url: CONNECT_WEB_URL})
+              fileurl = one_link['href']
+              filename=fileurl.gsub(%r{.*/},'')
+              api_connect_cdn.call({operation: 'GET',subpath: fileurl,save_to_file: File.join(folder_dest,filename)})
+              return Main.result_status("Downloaded: #{filename}")
+            when :open #
+              OpenApplication.instance.uri(one_link['href'])
+              return Main.result_status("Opened: #{one_link['href']}")
             end
           end
         end
@@ -666,7 +694,7 @@ END_OF_TEMPLATE
           end
         end
 
-        ACTIONS=[PRESET_GBL_ACTIONS,:id,:preset,:open,:documentation,:genkey,:gem_path,:plugins,:flush_tokens,:echo,:wizard,:export_to_cli,:detect,:coffee,:ascp,:email_test,:smtp_settings,:proxy_check,:folder,:file,:check_update,:initdemo,:vault].flatten.freeze
+        ACTIONS=[PRESET_GBL_ACTIONS,:id,:preset,:open,:documentation,:genkey,:gem_path,:plugin,:flush_tokens,:echo,:wizard,:export_to_cli,:detect,:coffee,:ascp,:email_test,:smtp_settings,:proxy_check,:folder,:file,:check_update,:initdemo,:vault].flatten.freeze
 
         # "config" plugin
         def execute_action
@@ -698,8 +726,30 @@ END_OF_TEMPLATE
           when :flush_tokens
             deleted_files=Oauth.flush_tokens
             return {type: :value_list, data: deleted_files, name: 'file'}
-          when :plugins
-            return {type: :object_list, data: @plugins.keys.map { |i| { 'plugin' => i.to_s, 'path' => @plugins[i][:source] } } , fields: ['plugin','path']}
+          when :plugin
+            case self.options.get_next_command([:list,:create])
+            when :list
+              return {type: :object_list, data: @plugins.keys.map { |i| { 'plugin' => i.to_s, 'path' => @plugins[i][:source] } } , fields: ['plugin','path']}
+            when :create
+              plugin_name=options.get_next_argument('name',:single,:mandatory).downcase
+              plugin_folder=options.get_next_argument('folder',:single,:optional) || File.join(@main_folder,ASPERA_PLUGINS_FOLDERNAME)
+              plugin_file=File.join(plugin_folder,"#{plugin_name}.rb")
+              content=<<_EOF_
+require 'aspera/cli/plugin'
+module Aspera
+  module Cli
+    module Plugins
+      class #{plugin_name.capitalize} < Plugin
+        ACTIONS=[]
+        def execute_action; return Main.result_status("You called plugin #{plugin_name}"); end
+      end # #{plugin_name.capitalize}
+    end # Plugins
+  end # Cli
+end # Aspera
+_EOF_
+              File.write(plugin_file,content)
+              return Main.result_status("Created #{plugin_file}")
+            end
           when :wizard
             # interactive mode
             self.options.ask_missing_mandatory=true
@@ -815,7 +865,7 @@ END_OF_TEMPLATE
                 o=self.options.get_option(s)
                 @config_presets[preset_name][s.to_s] = o unless o.nil?
               end
-              test_args="#{plugin_name} user info show"
+              test_args="#{plugin_name} user profile show"
             else
               raise CliBadArgument,"Supports only: aoc. Detected: #{appli}"
             end # product
@@ -905,7 +955,7 @@ END_OF_TEMPLATE
               Log.log.info("Setting server default preset to : #{DEMO_SERVER_PRESET}")
             end
             save_presets_to_config_file
-            return Main.result_status("Done")
+            return Main.result_status('Done')
           when :vault
             command=self.options.get_next_command([:init,:list,:get,:set,:delete])
             case command
@@ -916,9 +966,9 @@ END_OF_TEMPLATE
                 raise "default secrets already exists" if @config_presets.has_key?(CONF_PRESET_SECRETS)
                 @config_presets[CONF_PRESET_SECRETS]={}
                 set_global_default(:secrets,"@preset:#{CONF_PRESET_SECRETS}")
-              else raise "no such vault type"
+              else raise 'no such vault type'
               end
-              return Main.result_status("Done")
+              return Main.result_status('Done')
             when :list
               return {type: :object_list, data: vault.list}
             when :set
@@ -930,7 +980,7 @@ END_OF_TEMPLATE
               secret=self.options.get_next_argument('secret')
               vault.set(username: username, url: url, description: description, secret: secret)
               save_presets_to_config_file if vault.is_a?(Keychain::EncryptedHash)
-              return Main.result_status("Done")
+              return Main.result_status('Done')
             when :get
               # register url option
               BasicAuthPlugin.new(@agents.merge(skip_option_header: true))
@@ -944,7 +994,7 @@ END_OF_TEMPLATE
               username=self.options.get_option(:username,:mandatory)
               url=self.options.get_option(:url,:optional)
               result=vault.delete(username: username, url: url)
-              return Main.result_status("Done")
+              return Main.result_status('Done')
             end
           else raise 'INTERNAL ERROR: wrong case'
           end

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

@@ -12,10 +12,10 @@ module Aspera
       class Node < BasicAuthPlugin
         class << self
           def detect(base_url)
-            api=Rest.new({:base_url=>base_url})
-            result=api.call({:operation=>'GET',:subpath=>'ping'})
+            api=Rest.new({ base_url: base_url})
+            result=api.call({ operation: 'GET', subpath: 'ping'})
             if result[:http].body.eql?('')
-              return {:product=>:node,:version=>'unknown'}
+              return { product: :node, version: 'unknown'}
             end
             return nil
           end
@@ -27,15 +27,13 @@ module Aspera
           super(env)
           # this is added to some requests , for instance to add tags (COS)
           @add_request_param = env[:add_request_param] || {}
-          unless env[:skip_basic_auth_options]
-            self.options.add_opt_simple(:validator,"identifier of validator (optional for central)")
-            self.options.add_opt_simple(:asperabrowserurl,"URL for simple aspera web ui")
-            self.options.add_opt_simple(:name,"sync name")
-            self.options.add_opt_list(:token_type,[:aspera,:basic,:hybrid],'Type of token used for transfers')
-            self.options.set_option(:asperabrowserurl,'https://asperabrowser.mybluemix.net')
-            self.options.set_option(:token_type,:aspera)
-            self.options.parse_options!
-          end
+          self.options.add_opt_simple(:validator,"identifier of validator (optional for central)")
+          self.options.add_opt_simple(:asperabrowserurl,"URL for simple aspera web ui")
+          self.options.add_opt_simple(:sync_name,"sync name")
+          self.options.add_opt_list(:token_type,[:aspera,:basic,:hybrid],'Type of token used for transfers')
+          self.options.set_option(:asperabrowserurl,'https://asperabrowser.mybluemix.net')
+          self.options.set_option(:token_type,:aspera)
+          self.options.parse_options!
           return if env[:man_only]
           if env.has_key?(:node_api)
             @api_node=env[:node_api]
@@ -92,7 +90,7 @@ module Aspera
 
         # translates paths results into CLI result, and removes prefix
         def c_result_translate_rem_prefix(resp,type,success_msg,path_prefix)
-          resres={:data=>[],:type=>:object_list,:fields=>[type,'result']}
+          resres={ data: [], type: :object_list, fields: [type,'result']}
           JSON.parse(resp[:http].body)['paths'].each do |p|
             result=success_msg
             if p.has_key?('error')
@@ -132,7 +130,7 @@ module Aspera
               nagios.add_critical('node api',e.to_s)
             end
             begin
-              @api_node.call({:operation=>'POST',:subpath=>'services/soap/Transfer-201210',:headers=>{'Content-Type'=>'text/xml;charset=UTF-8','SOAPAction'=>'FASPSessionNET-200911#GetSessionInfo'},:text_body_params=>SAMPLE_SOAP_CALL})[:http].body
+              @api_node.call({ operation: 'POST', subpath: 'services/soap/Transfer-201210', headers: {'Content-Type'=>'text/xml;charset=UTF-8','SOAPAction'=>'FASPSessionNET-200911#GetSessionInfo'}, text_body_params: SAMPLE_SOAP_CALL})[:http].body
               nagios.add_ok('central','accessible by node')
             rescue => e
               nagios.add_critical('central',e.to_s)
@@ -140,19 +138,19 @@ module Aspera
             return nagios.result
           when :events
             events=@api_node.read('events',self.options.get_option(:value,:optional))[:data]
-            return { :type=>:object_list, :data => events}
+            return { type: :object_list, data: events}
           when :info
             node_info=@api_node.read('info')[:data]
-            return { :type=>:single_object, :data => node_info, :textify => lambda { |table_data| c_textify_bool_list_result(table_data,['capabilities','settings'])}}
+            return { type: :single_object, data: node_info, textify: lambda { |table_data| c_textify_bool_list_result(table_data,['capabilities','settings'])}}
           when :license # requires: asnodeadmin -mu <node user> --acl-add=internal --internal
             node_license=@api_node.read('license')[:data]
             if node_license['failure'].is_a?(String) and node_license['failure'].include?('ACL')
               Log.log.error("server must have: asnodeadmin -mu <node user> --acl-add=internal --internal")
             end
-            return { :type=>:single_object, :data => node_license}
+            return { type: :single_object, data: node_license}
           when :delete
             paths_to_delete = get_next_arg_add_prefix(prefix_path,"file list",:multiple)
-            resp=@api_node.create('files/delete',{:paths=>paths_to_delete.map{|i| {'path'=>i.start_with?('/') ? i : '/'+i} }})
+            resp=@api_node.create('files/delete',{ paths: paths_to_delete.map{|i| {'path'=>i.start_with?('/') ? i : '/'+i} }})
             return c_result_translate_rem_prefix(resp,'file','deleted',prefix_path)
           when :search
             search_root = get_next_arg_add_prefix(prefix_path,"search root")
@@ -160,7 +158,7 @@ module Aspera
             other_options=self.options.get_option(:value,:optional)
             parameters.merge!(other_options) unless other_options.nil?
             resp=@api_node.create('files/search',parameters)
-            result={ :type=>:object_list, :data => resp[:data]['items']}
+            result={ type: :object_list, data: resp[:data]['items']}
             return Main.result_empty if result[:data].empty?
             result[:fields]=result[:data].first.keys.select{|i|!['basename','permissions'].include?(i)}
             self.format.display_status("Items: #{resp[:data]['item_count']}/#{resp[:data]['total_count']}")
@@ -170,26 +168,26 @@ module Aspera
             # TODO: could be a list of path
             path_list=get_next_arg_add_prefix(prefix_path,"folder path or ext.val. list")
             path_list=[path_list] unless path_list.is_a?(Array)
-            resp=@api_node.create('space',{ "paths" => path_list.map {|i| {:path=>i} } } )
-            result={:data=>resp[:data]['paths'],:type=>:object_list}
+            resp=@api_node.create('space',{ "paths" => path_list.map {|i| { path: i} } } )
+            result={ data: resp[:data]['paths'], type: :object_list}
             #return c_result_translate_rem_prefix(resp,'folder','created',prefix_path)
             return c_result_remove_prefix_path(result,'path',prefix_path)
           when :mkdir
             path_list=get_next_arg_add_prefix(prefix_path,"folder path or ext.val. list")
             path_list=[path_list] unless path_list.is_a?(Array)
             #TODO: a command for that ?
-            #resp=@api_node.create('space',{ "paths" => path_list.map {|i| {:type=>:directory,:path=>i} } } )
-            resp=@api_node.create('files/create',{ "paths" => [{ :type => :directory, :path => path_list } ] } )
+            #resp=@api_node.create('space',{ "paths" => path_list.map {|i| { type: :directory, path: i} } } )
+            resp=@api_node.create('files/create',{ "paths" => [{ type: :directory, path: path_list } ] } )
             return c_result_translate_rem_prefix(resp,'folder','created',prefix_path)
           when :mklink
             target=get_next_arg_add_prefix(prefix_path,"target")
             path_list=get_next_arg_add_prefix(prefix_path,"link path")
-            resp=@api_node.create('files/create',{ "paths" => [{ :type => :symbolic_link, :path => path_list, :target => {:path => target} } ] } )
+            resp=@api_node.create('files/create',{ "paths" => [{ type: :symbolic_link, path: path_list, target: { path: target} } ] } )
             return c_result_translate_rem_prefix(resp,'folder','created',prefix_path)
           when :mkfile
             path_list=get_next_arg_add_prefix(prefix_path,"file path")
             contents64=Base64.strict_encode64(self.options.get_next_argument("contents"))
-            resp=@api_node.create('files/create',{ "paths" => [{ :type => :file, :path => path_list, :contents => contents64 } ] } )
+            resp=@api_node.create('files/create',{ "paths" => [{ type: :file, path: path_list, contents: contents64 } ] } )
             return c_result_translate_rem_prefix(resp,'folder','created',prefix_path)
           when :rename
             path_base=get_next_arg_add_prefix(prefix_path,"path_base")
@@ -199,7 +197,7 @@ module Aspera
             return c_result_translate_rem_prefix(resp,'entry','moved',prefix_path)
           when :browse
             thepath=get_next_arg_add_prefix(prefix_path,"path")
-            query={ :path => thepath}
+            query={ path: thepath}
             additional_query=self.options.get_option(:query,:optional)
             query.merge!(additional_query) unless additional_query.nil?
             send_result=@api_node.create('files/browse', query)[:data]
@@ -207,11 +205,11 @@ module Aspera
             # if there is no items
             case send_result['self']['type']
             when 'directory','container' # directory: node, container: shares
-              result={ :data => send_result['items'] , :type => :object_list, :textify => lambda { |table_data| c_textify_browse(table_data) } }
+              result={ data: send_result['items'] , type: :object_list, textify: lambda { |table_data| c_textify_browse(table_data) } }
               self.format.display_status("Items: #{send_result['item_count']}/#{send_result['total_count']}")
             else # 'file','symbolic_link'
-              result={ :data => send_result['self'] , :type => :single_object}
-              #result={ :data => [send_result['self']] , :type => :object_list, :textify => lambda { |table_data| c_textify_browse(table_data) } }
+              result={ data: send_result['self'] , type: :single_object}
+              #result={ data: [send_result['self']] , type: :object_list, textify: lambda { |table_data| c_textify_browse(table_data) } }
               #raise "unknown type: #{send_result['self']['type']}"
             end
             return c_result_remove_prefix_path(result,'path',prefix_path)
@@ -222,11 +220,11 @@ module Aspera
             case token_type
             when :aspera,:hybrid
               transfer_paths=case command
-              when :upload;[ { :destination => self.transfer.destination_folder('send') } ]
+              when :upload;[ { destination: self.transfer.destination_folder('send') } ]
               when :download;self.transfer.ts_source_paths
               end
               # only one request, so only one answer
-              transfer_spec=@api_node.create("files/#{command}_setup",{:transfer_requests => [ { transfer_request: {
+              transfer_spec=@api_node.create("files/#{command}_setup",{ transfer_requests: [ { transfer_request: {
                 paths: transfer_paths
                 }.deep_merge(@add_request_param) } ] } )[:data]['transfer_specs'].first['transfer_spec']
               # delete this part, as the returned value contains only destination, and not sources
@@ -239,22 +237,22 @@ module Aspera
                 'remote_user'=>Aspera::Fasp::Default::ACCESS_KEY_TRANSFER_USER,
                 'ssh_port'   =>Aspera::Fasp::Default::SSH_PORT,
                 'direction'  =>case command;when :upload;'send';when :download;'recv';else raise "Error";end
-              }
+              }.deep_merge(@add_request_param)
             else raise "ERROR: token_type #{tt}"
             end
             if [:basic,:hybrid].include?(token_type)
               Aspera::Node.set_ak_basic_token(transfer_spec,@api_node.params[:auth][:username],@api_node.params[:auth][:password])
             end
-            return Main.result_transfer(self.transfer.start(transfer_spec,{:src=>:node_gen3}))
+            return Main.result_transfer(self.transfer.start(transfer_spec,{ src: :node_gen3}))
           when :api_details
-            return { :type=>:single_object, :data => @api_node.params }
+            return { type: :single_object, data: @api_node.params }
           end
         end
 
         def execute_async
           command=self.options.get_next_command([:list,:delete,:files,:show,:counters,:bandwidth])
           unless command.eql?(:list)
-            asyncname=self.options.get_option(:name,:optional)
+            asyncname=self.options.get_option(:sync_name,:optional)
             if asyncname.nil?
               asyncid=self.instance_identifier()
               if asyncid.eql?('ALL') and [:show,:delete].include?(command)
@@ -276,25 +274,25 @@ module Aspera
           case command
           when :list
             resp=@api_node.read('async/list')[:data]['sync_ids']
-            return { :type => :value_list, :data => resp, :name=>'id'  }
+            return { type: :value_list, data: resp, name: 'id'  }
           when :show
             resp=@api_node.create('async/summary',pdata)[:data]['sync_summaries']
             return Main.result_empty if resp.empty?
             if asyncid.eql?('ALL')
-              return { :type => :object_list, :data => resp, :fields => ['snid','name','local_dir','remote_dir'] }
+              return { type: :object_list, data: resp, fields: ['snid','name','local_dir','remote_dir'] }
             else
-              return { :type => :single_object, :data => resp.first }
+              return { type: :single_object, data: resp.first }
             end
           when :delete
             resp=@api_node.create('async/delete',pdata)[:data]
-            return { :type => :single_object, :data => resp, :name=>'id'  }
+            return { type: :single_object, data: resp, name: 'id'  }
           when :bandwidth
             pdata['seconds']=100  # TODO: as parameter with --value
             resp=@api_node.create('async/bandwidth',pdata)[:data]
             data=resp['bandwidth_data']
             return Main.result_empty if data.empty?
             data=data.first[asyncid]['data']
-            return { :type => :object_list, :data => data, :name=>'id'  }
+            return { type: :object_list, data: data, name: 'id'  }
           when :files
             # count int
             # filename str
@@ -319,11 +317,11 @@ module Aspera
             end
             return Main.result_empty if data.empty?
             skip_ids_persistency.save unless skip_ids_persistency.nil?
-            return { :type => :object_list, :data => data, :name=>'id'  }
+            return { type: :object_list, data: data, name: 'id'  }
           when :counters
             resp=@api_node.create('async/counters',pdata)[:data]["sync_counters"].first[asyncid].last
             return Main.result_empty if resp.nil?
-            return { :type => :single_object, :data => resp }
+            return { type: :single_object, data: resp }
           end
         end
 
@@ -339,22 +337,22 @@ module Aspera
             case command
             when :list
               resp=@api_node.read('ops/transfers',self.options.get_option(:value,:optional))
-              return { :type => :object_list, :data => resp[:data], :fields=>['id','status']  } # TODO: useful?
+              return { type: :object_list, data: resp[:data], fields: ['id','status']  } # TODO: useful?
             when :create
               resp=@api_node.create('streams',self.options.get_option(:value,:mandatory))
-              return { :type => :single_object, :data => resp[:data] }
+              return { type: :single_object, data: resp[:data] }
             when :show
               trid=self.options.get_next_argument("transfer id")
               resp=@api_node.read('ops/transfers/'+trid)
-              return { :type=>:other_struct, :data => resp[:data] }
+              return { type: :other_struct, data: resp[:data] }
             when :modify
               trid=self.options.get_next_argument("transfer id")
               resp=@api_node.update('streams/'+trid,self.options.get_option(:value,:mandatory))
-              return { :type=>:other_struct, :data => resp[:data] }
+              return { type: :other_struct, data: resp[:data] }
             when :cancel
               trid=self.options.get_next_argument("transfer id")
               resp=@api_node.cancel('streams/'+trid)
-              return { :type=>:other_struct, :data => resp[:data] }
+              return { type: :other_struct, data: resp[:data] }
             else
               raise "error"
             end
@@ -367,15 +365,15 @@ module Aspera
             end
             case command
             when :list
-              # could use ? :subpath=>'transfers'
+              # could use ? subpath: 'transfers'
               resp=@api_node.read(res_class_path,self.options.get_option(:value,:optional))
-              return { :type => :object_list, :data => resp[:data], :fields=>['id','status','start_spec.direction','start_spec.remote_user','start_spec.remote_host','start_spec.destination_path']}
+              return { type: :object_list, data: resp[:data], fields: ['id','status','start_spec.direction','start_spec.remote_user','start_spec.remote_host','start_spec.destination_path']}
             when :cancel
               resp=@api_node.cancel(one_res_path)
-              return { :type=>:other_struct, :data => resp[:data] }
+              return { type: :other_struct, data: resp[:data] }
             when :show
               resp=@api_node.read(one_res_path)
-              return { :type=>:other_struct, :data => resp[:data] }
+              return { type: :other_struct, data: resp[:data] }
             else
               raise "error"
             end
@@ -389,7 +387,7 @@ module Aspera
             case command
             when :list
               resp=@api_node.read('rund/services')
-              return { :type=>:object_list, :data => resp[:data]["services"] }
+              return { type: :object_list, data: resp[:data]["services"] }
             when :create
               # @json:'{"type":"WATCHFOLDERD","run_as":{"user":"user1"}}'
               params=self.options.get_next_argument("Run creation data (structure)")
@@ -416,9 +414,9 @@ module Aspera
               return Main.result_status("#{resp[:data]['id']} created")
             when :list
               resp=@api_node.read(res_class_path,self.options.get_option(:value,:optional))
-              return { :type=>:value_list, :data => resp[:data]['ids'], :name=>'id' }
+              return { type: :value_list, data: resp[:data]['ids'], name: 'id' }
             when :show
-              return {:type=>:single_object, :data=>@api_node.read(one_res_path)[:data]}
+              return { type: :single_object, data: @api_node.read(one_res_path)[:data]}
             when :modify
               @api_node.update(one_res_path,self.options.get_option(:value,:mandatory))
               return Main.result_status("#{one_res_id} updated")
@@ -426,7 +424,7 @@ module Aspera
               @api_node.delete(one_res_path)
               return Main.result_status("#{one_res_id} deleted")
             when :state
-              return { :type=>:single_object, :data => @api_node.read("#{one_res_path}/state")[:data] }
+              return { type: :single_object, data: @api_node.read("#{one_res_path}/state")[:data] }
             end
           when :central
             command=self.options.get_next_command([ :session,:file])
@@ -441,7 +439,7 @@ module Aspera
               when :list
                 request_data.deep_merge!({"validation"=>validation}) unless validation.nil?
                 resp=@api_node.create('services/rest/transfers/v1/sessions',request_data)
-                return {:type=>:object_list,:data=>resp[:data]["session_info_result"]["session_info"],:fields=>["session_uuid","status","transport","direction","bytes_transferred"]}
+                return { type: :object_list, data: resp[:data]["session_info_result"]["session_info"], fields: ["session_uuid","status","transport","direction","bytes_transferred"]}
               end
             when :file
               command=self.options.get_next_command([ :list, :modify])
@@ -451,7 +449,7 @@ module Aspera
                 resp=@api_node.create('services/rest/transfers/v1/files',request_data)[:data]
                 resp=JSON.parse(resp) if resp.is_a?(String)
                 Log.dump(:resp,resp)
-                return {:type=>:object_list,:data=>resp['file_transfer_info_result']['file_transfer_info'],:fields=>["session_uuid","file_id","status","path"]}
+                return { type: :object_list, data: resp['file_transfer_info_result']['file_transfer_info'], fields: ["session_uuid","file_id","status","path"]}
               when :modify
                 request_data.deep_merge!(validation) unless validation.nil?
                 @api_node.update('services/rest/transfers/v1/files',request_data)

data/lib/aspera/cli/version.rb

@@ -1,5 +1,5 @@
 module Aspera
   module Cli
-    VERSION = "4.5.0"
+    VERSION = "4.6.0"
   end
 end

data/lib/aspera/environment.rb

@@ -34,7 +34,7 @@ module Aspera
       case RbConfig::CONFIG['host_cpu']
       when /x86_64/,/x64/
         return CPU_X86_64
-      when /powerpc/
+      when /powerpc/,/ppc64/
         return CPU_PPC64LE if os.eql?(OS_LINUX)
         return CPU_PPC64
       when /s390/

data/lib/aspera/faspex_gw.rb

@@ -172,7 +172,7 @@ module Aspera
         :SSLEnable          => true,
         :SSLVerifyClient    => OpenSSL::SSL::VERIFY_NONE,
       }
-      case 2
+      case 1
       when 0
         # generate self signed cert
         webrick_options[:SSLCertName]    = [ [ 'CN',WEBrick::Utils::getservername ] ]
@@ -180,6 +180,7 @@ module Aspera
       when 1
         fill_self_signed_cert(webrick_options)
       when 2
+        # TODO: args to set certificate of server
         webrick_options[:SSLPrivateKey] =OpenSSL::PKey::RSA.new(File.read('/Users/laurent/workspace/Tools/certificate/myserver.key'))
         webrick_options[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read('/Users/laurent/workspace/Tools/certificate/myserver.crt'))
       end