aspera-cli 4.4.0 → 4.5.0

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

@@ -32,6 +32,20 @@ module Aspera
         private_constant :KEY_NODE,:KEY_PATH,:VAL_ALL,:PACKAGE_MATCH_FIELD,:ATOM_MAILBOXES,
         :ATOM_PARAMS,:ATOM_EXT_PARAMS,:PUB_LINK_EXTERNAL_MATCH
 
+        class << self
+          def detect(base_url)
+            api=Rest.new({:base_url=>base_url})
+            result=api.call({:operation=>'POST',:subpath=>'aspera/faspex',:headers=>{'Accept'=>'application/xrds+xml'},:text_body_params=>''})
+            # 4.x
+            if result[:http].body.start_with?('<?xml')
+              res_s=XmlSimple.xml_in(result[:http].body, {'ForceArray' => false})
+              version=res_s['XRD']['application']['version']
+              return {version: version}
+            end
+            return nil
+          end
+        end
+
         def initialize(env)
           @api_v3=nil
           @api_v4=nil
@@ -136,6 +150,8 @@ module Aspera
             mailbox_query.delete(MAX_PAGES)
           end
           loop do
+            # get a batch of package information
+            # order: first batch is latest packages, and then in a batch ids are increasing
             atom_xml=api_v3.call({operation: 'GET',subpath: "#{mailbox}.atom",headers: {'Accept'=>'application/xml'},url_params: mailbox_query})[:http].body
             box_data=XmlSimple.xml_in(atom_xml, {'ForceArray' => true})
             Log.dump(:box_data,box_data)
@@ -143,7 +159,8 @@ module Aspera
             Log.log.debug("new items: #{items.count}")
             # it is the end if page is empty
             break if items.empty?
-            items.each do |package|
+            # results will be sorted in reverse id
+            items.reverse.each do |package|
               package[PACKAGE_MATCH_FIELD]=case mailbox
               when :inbox,:archive
                 recipient=package['to'].select{|i|i['name'].first.eql?(recipient_name)}.first
@@ -151,12 +168,16 @@ module Aspera
               else # :sent
                 package['delivery_id'].first
               end
-              # keep only those for the specified recipient
+              # keep only those for the specified recipient,
               result.push(package) unless package[PACKAGE_MATCH_FIELD].nil?
             end
+            #result.push({PACKAGE_MATCH_FIELD=>'======'})
             Log.log.debug("total items: #{result.count}")
             # reach the limit ?
-            break if !max_items.nil? and result.count > max_items
+            if !max_items.nil? and result.count >= max_items
+              result=result.slice(0,max_items) if result.count > max_items
+              break
+            end
             link=box_data['link'].select{|i|i['rel'].eql?('next')}.first
             Log.log.debug("link: #{link}")
             # no next link
@@ -267,10 +288,11 @@ module Aspera
                   id:      IdGenerator.from_list(['faspex_recv',self.options.get_option(:url,:mandatory),self.options.get_option(:username,:mandatory),self.options.get_option(:box,:mandatory).to_s]))
                 end
                 # get command line parameters
-                delivid=self.options.get_option(:id,:mandatory)
+                delivid=self.instance_identifier()
+                raise "empty id" if delivid.empty?
                 if delivid.eql?(VAL_ALL)
                   pkg_id_uri=mailbox_all_entries.map{|i|{:id=>i[PACKAGE_MATCH_FIELD],:uri=>self.class.get_fasp_uri_from_entry(i)}}
-                  # TODO : remove ids from skip not present in inbox
+                  # TODO : remove ids from skip not present in inbox to avoid growing too big
                   # skip_ids_data.select!{|id|pkg_id_uri.select{|p|p[:id].eql?(id)}}
                   pkg_id_uri.select!{|i|!skip_ids_data.include?(i[:id])}
                 else
@@ -294,7 +316,7 @@ module Aspera
                 if !link_data[:subpath].start_with?(PUB_LINK_EXTERNAL_MATCH)
                   raise CliBadArgument,"Pub link is #{link_data[:subpath]}. Expecting #{PUB_LINK_EXTERNAL_MATCH}"
                 end
