Merge pull request #816 from net-ssh/update_rubocop_config

Update rubocop config

2 files changed, 304 insertions, 135 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 41e4915..973c53d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ Style/DoubleNegation:
   Exclude:
     - 'lib/net/ssh/key_factory.rb'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 150
   Exclude:
     - 'test/**/*.rb'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d554db7..39464ef 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,37 +1,49 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-05-29 10:37:36 +0200 using RuboCop version 0.74.0.
+# on 2021-06-10 19:22:32 UTC using RuboCop version 1.12.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'net-ssh.gemspec'
+
 # Offense count: 75
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
   Enabled: false
 
-# Offense count: 63
+# Offense count: 5
 # Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
+# Configuration parameters: IndentationWidth.
+Layout/AssignmentIndentation:
   Exclude:
-    - 'lib/net/ssh/key_factory.rb'
-    - 'lib/net/ssh/transport/cipher_factory.rb'
-    - 'lib/net/ssh/transport/hmac.rb'
-    - 'lib/net/ssh/transport/kex.rb'
-    - 'test/test_config.rb'
+    - 'test/transport/kex/test_curve25519_sha256.rb'
+    - 'test/transport/kex/test_diffie_hellman_group1_sha1.rb'
+    - 'test/transport/kex/test_ecdh_sha2_nistp256.rb'
+    - 'test/transport/kex/test_ecdh_sha2_nistp384.rb'
+    - 'test/transport/kex/test_ecdh_sha2_nistp521.rb'
 
-# Offense count: 70
+# Offense count: 71
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'lib/net/ssh/authentication/agent.rb'
+    - 'test/integration/test_proxy.rb'
+
 # Offense count: 172
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -39,6 +51,20 @@ Layout/EmptyLineAfterGuardClause:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
+# Offense count: 63
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/net/ssh/key_factory.rb'
+    - 'lib/net/ssh/transport/cipher_factory.rb'
+    - 'lib/net/ssh/transport/hmac.rb'
+    - 'lib/net/ssh/transport/kex.rb'
+    - 'test/test_config.rb'
+
 # Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -61,7 +87,7 @@ Layout/SpaceAfterColon:
     - 'test/integration/test_ed25519_pkeys.rb'
     - 'test/verifiers/test_always.rb'
 
-# Offense count: 291
+# Offense count: 290
 # Cop supports --auto-correct.
 Layout/SpaceAfterComma:
   Enabled: false
@@ -96,7 +122,7 @@ Layout/SpaceInsideReferenceBrackets:
   Exclude:
     - 'lib/net/ssh/transport/algorithms.rb'
 
-# Offense count: 730
+# Offense count: 732
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -111,21 +137,23 @@ Lint/AssignmentInCondition:
     - 'lib/net/ssh/proxy/command.rb'
 
 # Offense count: 1
-Lint/EmptyWhen:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'lib/net/ssh/config.rb'
+    - 'test/transport/test_cipher_factory.rb'
 
-# Offense count: 9
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
+# Offense count: 10
+# Cop supports --auto-correct.
+Lint/DeprecatedOpenSSLConstant:
   Exclude:
-    - 'lib/net/ssh/authentication/session.rb'
-    - 'lib/net/ssh/known_hosts.rb'
     - 'lib/net/ssh/transport/openssl.rb'
-    - 'test/integration/common.rb'
-    - 'test/integration/test_forward.rb'
-    - 'test/start/test_connection.rb'
-    - 'test/start/test_transport.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowComments.
+Lint/EmptyWhen:
+  Exclude:
+    - 'lib/net/ssh/config.rb'
 
 # Offense count: 72
 Lint/ImplicitStringConcatenation:
@@ -133,33 +161,61 @@ Lint/ImplicitStringConcatenation:
     - 'lib/net/ssh/transport/kex/diffie_hellman_group14_sha1.rb'
     - 'lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb'
 
-# Offense count: 1
-Lint/LiteralAsCondition:
-  Exclude:
-    - 'lib/net/ssh/authentication/pageant.rb'
-
 # Offense count: 2
