aspera-cli 4.23.0 → 4.24.1

data/lib/aspera/oauth/url_json.rb

@@ -19,10 +19,10 @@ module Aspera
       end
 
       def create_token
-        @api.call(
+        api.call(
           operation:    'POST',
-          subpath:      @path_token,
-          query:        @query.merge(scope: @scope), # scope is here because it may change over time (node)
+          subpath:      path_token,
+          query:        @query.merge(scope: scope), # scope is here because it may change over time (node)
           content_type: Rest::MIME_JSON,
           body:         @body,
           headers:      {'Accept' => Rest::MIME_JSON}

data/lib/aspera/oauth/web.rb

@@ -31,8 +31,9 @@ module Aspera
         # generate secure state to check later
         random_state = SecureRandom.uuid
         login_page_url = Rest.build_uri(
-          "#{@api.base_url}/#{@path_authorize}",
-          optional_scope_client_id.merge(response_type: 'code', redirect_uri: @redirect_uri, state: random_state))
+          "#{api.base_url}/#{@path_authorize}",
+          optional_scope_client_id.merge(response_type: 'code', redirect_uri: @redirect_uri, state: random_state)
+        )
         # here, we need a human to authorize on a web page
         Log.log.info{"login_page_url=#{login_page_url}".bg_red.gray}
         # start a web server to receive request code
@@ -46,7 +47,8 @@ module Aspera
         return create_token_call(optional_scope_client_id(add_secret: true).merge(
           grant_type:   'authorization_code',
           code:         received_params['code'],
-          redirect_uri: @redirect_uri))
+          redirect_uri: @redirect_uri
+        ))
       end
     end
     Factory.instance.register_token_creator(Web)

data/lib/aspera/persistency_folder.rb

@@ -60,7 +60,7 @@ module Aspera
     end
 
     # Delete persisted items
-    def garbage_collect(persist_category, max_age_seconds=nil)
+    def garbage_collect(persist_category, max_age_seconds = nil)
       garbage_files = current_files(persist_category)
       if !max_age_seconds.nil?
         current_time = Time.now
@@ -75,7 +75,7 @@ module Aspera
     end
 
     def current_files(persist_category)
-      Dir[File.join(@folder, persist_category + '*' + FILE_SUFFIX)]
+      Dir[File.join(@folder, "#{persist_category}*#{FILE_SUFFIX}")]
     end
 
     def current_items(persist_category)

data/lib/aspera/preview/file_types.rb

@@ -48,7 +48,8 @@ module Aspera
         'application/x-xfig'                 => :image,
         'font/ttf'                           => :image,
         'text/troff'                         => :image,
-        'video/x-mng'                        => :image}.freeze
+        'video/x-mng'                        => :image
+      }.freeze
 
       private_constant :SUPPORTED_MIME_TYPES
 
@@ -68,7 +69,7 @@ module Aspera
         return :office if mimetype.start_with?('application/vnd.openxmlformats-officedocument')
         return :video if mimetype.start_with?('video/')
         return :image if mimetype.start_with?('image/')
-        return nil
+        return
       end
 
       # @param filepath [String] full path to file
@@ -118,7 +119,7 @@ module Aspera
         return Environment.secure_capture(exec: 'file', args: ['--mime-type', '--brief', filepath]).strip
       rescue => e
         Log.log.error{"error using 'file' command: #{e.message}"}
-        return nil
+        return
       end
     end
   end

data/lib/aspera/preview/generator.rb

@@ -116,7 +116,9 @@ module Aspera
             '-filter:v', "scale='trunc(iw/2)*2:trunc(ih/2)*2'",
             '-codec:v', 'libx264',
             '-r', 30,
-            '-pix_fmt', 'yuv420p'])
+            '-pix_fmt', 'yuv420p'
+          ]
+        )
       end
 
       # generate n clips starting at offset
@@ -135,7 +137,9 @@ module Aspera
                 '-ss', offset_seconds * 0.1,
                 '-t', @options.clips_length,
                 '-filter:v', "scale=#{@options.video_scale}",