-                # Note: unauthenticated API (autorization is in url params)
+                # Note: unauthenticated API (authorization is in url params)
                 api_public_link=Rest.new({:base_url=>link_data[:base_url]})
                 pkgdatares=api_public_link.call({:operation=>'GET',:subpath=>link_data[:subpath],:url_params=>{:passcode=>link_data[:query]['passcode']},:headers=>{'Accept'=>'application/xml'}})
                 if !pkgdatares[:http].body.start_with?('<?xml ')
@@ -400,7 +422,7 @@ module Aspera
               return self.entity_action(api_v4,'metadata_profiles',nil,:id)
             when :package
               pkg_box_type=self.options.get_next_command([:users])
-              pkg_box_id=self.options.get_option(:id,:mandatory)
+              pkg_box_id=self.instance_identifier()
               return self.entity_action(api_v4,"#{pkg_box_type}/#{pkg_box_id}/packages",nil,:id)
             end
           when :address_book

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

@@ -7,14 +7,27 @@ module Aspera
   module Cli
     module Plugins
       class Faspex5 < BasicAuthPlugin
+        class << self
+          def detect(base_url)
+            api=Rest.new({:base_url=>base_url})
+            result=api.read('api/v5/configuration/ping')
+            if result[:http].code.start_with?('2') and result[:http].body.strip.empty?
+              return {version: '5'}
+            end
+            return nil
+          end
+        end
+
         VAL_ALL='ALL'
+        private_constant :VAL_ALL
+
         def initialize(env)
           super(env)
-          options.add_opt_simple(:client_id,'API client identifier in application')
-          options.add_opt_simple(:client_secret,'API client secret in application')
-          options.add_opt_simple(:redirect_uri,'API client redirect URI')
-          options.add_opt_list(:auth,Oauth.auth_types.clone.push(:boot),'type of Oauth authentication')
-          options.add_opt_simple(:private_key,'RSA private key PEM value for JWT (prefix file path with @val:@file:)')
+          options.add_opt_simple(:client_id,'OAuth client identifier')
+          options.add_opt_simple(:client_secret,'OAuth client secret')
+          options.add_opt_simple(:redirect_uri,'OAuth redirect URI')
+          options.add_opt_list(:auth,Oauth.auth_types.clone.push(:boot),'OAuth type of authentication')
+          options.add_opt_simple(:private_key,'Oauth RSA private key PEM value for JWT (prefix file path with @val:@file:)')
           options.set_option(:auth,:jwt)
           options.parse_options!
         end
@@ -43,7 +56,7 @@ module Aspera
               :redirect_uri   => options.get_option(:redirect_uri,:mandatory),
               }})
           when :jwt
