aspera-cli 4.14.0 → 4.16.0

data/bin/ascli

@@ -1,29 +1,20 @@
-#!/usr/bin/env ruby -EUTF-8:UTF-8
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'securerandom'
-# compute gem root based on  this script location
-GEM_ROOT = File.realpath(File.join(File.dirname(File.realpath(__FILE__)), '..'))
-# coverage for tests
-if ENV.key?('ENABLE_COVERAGE')
-  require 'simplecov'
-  SimpleCov.root(GEM_ROOT)
-  SimpleCov.enable_for_subprocesses if SimpleCov.respond_to?(:enable_for_subprocesses)
-  # keep cache data for 1 day (must be longer that time to run the whole test suite)
-  SimpleCov.merge_timeout(86400)
-  SimpleCov.command_name(SecureRandom.uuid)
-  SimpleCov.at_exit do
-    original_file_descriptor = $stdout
-    $stdout.reopen(File.join(GEM_ROOT, 'simplecov.log'))
-    SimpleCov.result.format!
-    $stdout.reopen(original_file_descriptor)
+Encoding.default_internal = Encoding::UTF_8
+Encoding.default_external = Encoding::UTF_8
+
+begin
+  gem_lib_folder = File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib')
+  Kernel.load(File.join(gem_lib_folder, 'aspera/coverage.rb'))
+  begin
+    require 'aspera/cli/main'
+  rescue LoadError
+    # if in development, add path toward gem
+    $LOAD_PATH.unshift(gem_lib_folder)
+    require 'aspera/cli/main'
   end
-  SimpleCov.start
+  require 'aspera/environment'
+  Aspera::Environment.fix_home
+  Aspera::Cli::Main.new(ARGV).process_command_line
 end
-# if in development, add path to gem
-$LOAD_PATH.unshift(File.join(GEM_ROOT, 'lib'))
-require 'aspera/cli/main'
-require 'aspera/environment'
-Aspera::Environment.fix_home
-Aspera::Cli::Main.new(ARGV).process_command_line

data/bin/asession

@@ -2,16 +2,16 @@
 # frozen_string_literal: true
 
 # Laurent Martin/2017
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 require 'aspera/fasp/agent_direct'
-require 'aspera/cli/listener/line_dump'
 require 'aspera/cli/extended_value'
 require 'aspera/log'
 require 'json'
-# extended transfer spec parameter to change log level
-TS_LOGLEVEL = 'EX_loglevel'
+# extended transfer spec parameter (only used in asession)
+# Change log level
+TS_LOG_LEVEL = 'EX_loglevel'
 # by default go to /tmp/username.filelist
-TS_TMP_FILELIST_FOLDER = 'EX_file_list_folder'
+TS_TMP_FILE_LIST_FOLDER = 'EX_file_list_folder'
 
 SAMPLE_DEMO = '"remote_host":"demo.asperasoft.com","remote_user":"asperaweb","ssh_port":33001,"remote_password":"demoaspera"'
 SAMPLE_DEMO2 = '"direction":"receive","destination_root":"./test.dir"'
@@ -34,7 +34,7 @@ def assert_usage(assertion, error_message)
   $stderr.puts('       {"type":"START","source":"/aspera-test-dir-tiny/200KB.2"}')
   $stderr.puts('       {"type":"START","source":"xx","destination":"yy"}')
   $stderr.puts('       {"type":"DONE"}')
-  $stderr.puts(%Q(Note: debug information can be placed on STDERR, using the "#{TS_LOGLEVEL}" parameter in transfer spec (debug=0)))
+  $stderr.puts(%Q(Note: debug information can be placed on STDERR, using the "#{TS_LOG_LEVEL}" parameter in transfer spec (debug=0)))
   $stderr.puts('EXAMPLES')
   $stderr.puts(%Q(    asession @json:'{#{SAMPLE_DEMO},#{SAMPLE_DEMO2},"paths":[{"source":"/aspera-test-dir-tiny/200KB.1"}]}'))
   $stderr.puts(%q(    echo '{"remote_host":...}'|asession @json:@stdin))
@@ -60,27 +60,27 @@ end
 # ensure right type
 assert_usage(transfer_spec.is_a?(Hash), "the value must be a hash table#{parameter_source_err_msg}")
 # additional debug capability
-if transfer_spec.key?(TS_LOGLEVEL)
-  Aspera::Log.instance.level = transfer_spec[TS_LOGLEVEL]
-  transfer_spec.delete(TS_LOGLEVEL)
+if transfer_spec.key?(TS_LOG_LEVEL)
+  Aspera::Log.instance.level = transfer_spec[TS_LOG_LEVEL]
+  transfer_spec.delete(TS_LOG_LEVEL)
 end
 # possibly override temp folder
-if transfer_spec.key?(TS_TMP_FILELIST_FOLDER)
-  Aspera::Fasp::Parameters.file_list_folder = transfer_spec[TS_TMP_FILELIST_FOLDER]
-  transfer_spec.delete(TS_TMP_FILELIST_FOLDER)
+if transfer_spec.key?(TS_TMP_FILE_LIST_FOLDER)
+  Aspera::Fasp::Parameters.file_list_folder = transfer_spec[TS_TMP_FILE_LIST_FOLDER]
+  transfer_spec.delete(TS_TMP_FILE_LIST_FOLDER)
 end
 # get local agent (ascp), disable ascp output on stdout to not mix with JSON events
 client = Aspera::Fasp::AgentDirect.new({quiet: true})
-# display JSON instead of legacy Lines
-client.add_listener(Aspera::Cli::Listener::LineDump.new)
 # start transfer (asynchronous)
 job_id = client.start_transfer(transfer_spec)
 # async commands
 Thread.new do
+  # we assume here a single session
+  session_id = client.sessions_by_job(job_id).first
   begin # rubocop:disable Style/RedundantBegin
     loop do
       data = JSON.parse($stdin.gets)
-      client.send_command(job_id, 0, data)
+      client.send_command(session_id, data)
     end
   rescue
     Process.exit(1)

data/examples/dascli

@@ -7,7 +7,7 @@
 : "${imgtag=$image:$version}"
 # set env var `docker` to podman, to use podman
 : "${docker:=docker}"
-# set env var docker_args to add options to docker run (transform var into array) # spellcheck disable=SC2086
+# set env var `docker_args` to add options to docker run (then, transform this var into array) # spellcheck disable=SC2086
 read -a add_dock_args <<< $docker_args
 # set env var ASCLI_HOME to set the config folder on host
 : "${ASCLI_HOME:=$HOME/.aspera/ascli}"
@@ -24,7 +24,7 @@ exec $docker run \
 --interactive \
 --user root \
 --env ASCLI_HOME="$ascli_home_container" \
---volume "$ASCLI_HOME:$ascli_home_container" \
+--volume "$ASCLI_HOME:$ascli_home_container:z" \
 "${add_dock_args[@]}" \
 "$imgtag" \
 "$@"

data/examples/proxy.pac

@@ -1,4 +1,4 @@
-/* demo proxy pac for ascli */
+/* demo proxy pac for `ascli` */
 function FindProxyForURL(url, host) {
 	/* Normalize the URL for pattern matching */
 	url = url.toLowerCase();