iostreams 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a047f1f33b360bf1aa4f028da098e5d2364e4e4ebc4f4c603c445e6f43f99d8
-  data.tar.gz: 42e7095dcdb7707ec774f6d5efe104418fcb632af97d2978e736ddd3ec7c72ae
+  metadata.gz: 1a141ad8f92a6c1387ad487fc8cf545bcc010ebc862967ffce8f79f71b7ba2d6
+  data.tar.gz: 0210b8d23390ddff6fe31133c24b88b2beb7e5e0f54d6b9df962632dc369a9ec
 SHA512:
-  metadata.gz: ef9b14f94069a48f81cfb52960a115f0bfb83bcebde57850002d52148e2cb495a0eed9a9f1a6505e1210dd259cc1ab8555e36cb7e9769410a48ca11daa4c4b9c
-  data.tar.gz: b8b0bc72a97bbb7174c32e3d852ce171e6443d246950f788016ed4309e539d644703765fd2767c36ea4df7b8218d7b14b84c94a8630d5214a1bc60b0f4659472
+  metadata.gz: 810573a43277573365e946205465a4a1cc87c65cf517450dc6f363f5bb7168e66a25cd2d891e346d09c4b96aa9166f369fd2bc9dc21ec2112d87bce270467ff2
+  data.tar.gz: 2304155b27a897f270263283bdf499855a81f80885b9103b6c116f135904a42d73bfb29705a8156f3bde973b7a899eba9b123073e7b140a2e502b2203869ad1f

data/README.md

@@ -1,5 +1,5 @@
 # iostreams