+# Cop supports --auto-correct.
 Lint/Loop:
   Exclude:
     - 'lib/net/ssh/authentication/methods/password.rb'
     - 'lib/net/ssh/key_factory.rb'
 
+# Offense count: 3
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/net/ssh/proxy/jump.rb'
+    - 'test/common.rb'
+    - 'test/integration/mitm_server.rb'
+
 # Offense count: 1
 Lint/NonLocalExitFromIterator:
   Exclude:
     - 'lib/net/ssh/known_hosts.rb'
 
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: AllowedImplicitNamespaces.
+# AllowedImplicitNamespaces: Gem
+Lint/RaiseException:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/net/ssh/buffer.rb'
+    - 'lib/net/ssh/key_factory.rb'
+
 # Offense count: 3
 Lint/RescueException:
   Exclude:
     - 'lib/net/ssh/authentication/key_manager.rb'
     - 'lib/net/ssh/service/forward.rb'
 
+# Offense count: 4
+# Cop supports --auto-correct.
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'lib/net/ssh/test/extensions.rb'
+
 # Offense count: 2
 Lint/ShadowedException:
   Exclude:
     - 'lib/net/ssh/authentication/key_manager.rb'
 
+# Offense count: 5
+# Configuration parameters: AllowComments, AllowNil.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/net/ssh/authentication/session.rb'
+    - 'lib/net/ssh/transport/openssl.rb'
+    - 'test/integration/common.rb'
+    - 'test/integration/test_forward.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowKeywordBlockArguments.
 Lint/UnderscorePrefixedVariableName:
@@ -182,13 +238,14 @@ Lint/UnusedBlockArgument:
     - 'test/transport/test_algorithms.rb'
     - 'test/transport/test_hmac.rb'
 
-# Offense count: 65
+# Offense count: 69
 # Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Enabled: false
 
 # Offense count: 3
+# Cop supports --auto-correct.
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
@@ -204,13 +261,20 @@ Lint/UselessAssignment:
     - 'test/integration/common.rb'
     - 'test/integration/test_forward.rb'
 
-# Offense count: 239
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/UselessTimes:
+  Exclude:
+    - 'test/integration/test_forward.rb'
+
+# Offense count: 201
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 71
+  Max: 77
 
 # Offense count: 17
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine
 Metrics/BlockLength:
   Max: 59
 
@@ -220,32 +284,35 @@ Metrics/BlockNesting:
   Max: 4
 
 # Offense count: 33
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 488
 
-# Offense count: 40
+# Offense count: 36
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 28
+  Max: 32
 
 # Offense count: 224
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 72
 
 # Offense count: 3
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
   Max: 160
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
+  MaxOptionalParameters: 4
 
-# Offense count: 32
+# Offense count: 31
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 32
 
 # Offense count: 10
 Naming/AccessorMethodName:
@@ -259,12 +326,15 @@ Naming/AccessorMethodName:
     - 'lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb'
 
 # Offense count: 2
+# Cop supports --auto-correct.
 Naming/BinaryOperatorParameterName:
   Exclude:
     - 'lib/net/ssh/buffer.rb'
     - 'lib/net/ssh/version.rb'
 
 # Offense count: 16
+# Configuration parameters: AllowedNames.
+# AllowedNames: module_parent
 Naming/ClassAndModuleCamelCase:
   Enabled: false
 
@@ -276,8 +346,8 @@ Naming/ConstantName:
     - 'lib/net/ssh/transport/openssl.rb'
 
 # Offense count: 12
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'test/authentication/test_agent.rb'
@@ -296,7 +366,7 @@ Naming/MemoizedInstanceVariableName:
     - 'test/authentication/test_key_manager.rb'
 
 # Offense count: 32
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
@@ -309,19 +379,10 @@ Naming/MethodName:
     - 'test/test_config.rb'
     - 'test/test_key_factory.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredName.
