aspera-cli 4.13.0 → 4.15.0

data/bin/ascli

@@ -1,29 +1,38 @@
-#!/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__)), '..'))
+Encoding.default_internal = Encoding::UTF_8
+Encoding.default_external = Encoding::UTF_8
 # coverage for tests
 if ENV.key?('ENABLE_COVERAGE')
   require 'simplecov'
-  SimpleCov.root(GEM_ROOT)
+  require 'securerandom'
+  # compute gem source root based on this script location, assuming it is in bin/
+  # use dirname instead of gsub, in case folder separator is not /
+  development_root = File.dirname(File.dirname(File.realpath(__FILE__)))
+  SimpleCov.root(development_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'))
+    $stdout.reopen(File.join(development_root, 'simplecov.log'))
     SimpleCov.result.format!
     $stdout.reopen(original_file_descriptor)
   end
   SimpleCov.start
 end
 # if in development, add path to gem
-$LOAD_PATH.unshift(File.join(GEM_ROOT, 'lib'))
-require 'aspera/cli/main'
+#
+begin
+  require 'aspera/cli/main'
+rescue LoadError
+  # development environment
+  development_root = File.dirname(File.dirname(File.realpath(__FILE__)))
+  $LOAD_PATH.unshift(File.join(development_root, 'lib'))
+  require 'aspera/cli/main'
+end
 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,19 +60,17 @@ 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

data/examples/dascli

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # set env var image to specify another docker image
-: "${image:=martinlaurent/ascli}"
+: "${image:=docker.io/martinlaurent/ascli}"
 # set env var version to specify another image version (default: latest version)
 : "${version:=latest}"
 # set env var imgtag to specify a specific image/version

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();

data/examples/rubyc

@@ -0,0 +1,24 @@
+#!/bin/bash
+# https://github.com/you54f/ruby-packer
+# https://github.com/YOU54F/ruby-packer/releases
+set -e
+FOLDER="$(dirname $0)/../tmp"
+RUBYC="$FOLDER/rubyc"
+if test ! -e "$RUBYC"; then
+    mkdir -p "$FOLDER"
+    case $(uname -sm|tr ' ' -) in
+        Darwin-arm64)
+            curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Darwin-arm64.tar.gz | tar -xz -C "$FOLDER"
+            mv "$FOLDER/rubyc-Darwin-arm64" "$RUBYC"
+            ;;
+        Linux-x86_64)
+            curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Linux-x86_64.tar.gz | tar -xz -C "$FOLDER"
+            mv "$FOLDER/rubyc-Linux-x86_64" "$RUBYC"
+            ;;
+        *)
+            echo "This architecture is not supported." >&2
+            exit 1
+            ;;
+    esac
+fi
+exec "$RUBYC" "$@"