-            # currently Faspex 5 beta 3 only supports non-user based apis (e.g. jobs)
+            # currently Faspex 5 beta 4 only supports non-user based apis (e.g. jobs)
             app_client_id=options.get_option(:client_id,:mandatory)
             @api_v5=Rest.new({
               :base_url => faxpex5_api_v5_url,
@@ -85,7 +98,7 @@ module Aspera
               parameters=options.get_option(:value,:optional)
               return {:type => :object_list, :data=>@api_v5.read('packages',parameters)[:data]['packages']}
             when :show
-              id=options.get_option(:id,:mandatory)
+              id=instance_identifier()
               return {:type => :single_object, :data=>@api_v5.read("packages/#{id}")[:data]}
             when :send
               parameters=options.get_option(:value,:mandatory)
@@ -96,7 +109,7 @@ module Aspera
               return Main.result_transfer(self.transfer.start(transfer_spec,{:src=>:node_gen3}))
             when :receive
               pkg_type='received'
-              pack_id=options.get_option(:id,:mandatory)
+              pack_id=instance_identifier()
               package_ids=[pack_id]
               skip_ids_data=[]
               skip_ids_persistency=nil

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

@@ -2,6 +2,7 @@ require 'aspera/cli/basic_auth_plugin'
 require 'aspera/nagios'
 require 'aspera/hash_ext'
 require 'aspera/id_generator'
+require 'aspera/node'
 require 'base64'
 require 'zlib'
 
@@ -9,8 +10,19 @@ module Aspera
   module Cli
     module Plugins
       class Node < BasicAuthPlugin
+        class << self
+          def detect(base_url)
+            api=Rest.new({:base_url=>base_url})
+            result=api.call({:operation=>'GET',:subpath=>'ping'})
+            if result[:http].body.eql?('')
+              return {:product=>:node,:version=>'unknown'}
+            end
+            return nil
+          end
+        end
         SAMPLE_SOAP_CALL='<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:typ="urn:Aspera:XML:FASPSessionNET:2009/11:Types"><soapenv:Header></soapenv:Header><soapenv:Body><typ:GetSessionInfoRequest><SessionFilter><SessionStatus>running</SessionStatus></SessionFilter></typ:GetSessionInfoRequest></soapenv:Body></soapenv:Envelope>'
         private_constant :SAMPLE_SOAP_CALL
+
         def initialize(env)
           super(env)
           # this is added to some requests , for instance to add tags (COS)
@@ -165,7 +177,7 @@ module Aspera
           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
+            #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 } ] } )
             return c_result_translate_rem_prefix(resp,'folder','created',prefix_path)
@@ -224,9 +236,9 @@ module Aspera
               raise "shall be basic auth" unless @api_node.params[:auth][:type].eql?(:basic)
               transfer_spec={
                 'remote_host'=>URI.parse(@api_node.params[:base_url]).host,
-                'remote_user'=>Aspera::Node::ACCESS_KEY_TRANSFER_USER,
-                'ssh_port'=>Aspera::Node::SSH_PORT_DEFAULT,
-                'direction'=>case command;when :upload;'send';when :download;'recv';else raise "Error";end
+                '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
               }
             else raise "ERROR: token_type #{tt}"
             end
@@ -244,7 +256,7 @@ module Aspera
           unless command.eql?(:list)
             asyncname=self.options.get_option(:name,:optional)
             if asyncname.nil?
-              asyncid=self.options.get_option(:id,:mandatory)
+              asyncid=self.instance_identifier()
               if asyncid.eql?('ALL') and [:show,:delete].include?(command)
                 asyncids=@api_node.read('async/list')[:data]['sync_ids']
               else
@@ -327,7 +339,7 @@ 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
+              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] }
@@ -350,7 +362,7 @@ module Aspera
             command=self.options.get_next_command([ :list, :cancel, :show ])
             res_class_path='ops/transfers'
             if [:cancel, :show].include?(command)
-              one_res_id=self.options.get_option(:id,:mandatory)
+              one_res_id=self.instance_identifier()
               one_res_path="#{res_class_path}/#{one_res_id}"
             end
             case command
@@ -372,7 +384,7 @@ module Aspera
           when :service
             command=self.options.get_next_command([ :list, :create, :delete])
             if [:delete].include?(command)
-              svcid=self.options.get_option(:id,:mandatory)
+              svcid=self.instance_identifier()
             end
             case command
             when :list
@@ -392,7 +404,7 @@ module Aspera
             #return entity_action(@api_node,'v3/watchfolders',nil,:id)
             command=self.options.get_next_command([ :create, :list, :show, :modify, :delete, :state])
             if [:show,:modify,:delete,:state].include?(command)
-              one_res_id=self.options.get_option(:id,:mandatory)
+              one_res_id=self.instance_identifier()
               one_res_path="#{res_class_path}/#{one_res_id}"
             end
             # hum, to avoid: Unable to convert 2016_09_14 configuration

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

@@ -110,12 +110,14 @@ module Aspera
             return {:type=>:object_list,:data=>result['Plugin']}
           when :workflow
             command=self.options.get_next_command([:list, :status, :inputs, :details, :start, :export])
-            unless [:list, :status].include?(command)
-              wf_id=self.options.get_option(:id,:mandatory)
+            unless [:list].include?(command)
+              wf_id=self.instance_identifier()
             end
             case command
             when :status
-              result=call_API('workflows_status')[:data]
+              options={}
+              options[:id]=wf_id unless wf_id.eql?('ALL')
+              result=call_API('workflows_status',options)[:data]
               return {:type=>:object_list,:data=>result['workflows']['workflow']}
             when :list
               result=call_API('workflows_list',id: 0)[:data]

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

@@ -205,9 +205,9 @@ module Aspera
             template_ts=res[:data]['transfer_specs'].first['transfer_spec']
             # get ports, anyway that should be 33001 for both. add remote_user ?
             @default_transfer_spec=['ssh_port','fasp_port'].inject({}){|h,e|h[e]=template_ts[e];h}