-                '-codec:a', 'libmp3lame'])
+                '-codec:a', 'libmp3lame'
+              ]
+            )
             f.puts("file '#{tmp_file_name}'")
           end
         end
@@ -144,7 +148,8 @@ module Aspera
           in_f: file_list_file,
           in_p: ['-f', 'concat'],
           out_f: @destination_file_path,
-          out_p: ['-codec', 'copy'])
+          out_p: ['-codec', 'copy']
+        )
         File.delete(file_list_file)
       end
 
@@ -174,7 +179,9 @@ module Aspera
             '-codec:a', 'libmp3lame',
             '-ac', '2',
             '-b:a', '128k',
-            '-movflags', 'faststart'])
+            '-movflags', 'faststart'
+          ]
+        )
       end
 
       def convert_video_to_png_using_fixed
@@ -182,7 +189,8 @@ module Aspera
           @source_file_path,
           Utils.video_get_duration(@source_file_path) * @options.thumb_vid_fraction,
           @options.thumb_vid_scale,
-          @destination_file_path)
+          @destination_file_path
+        )
       end
 
       # https://trac.ffmpeg.org/wiki/SponsoringPrograms/GSoC/2015#AnimatedPortableNetworkGraphicsAPNG
@@ -201,19 +209,21 @@ module Aspera
             '-vf', 'fps=5,scale=120:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse',
             '-loop', 0,
             '-f', 'gif'
-          ])
+          ]
+        )
       end
 
       def convert_office_to_png
-        tmp_pdf_file = File.join(this_tmpdir, File.basename(@source_file_path, File.extname(@source_file_path)) + '.pdf')
+        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])
+          @source_file_path
+        ])
         convert_pdf_to_png(tmp_pdf_file)
       end
 
-      def convert_pdf_to_png(source_file_path=nil)
+      def convert_pdf_to_png(source_file_path = nil)
         source_file_path ||= @source_file_path
         Utils.external_command(:magick, [
           'convert',
@@ -221,7 +231,8 @@ module Aspera
           '-background', 'white',
           '-flatten',
           "#{source_file_path}[0]",
-          @destination_file_path])
+          @destination_file_path
+        ])
       end
 
       def convert_image_to_png
@@ -233,7 +244,8 @@ module Aspera
           '+dither',
           '-posterize', 40,
           "#{@source_file_path}[0]",
-          @destination_file_path])
+          @destination_file_path
+        ])
         Utils.external_command(:optipng, [@destination_file_path])
       end
 
@@ -253,7 +265,8 @@ module Aspera
           '-bordercolor', 'white',
           '-border', 8,
           '+repage',
-          @destination_file_path])
+          @destination_file_path
+        ])
       end
     end
   end

data/lib/aspera/preview/terminal.rb

@@ -5,9 +5,11 @@
 require 'rainbow'
 require 'io/console'
 require 'aspera/log'
+require 'aspera/environment'
 module Aspera
   module Preview
-    # Display a picture in the terminal, either using coloured characters or iTerm2
+    # Display a picture in the terminal.
+    # Either use coloured characters or iTerm2 protocol.
     class Terminal
       # Rainbow only supports 8-bit colors
       # env vars to detect terminal type
@@ -19,13 +21,14 @@ module Aspera
       DEFAULT_FONT_RATIO = 32.0 / 14.0
       private_constant :TERM_ENV_VARS, :ITERM_NAMES, :DEFAULT_FONT_RATIO
       class << self
-        # @return [String] the image as text, or the iTerm2 escape sequence
-        # @param blob [String] the image as a binary string
-        # @param reserve [Integer] number of lines to reserve for other text than the image
-        # @param text [Boolean] true to display the image as text, false to use iTerm2
-        # @param double [Boolean] true to use colors on half lines, false to use colors on full lines
-        # @param font_ratio [Float] ratio = font height / font width
+        # @param blob       [String]  The image as a binary string
+        # @param reserve    [Integer] Number of lines to reserve for other text than the image
+        # @param text       [Boolean] `true` to display the image as text, `false` to use iTerm2 if supported
+        # @param double     [Boolean] `true` to use colors on half lines, `false` to use colors on full lines
+        # @param font_ratio [Float]   ratio = font height / font width
+        # @return [String] The image as text, or the iTerm2 escape sequence
         def build(blob, reserve: 3, text: false, double: true, font_ratio: DEFAULT_FONT_RATIO)