-Naming/RescuedExceptionsVariableName:
-  Exclude:
-    - 'lib/net/ssh/connection/session.rb'
-    - 'lib/net/ssh/service/forward.rb'
-    - 'lib/net/ssh/verifiers/accept_new.rb'
-
 # Offense count: 23
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
+# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
   Exclude:
     - 'lib/net/ssh/authentication/certificate.rb'
     - 'lib/net/ssh/authentication/ed25519.rb'
@@ -335,14 +396,44 @@ Naming/UncommunicativeMethodParamName:
     - 'lib/net/ssh/transport/identity_cipher.rb'
     - 'test/connection/test_session.rb'
 
-# Offense count: 8
-# Configuration parameters: EnforcedStyle.
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/net/ssh/connection/session.rb'
+    - 'lib/net/ssh/service/forward.rb'
+    - 'lib/net/ssh/verifiers/accept_new.rb'
+
+# Offense count: 5
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
+# SupportedStyles: snake_case, normalcase, non_integer
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
+Naming/VariableNumber:
+  Exclude:
+    - 'test/test_buffer.rb'
+    - 'test/test_known_hosts.rb'
+    - 'test/transport/test_identity_cipher.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
   Exclude:
     - 'lib/net/ssh/authentication/pageant.rb'
-    - 'lib/net/ssh/transport/openssl.rb'
-    - 'test/test_key_factory.rb'
+
+# Offense count: 31
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: separated, grouped
+Style/AccessorGrouping:
+  Exclude:
+    - 'lib/net/ssh/authentication/certificate.rb'
+    - 'lib/net/ssh/transport/kex/abstract.rb'
+    - 'test/common.rb'
+    - 'test/connection/test_channel.rb'
+    - 'test/integration/mitm_server.rb'
+    - 'test/start/test_transport.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -353,28 +444,19 @@ Style/Alias:
     - 'lib/net/ssh/connection/session.rb'
     - 'lib/net/ssh/service/forward.rb'
 
-# Offense count: 31
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
 Style/AndOr:
   Exclude:
-    - 'lib/net/ssh/authentication/key_manager.rb'
-    - 'lib/net/ssh/buffer.rb'
-    - 'lib/net/ssh/buffered_io.rb'
     - 'lib/net/ssh/connection/channel.rb'
     - 'lib/net/ssh/connection/session.rb'
-    - 'lib/net/ssh/key_factory.rb'
     - 'lib/net/ssh/service/forward.rb'
-    - 'lib/net/ssh/test/channel.rb'
-    - 'lib/net/ssh/test/script.rb'
-    - 'lib/net/ssh/transport/cipher_factory.rb'
-    - 'lib/net/ssh/transport/hmac.rb'
-    - 'lib/net/ssh/transport/key_expander.rb'
-    - 'test/common.rb'
 
 # Offense count: 2
 # Configuration parameters: AllowedChars.
+# AllowedChars: ©
 Style/AsciiComments:
   Exclude:
     - 'lib/net/ssh/authentication/pageant.rb'
@@ -382,7 +464,7 @@ Style/AsciiComments:
 
 # Offense count: 9
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
@@ -397,24 +479,21 @@ Style/BlockDelimiters:
     - 'lib/net/ssh/transport/ctr.rb'
     - 'test/verifiers/test_always.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'lib/net/ssh/config.rb'
-    - 'test/integration/test_ed25519_pkeys.rb'
-    - 'test/integration/test_id_rsa_keys.rb'
-    - 'test/transport/test_hmac.rb'
-    - 'test/transport/test_session.rb'
-
 # Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowOnConstant.
 Style/CaseEquality:
   Exclude:
     - 'lib/net/ssh/buffer.rb'
     - 'lib/net/ssh/connection/session.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/CaseLikeIf:
+  Exclude:
+    - 'lib/net/ssh/transport/openssl.rb'
+    - 'test/connection/test_session.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/CharacterLiteral:
@@ -423,11 +502,19 @@ Style/CharacterLiteral:
 
 # Offense count: 17
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: ==, equal?, eql?
+Style/ClassEqualityComparison:
+  Exclude:
+    - 'lib/net/ssh/service/forward.rb'
+
 # Offense count: 7
 Style/ClassVars:
   Exclude:
@@ -442,10 +529,16 @@ Style/ColonMethodCall:
   Exclude:
     - 'lib/net/ssh/authentication/ed25519.rb'
 
+# Offense count: 2
+Style/CombinableLoops:
+  Exclude:
+    - 'lib/net/ssh/connection/channel.rb'
+    - 'test/integration/test_hmac_etm.rb'
+
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
 Style/CommentAnnotation:
   Exclude:
     - 'lib/net/ssh/authentication/ed25519.rb'
@@ -454,6 +547,7 @@ Style/CommentAnnotation:
     - 'lib/net/ssh/config.rb'
 
 # Offense count: 3
+# Cop supports --auto-correct.
 Style/CommentedKeyword:
   Exclude:
     - 'test/connection/test_session.rb'
@@ -471,7 +565,8 @@ Style/ConditionalAssignment:
     - 'lib/net/ssh/transport/state.rb'
     - 'test/test_key_factory.rb'
 
-# Offense count: 13
+# Offense count: 12
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -496,6 +591,16 @@ Style/EvenOdd:
   Exclude:
     - 'lib/net/ssh/buffer.rb'
 
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/ExplicitBlockArgument:
+  Exclude:
+    - 'lib/net/ssh/loggable.rb'
+    - 'lib/net/ssh/test.rb'
+    - 'test/integration/common.rb'
+    - 'test/integration/mitm_server.rb'
+    - 'test/integration/test_forward.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -505,26 +610,26 @@ Style/FormatString:
     - 'lib/net/ssh/authentication/pageant.rb'
     - 'lib/net/ssh/loggable.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'lib/net/ssh/loggable.rb'
-
 # Offense count: 171
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/GlobalStdStream:
+  Exclude:
+    - 'lib/net/ssh.rb'
+
 # Offense count: 35
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
 # Offense count: 1
+# Cop supports --auto-correct.
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Exclude:
@@ -559,11 +664,6 @@ Style/LineEndConcatenation:
     - 'lib/net/ssh/verifiers/always.rb'
 
 # Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/net/ssh/connection/session.rb'
-
-# Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/net/ssh/connection/session.rb'
@@ -575,15 +675,15 @@ Style/MultilineIfThen:
     - 'lib/net/ssh/buffered_io.rb'
     - 'lib/net/ssh/service/forward.rb'
 
-# Offense count: 6
+# Offense count: 7
 # Cop supports --auto-correct.
 Style/MultilineWhenThen:
   Exclude:
-    - 'lib/net/ssh/test/packet.rb'
     - 'lib/net/ssh/transport/packet_stream.rb'
     - 'lib/net/ssh/transport/session.rb'
 
 # Offense count: 5
+# Cop supports --auto-correct.
 Style/MultipleComparison:
   Exclude:
     - 'lib/net/ssh/authentication/agent.rb'
@@ -591,7 +691,7 @@ Style/MultipleComparison:
     - 'lib/net/ssh/known_hosts.rb'
     - 'lib/net/ssh/verifiers/accept_new_or_local_tunnel.rb'
 
-# Offense count: 41
+# Offense count: 42
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
@@ -642,7 +742,7 @@ Style/Not:
   Exclude:
     - 'lib/net/ssh/connection/channel.rb'
 
-# Offense count: 10
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
@@ -650,11 +750,28 @@ Style/NumericLiterals:
 
 # Offense count: 29
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Enabled: false
 
+# Offense count: 17
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/net/ssh/connection/session.rb'
+    - 'lib/net/ssh/key_factory.rb'
+    - 'lib/net/ssh/prompt.rb'
+    - 'lib/net/ssh/test/channel.rb'
+    - 'lib/net/ssh/test/script.rb'
+    - 'lib/net/ssh/transport/algorithms.rb'
+    - 'lib/net/ssh/transport/session.rb'
+    - 'lib/net/ssh/transport/state.rb'
+    - 'test/common.rb'
+    - 'test/integration/common.rb'
+    - 'test/transport/test_server_version.rb'
+
 # Offense count: 15
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
@@ -687,7 +804,7 @@ Style/PercentLiteralDelimiters:
     - 'net-ssh.gemspec'
     - 'test/test_config.rb'
 