-            if ! @default_transfer_spec['remote_user'].eql?(Aspera::Node::ACCESS_KEY_TRANSFER_USER)
+            if ! @default_transfer_spec['remote_user'].eql?(Aspera::Fasp::Default::ACCESS_KEY_TRANSFER_USER)
               Log.log.warn("remote_user shall be xfer")
-              @default_transfer_spec['remote_user']=Aspera::Node::ACCESS_KEY_TRANSFER_USER
+              @default_transfer_spec['remote_user']=Aspera::Fasp::Default::ACCESS_KEY_TRANSFER_USER
             end
             Aspera::Node::set_ak_basic_token(@default_transfer_spec,@access_key_self['id'],self.options.get_option(:password,:mandatory))
             # note: we use the same address for ascp than for node api instead of the one from upload_setup

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

@@ -1,6 +1,6 @@
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/ascmd'
-require 'aspera/node'
+require 'aspera/fasp/default'
 require 'aspera/ssh'
 require 'aspera/nagios'
 require 'tempfile'
@@ -73,8 +73,8 @@ module Aspera
           case server_uri.scheme
           when 'ssh'
             if self.options.get_option(:username,:optional).nil?
-              self.options.set_option(:username,Aspera::Node::ACCESS_KEY_TRANSFER_USER)
-              Log.log.info("Using default transfer user: #{Aspera::Node::ACCESS_KEY_TRANSFER_USER}")
+              self.options.set_option(:username,Aspera::Fasp::Default::ACCESS_KEY_TRANSFER_USER)
+              Log.log.info("Using default transfer user: #{Aspera::Fasp::Default::ACCESS_KEY_TRANSFER_USER}")
             end
             server_transfer_spec['remote_user']=self.options.get_option(:username,:mandatory)
             ssh_options=self.options.get_option(:ssh_options,:optional)

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

@@ -4,6 +4,23 @@ module Aspera
   module Cli
     module Plugins
       class Shares < BasicAuthPlugin
+        class << self
+          def detect(base_url)
+            api=Rest.new({:base_url=>base_url})
+            # Shares
+            begin
+              # shall fail: shares requires auth, but we check error message
+              api.read('node_api/app')
+            rescue RestCallError => e
+              if e.response.code.to_s.eql?('401') and e.response.body.eql?('{"error":{"user_message":"API user authentication failed"}}')
+                return {:version=>'unknown'}
+              end
+            rescue
+            end
+            nil
+          end
+        end
+
         def initialize(env)
           super(env)
           #self.options.parse_options!

data/lib/aspera/cli/transfer_agent.rb

@@ -1,8 +1,4 @@
-require 'aspera/fasp/local'
 require 'aspera/fasp/parameters'
-require 'aspera/fasp/connect'
-require 'aspera/fasp/node'
-require 'aspera/fasp/http_gw'
 require 'aspera/cli/listener/logger'
 require 'aspera/cli/listener/progress_multi'
 
@@ -25,12 +21,14 @@ Transfer is: <%=global_transfer_status%>
 
 <%=ts.to_yaml%>
 END_OF_TEMPLATE
-      #%
+      #% (formating bug in eclipse)
       private_constant :FILE_LIST_FROM_ARGS,:FILE_LIST_FROM_TRANSFER_SPEC,:DEFAULT_TRANSFER_NOTIF_TMPL
+      TRANSFER_AGENTS=[:direct,:node,:connect,:httpgw,:trsdk]
+
       # @param env external objects: option manager, config file manager
-      def initialize(env)
-        # same as plugin environment
-        @env=env
+      def initialize(opt_mgr,config)
+        @opt_mgr=opt_mgr
+        @config=config
         # command line can override transfer spec
         @transfer_spec_cmdline={'create_dir'=>true}
         # the currently selected transfer agent
@@ -38,25 +36,21 @@ END_OF_TEMPLATE
         @progress_listener=Listener::ProgressMulti.new
         # source/destination pair, like "paths" of transfer spec
         @transfer_paths=nil
