aspera-cli 4.25.0.pre → 4.25.0

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

@@ -32,6 +32,7 @@ require 'aspera/assert'
 require 'aspera/oauth'
 require 'aspera/ssl'
 require 'openssl'
+require 'digest'
 require 'open3'
 require 'date'
 require 'erb'
@@ -80,7 +81,7 @@ module Aspera
           # We need to defer parsing of options until we have the config file, so we can use @extend with @preset
           super
           @use_plugin_defaults = true
-          @config_presets = nil
+          @config_presets = {}
           @config_checksum_on_disk = nil
           @vault_instance = nil
           @pac_exec = nil
@@ -493,8 +494,9 @@ module Aspera
           end
         end
 
+        # @return [Integer]
         def config_checksum
-          JSON.generate(@config_presets).hash
+          Digest::SHA1.hexdigest(JSON.generate(@config_presets))
         end
 
         # Read config file and validate format
@@ -535,6 +537,7 @@ module Aspera
               Log.log.warn{"#{file} -> #{@main_folder}"}
             end
           end
+          return
         rescue Psych::SyntaxError => e
           Log.log.error('YAML error in config file')
           raise e
@@ -584,6 +587,15 @@ module Aspera
               return Main.result_status("Opened: #{one_link['href']}")
             end
           end
+          Aspera.error_unreachable_line
+        end
+
+        def install_transfer_sdk
+          # Reset to default location, if older default was used
+          Products::Transferd.sdk_directory = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME) if @sdk_default_location
+          asked_version = options.get_next_argument('transferd version', mandatory: false)
+          name, version, folder = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: asked_version)
+          return Main.result_status("Installed #{name} version #{version} in #{folder}")
         end
 
         def execute_action_ascp
@@ -621,11 +633,7 @@ module Aspera
               return Main.result_nothing
             end
           when :install
-            # Reset to default location, if older default was used
-            Products::Transferd.sdk_directory = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME) if @sdk_default_location
-            version = options.get_next_argument('transferd version', mandatory: false)
-            n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: version)
-            return Main.result_status("Installed #{n} version #{v}")
+            return install_transfer_sdk
           when :spec
             fields, data = Transfer::SpecDoc.man_table(Formatter, include_option: true)
             return Main.result_object_list(data, fields: fields.map(&:to_s))
@@ -650,11 +658,7 @@ module Aspera
           command = options.get_next_command(%i[list install])
           case command
           when :install
-            # Reset to default location, if older default was used
-            Products::Transferd.sdk_directory = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME) if @sdk_default_location
-            version = options.get_next_argument('transferd version', mandatory: false)
-            n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: version)
-            return Main.result_status("Installed #{n} version #{v}")
+            return install_transfer_sdk
           when :list
             sdk_list = Ascp::Installation.instance.sdk_locations
             return Main.result_object_list(
@@ -1166,16 +1170,17 @@ module Aspera
         end
 
         # Lookup the corresponding secret for the given URL and usernames
-        # @raise Exception if mandatory and not found
-        def lookup_secret(url:, username:, mandatory: false)
+        # @param url      [String] Server URL
+        # @param username [String] Username
+        # @return [String, nil] Secret if found
+        def lookup_secret(url:, username:)
           secret = options.get_option(:secret)
-          if secret.nil?
+          if secret.eql?('PRESET')
             conf = lookup_preset(url: url, username: username)
             if conf.is_a?(Hash)
               Log.log.debug{"Found preset #{conf} with URL and username"}
               secret = conf['password']
             end
-            raise "Please provide secret for #{username} using option: secret or by setting a preset for #{username}@#{url}." if secret.nil? && mandatory
           end
           return secret
         end

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

@@ -13,6 +13,7 @@ module Aspera
         private_constant :STANDARD_PATH, :DEFAULT_FILTER_AGE_SECONDS, :EXPR_RE
 
         class << self
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
             urls = [address_or_url]
@@ -52,7 +53,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {

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

@@ -39,6 +39,7 @@ module Aspera
         private_constant :KEY_NODE, :KEY_PATH, :PACKAGE_MATCH_FIELD, :ATOM_MAILBOXES, :ATOM_PARAMS, :ATOM_EXT_PARAMS, :PUB_LINK_EXTERNAL_MATCH, :HEADER_FASPEX_VERSION
 
         class << self
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
             urls = [address_or_url]
@@ -108,7 +109,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {
@@ -149,7 +150,9 @@ module Aspera
                 grant_method: :generic,
                 base_url:     "#{faspex_api_base}/auth/oauth2",
                 auth:         {type: :basic, username: options.get_option(:username, mandatory: true), password: options.get_option(:password, mandatory: true)},
-                scope:        'admin',
+                params:       {
+                  scope: 'admin'
+                },
                 grant_type:   'password'
               }
             )
@@ -336,12 +339,12 @@ module Aspera
                   skip_ids_persistency = PersistencyActionOnce.new(
                     manager: persistency,
                     data:    skip_ids_data,
-                    id:      IdGenerator.from_list([
+                    id:      IdGenerator.from_list(
                       'faspex_recv',
                       options.get_option(:url, mandatory: true),
                       options.get_option(:username, mandatory: true),
                       options.get_option(:box, mandatory: true).to_s
-                    ])
+                    )
                   )
                 end
                 # get command line parameters

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

@@ -23,6 +23,7 @@ module Aspera
             'Faspex'
           end
 
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             # add scheme if missing
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
@@ -52,7 +53,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           client_id = options.get_option(:client_id)
@@ -78,12 +79,14 @@ module Aspera
           )
           return {
             preset_value: {
-              url:           app_url,
-              username:      wiz_username,
-              auth:          :jwt.to_s,
-              private_key:   "@file:#{private_key_path}",
-              client_id:     client_id,
-              client_secret: client_secret
+              url:         app_url,
+              username:    wiz_username,
+              auth:        :jwt.to_s,
+              private_key: "@file:#{private_key_path}",
+              params:      {
+                client_id:     client_id,
+                client_secret: client_secret
+              }
             },
             test_args:    'user profile show'
           }