+          return '[Image display requires a terminal]' unless Environment.terminal?
           return iterm_display_image(blob) if iterm_supported? && !text
           begin
             # do not require statically, as the package is optional

data/lib/aspera/preview/utils.rb

@@ -31,7 +31,7 @@ module Aspera
         end
 
         # check that external tools can be executed
-        def check_tools(skip_types=[])
+        def check_tools(skip_types = [])
           tools_to_check = EXTERNAL_TOOLS.dup
           tools_to_check.delete(:unoconv) if skip_types.include?(:office)
           # Check for binaries
@@ -70,7 +70,8 @@ module Aspera
             '-loglevel', 'error',
             '-show_entries', 'format=duration',
             '-print_format', 'default=noprint_wrappers=1:nokey=1', # cspell:disable-line
-            input_file]).to_f
+            input_file
+          ]).to_f
         end
 
         def ffmpeg_fmt(temp_folder)
@@ -88,24 +89,25 @@ module Aspera
           end
         end
 
-        def video_blend_frames(temp_folder, index1, index2)
-          img1 = get_tmp_num_filepath(temp_folder, index1)
-          img2 = get_tmp_num_filepath(temp_folder, index2)
-          count = index2 - index1 - 1
+        def video_blend_frames(temp_folder, index_begin, index_end)
+          img1 = get_tmp_num_filepath(temp_folder, index_begin)
+          img2 = get_tmp_num_filepath(temp_folder, index_end)
+          count = index_end - index_begin - 1
           1.upto(count) do |i|
             percent = i * 100 / (count + 1)
-            filename = get_tmp_num_filepath(temp_folder, index1 + i)
+            filename = get_tmp_num_filepath(temp_folder, index_begin + i)
             external_command(:magick, ['composite', '-blend', percent, img2, img1, filename])
           end
         end
 
-        def video_dump_frame(input_file, offset_seconds, scale, output_file, index=nil)
+        def video_dump_frame(input_file, offset_seconds, scale, output_file, index = nil)
           output_file = get_tmp_num_filepath(output_file, index) unless index.nil?
           ffmpeg(
             in_f: input_file,
             in_p: ['-ss', offset_seconds],
             out_f: output_file,
-            out_p: ['-frames:v', 1, '-filter:v', "scale=#{scale}"])
+            out_p: ['-frames:v', 1, '-filter:v', "scale=#{scale}"]
+          )
           return output_file
         end
       end

data/lib/aspera/products/connect.rb

@@ -13,7 +13,7 @@ module Aspera
       class << self
         # standard folder locations
         def locations