-        options.set_obj_attr(:ts,self,:option_transfer_spec)
-        options.add_opt_simple(:ts,"override transfer spec values (Hash, use @json: prefix), current=#{options.get_option(:ts,:optional)}")
-        options.add_opt_simple(:local_resume,"set resume policy (Hash, use @json: prefix), current=#{options.get_option(:local_resume,:optional)}")
-        options.add_opt_simple(:to_folder,"destination folder for downloaded files")
-        options.add_opt_simple(:sources,"list of source files (see doc)")
-        options.add_opt_simple(:transfer_info,"parameters for transfer agent")
-        options.add_opt_list(:src_type,[:list,:pair],"type of file list")
-        options.add_opt_list(:transfer,[:direct,:httpgw,:connect,:node],"type of transfer agent")
-        options.add_opt_list(:progress,[:none,:native,:multi],"type of progress bar")
-        options.set_option(:transfer,:direct)
-        options.set_option(:src_type,:list)
-        options.set_option(:progress,:native) # use native ascp progress bar as it is more reliable
-        options.parse_options!
+        @opt_mgr.set_obj_attr(:ts,self,:option_transfer_spec)
+        @opt_mgr.add_opt_simple(:ts,"override transfer spec values (Hash, use @json: prefix), current=#{@opt_mgr.get_option(:ts,:optional)}")
+        @opt_mgr.add_opt_simple(:local_resume,"set resume policy (Hash, use @json: prefix), current=#{@opt_mgr.get_option(:local_resume,:optional)}")
+        @opt_mgr.add_opt_simple(:to_folder,"destination folder for downloaded files")
+        @opt_mgr.add_opt_simple(:sources,"list of source files (see doc)")
+        @opt_mgr.add_opt_simple(:transfer_info,"parameters for transfer agent")
+        @opt_mgr.add_opt_list(:src_type,[:list,:pair],"type of file list")
+        @opt_mgr.add_opt_list(:transfer,TRANSFER_AGENTS,"type of transfer agent")
+        @opt_mgr.add_opt_list(:progress,[:none,:native,:multi],"type of progress bar")
+        @opt_mgr.set_option(:transfer,:direct)
+        @opt_mgr.set_option(:src_type,:list)
+        @opt_mgr.set_option(:progress,:native) # use native ascp progress bar as it is more reliable
+        @opt_mgr.parse_options!
       end
 
-      def options; @env[:options];end
-
-      def config; @env[:config];end
-
       def option_transfer_spec; @transfer_spec_cmdline; end
 
       # multiple option are merged
@@ -68,8 +62,8 @@ END_OF_TEMPLATE
         @agent=instance
         @agent.add_listener(Listener::Logger.new)
         # use local progress bar if asked so, or if native and non local ascp (because only local ascp has native progress bar)
-        if options.get_option(:progress,:mandatory).eql?(:multi) or
-        (options.get_option(:progress,:mandatory).eql?(:native) and !options.get_option(:transfer,:mandatory).eql?(:direct))
+        if @opt_mgr.get_option(:progress,:mandatory).eql?(:multi) or
+        (@opt_mgr.get_option(:progress,:mandatory).eql?(:native) and ! instance.class.to_s.eql?('Aspera::Fasp::AgentDirect'))
           @agent.add_listener(@progress_listener)
         end
       end
@@ -77,56 +71,24 @@ END_OF_TEMPLATE
       # analyze options and create new agent if not already created or set
       def set_agent_by_options
         return nil unless @agent.nil?
-        agent_type=options.get_option(:transfer,:mandatory)
-        case agent_type
-        when :direct
-          agent_options=options.get_option(:transfer_info,:optional)
-          agent_options=agent_options.symbolize_keys if agent_options.is_a?(Hash)
-          new_agent=Fasp::Local.new(agent_options)
-          new_agent.quiet=false if options.get_option(:progress,:mandatory).eql?(:native)
-        when :httpgw
-          httpgw_config=options.get_option(:transfer_info,:mandatory)
-          new_agent=Fasp::HttpGW.new(httpgw_config)
-        when :connect
-          new_agent=Fasp::Connect.new
-        when :node
-          # way for code to setup alternate node api in advance
-          # support: @preset:<name>
-          # support extended values
-          node_config=options.get_option(:transfer_info,:optional)
-          # if not specified: use default node
-          if node_config.nil?
-            param_set_name=config.get_plugin_default_config_name(:node)
-            raise CliBadArgument,"No default node configured, Please specify --#{:transfer_info.to_s.gsub('_','-')}" if param_set_name.nil?
-            node_config=config.preset_by_name(param_set_name)
-          end
-          Log.log.debug("node=#{node_config}")
-          raise CliBadArgument,"the node configuration shall be Hash, not #{node_config.class} (#{node_config}), use either @json:<json> or @preset:<parameter set name>" unless node_config.is_a?(Hash)
-          # here, node_config is a Hash
-          node_config=node_config.symbolize_keys
-          # Check mandatory params
-          [:url,:username,:password].each { |k| raise CliBadArgument,"missing parameter [#{k}] in node specification: #{node_config}" unless node_config.has_key?(k) }
-          if node_config[:password].match(/^Bearer /)
-            node_api=Rest.new({
-              base_url: node_config[:url],
-              headers: {
-              'X-Aspera-AccessKey'=>node_config[:username],
-              'Authorization'     =>node_config[:password]}})
-          else
-            node_api=Rest.new({
-              base_url: node_config[:url],
-              auth:     {
-              type:     :basic,
-              username: node_config[:username],
-              password: node_config[:password]
-              }})
-          end
-          new_agent=Fasp::Node.new(node_api)
-          # add root id if it's an access key
-          new_agent.options={root_id: node_config[:root_id]} if node_config.has_key?(:root_id)
-        else
-          raise "Unexpected transfer agent type: #{agent_type}"
+        agent_type=@opt_mgr.get_option(:transfer,:mandatory)
+        require "aspera/fasp/agent_#{agent_type}"
+        agent_options=@opt_mgr.get_option(:transfer_info,:optional)
+        raise CliBadArgument,"the transfer agent configuration shall be Hash, not #{agent_options.class} (#{agent_options}), use either @json:<json> or @preset:<parameter set name>" unless [Hash,NilClass].include?(agent_options.class)
+        # special case
+        if agent_type.eql?(:node) and agent_options.nil?
+          param_set_name=@config.get_plugin_default_config_name(:node)
+          raise CliBadArgument,"No default node configured, Please specify --#{:transfer_info.to_s.gsub('_','-')}" if param_set_name.nil?
+          agent_options=@config.preset_by_name(param_set_name)
         end
+        # special case
+        if agent_type.eql?(:direct) and @opt_mgr.get_option(:progress,:mandatory).eql?(:native)
+          agent_options={} if agent_options.nil?
+          agent_options[:quiet]=false
+        end
+        agent_options=agent_options.symbolize_keys if agent_options.is_a?(Hash)
+        # get agent instance
+        new_agent=Kernel.const_get("Aspera::Fasp::Agent#{agent_type.capitalize}").new(agent_options)
         set_agent_instance(new_agent)
         return nil
       end
@@ -135,8 +97,8 @@ END_OF_TEMPLATE
       # sets default if needed
       # param: 'send' or 'receive'
       def destination_folder(direction)
-        dest_folder=options.get_option(:to_folder,:optional)
-        return dest_folder unless dest_folder.nil?
+        dest_folder=@opt_mgr.get_option(:to_folder,:optional)
+        return File.expand_path(dest_folder) unless dest_folder.nil?
         dest_folder=@transfer_spec_cmdline['destination_root']
         return dest_folder unless dest_folder.nil?
         # default: / on remote, . on local
@@ -158,16 +120,16 @@ END_OF_TEMPLATE
         # start with lower priority : get paths from transfer spec on command line
         @transfer_paths=@transfer_spec_cmdline['paths'] if @transfer_spec_cmdline.has_key?('paths')
         # is there a source list option ?
-        file_list=options.get_option(:sources,:optional)
+        file_list=@opt_mgr.get_option(:sources,:optional)
         case file_list
         when nil,FILE_LIST_FROM_ARGS
           Log.log.debug("getting file list as parameters")
           # get remaining arguments
-          file_list=options.get_next_argument("source file list",:multiple)
+          file_list=@opt_mgr.get_next_argument("source file list",:multiple)
           raise CliBadArgument,"specify at least one file on command line or use --sources=#{FILE_LIST_FROM_TRANSFER_SPEC} to use transfer spec" if !file_list.is_a?(Array) or file_list.empty?
         when FILE_LIST_FROM_TRANSFER_SPEC
           Log.log.debug("assume list provided in transfer spec")
-          special_case_direct_with_list=options.get_option(:transfer,:mandatory).eql?(:direct) and Fasp::Parameters.ts_has_file_list(@transfer_spec_cmdline)
+          special_case_direct_with_list=@opt_mgr.get_option(:transfer,:mandatory).eql?(:direct) and Fasp::Parameters.ts_has_file_list(@transfer_spec_cmdline)
           raise CliBadArgument,"transfer spec on command line must have sources" if @transfer_paths.nil? and !special_case_direct_with_list
           # here we assume check of sources is made in transfer agent
           return @transfer_paths
@@ -181,7 +143,7 @@ END_OF_TEMPLATE
         if !@transfer_paths.nil?
           Log.log.warn("--sources overrides paths from --ts")
         end
-        case options.get_option(:src_type,:mandatory)
+        case @opt_mgr.get_option(:src_type,:mandatory)
         when :list
           # when providing a list, just specify source
           @transfer_paths=file_list.map{|i|{'source'=>i}}
@@ -237,13 +199,13 @@ END_OF_TEMPLATE
         @agent.start_transfer(transfer_spec,tr_opts)
         result=@agent.wait_for_transfers_completion
         @progress_listener.reset
-        Fasp::Manager.validate_status_list(result)
+        Fasp::AgentBase.validate_status_list(result)
         send_email_transfer_notification(transfer_spec,result)
         return result
       end
 
       def send_email_transfer_notification(transfer_spec,statuses)
-        return if options.get_option(:notif_to,:optional).nil?
+        return if @opt_mgr.get_option(:notif_to,:optional).nil?
         global_status=self.class.session_status(statuses)
         email_vars={
           global_transfer_status: global_status,
@@ -251,7 +213,7 @@ END_OF_TEMPLATE
           body: "Transfer is: #{global_status}",
           ts: transfer_spec
         }
-        @env[:config].send_email_template(email_vars,DEFAULT_TRANSFER_NOTIF_TMPL)
+        @config.send_email_template(email_vars,DEFAULT_TRANSFER_NOTIF_TMPL)
       end
 
       # @return :success if all sessions statuses returned by "start" are success

data/lib/aspera/cli/version.rb

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

data/lib/aspera/environment.rb

@@ -33,12 +33,12 @@ module Aspera
     def self.cpu
       case RbConfig::CONFIG['host_cpu']
       when /x86_64/,/x64/
-        return :x86_64
+        return CPU_X86_64
       when /powerpc/
-        return :ppc64le if os.eql?(OS_LINUX)
-        return :ppc64
+        return CPU_PPC64LE if os.eql?(OS_LINUX)
+        return CPU_PPC64
       when /s390/
-        return :s390
+        return CPU_S390
       else # other
         raise "Unknown CPU: #{RbConfig::CONFIG['host_cpu']}"
       end

data/lib/aspera/fasp/{manager.rb → agent_base.rb}

@@ -2,7 +2,7 @@ module Aspera
   module Fasp
     # Base class for FASP transfer agents
     # sub classes shall implement start_transfer and shutdown
-    class Manager
+    class AgentBase
 
       private
 
@@ -68,17 +68,18 @@ module Aspera
         self
       end
 
-      # the following methods must be implemented by subclass:
-      # start_transfer(transfer_spec,options) : start and wait for completion
-      # wait_for_transfers_completion : wait for termination of all transfers, @return list of : :success or error message
-      # optional: shutdown
-      
       # This checks the validity of the value returned by wait_for_transfers_completion
       # it must be a list of :success or exception
       def self.validate_status_list(statuses)
         raise "internal error: bad statuses type: #{statuses.class}" unless statuses.is_a?(Array)
         raise "internal error: bad statuses content: #{statuses}" unless statuses.select{|i|!i.eql?(:success) and !i.is_a?(StandardError)}.empty?
       end
+
+      # the following methods must be implemented by subclass:
+      # start_transfer(transfer_spec,options) : start and wait for completion
+      # wait_for_transfers_completion : wait for termination of all transfers, @return list of : :success or error message
+      # optional: shutdown
+
     end
   end
 end