-[![Gem Version](https://img.shields.io/gem/v/iostreams.svg)](https://rubygems.org/gems/iostreams) [![Build Status](https://travis-ci.org/rocketjob/iostreams.svg?branch=master)](https://travis-ci.org/rocketjob/iostreams) [![Downloads](https://img.shields.io/gem/dt/iostreams.svg)](https://rubygems.org/gems/iostreams) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Beta-yellow.svg) [![Gitter chat](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
+[![Gem Version](https://img.shields.io/gem/v/iostreams.svg)](https://rubygems.org/gems/iostreams) [![Build Status](https://travis-ci.org/rocketjob/iostreams.svg?branch=master)](https://travis-ci.org/rocketjob/iostreams) [![Downloads](https://img.shields.io/gem/dt/iostreams.svg)](https://rubygems.org/gems/iostreams) [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg)](http://opensource.org/licenses/Apache-2.0) ![](https://img.shields.io/badge/status-Production%20Ready-blue.svg) [![Gitter chat](https://img.shields.io/badge/IRC%20(gitter)-Support-brightgreen.svg)](https://gitter.im/rocketjob/support)
 
 Input and Output streaming for Ruby.
 

data/Rakefile

@@ -1,21 +1,21 @@
-require 'rake/testtask'
-require_relative 'lib/io_streams/version'
+require "rake/testtask"
+require_relative "lib/io_streams/version"
 
 task :gem do
-  system 'gem build iostreams.gemspec'
+  system "gem build iostreams.gemspec"
 end
 
-task :publish => :gem do
+task publish: :gem do
   system "git tag -a v#{IOStreams::VERSION} -m 'Tagging #{IOStreams::VERSION}'"
-  system 'git push --tags'
+  system "git push --tags"
   system "gem push iostreams-#{IOStreams::VERSION}.gem"
   system "rm iostreams-#{IOStreams::VERSION}.gem"
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
   t.warning = true
 end
 
-task :default => :test
+task default: :test

data/lib/io_streams/builder.rb

@@ -1,5 +1,5 @@
 module IOStreams
-# Build the streams that need to be applied to a path druing reading or writing.
+  # Build the streams that need to be applied to a path druing reading or writing.
   class Builder
     attr_accessor :file_name
     attr_reader :streams, :options
@@ -61,6 +61,7 @@ module IOStreams
     # Return the options set for either a stream or option.
     def setting(stream)
       return streams[stream] if streams
+
       options[stream] if options
     end
 
@@ -96,7 +97,7 @@ module IOStreams
 
     # Returns the streams for the supplied file_name
     def parse_extensions
-      parts      = ::File.basename(file_name).split('.')
+      parts      = ::File.basename(file_name).split(".")
       extensions = []
       while extension = parts.pop
         sym = extension.downcase.to_sym
@@ -109,7 +110,7 @@ module IOStreams
 
     # Executes the streams that need to be executed.
     def execute(type, pipeline, io_stream, &block)
-      raise(ArgumentError, 'IOStreams call is missing mandatory block') if block.nil?
+      raise(ArgumentError, "IOStreams call is missing mandatory block") if block.nil?
 
       if pipeline.empty?
         block.call(io_stream)

data/lib/io_streams/bzip2/reader.rb

@@ -3,7 +3,7 @@ module IOStreams
     class Reader < IOStreams::Reader
       # Read from a Bzip2 stream, decompressing the contents as it is read
       def self.stream(input_stream, **_args)
-        Utils.load_soft_dependency('rbzip2', 'Bzip2') unless defined?(RBzip2)
+        Utils.load_soft_dependency("rbzip2", "Bzip2") unless defined?(RBzip2)
 
         begin
           io = RBzip2.default_adapter::Decompressor.new(input_stream)

data/lib/io_streams/bzip2/writer.rb

@@ -3,7 +3,7 @@ module IOStreams
     class Writer < IOStreams::Writer
       # Write to a stream, compressing with Bzip2
       def self.stream(input_stream, original_file_name: nil, **_args)
-        Utils.load_soft_dependency('rbzip2', 'Bzip2') unless defined?(RBzip2)
+        Utils.load_soft_dependency("rbzip2", "Bzip2") unless defined?(RBzip2)
 
         begin
           io = RBzip2.default_adapter::Compressor.new(input_stream)

data/lib/io_streams/deprecated.rb

@@ -1,6 +1,6 @@
 module IOStreams
-  UTF8_ENCODING   = Encoding.find('UTF-8').freeze
-  BINARY_ENCODING = Encoding.find('BINARY').freeze
+  UTF8_ENCODING   = Encoding.find("UTF-8").freeze
+  BINARY_ENCODING = Encoding.find("BINARY").freeze
 
   # Deprecated IOStreams from v0.x. Do not use, will be removed soon.
   module Deprecated
@@ -9,7 +9,6 @@ module IOStreams
     end
 
     module ClassMethods
-
       # DEPRECATED. Use `#path` or `#io`
       # Examples:
       #   IOStreams.path("data.zip").reader { |f| f.read(100) }

data/lib/io_streams/encode/reader.rb

@@ -7,9 +7,9 @@ module IOStreams
       # Builtin strip options to apply after encoding the read data.
       CLEANSE_RULES = {
         # Strips all non printable characters
-        printable: ->(data, _) { data.gsub!(NOT_PRINTABLE, '') || data },
+        printable:             ->(data, _) { data.gsub!(NOT_PRINTABLE, "") || data },
         # Replaces non printable characters with the value specified in the `replace` option.
-        replace_non_printable: ->(data, replace) { data.gsub!(NOT_PRINTABLE, replace || '') || data }
+        replace_non_printable: ->(data, replace) { data.gsub!(NOT_PRINTABLE, replace || "") || data }
       }.freeze
 
       # Read a line at a time from a file or stream
@@ -42,7 +42,7 @@ module IOStreams
       #     :printable Cleanse all non-printable characters except \r and \n
       #     Proc/lambda    Proc to call after every read to cleanse the data
       #     Default: nil
-      def initialize(input_stream, encoding: 'UTF-8', cleaner: nil, replace: nil)
+      def initialize(input_stream, encoding: "UTF-8", cleaner: nil, replace: nil)
         super(input_stream)
 
         @cleaner          = self.class.extract_cleaner(cleaner)
@@ -51,11 +51,7 @@ module IOStreams
         @replace          = replace
 
         # More efficient read buffering only supported when the input stream `#read` method supports it.
-        if replace.nil? && !@input_stream.method(:read).arity.between?(0, 1)
-          @read_cache_buffer = ''.encode(@encoding)
-        else
-          @read_cache_buffer = nil
-        end
+        @read_cache_buffer = ("".encode(@encoding) if replace.nil? && !@input_stream.method(:read).arity.between?(0, 1))
       end
 
       # Returns [String] data returned from the input stream.
@@ -91,6 +87,7 @@ module IOStreams
         when Symbol
           proc = CLEANSE_RULES[cleaner]
           raise(ArgumentError, "Invalid cleansing rule #{cleaner.inspect}") unless proc
+
           proc
         when Proc
           cleaner

data/lib/io_streams/encode/writer.rb

@@ -34,7 +34,7 @@ module IOStreams
       #     :printable Cleanse all non-printable characters except \r and \n
       #     Proc/lambda    Proc to call after every read to cleanse the data
       #     Default: nil
-      def initialize(output_stream, encoding: 'UTF-8', cleaner: nil, replace: nil)
+      def initialize(output_stream, encoding: "UTF-8", cleaner: nil, replace: nil)
         super(output_stream)
 
         @cleaner          = ::IOStreams::Encode::Reader.send(:extract_cleaner, cleaner)

data/lib/io_streams/io_streams.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require "uri"
 
 # Streaming library for Ruby
 #
@@ -111,7 +111,7 @@ module IOStreams
   #
   # Example:
   #   IOStreams.temp_file
-  def self.temp_file(basename, extension = "", &block)
+  def self.temp_file(basename, extension = "")
     Utils.temp_file_name(basename, extension) { |file_name| yield(Paths::File.new(file_name).stream(:none)) }
   end
 
@@ -258,6 +258,7 @@ module IOStreams
   #   register_extension(:xls, MyXls::Reader, MyXls::Writer)
   def self.register_extension(extension, reader_class, writer_class)
     raise(ArgumentError, "Invalid extension #{extension.inspect}") unless extension.nil? || extension.to_s =~ /\A\w+\Z/
+
     @extensions[extension.nil? ? nil : extension.to_sym] = Extension.new(reader_class, writer_class)
   end
 
@@ -269,6 +270,7 @@ module IOStreams
   #   register_extension(:xls)
   def self.deregister_extension(extension)
     raise(ArgumentError, "Invalid extension #{extension.inspect}") unless extension.to_s =~ /\A\w+\Z/
+
     @extensions.delete(extension.to_sym)
   end
 
@@ -284,6 +286,7 @@ module IOStreams
   #   register_scheme(:xls, MyXls::Reader, MyXls::Writer)
   def self.register_scheme(scheme, klass)
     raise(ArgumentError, "Invalid scheme #{scheme.inspect}") unless scheme.nil? || scheme.to_s =~ /\A\w+\Z/
+
     @schemes[scheme.nil? ? nil : scheme.to_sym] = klass
   end
 

data/lib/io_streams/line/reader.rb

@@ -94,6 +94,7 @@ module IOStreams
           initial_line_number = @line_number
           while line.count(@embedded_within).odd?
             raise "Unclosed quoted field on line #{initial_line_number}" if eof? || line.length > @buffer_size * 10
+
             line << @delimiter
             line << _readline
           end
@@ -163,7 +164,7 @@ module IOStreams
           # Take on the encoding from the input stream
           @buffer            = block.dup
           # Take on the encoding from the first block that was read.
-          @read_cache_buffer = ''.encode(block.encoding) if @use_read_cache_buffer
+          @read_cache_buffer = "".encode(block.encoding) if @use_read_cache_buffer
         end
 
         if @buffer.size > MAX_BLOCKS_MULTIPLIER * @buffer_size

data/lib/io_streams/path.rb

@@ -3,7 +3,7 @@ module IOStreams
     attr_accessor :path
 
     def initialize(path)
-      raise(ArgumentError, 'Path cannot be nil') if path.nil?
+      raise(ArgumentError, "Path cannot be nil") if path.nil?
       raise(ArgumentError, "Path must be a string: #{path.inspect}, class: #{path.class}") unless path.is_a?(String)
 
       @path      = path.frozen? ? path : path.dup.freeze
@@ -30,7 +30,7 @@ module IOStreams
     end
 
     def absolute?
-      !!(path.strip =~ /\A\//)
+      !!(path.strip =~ %r{\A/})
     end
 
     # By default realpath just returns self.
@@ -84,12 +84,12 @@ module IOStreams
     # Cleanup an incomplete write to the target "file" if the copy fails.
     def copy_from(source, **args)
       super(source, **args)
-    rescue StandardError => exc
+    rescue StandardError => e
       begin
         delete
       rescue NotImplementedError
       end
-      raise(exc)
+      raise(e)
     end
 
     # Moves the file by copying it to the new path and then deleting the current path.

data/lib/io_streams/paths/http.rb

@@ -1,5 +1,5 @@
-require 'net/http'
-require 'uri'
+require "net/http"
+require "uri"
 module IOStreams
   module Paths
     class HTTP < IOStreams::Path
@@ -68,21 +68,19 @@ module IOStreams
         result = nil
         raise(IOStreams::Errors::CommunicationsFailure, "Too many redirects") if http_redirect_count < 1
 
-        Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
+        Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
           request = Net::HTTP::Get.new(uri)
           request.basic_auth(username, password) if username
 
           http.request(request) do |response|
-            if response.is_a?(Net::HTTPNotFound)
-              raise(IOStreams::Errors::CommunicationsFailure, "Invalid URL: #{uri}")
-            end
+            raise(IOStreams::Errors::CommunicationsFailure, "Invalid URL: #{uri}") if response.is_a?(Net::HTTPNotFound)
             if response.is_a?(Net::HTTPUnauthorized)
               raise(IOStreams::Errors::CommunicationsFailure, "Authorization Required: Invalid :username or :password.")
             end
 
             if response.is_a?(Net::HTTPRedirection)
-              new_uri = response['location']
-              return handle_redirects(new_uri, http_redirect_count: http_redirect_count - 1, &block)
+              new_uri = response["location"]
+              return handle_redirects(new_uri, http_redirect_count - 1, &block)
             end
 
             unless response.is_a?(Net::HTTPSuccess)
@@ -90,8 +88,8 @@ module IOStreams
             end
 
             # Since Net::HTTP download only supports a push stream, write it to a tempfile first.
-            Utils.temp_file_name('iostreams_http') do |file_name|
-              ::File.open(file_name, 'wb') { |io| response.read_body { |chunk| io.write(chunk) } }
+            Utils.temp_file_name("iostreams_http") do |file_name|
+              ::File.open(file_name, "wb") { |io| response.read_body { |chunk| io.write(chunk) } }
               # Return a read stream
               result = ::File.open(file_name, "rb") { |io| builder.reader(io, &block) }
             end

data/lib/io_streams/paths/matcher.rb

@@ -3,7 +3,7 @@ module IOStreams
     # Implement fnmatch logic for any path iterator
     class Matcher
       # Characters indicating that pattern matching is required
-      MATCH_START_CHARS = /[*?\[{]/
+      MATCH_START_CHARS = /[*?\[{]/.freeze
 
       attr_reader :path, :pattern, :flags
 
@@ -26,7 +26,7 @@ module IOStreams
 
       # Returns whether the relative `file_name` matches
       def match?(file_name)
-        relative_file_name = file_name.sub(path.to_s, '').sub(%r{\A/}, '')
+        relative_file_name = file_name.sub(path.to_s, "").sub(%r{\A/}, "")
         ::File.fnmatch?(pattern, relative_file_name, flags)
       end
 
@@ -39,23 +39,22 @@ module IOStreams
       private
 
       def extract_optimized_path(path, pattern)
-        elements = pattern.split('/')
+        elements = pattern.split("/")
         index    = elements.find_index { |e| e.match(MATCH_START_CHARS) }
-        if index == 0
-          # Cannot optimize path since the very first entry contains a wildcard
-          @path    = path || IOStreams.path
-          @pattern = pattern
-        elsif index.nil?
+        if index.nil?
           # No index means it has no pattern.
           @path    = path.nil? ? IOStreams.path(pattern) : path.join(pattern)
           @pattern = nil
+        elsif index.zero?
+          # Cannot optimize path since the very first entry contains a wildcard
+          @path    = path || IOStreams.path
+          @pattern = pattern
         else
-          new_path = elements[0..index - 1].join('/')
+          new_path = elements[0..index - 1].join("/")
           @path    = path.nil? ? IOStreams.path(new_path) : path.join(new_path)
-          @pattern = elements[index..-1].join('/')
+          @pattern = elements[index..-1].join("/")
         end
       end
-
     end
   end
 end

data/lib/io_streams/paths/s3.rb

@@ -131,13 +131,13 @@ module IOStreams
       # @option params [String] :object_lock_legal_hold_status
       #   The Legal Hold status that you want to apply to the specified object.
       def initialize(url, client: nil, access_key_id: nil, secret_access_key: nil, **args)
-        Utils.load_soft_dependency('aws-sdk-s3', 'AWS S3') unless defined?(::Aws::S3::Client)
+        Utils.load_soft_dependency("aws-sdk-s3", "AWS S3") unless defined?(::Aws::S3::Client)
 
         uri = Utils::URI.new(url)
-        raise "Invalid URI. Required Format: 's3://<bucket_name>/<key>'" unless uri.scheme == 's3'
+        raise "Invalid URI. Required Format: 's3://<bucket_name>/<key>'" unless uri.scheme == "s3"
 
         @bucket_name = uri.hostname
-        key          = uri.path.sub(%r{\A/}, '')
+        key          = uri.path.sub(%r{\A/}, "")
         if client.is_a?(Hash)
           client[:access_key_id]     = access_key_id if access_key_id
           client[:secret_access_key] = secret_access_key if secret_access_key
@@ -219,7 +219,7 @@ module IOStreams
 
       # Shortcut method if caller has a filename already with no other streams applied:
       def read_file(file_name)
-        ::File.open(file_name, 'wb') do |file|
+        ::File.open(file_name, "wb") do |file|
           client.get_object(@options.merge(response_target: file, bucket: bucket_name, key: path))
         end
       end
@@ -250,7 +250,7 @@ module IOStreams
           obj = s3.bucket(bucket_name).object(path)
           obj.upload_file(file_name)
         else
-          ::File.open(file_name, 'rb') do |file|
+          ::File.open(file_name, "rb") do |file|
             client.put_object(@options.merge(bucket: bucket_name, key: path, body: file))
           end
         end
@@ -267,7 +267,7 @@ module IOStreams
           return
         end
 
-        prefix = Utils::URI.new(matcher.path.to_s).path.sub(%r{\A/}, '')
+        prefix = Utils::URI.new(matcher.path.to_s).path.sub(%r{\A/}, "")
         token  = nil
         loop do
           # Fetches upto 1,000 entries at a time

data/lib/io_streams/paths/sftp.rb

@@ -1,4 +1,4 @@
-require 'open3'
+require "open3"
 
 module IOStreams
   module Paths
@@ -29,8 +29,8 @@ module IOStreams
         attr_accessor :sshpass_bin, :sftp_bin, :sshpass_wait_seconds
       end
 
-      @sftp_bin             = 'sftp'
-      @sshpass_bin          = 'sshpass'
+      @sftp_bin             = "sftp"
+      @sshpass_bin          = "sshpass"
       @sshpass_wait_seconds = 5
 
       attr_reader :hostname, :username, :ssh_options, :url, :port
@@ -76,7 +76,7 @@ module IOStreams
       #   end
       def initialize(url, username: nil, password: nil, ssh_options: {})
         uri = Utils::URI.new(url)
-        raise(ArgumentError, "Invalid URL. Required Format: 'sftp://<host_name>/<file_name>'") unless uri.scheme == 'sftp'
+        raise(ArgumentError, "Invalid URL. Required Format: 'sftp://<host_name>/<file_name>'") unless uri.scheme == "sftp"
 
         @hostname = uri.hostname
         @mkdir    = false
@@ -133,6 +133,7 @@ module IOStreams
         Net::SFTP.start(hostname, username, build_ssh_options) do |sftp|
           sftp.dir.glob(".", pattern, flags) do |path|
             next if !directories && !path.file?
+
             new_path = self.class.new("sftp://#{hostname}/#{path.name}", username: username, password: password, **ssh_options)
             yield(new_path, path.attributes.attributes)
           end
@@ -168,13 +169,20 @@ module IOStreams
               # Give time for password to be processed and stdin to be passed to sftp process.
               sleep self.class.sshpass_wait_seconds
               writer.puts "get #{remote_file_name} #{local_file_name}"
-              writer.puts 'bye'
+              writer.puts "bye"
               writer.close
               out = reader.read.chomp
-              raise(Errors::CommunicationsFailure, "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}") unless waith_thr.value.success?
+              unless waith_thr.value.success?
+                raise(Errors::CommunicationsFailure, "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
+              end
+
               out
             rescue Errno::EPIPE
-              out = reader.read.chomp rescue nil
+              out = begin
+                      reader.read.chomp
+                    rescue StandardError
+                      nil
+                    end
               raise(Errors::CommunicationsFailure, "Download failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
             end
           end
@@ -189,13 +197,20 @@ module IOStreams
               # Give time for password to be processed and stdin to be passed to sftp process.
               sleep self.class.sshpass_wait_seconds
               writer.puts "put #{local_file_name.inspect} #{remote_file_name.inspect}"
-              writer.puts 'bye'
+              writer.puts "bye"
               writer.close
               out = reader.read.chomp
-              raise(Errors::CommunicationsFailure, "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}") unless waith_thr.value.success?
+              unless waith_thr.value.success?
+                raise(Errors::CommunicationsFailure, "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
+              end
+
               out
             rescue Errno::EPIPE
-              out = reader.read.chomp rescue nil
+              out = begin
+                      reader.read.chomp
+                    rescue StandardError
+                      nil
+                    end
               raise(Errors::CommunicationsFailure, "Upload failed calling #{self.class.sftp_bin} via #{self.class.sshpass_bin}: #{out}")
             end
           end
@@ -203,15 +218,15 @@ module IOStreams
       end
 
       def with_sftp_args
-        return yield sftp_args(ssh_options) unless ssh_options.key?('IdentityKey')
+        return yield sftp_args(ssh_options) unless ssh_options.key?("IdentityKey")
 
-        Utils.temp_file_name('iostreams-sftp-args', 'key') do |file_name|
+        Utils.temp_file_name("iostreams-sftp-args", "key") do |file_name|
           options = ssh_options.dup
-          key     = options.delete('IdentityKey')
+          key     = options.delete("IdentityKey")
           # sftp requires that private key is only readable by the current user
-          ::File.open(file_name, 'wb', 0600) { |io| io.write(key) }
+          ::File.open(file_name, "wb", 0o600) { |io| io.write(key) }
 
-          options['IdentityFile'] = file_name
+          options["IdentityFile"] = file_name
           yield sftp_args(options)
         end
       end
@@ -228,22 +243,22 @@ module IOStreams
           args << "-oBatchMode=yes"
           args << "-oPasswordAuthentication=no"
         end
-        args << "-oIdentitiesOnly=yes" if ssh_options.key?('IdentityFile')
+        args << "-oIdentitiesOnly=yes" if ssh_options.key?("IdentityFile")
         # Default is ask, but this is non-interactive so make the default fail without asking.
-        args << "-oStrictHostKeyChecking=yes" unless ssh_options.key?('StrictHostKeyChecking')
-        args << "-oLogLevel=#{map_log_level}" unless ssh_options.key?('LogLevel')
+        args << "-oStrictHostKeyChecking=yes" unless ssh_options.key?("StrictHostKeyChecking")
+        args << "-oLogLevel=#{map_log_level}" unless ssh_options.key?("LogLevel")
         args << "-oPort=#{port}" unless port == 22
         ssh_options.each_pair { |key, value| args << "-o#{key}=#{value}" }
-        args << '-b'
-        args << '-'
+        args << "-b"
+        args << "-"
         args << "#{username}@#{hostname}"
         args
       end
 
       def build_ssh_options
-        options                = ssh_options.dup
-        options[:logger]       ||= self.logger if defined?(SemanticLogger)
-        options[:port]         ||= port
+        options = ssh_options.dup
+        options[:logger] ||= logger if defined?(SemanticLogger)
+        options[:port] ||= port
         options[:max_pkt_size] ||= 65_536
         options[:password]     ||= @password
         options