-          case Aspera::Environment.os
+          case Aspera::Environment.instance.os
           when Aspera::Environment::OS_WINDOWS then [{
             app_root: File.join(ENV.fetch('LOCALAPPDATA', nil), 'Programs', 'Aspera', 'Aspera Connect'),
             log_root: File.join(ENV.fetch('LOCALAPPDATA', nil), 'Aspera', 'Aspera Connect', 'var', 'log'),

data/lib/aspera/products/desktop.rb

@@ -11,7 +11,7 @@ module Aspera
       class << self
         # standard folder locations
         def locations
-          case Aspera::Environment.os
+          case Aspera::Environment.instance.os
           when Aspera::Environment::OS_MACOS then [{
             app_root: File.join('', 'Applications', 'IBM Aspera.app'),
             log_root: File.join(Dir.home, 'Library', 'Logs', APP_IDENTIFIER),

data/lib/aspera/products/other.rb

@@ -21,7 +21,7 @@ module Aspera
       # :log_root  O location of log files (Linux uses syslog)
       # :run_root  O only for Connect Client, location of http port file
       # :sub_bin   O subfolder with executables, default : bin
-      LOCATION_ON_THIS_OS = case Aspera::Environment.os
+      LOCATION_ON_THIS_OS = case Aspera::Environment.instance.os
       when Aspera::Environment::OS_WINDOWS then [{
         expected: CLI_V3,
         app_root: File.join('C:', 'Program Files', 'Aspera', 'cli'),
@@ -61,7 +61,7 @@ module Aspera
             next false unless Dir.exist?(item[:app_root])
             Log.log.debug{"Found #{item[:expected]}"}
             sub_bin = item[:sub_bin] || 'bin'
-            item[:ascp_path] = File.join(item[:app_root], sub_bin, Environment.exe_file('ascp'))
+            item[:ascp_path] = File.join(item[:app_root], sub_bin, Environment.instance.exe_file('ascp'))
             # skip if no ascp
             next false unless File.exist?(item[:ascp_path])
             # read info from product info file if present

data/lib/aspera/products/transferd.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'aspera/log'
+require 'aspera/assert'
 module Aspera
   module Products
     class Transferd
@@ -19,9 +21,9 @@ module Aspera
         end
 
         # location of SDK files
-        def sdk_directory=(v)
-          Log.log.debug{"sdk_directory=#{v}"}
-          @sdk_dir = v
+        def sdk_directory=(folder)
+          Log.log.debug{"sdk_directory=#{folder}"}
+          @sdk_dir = folder
           sdk_directory
         end
 
@@ -33,9 +35,9 @@ module Aspera
         end
 
         def transferd_path
-          v1_path = File.join(sdk_directory, Environment.exe_file(V1_DAEMON_NAME))
+          v1_path = File.join(sdk_directory, Environment.instance.exe_file(V1_DAEMON_NAME))
           return v1_path if File.exist?(v1_path)
-          return File.join(sdk_directory, Environment.exe_file(V2_DAEMON_NAME))
+          return File.join(sdk_directory, Environment.instance.exe_file(V2_DAEMON_NAME))
         end
 
         # Well, the port number is only in log file
@@ -51,7 +53,7 @@ module Aspera
               end
             end
           end
-          raise 'Port not found in daemon logs' if result.nil?
+          Aspera.assert(!result.nil?){'Port not found in daemon logs'}
           Log.log.debug{"Got port #{result} from log"}
           return result
         end

data/lib/aspera/proxy_auto_config.rb

@@ -13,7 +13,7 @@ module URI
       def register_proxy_finder
         Aspera.assert(block_given?)
         # overload the method in URI : call user's provided block and fallback to original method
-        define_method(:find_proxy){ |env_vars=ENV| yield(to_s) || find_proxy_orig(env_vars)}
+        define_method(:find_proxy){ |env_vars = ENV| yield(to_s) || find_proxy_orig(env_vars)}
       end
     end
   end

data/lib/aspera/rest.rb

@@ -88,11 +88,11 @@ module Aspera
       # Build URI from URL and parameters and check it is http or https
       # encode array [] parameters
       # @param query [Hash,Array]
-      def build_uri(url, query=nil)
+      def build_uri(url, query = nil)
         uri = URI.parse(url)
         Aspera.assert(%w[http https].include?(uri.scheme)){"REST endpoint shall be http/s not #{uri.scheme}"}
         return uri if query.nil? || query.respond_to?(:empty?) && query.empty?
-        Log.log.debug{Log.dump('query', query)}
+        Log.dump(:query, query)
         query_array = []
         case query
         when Hash
@@ -194,9 +194,7 @@ module Aspera
 
     # create and start keep alive connection on demand
     def http_session
-      if @http_session.nil?
-        @http_session = self.class.start_http_session(@base_url)
-      end
+      @http_session = self.class.start_http_session(@base_url) if @http_session.nil?
       return @http_session
     end
 
@@ -239,7 +237,7 @@ module Aspera
     )
       Aspera.assert_type(base_url, String)
       # base url with no trailing slashes (note: string may be frozen)
-      @base_url = base_url.gsub(%r{/+$}, '')
+      @base_url = base_url.chomp('/')
       # remove trailing port if it is 443 and scheme is https
       @base_url = @base_url.gsub(/:443$/, '') if @base_url.start_with?('https://')
       @base_url = @base_url.gsub(/:80$/, '') if @base_url.start_with?('http://')
@@ -266,7 +264,7 @@ module Aspera
       if @oauth.nil?
         Aspera.assert(@auth_params[:type].eql?(:oauth2)){'no OAuth defined'}
         oauth_parameters = @auth_params.reject{ |k, _v| k.eql?(:type)}
-        Log.log.debug{Log.dump('oauth parameters', oauth_parameters)}
+        Log.dump(:oauth_parameters, oauth_parameters)
         @oauth = OAuth::Factory.instance.create(**oauth_parameters)
       end
       return @oauth
@@ -293,8 +291,8 @@ module Aspera
     )
       subpath = subpath.to_s if subpath.is_a?(Symbol)
       subpath = '' if subpath.nil?
-      Log.log.debug{"#{operation} [#{subpath}]".red.bold.bg_green}
-      Log.log.debug{Log.dump(:body, body)}
+      Log.log.debug{"call #{operation} [#{subpath}]".red.bold.bg_green}
+      Log.dump(:body, body)
       Aspera.assert_type(subpath, String)
       if headers.nil?
         headers = @headers.clone
@@ -352,7 +350,7 @@ module Aspera
         end
         # :type = :basic
         req.basic_auth(@auth_params[:username], @auth_params[:password]) if @auth_params[:type].eql?(:basic)
-        Log.log.trace1{Log.dump(:req_body, req.body)}
+        Log.dump(:req_body, req.body, level: :trace1)
         # we try the call, and will retry on some error types
         error_tries ||= 1 + RestParameters.instance.retry_max
         # initialize with number of initial retries allowed, nil gives zero
@@ -375,9 +373,7 @@ module Aspera
             # override user's path to path in header
             if !response['Content-Disposition'].nil?
               disposition = self.class.parse_header(response['Content-Disposition'])
-              if disposition[:parameters].key?(:filename) && !disposition[:parameters][:filename].eql?('.')
-                target_file = File.join(File.dirname(target_file), disposition[:parameters][:filename])
-              end
+              target_file = File.join(File.dirname(target_file), disposition[:parameters][:filename]) if disposition[:parameters].key?(:filename) && !disposition[:parameters][:filename].eql?('.')
             end
             # download with temp filename
             target_file_tmp = "#{target_file}#{RestParameters.instance.download_partial_suffix}"
@@ -395,7 +391,8 @@ module Aspera
                 RestParameters.instance.progress_bar&.event(:transfer, session_id: session_id, info: written_size) if limiter.trigger?
               end
             end
-            RestParameters.instance.progress_bar&.event(:end, session_id: session_id)
+            RestParameters.instance.progress_bar&.event(:session_end, session_id: session_id)
+            RestParameters.instance.progress_bar&.event(:end)
             # rename at the end
             File.rename(target_file_tmp, target_file)
             file_saved = true
@@ -408,7 +405,7 @@ module Aspera
         case result_mime
         when *JSON_DECODE
           result[:data] = JSON.parse(result[:http].body) rescue result[:http].body
-          Log.log.debug{Log.dump('result_data', result[:data])}
+          Log.dump(:result_data, result[:data])
         else # when MIME_TEXT
           result[:data] = result[:http].body
         end
@@ -447,7 +444,7 @@ module Aspera
         if e.response.is_a?(Net::HTTPRedirection) && tries_remain_redirect.positive?
           tries_remain_redirect -= 1
           current_uri = URI.parse(@base_url)
-          new_url = e.response['location']
+          new_url = e.response['Location']
           # special case: relative redirect
           if URI.parse(new_url).host.nil?
             # we don't manage relative redirects with non-absolute path
@@ -455,9 +452,19 @@ module Aspera
             new_url = "#{current_uri.scheme}://#{current_uri.host}#{new_url}"
           end
           # forwards the request to the new location
-          return self.class.new(base_url: new_url, redirect_max: tries_remain_redirect).call(
-            operation: operation, query: query, body: body, content_type: content_type,
-            save_to_file: save_to_file, return_error: return_error, headers: headers)
+          return self.class.new(
+            base_url: new_url,
+            redirect_max: tries_remain_redirect
+          ).call(
+            operation: operation,
+            subpath: new_url.end_with?('/') ? '/' : nil,
+            query: query,
+            body: body,
+            content_type: content_type,
+            save_to_file: save_to_file,
+            return_error: return_error,
+            headers: headers
+          )
         end
         # raise exception if could not retry and not return error in result
         raise e unless return_error
@@ -475,7 +482,7 @@ module Aspera
       return call(operation: 'POST', subpath: subpath, headers: {'Accept' => MIME_JSON}, body: params, content_type: MIME_JSON)[:data]
     end
 
-    def read(subpath, query=nil)
+    def read(subpath, query = nil)
       return call(operation: 'GET', subpath: subpath, headers: {'Accept' => MIME_JSON}, query: query)[:data]
     end
 
@@ -483,7 +490,7 @@ module Aspera
       return call(operation: 'PUT', subpath: subpath, headers: {'Accept' => MIME_JSON}, body: params, content_type: MIME_JSON)[:data]
     end
 
-    def delete(subpath, params=nil)
+    def delete(subpath, params = nil)
       return call(operation: 'DELETE', subpath: subpath, headers: {'Accept' => MIME_JSON}, query: params)[:data]
     end
 
@@ -513,7 +520,7 @@ module Aspera
         name_matches = matching_items.select{ |i| i['name'].casecmp?(search_name)}
         case name_matches.length
         when 1 then return name_matches.first
-        when 0 then raise %Q(#{subpath}: multiple case insensitive partial match for: "#{search_name}": #{matching_items.map{ |i| i['name']}} but no case insensitive full match. Please be more specific or give exact name.) # rubocop:disable Layout/LineLength
+        when 0 then raise %Q(#{subpath}: multiple case insensitive partial match for: "#{search_name}": #{matching_items.map{ |i| i['name']}} but no case insensitive full match. Please be more specific or give exact name.)
         else raise "Two entities cannot have the same case insensitive name: #{name_matches.map{ |i| i['name']}}"
         end
       end

data/lib/aspera/rest_call_error.rb

@@ -8,7 +8,7 @@ module Aspera
     # @param req HTTP Request object
     # @param resp HTTP Response object
     # @param msg Error message
-    def initialize(msg, req=nil, resp=nil)
+    def initialize(msg, req = nil, resp = nil)
       @request = req
       @response = resp
       super(msg)

data/lib/aspera/resumer.rb

@@ -16,7 +16,7 @@ module Aspera
     }.freeze
 
     # @param params see DEFAULTS
-    def initialize(params=nil)
+    def initialize(params = nil)
       @parameters = DEFAULTS.dup
       if !params.nil?
         Aspera.assert_type(params, Hash)

data/lib/aspera/secret_hider.rb

@@ -2,10 +2,13 @@
 
 # cspell:ignore FILEPASS
 require 'logger'
+require 'singleton'
 
 module Aspera
   # remove secret from logs and output
   class SecretHider
+    include Singleton
+
     # configurable:
     ADDITIONAL_KEYS_TO_HIDE = []
     # display string for hidden secrets
@@ -34,56 +37,59 @@ module Aspera
       /(?<begin>(?:#{HTTP_SECRETS.join('|')}): )[^\\]+(?<end>\\)/i
     ].freeze
     private_constant :HIDDEN_PASSWORD, :ASCP_ENV_SECRETS, :KEY_SECRETS, :HTTP_SECRETS, :ALL_SECRETS, :KEY_FALSE_POSITIVES, :REGEX_LOG_REPLACES
-    @log_secrets = false
-    class << self
-      attr_accessor :log_secrets
+    attr_accessor :log_secrets
 
-      # @return new log formatter that hides secrets
-      def log_formatter(original_formatter)
-        original_formatter ||= Logger::Formatter.new
-        # NOTE: that @log_secrets may be set AFTER this init is done, so it's done at runtime
-        return lambda do |severity, date_time, program_name, msg|
-          if msg.is_a?(String) && !@log_secrets
-            REGEX_LOG_REPLACES.each do |reg_ex|
-              msg = msg.gsub(reg_ex){"#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}"}
-            end
+    # @return new log formatter that hides secrets
+    def log_formatter(original_formatter)
+      original_formatter ||= Logger::Formatter.new
+      # NOTE: that @log_secrets may be set AFTER this init is done, so it's done at runtime
+      return lambda do |severity, date_time, program_name, msg|
+        if msg.is_a?(String) && !@log_secrets
+          REGEX_LOG_REPLACES.each do |reg_ex|
+            msg = msg.gsub(reg_ex){"#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}"}
           end
-          original_formatter.call(severity, date_time, program_name, msg)
         end
+        original_formatter.call(severity, date_time, program_name, msg)
       end
+    end
 
-      def hide_secrets_in_string(value)
-        return value.gsub(REGEX_LOG_REPLACES.first){"#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}"}
-      end
+    def hide_secrets_in_string(value)
+      return value.gsub(REGEX_LOG_REPLACES.first){"#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}"}
+    end
 
-      # @return true if the key denotes a secret
-      def secret?(keyword, value)
-        keyword = keyword.to_s if keyword.is_a?(Symbol)
-        # only Strings can be secrets, not booleans, or hash, arrays
-        return false unless keyword.is_a?(String) && value.is_a?(String)
-        # those are not secrets
-        return false if KEY_FALSE_POSITIVES.any?{ |f| f.match?(keyword)}
-        return true if ADDITIONAL_KEYS_TO_HIDE.include?(keyword)
-        # check if keyword (name) contains an element that designate it as a secret
-        ALL_SECRETS.any?{ |kw| keyword.include?(kw)}
-      end
+    # @return true if the key denotes a secret
+    def secret?(keyword, value)
+      keyword = keyword.to_s if keyword.is_a?(Symbol)
+      # only Strings can be secrets, not booleans, or hash, arrays
+      return false unless keyword.is_a?(String) && value.is_a?(String)
+      # those are not secrets
+      return false if KEY_FALSE_POSITIVES.any?{ |f| f.match?(keyword)}
+      return true if ADDITIONAL_KEYS_TO_HIDE.include?(keyword)
+      # check if keyword (name) contains an element that designate it as a secret
+      ALL_SECRETS.any?{ |kw| keyword.include?(kw)}
+    end
 
-      # Hides recursively secrets in Hash or Array of Hash
-      def deep_remove_secret(obj)
-        case obj
-        when Array
-          obj.each{ |i| deep_remove_secret(i)}
-        when Hash
-          obj.each do |k, v|
-            if secret?(k, v)
-              obj[k] = HIDDEN_PASSWORD
-            elsif obj[k].is_a?(Hash)
-              deep_remove_secret(obj[k])
-            end
+    # Hides recursively secrets in Hash or Array of Hash
+    def deep_remove_secret(obj)
+      case obj
+      when Array
+        obj.each{ |i| deep_remove_secret(i)}
+      when Hash
+        obj.each do |k, v|
+          if secret?(k, v)
+            obj[k] = HIDDEN_PASSWORD
+          elsif obj[k].is_a?(Hash)
+            deep_remove_secret(obj[k])
           end
         end
-        return obj
       end
+      return obj
+    end
+
+    private
+
+    def initialize
+      @log_secrets = false
     end
   end
 end