-# Offense count: 15
+# Offense count: 16
 # Cop supports --auto-correct.
 Style/PerlBackrefs:
   Exclude:
@@ -713,21 +830,56 @@ Style/Proc:
 
 # Offense count: 7
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Exclude:
     - 'lib/net/ssh/authentication/ed25519.rb'
 
-# Offense count: 4
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/RedundantBegin:
   Exclude:
     - 'lib/net/ssh/buffered_io.rb'
+    - 'lib/net/ssh/service/forward.rb'
     - 'lib/net/ssh/verifiers/accept_new.rb'
     - 'test/manual/test_pageant.rb'
 
-# Offense count: 61
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantCondition:
+  Exclude:
+    - 'lib/net/ssh/proxy/command.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantFileExtensionInRequire:
+  Exclude:
+    - 'lib/net/ssh/transport/cipher_factory.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantInterpolation:
+  Exclude:
+    - 'lib/net/ssh/proxy/socks5.rb'
+    - 'lib/net/ssh/transport/session.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantPercentQ:
+  Exclude:
+    - 'net-ssh.gemspec'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/net/ssh/authentication/agent.rb'
+    - 'lib/net/ssh/buffer.rb'
+    - 'lib/net/ssh/config.rb'
+    - 'lib/net/ssh/transport/cipher_factory.rb'
+
+# Offense count: 86
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
@@ -750,8 +902,8 @@ Style/RescueModifier:
 
 # Offense count: 25
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'lib/net/ssh/authentication/key_manager.rb'
@@ -798,6 +950,15 @@ Style/SingleLineMethods:
   Exclude:
     - 'lib/net/ssh/buffered_io.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
+  Exclude:
+    - 'lib/net/ssh/transport/packet_stream.rb'
+    - 'test/common.rb'
+    - 'test/integration/test_proxy.rb'
+
 # Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -812,7 +973,23 @@ Style/SpecialGlobalVars:
     - 'test/manual/test_pageant.rb'
     - 'test/test_all.rb'
 
-# Offense count: 1801
+# Offense count: 27
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/net/ssh/authentication/certificate.rb'
+    - 'lib/net/ssh/authentication/key_manager.rb'
+    - 'lib/net/ssh/authentication/pageant.rb'
+    - 'lib/net/ssh/config.rb'
+    - 'lib/net/ssh/transport/algorithms.rb'
+    - 'lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb'
+    - 'test/authentication/test_key_manager.rb'
+    - 'test/integration/common.rb'
+    - 'test/integration/test_proxy.rb'
+    - 'test/test_buffer.rb'
+    - 'test/test_key_factory.rb'
+
+# Offense count: 1820
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -821,7 +998,7 @@ Style/StringLiterals:
 
 # Offense count: 7
 # Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowMethodsWithArguments, IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Exclude:
@@ -831,24 +1008,16 @@ Style/SymbolProc:
     - 'lib/net/ssh/test/extensions.rb'
     - 'lib/net/ssh/transport/algorithms.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/UnneededCondition:
-  Exclude:
-    - 'lib/net/ssh/proxy/command.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededInterpolation:
-  Exclude:
-    - 'lib/net/ssh/proxy/socks5.rb'
-    - 'lib/net/ssh/transport/session.rb'
-
-# Offense count: 2
+# Offense count: 14
 # Cop supports --auto-correct.
-Style/UnneededPercentQ:
+Style/UnpackFirst:
   Exclude:
-    - 'net-ssh.gemspec'
+    - 'lib/net/ssh/authentication/pageant.rb'
+    - 'lib/net/ssh/buffer.rb'
+    - 'lib/net/ssh/key_factory.rb'
+    - 'lib/net/ssh/known_hosts.rb'
+    - 'lib/net/ssh/transport/openssl.rb'
+    - 'lib/net/ssh/transport/packet_stream.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -857,7 +1026,7 @@ Style/WhileUntilDo:
     - 'lib/net/ssh/config.rb'
     - 'test/integration/common.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets