aspera-cli 4.0.0.pre1 → 4.0.0.pre2

data/lib/aspera/fasp/local.rb

@@ -43,9 +43,8 @@ module Aspera
         if transfer_spec.has_key?('token') and
         !transfer_spec.has_key?('remote_password') and
         !transfer_spec.has_key?('EX_ssh_key_paths')
-          keys=Installation.instance.bypass_keys
-          transfer_spec['remote_password'] = keys.shift
-          transfer_spec['EX_ssh_key_paths'] = keys
+          # transfer_spec['remote_password'] = Installation.instance.bypass_pass # not used
+          transfer_spec['EX_ssh_key_paths'] = Installation.instance.bypass_keys
         end
 
         # compute known args

data/lib/aspera/faspex_gw.rb

@@ -1,5 +1,5 @@
 require 'aspera/log'
-require 'aspera/on_cloud'
+require 'aspera/aoc'
 require 'aspera/cli/main'
 require 'webrick'
 require 'webrick/https'
@@ -55,7 +55,7 @@ module Aspera
         node_info=@aoc_api_user.read("nodes/#{the_package['node_id']}")[:data]
 
         #  get transfer token (for node)
-        node_auth_bearer_token=@aoc_api_user.oauth_token(scope: OnCloud.node_scope(node_info['access_key'],OnCloud::SCOPE_NODE_USER))
+        node_auth_bearer_token=@aoc_api_user.oauth_token(scope: AoC.node_scope(node_info['access_key'],AoC::SCOPE_NODE_USER))
 
         # tell Files what to expect in package: 1 transfer (can also be done after transfer)
         @aoc_api_user.update("packages/#{the_package['id']}",{"sent"=>true,"transfers_expected"=>1})

data/lib/aspera/open_application.rb

@@ -1,4 +1,5 @@
 require 'aspera/log'
+require 'aspera/environment'
 require 'rbconfig'
 require 'singleton'
 
@@ -12,37 +13,23 @@ module Aspera
     def self.user_interfaces; [ :text, :graphical ]; end
 
     def self.default_gui_mode
-      case current_os_type
-      when :windows,:mac
-        return :graphical
-      else # unix family
-        if ENV.has_key?("DISPLAY") and !ENV["DISPLAY"].empty?
-          return :graphical
-        end
-        return :text
-      end
-    end
-
-    def self.current_os_type
-      case RbConfig::CONFIG['host_os']
-      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        return :windows
-      when /darwin|mac os/
-        return :mac
-      else # unix family
-        return :unix
-      end
+      return :graphical if [Aspera::Environment::OS_WINDOWS,Aspera::Environment::OS_X].include?(Aspera::Environment.os)
+      # unix family
+      return :graphical if ENV.has_key?("DISPLAY") and !ENV["DISPLAY"].empty?
+      return :text
     end
 
     # command must be non blocking
     def self.uri_graphical(uri)
-      case current_os_type
-      when :mac
+      case Aspera::Environment.os
+      when Aspera::Environment::OS_X
         return system('open',uri.to_s)
-      when :windows
+      when Aspera::Environment::OS_WINDOWS
         return system('start explorer "'+uri.to_s+'"')
-      else  # unix family
+      when Aspera::Environment::OS_LINUX
         return system("xdg-open '#{uri.to_s}'")
+      else
+        raise "no graphical open method for #{Aspera::Environment.os}"
       end
     end
 

data/lib/aspera/preview/generator.rb

@@ -194,7 +194,7 @@ module Aspera
         ],
         out_f: @destination_file_path,
         out_p: [
-          '-vf',"fps=5,scale=120:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse",
+          '-vf','fps=5,scale=120:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse',
           '-loop',0,
           '-f','gif'
         ])
@@ -203,7 +203,6 @@ module Aspera
       def convert_office_to_png()
         tmp_pdf_file=File.join(this_tmpdir,File.basename(@source_file_path,File.extname(@source_file_path))+'.pdf')
         Utils.external_command(:unoconv,[
-
           '-f','pdf',
           '-o',tmp_pdf_file,
           @source_file_path])
@@ -213,7 +212,6 @@ module Aspera
       def convert_pdf_to_png(source_file_path=nil)
         source_file_path||=@source_file_path
         Utils.external_command(:convert,[
-
           '-size',"x#{@options.thumb_img_size}",
           '-background','white',
           '-flatten',
@@ -223,7 +221,6 @@ module Aspera
 
       def convert_image_to_png()
         Utils.external_command(:convert,[
-
           '-auto-orient',
           '-thumbnail',"#{@options.thumb_img_size}x#{@options.thumb_img_size}>",
           '-quality',95,
@@ -239,7 +236,6 @@ module Aspera
         # get 100 first lines of text file
         first_lines=File.open(@source_file_path){|f|100.times.map{f.readline rescue ''}}.join
         Utils.external_command(:convert,[
-
           '-size',"#{@options.thumb_img_size}x#{@options.thumb_img_size}",
           'xc:white',
           '-font','Courier',

data/lib/aspera/rest.rb

@@ -7,6 +7,7 @@ require 'net/http'
 require 'net/https'
 require 'json'
 require 'base64'
+require 'ruby-progressbar'
 
 # add cancel method to http
 class Net::HTTP::Cancel < Net::HTTPRequest
@@ -27,6 +28,54 @@ module Aspera
   # and error are analyzed in RestErrorAnalyzer
   class Rest
     private
+    # set to true enables debug in HTTP class
+    @@debug=false
+    # true if https ignore certificate
+    @@insecure=false
+    @@user_agent='Ruby'
+
+    public
+    def self.insecure=(v); @@insecure=v;Log.log.debug("insecure => #{@@insecure}".red);end
+
+    def self.insecure; @@insecure;end
+
+    def self.user_agent=(v); @@user_agent=v;Log.log.debug("user_agent => #{@@user_agent}".red);end
+
+    def self.user_agent; @@user_agent;end
+
+    def self.debug=(flag); @@debug=flag; Log.log.debug("debug http => #{flag}"); end
+
+    def self.basic_creds(user,pass); return "Basic #{Base64.strict_encode64("#{user}:#{pass}")}";end
+
+    # build URI from URL and parameters and check it is http or https
+    def self.build_uri(url,params=nil)
+      uri=URI.parse(url)
+      raise "REST endpoint shall be http(s)" unless ['http','https'].include?(uri.scheme)
+      if !params.nil?
+        # support array url params, there is no standard. Either p[]=1&p[]=2, or p=1&p=2
+        if params.is_a?(Hash)
+          orig=params
+          params=[]
+          orig.each do |k,v|
+            case v
+            when Array
+              suffix=v.first.eql?('[]') ? v.shift : ''
+              v.each do |e|
+                params.push([k+suffix,e])
+              end
+            else
+              params.push([k,v])
+            end
+          end
+        end
+        # CGI.unescape to transform back %5D into []
+        uri.query=CGI.unescape(URI.encode_www_form(params))
+      end
+      return uri
+    end
+
+    private
+
     # create and start keep alive connection on demand
     def http_session
       if @http_session.nil?
@@ -46,26 +95,8 @@ module Aspera
       return @http_session
     end
 
-    # set to true enables debug in HTTP class
-    @@debug=false
-    # true if https ignore certificate
-    @@insecure=false
-    @@user_agent='Ruby'
-
     public
 
-    def self.insecure=(v); @@insecure=v;Log.log.debug("insecure => #{@@insecure}".red);end
-
-    def self.insecure; @@insecure;end
-
-    def self.user_agent=(v); @@user_agent=v;Log.log.debug("user_agent => #{@@user_agent}".red);end
-
-    def self.user_agent; @@user_agent;end
-
-    def self.debug=(flag); @@debug=flag; Log.log.debug("debug http => #{flag}"); end
-
-    def self.basic_creds(user,pass); return "Basic #{Base64.strict_encode64("#{user}:#{pass}")}";end
-
     attr_reader :params
 
     # @param a_rest_params default call parameters and authentication (:auth) :
@@ -105,33 +136,6 @@ module Aspera
       return @oauth.get_authorization(options)
     end
 
-    # build URI from URL and parameters and check it is http or https
-    def self.build_uri(url,params=nil)
-      uri=URI.parse(url)
-      raise "REST endpoint shall be http(s)" unless ['http','https'].include?(uri.scheme)
-      if !params.nil?
-        # support array url params, there is no standard. Either p[]=1&p[]=2, or p=1&p=2
-        if params.is_a?(Hash)
-          orig=params
-          params=[]
-          orig.each do |k,v|
-            case v
-            when Array
-              suffix=v.first.eql?('[]') ? v.shift : ''
-              v.each do |e|
-                params.push([k+suffix,e])
-              end
-            else
-              params.push([k,v])
-            end
-          end
-        end
-        # CGI.unescape to transform back %5D into []
-        uri.query=CGI.unescape(URI.encode_www_form(params))
-      end
-      return uri
-    end
-
     # HTTP/S REST call
     # call_data has keys:
     # :auth
@@ -167,7 +171,7 @@ module Aspera
       end
       # TODO: shall we percent encode subpath (spaces) test with access key delete with space in id
       # URI.escape()
-      uri=self.class.build_uri("#{@params[:base_url]}/#{call_data[:subpath]}",call_data[:url_params])
+      uri=self.class.build_uri("#{@params[:base_url]}#{call_data[:subpath].nil? ? '' : '/'}#{call_data[:subpath]}",call_data[:url_params])
       Log.log.debug("URI=#{uri}")
       begin
         # instanciate request object based on string name
@@ -209,7 +213,6 @@ module Aspera
         http_session.request(req) do |response|
           result[:http] = response
           if call_data.has_key?(:save_to_file)
-            require 'ruby-progressbar'
             total_size=result[:http]['Content-Length'].to_i
             progress=ProgressBar.create(
             :format     => '%a %B %p%% %r KB/sec %e',
@@ -218,11 +221,14 @@ module Aspera
             :total      => total_size)
             Log.log.debug("before write file")
             target_file=call_data[:save_to_file]
+            # override user's path to path in header
             if !response['Content-Disposition'].nil? and m=response['Content-Disposition'].match(/filename="([^"]+)"/)
               target_file=m[1]
             end
+            # download with temp filename
+            target_file_tmp=target_file+'.http.partial'
             Log.log.debug("saving to: #{target_file}")
-            File.open(target_file, "wb") do |file|
+            File.open(target_file_tmp, "wb") do |file|
               result[:http].read_body do |fragment|
                 file.write(fragment)
                 new_process=progress.progress+fragment.length
@@ -230,6 +236,8 @@ module Aspera
                 progress.progress=new_process
               end
             end
+            # rename at the end
+            File.rename(target_file_tmp, target_file)
             progress=nil
           end
         end

data/lib/aspera/rest_error_analyzer.rb

@@ -6,10 +6,12 @@ module Aspera
   # analyze error codes returned by REST calls and raise ruby exception
   class RestErrorAnalyzer
     include Singleton
+    attr_accessor :log_file
     # the singleton object is registered with application specific handlers
     def initialize
       # list of handlers
       @error_handlers=[]
+      @log_file=nil
       self.add_handler('Type Generic') do |type,context|
         if !context[:response].code.start_with?('2')
           # add generic information
@@ -85,14 +87,13 @@ module Aspera
     # @param msg one error message  to add to list
     def self.add_error(context,type,msg)
       context[:messages].push(msg)
+      logfile=instance.log_file
       # log error for further analysis (file must exist to activate)
-      exc_log_file=File.join(Fasp::Installation.instance.config_folder,'exceptions.log')
-      if File.exist?(exc_log_file)
-        File.open(exc_log_file,'a+') do |f|
+      if !logfile.nil? and File.exist?(logfile)
+        File.open(logfile,'a+') do |f|
           f.write("\n=#{type}=====\n#{context[:request].method} #{context[:request].path}\n#{context[:response].code}\n#{JSON.generate(context[:data])}\n#{context[:messages].join("\n")}")
         end
       end
     end
-
   end
 end

data/lib/aspera/temp_file_manager.rb

@@ -22,7 +22,7 @@ module Aspera
     # ensure that provided folder exists, or create it, generate a unique filename
     # @return path to that unique file
     def new_file_path_in_folder(temp_folder,add_base='')
-      FileUtils::mkdir_p(temp_folder) unless Dir.exist?(temp_folder)
+      FileUtils.mkdir_p(temp_folder) unless Dir.exist?(temp_folder)
       new_file=File.join(temp_folder,add_base+SecureRandom.uuid)
       @created_files.push(new_file)
       return new_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspera-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre1
+  version: 4.0.0.pre2
 platform: ruby
 authors:
 - Laurent Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -28,16 +28,16 @@ dependencies:
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -122,49 +122,63 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: A powerful CLI for IBM Aspera products
+description: Command line interface for IBM Aspera products
 email:
 - laurent.martin.aspera@fr.ibm.com
 executables:
@@ -180,12 +194,12 @@ files:
 - docs/README.erb.md
 - docs/README.md
 - docs/diagrams.txt
-- docs/secrets.make
 - docs/test_env.conf
 - docs/transfer_spec.html
 - examples/aoc.rb
 - examples/proxy.pac
 - examples/transfer.rb
+- lib/aspera/aoc.rb
 - lib/aspera/api_detector.rb
 - lib/aspera/ascmd.rb
 - lib/aspera/ats_api.rb
@@ -200,6 +214,7 @@ files:
 - lib/aspera/cli/manager.rb
 - lib/aspera/cli/plugin.rb
 - lib/aspera/cli/plugins/alee.rb
+- lib/aspera/cli/plugins/aoc.rb
 - lib/aspera/cli/plugins/ats.rb
 - lib/aspera/cli/plugins/bss.rb
 - lib/aspera/cli/plugins/config.rb
@@ -208,18 +223,26 @@ files:
 - lib/aspera/cli/plugins/faspex.rb
 - lib/aspera/cli/plugins/faspex5.rb
 - lib/aspera/cli/plugins/node.rb
-- lib/aspera/cli/plugins/oncloud.rb
 - lib/aspera/cli/plugins/orchestrator.rb
 - lib/aspera/cli/plugins/preview.rb
 - lib/aspera/cli/plugins/server.rb
 - lib/aspera/cli/plugins/shares.rb
 - lib/aspera/cli/plugins/shares2.rb
 - lib/aspera/cli/plugins/sync.rb
-- lib/aspera/cli/plugins/xnode.rb
 - lib/aspera/cli/transfer_agent.rb
 - lib/aspera/cli/version.rb
 - lib/aspera/colors.rb
 - lib/aspera/command_line_builder.rb
+- lib/aspera/cos_node.rb
+- lib/aspera/data/1
+- lib/aspera/data/2
+- lib/aspera/data/3
+- lib/aspera/data/4
+- lib/aspera/data/5
+- lib/aspera/data/6
+- lib/aspera/data/7
+- lib/aspera/data_repository.rb
+- lib/aspera/environment.rb
 - lib/aspera/fasp/aoc.rb
 - lib/aspera/fasp/connect.rb
 - lib/aspera/fasp/error.rb
@@ -239,7 +262,6 @@ files:
 - lib/aspera/nagios.rb
 - lib/aspera/node.rb
 - lib/aspera/oauth.rb
-- lib/aspera/on_cloud.rb
 - lib/aspera/open_application.rb
 - lib/aspera/persistency_action_once.rb
 - lib/aspera/persistency_folder.rb
@@ -264,6 +286,10 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/IBM/aspera-cli
+  source_code_uri: https://github.com/IBM/aspera-cli
+  changelog_uri: https://github.com/IBM/aspera-cli
+  rubygems_uri: https://rubygems.org/gems/aspera-cli
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -272,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -283,6 +309,6 @@ requirements:
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: 'Command line tool for Aspera Server products: Aspera on Cloud, Faspex, Shares,
-  Node, Console, Orchestrator, Transfer Server'
+summary: 'Execute actions using command line on IBM Aspera Server products: Aspera
+  on Cloud, Faspex, Shares, Node, Console, Orchestrator, Transfer Server'
 test_files: []