@@ -197,12 +200,12 @@ module Aspera
             skip_ids_persistency = PersistencyActionOnce.new(
               manager: persistency,
               data:    [],
-              id:      IdGenerator.from_list([
+              id:      IdGenerator.from_list(
                 'faspex_recv',
                 options.get_option(:url, mandatory: true),
                 options.get_option(:username, mandatory: true),
                 options.get_option(:box, mandatory: true)
-              ])
+              )
             )
           end
           packages = []

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

@@ -13,6 +13,7 @@ module Aspera
             'faspio Gateway'
           end
 
+          # @return [Hash,NilClass]
           def detect(base_url)
             api = Rest.new(base_url: base_url)
             data, http = api.read('ping', ret: :both)
@@ -27,7 +28,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {
@@ -63,7 +64,9 @@ module Aspera
                   type:            :oauth2,
                   grant_method:    :jwt,
                   base_url:        "#{base_url}/auth",
-                  client_id:       app_client_id,
+                  params:          {
+                    client_id: app_client_id
+                  },
                   use_query:       true,
                   payload:         {
                     iss: app_client_id, # issuer

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

@@ -14,6 +14,7 @@ module Aspera
             'HTTP Gateway'
           end
 
+          # @return [Hash,NilClass]
           def detect(base_url)
             api = Api::Httpgw.new(url: base_url)
             api_info = api.info
@@ -26,7 +27,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {

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

@@ -54,6 +54,7 @@ module Aspera
             'HSTS Node API'
           end
 
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             urls = if address_or_url.match?(%r{^[a-z]{1,6}://})
               [address_or_url]
@@ -414,10 +415,12 @@ module Aspera
               root_file_id = options.get_option(:root_id)
               if root_file_id.nil?
                 ak_info = @api_node.read("access_keys/#{access_key_id}")
+                ak_secret = config.lookup_secret(url: @api_node.base_url, username: ak_info['id'])
                 # change API credentials if different access key
                 if !access_key_id.eql?('self')
+                  Aspera.assert(ak_secret, type: Cli::MissingArgument){"Please provide secret for #{ak_info['id']} using option: secret or by setting a preset for #{ak_info['id']}@#{@api_node.base_url}."}
                   @api_node.auth_params[:username] = ak_info['id']
-                  @api_node.auth_params[:password] = config.lookup_secret(url: @api_node.base_url, username: ak_info['id'], mandatory: true)
+                  @api_node.auth_params[:password] = ak_secret
                 end
                 root_file_id = ak_info['root_file_id']
               end
@@ -516,7 +519,8 @@ module Aspera
             else Aspera.error_unreachable_line
             end
             return Main.result_single_object(result) if command_repo.eql?(:node_info)
-            raise BadArgument, 'Cannot get bearer token if authenticating with secret' unless apifid[:api].auth_params[:type].eql?(:oauth2)
+            Log.dump(:result, result)
+            raise BadArgument, "Cannot get bearer token if authenticating with secret (#{apifid[:api].auth_params[:type]})" unless apifid[:api].auth_params[:type].eql?(:oauth2)
             Aspera.assert(OAuth::Factory.bearer_auth?(result[:password])){'Not using bearer token auth'}
             return Main.result_text(result[:password])
           when :browse
@@ -727,12 +731,12 @@ module Aspera
               skip_ids_persistency = PersistencyActionOnce.new(
                 manager: persistency,
                 data:    iteration_data,
-                id:      IdGenerator.from_list([
+                id:      IdGenerator.from_list(
                   'sync_files',
                   options.get_option(:url, mandatory: true),
                   options.get_option(:username, mandatory: true),
                   async_id
-                ])
+                )
               )
               data.select!{ |l| l['fnid'].to_i > iteration_data.first} unless iteration_data.first.nil?
               iteration_data[0] = data.last['fnid'].to_i unless data.empty?
@@ -872,11 +876,11 @@ module Aspera
                 iteration_persistency = PersistencyActionOnce.new(
                   manager: persistency,
                   data:    [],
-                  id:      IdGenerator.from_list([
+                  id:      IdGenerator.from_list(
                     'node_transfers',
                     options.get_option(:url, mandatory: true),
                     options.get_option(:username, mandatory: true)
-                  ])
+                  )
                 )
                 if transfer_filter.delete('reset')
                   iteration_persistency.data.clear

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

@@ -10,7 +10,7 @@ module Aspera
         # OAuth methods supported
         AUTH_TYPES = %i[web jwt boot].freeze
         # Options used for authentication
-        AUTH_OPTIONS = %i[url auth client_id client_secret scope redirect_uri private_key passphrase username password].freeze
+        AUTH_OPTIONS = %i[url auth client_id client_secret redirect_uri private_key passphrase username password].freeze
         def initialize(**_)
           super
           options.declare(:auth, 'OAuth type of authentication', allowed: AUTH_TYPES, default: :jwt)
@@ -19,22 +19,23 @@ module Aspera
           options.declare(:redirect_uri, 'OAuth (Web) redirect URI for web authentication')
           options.declare(:private_key, 'OAuth (JWT) RSA private key PEM value (prefix file path with @file:)')
           options.declare(:passphrase, 'OAuth (JWT) RSA private key passphrase')
-          options.declare(:scope, 'OAuth scope for API calls')
         end
 
-        # Get all options specified by AUTH_OPTIONS and add.keys
-        # Adds those not nil to the `base`.
+        # Get command line options specified by `AUTH_OPTIONS` and `option.keys` (value is default).
+        # Adds those not nil to the `kwargs`.
         # Instantiate the provided `klass` with those kwargs.
-        # `add` can specify a default value (not `nil`)
-        # @param klass [Class] API object to create
-        # @param base  [Hash] The base options for creation
-        # @param add   [Hash] Additional options, key=symbol, value:default value or nil
-        def new_with_options(klass, base: {}, add: {})
+        # `option` can specify a default value (not `nil`)
+        # @param klass   [Class] API object to create
+        # @param kwargs  [Hash] The fixed keyword arguments for creation
+        # @param option [Hash] Additional options, key=symbol, value:default value or nil
+        # @return [Object] instance of `klass`
+        # @raise [Cli::Error] if a required option is missing
+        def new_with_options(klass, kwargs: {}, option: {})
           klass.new(**
-            (AUTH_OPTIONS + add.keys).each_with_object(base) do |i, m|
+            (AUTH_OPTIONS + option.keys).each_with_object(kwargs) do |i, m|
               v = options.get_option(i)
               m[i] = v unless v.nil?
-              m[i] = add[i] unless !m[i].nil? || add[i].nil?
+              m[i] = option[i] unless !m[i].nil? || option[i].nil?
             end)
         rescue ::ArgumentError => e
           if (m = e.message.match(/missing keyword: :(.*)$/))

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

@@ -16,6 +16,7 @@ module Aspera
         TEST_ENDPOINT = 'api/remote_node_ping'
         private_constant :STANDARD_PATH, :TEST_ENDPOINT
         class << self
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
             urls = [address_or_url]
@@ -41,7 +42,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {

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

@@ -451,12 +451,12 @@ module Aspera
               iteration_persistency = PersistencyActionOnce.new(
                 manager: persistency,
                 data:    [],
-                id:      IdGenerator.from_list([
+                id:      IdGenerator.from_list(
                   'preview_iteration',
                   command.to_s,
                   options.get_option(:url, mandatory: true),
                   options.get_option(:username, mandatory: true)
-                ])
+                )
               )
             end
             # call processing method specified by command line command

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

@@ -32,7 +32,7 @@ module Aspera
 
         class LocalExecutor
           def execute(ascmd_path, input:)
-            return Environment.secure_capture(exec: ascmd_path, stdin_data: input, binmode: true, exception: false)
+            return Environment.secure_execute(ascmd_path, mode: :capture, stdin_data: input, binmode: true, exception: false)
           end
         end
 
@@ -41,6 +41,7 @@ module Aspera
             'HSTS Fasp/SSH'
           end
 
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             urls = if address_or_url.match?(%r{^[a-z]{1,6}://})
               [address_or_url]
@@ -70,7 +71,7 @@ module Aspera
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {

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

@@ -13,27 +13,62 @@ module Aspera
         # path for node admin after base url
         ADMIN_API_PATH = 'api/v1'
         class << self
+          # Check various endpoints on Shares
+          # @return [Hash] with version, ping, api
+          def health_check(url)
+            result = {}
+            result[:version] =
+              begin
+                version = nil
+                login_page = Rest
+                  .new(base_url: url, redirect_max: 2)
+                  .read('', headers: {'Accept'=>'text/html'})
+                if (m = login_page.match(/\(v([0-9a-f\.]+)\)/))
+                  version = m[1]
+                  if (m = login_page.match(/Patch level ([0-9]+)/))
+                    version = "#{result[:version]} #{m[0]}"
+                  end
+                end
+                raise 'no version' if version.nil?
+                version
+              rescue => e
+                e
+              end
+            result[:ping] =
+              begin
+                Rest
+                  .new(base_url: "#{url}/#{NODE_API_PATH}")
+                  .read('ping', headers: {'Content-Type'=>'application/json'})
+                'ping ok'
+              rescue => e
+                e
+              end
+            result[:api] =
+              begin
+                resp = Rest.new(base_url: url, redirect_max: 1).read("#{NODE_API_PATH}/app", exception: false, ret: :resp)
+                # shall fail: shares requires auth, but we check error message
+                raise 'not found' unless resp.code.to_s.eql?('401') && resp.body.eql?('{"error":{"user_message":"API user authentication failed"}}')
+                'available'
+              rescue => e
+                e
+              end
+            result
+          end
+
+          # @return [Hash,NilClass]
           def detect(address_or_url)
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
-            api = Rest.new(base_url: address_or_url, redirect_max: 1)
-            # TODO: use ping instead ?
-            resp = api.read("#{NODE_API_PATH}/app", exception: false, ret: :resp)
-            # shall fail: shares requires auth, but we check error message
-            return unless resp.code.to_s.eql?('401') && resp.body.eql?('{"error":{"user_message":"API user authentication failed"}}')
-            version = 'unknown'
-            http = api.read('login', headers: {'Accept'=>'*/*'}, ret: :resp)
-            if (m = http.body.match(/\(v(1\..*)\)/))
-              version = m[1]
-            end
+            health = health_check(address_or_url)
+            return unless health[:api].is_a?(String)
             return {
-              version: version,
+              version: health[:version].is_a?(String) ? health[:version] : 'unknown',
               url:     address_or_url
             }
           end
         end
 
         # @param wizard  [Wizard] The wizard object
-        # @param app_url [Wizard] The wizard object
+        # @param app_url [String] Tested URL
         # @return [Hash] :preset_value, :test_args
         def wizard(wizard, app_url)
           return {
@@ -62,14 +97,18 @@ module Aspera
           case command
           when :health
             nagios = Nagios.new
-            begin
-              http = Rest
-                .new(base_url: "#{options.get_option(:url, mandatory: true)}/#{NODE_API_PATH}")
-                .read('ping', ret: :resp)
-              raise Error, 'Shares not detected' unless http.body.eql?(' ')
-              nagios.add_ok('shares api', 'accessible')
-            rescue StandardError => e
-              nagios.add_critical('API', e.to_s)
+            shares_url = options.get_option(:url, mandatory: true)
+            health = self.class.health_check(shares_url)
+            nagios.add_ok('version', health[:version]) if health[:version].is_a?(String)
+            if health[:ping].is_a?(String)
+              nagios.add_ok('ping', health[:ping])
+            else
+              nagios.add_critical('ping', health[:ping].to_s)
+            end
+            if health[:api].is_a?(String)
+              nagios.add_ok('API', health[:api])
+            else
+              nagios.add_critical('API', health[:api].to_s)
             end
             Main.result_object_list(nagios.status_list)
           when :files

data/lib/aspera/cli/transfer_agent.rb

@@ -31,7 +31,6 @@ module Aspera
         :FILE_LIST_FROM_TRANSFER_SPEC,
         :FILE_LIST_OPTIONS,
         :DEFAULT_TRANSFER_NOTIFY_TEMPLATE
-      TRANSFER_AGENTS = Agent::Factory.instance.list.freeze
 
       class << self
         # @return :success if all sessions statuses returned by "start" are success
@@ -65,7 +64,7 @@ module Aspera
         @opt_mgr.declare(:to_folder, 'Destination folder for transferred files')
         @opt_mgr.declare(:sources, "How list of transferred files is provided (#{FILE_LIST_OPTIONS.join(',')})", default: FILE_LIST_FROM_ARGS)
         @opt_mgr.declare(:src_type, 'Type of file list', allowed: %i[list pair], default: :list)
-        @opt_mgr.declare(:transfer, 'Type of transfer agent', allowed: TRANSFER_AGENTS, default: :direct)
+        @opt_mgr.declare(:transfer, 'Type of transfer agent', allowed: Agent::Factory::ALL.keys, default: :direct)
         @opt_mgr.declare(:transfer_info, 'Parameters for transfer agent', allowed: Hash, handler: {o: self, m: :transfer_info})
         @opt_mgr.parse_options!
         @notification_cb = nil

data/lib/aspera/cli/version.rb

@@ -4,6 +4,6 @@ module Aspera
   module Cli
     # For beta add extension : .beta1
     # For dev version add extension : .pre
-    VERSION = '4.25.0.pre'
+    VERSION = '4.25.0'
   end
 end

data/lib/aspera/command_line_builder.rb

@@ -22,11 +22,11 @@ module Aspera
       'x-cli-envvar',   # [String]       Name of env var
       'x-cli-option',   # [String]       Command line option (starts with "-")
       'x-cli-short',    # [String]       Command line option (starts with "-")
-      'x-cli-switch',   # [Bool]         `true` if option has no arg, else by default option has a value
-      'x-cli-special',  # [Bool]         `true` if special handling (deferred)
+      'x-cli-switch',   # [Boolean]      `true` if option has no arg, else by default option has a value
+      'x-cli-special',  # [Boolean]      `true` if special handling (deferred)
       'x-cli-convert',  # [String,Hash]  Method name for Convert object or Conversion for enum ts to arg
       'x-agents',       # [Array]        Supported agents (for doc only), if not specified: all
-      'x-ts-name',      # [Bool,String]  (async) true if same name in transfer spec, else real name in transfer spec, else ignored
+      'x-ts-name',      # [Boolean,String] (async) true if same name in transfer spec, else real name in transfer spec, else ignored
       'x-ts-convert',   # [String]       (async) Name of methods to convert value from transfer spec to `conf` API.
       'x-deprecation'   # [String]       Deprecation message for doc
     ].freeze
@@ -50,8 +50,8 @@ module Aspera
       private
 
       # Fill default values for some fields in the schema
-      # @param schema [Hash] The JSON schema
-      # @param ascp [Bool] `true` if ascp
+      # @param schema [Hash]    The JSON schema
+      # @param ascp   [Boolean] `true` if ascp
       def validate_schema(schema, ascp: false)
         direct_props = %w[x-cli-option x-cli-envvar x-cli-special].freeze
         schema['properties'].each do |name, info|

data/lib/aspera/coverage.rb

@@ -6,14 +6,18 @@ if ENV.key?('ENABLE_COVERAGE')
   require 'securerandom'
   # compute development top folder based on this source location
   development_root = File.dirname(File.realpath(__FILE__), 3)
+  coverage_dir = 'tmp/coverage'
+  coverage_root = File.join(development_root, coverage_dir)
+  FileUtils.mkdir_p(coverage_root)
   SimpleCov.root(development_root)
+  SimpleCov.coverage_dir(coverage_dir)
   SimpleCov.enable_for_subprocesses if SimpleCov.respond_to?(:enable_for_subprocesses)
   # keep cache data for 1 day (must be longer than 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(development_root, 'simplecov.log'))
+    $stdout.reopen(File.open(File.join(coverage_root, 'simplecov.log'), 'a'))
     SimpleCov.result.format!
     $stdout.reopen(original_file_descriptor)
   end