diff options
author | Florian Wininger <fw.centrale@gmail.com> | 2019-08-14 14:27:09 +0200 |
---|---|---|
committer | Florian Wininger <fw.centrale@gmail.com> | 2019-08-19 16:22:00 +0200 |
commit | 385dd7cfecbb60a3bc5f191a35bbe89c3a37614c (patch) | |
tree | fd6d3f18ebc0773e7a838a644f09a36b76cac443 | |
parent | dd9346ad9c667cf7256eab4ad02c9fe8b4307d89 (diff) | |
download | net-ssh-385dd7cfecbb60a3bc5f191a35bbe89c3a37614c.tar.gz |
Update dependencies configuration
Signed-off-by: Florian Wininger <fw.centrale@gmail.com>
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .rubocop_todo.yml | 227 | ||||
-rw-r--r-- | .travis.yml | 27 | ||||
-rw-r--r-- | Gemfile.noed25519.lock | 41 | ||||
-rw-r--r-- | appveyor.yml | 6 | ||||
-rw-r--r-- | net-ssh.gemspec | 6 |
6 files changed, 193 insertions, 115 deletions
@@ -1,4 +1,5 @@ /Gemfile.lock +/Gemfile.noed25519.lock doc rdoc ri diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c07b37b..bd6502d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-08-12 17:58:13 +0200 using RuboCop version 0.54.0. +# on 2019-08-17 17:53:05 +0200 using RuboCop version 0.74.0. # 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 @@ -9,8 +9,35 @@ # Offense count: 78 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: with_first_parameter, with_fixed_indentation -Layout/AlignParameters: +# SupportedStyles: with_first_argument, with_fixed_indentation +Layout/AlignArguments: + Enabled: false + +# Offense count: 48 +# 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: + 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: 4 +# Cop supports --auto-correct. +Layout/ClosingHeredocIndentation: + Exclude: + - 'test/authentication/test_agent.rb' + - 'test/authentication/test_ed25519.rb' + - 'test/test_key_factory.rb' + +# Offense count: 74 +# Cop supports --auto-correct. +Layout/EmptyLineAfterGuardClause: Enabled: false # Offense count: 189 @@ -22,14 +49,6 @@ Layout/EmptyLinesAroundModuleBody: # Offense count: 4 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: special_inside_parentheses, consistent, align_brackets -Layout/IndentArray: - Exclude: - - 'lib/net/ssh/transport/openssl.rb' - -# Offense count: 4 -# Cop supports --auto-correct. # Configuration parameters: IndentationWidth. Layout/IndentAssignment: Exclude: @@ -38,10 +57,18 @@ Layout/IndentAssignment: - 'test/transport/kex/test_ecdh_sha2_nistp384.rb' - 'test/transport/kex/test_ecdh_sha2_nistp521.rb' +# Offense count: 4 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, IndentationWidth. +# SupportedStyles: special_inside_parentheses, consistent, align_brackets +Layout/IndentFirstArrayElement: + Exclude: + - 'lib/net/ssh/transport/openssl.rb' + # Offense count: 11 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. -# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent +# SupportedStyles: squiggly, active_support, powerpack, unindent Layout/IndentHeredoc: Exclude: - 'test/authentication/test_agent.rb' @@ -51,8 +78,33 @@ Layout/IndentHeredoc: - 'test/integration/test_agent.rb' - 'test/test_key_factory.rb' +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle. +# SupportedStyles: normal, indented_internal_methods +Layout/IndentationConsistency: + Exclude: + - 'test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb' + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: Width, IgnoredPatterns. +Layout/IndentationWidth: + Exclude: + - 'test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb' + +# Offense count: 4 +# Cop supports --auto-correct. +Layout/LeadingBlankLines: + Exclude: + - 'Rakefile' + - 'lib/net/ssh/authentication/pub_key_fingerprint.rb' + - 'net-ssh.gemspec' + - 'support/arcfour_check.rb' + # Offense count: 14 # Cop supports --auto-correct. +# Configuration parameters: AllowDoxygenCommentStyle. Layout/LeadingCommentSpace: Exclude: - 'test/integration/test_ed25519_pkeys.rb' @@ -109,6 +161,15 @@ Layout/SpaceInsideBlockBraces: - 'test/authentication/test_key_manager.rb' - 'test/start/test_user_nil.rb' +# Offense count: 6 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets. +# SupportedStyles: space, no_space +# SupportedStylesForEmptyBrackets: space, no_space +Layout/SpaceInsideReferenceBrackets: + Exclude: + - 'lib/net/ssh/transport/algorithms.rb' + # Offense count: 18 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. @@ -118,6 +179,7 @@ Layout/TrailingBlankLines: # Offense count: 780 # Cop supports --auto-correct. +# Configuration parameters: AllowInHeredoc. Layout/TrailingWhitespace: Enabled: false @@ -135,6 +197,7 @@ Lint/EmptyWhen: - 'lib/net/ssh/config.rb' # Offense count: 9 +# Configuration parameters: AllowComments. Lint/HandleExceptions: Exclude: - 'lib/net/ssh/authentication/session.rb' @@ -188,10 +251,17 @@ Lint/ShadowedException: - 'lib/net/ssh/authentication/key_manager.rb' # Offense count: 1 +# Configuration parameters: AllowKeywordBlockArguments. Lint/UnderscorePrefixedVariableName: Exclude: - 'lib/net/ssh/test/local_packet.rb' +# Offense count: 1 +# Cop supports --auto-correct. +Lint/UnneededRequireStatement: + Exclude: + - 'lib/net/ssh/ruby_compat.rb' + # Offense count: 60 # Cop supports --auto-correct. # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. @@ -230,12 +300,13 @@ Lint/UselessAssignment: - 'test/integration/common.rb' - 'test/integration/test_forward.rb' -# Offense count: 227 +# Offense count: 224 Metrics/AbcSize: - Max: 74 + Max: 69 -# Offense count: 16 +# Offense count: 15 # Configuration parameters: CountComments, ExcludedMethods. +# ExcludedMethods: refine Metrics/BlockLength: Max: 63 @@ -254,7 +325,7 @@ Metrics/CyclomaticComplexity: Max: 30 # Offense count: 208 -# Configuration parameters: CountComments. +# Configuration parameters: CountComments, ExcludedMethods. Metrics/MethodLength: Max: 88 @@ -314,7 +385,7 @@ Naming/ConstantName: # Offense count: 11 # Configuration parameters: Blacklist. -# Blacklist: END, (?-mix:EO[A-Z]{1}) +# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$)) Naming/HeredocDelimiterNaming: Exclude: - 'test/authentication/test_agent.rb' @@ -325,6 +396,8 @@ Naming/HeredocDelimiterNaming: - 'test/test_key_factory.rb' # Offense count: 4 +# Configuration parameters: EnforcedStyleForLeadingUnderscores. +# SupportedStylesForLeadingUnderscores: disallowed, required, optional Naming/MemoizedInstanceVariableName: Exclude: - 'lib/net/ssh/transport/openssl.rb' @@ -343,9 +416,18 @@ 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 +# AllowedNames: io, id, to, by, on, in, at, ip, db Naming/UncommunicativeMethodParamName: Exclude: - 'lib/net/ssh/authentication/certificate.rb' @@ -361,25 +443,14 @@ Naming/UncommunicativeMethodParamName: - 'lib/net/ssh/transport/identity_cipher.rb' - 'test/connection/test_session.rb' -# Offense count: 3 -# Cop supports --auto-correct. -Performance/RangeInclude: - Exclude: - - 'lib/net/ssh/transport/algorithms.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Performance/RedundantBlockCall: - Exclude: - - 'lib/net/ssh/connection/session.rb' - - 'test/connection/test_channel.rb' - -# Offense count: 6 -# Cop supports --auto-correct. -Performance/RedundantMatch: +# Offense count: 8 +# Configuration parameters: EnforcedStyle. +# SupportedStyles: inline, group +Style/AccessModifierDeclarations: Exclude: - - 'lib/net/ssh/key_factory.rb' - - 'lib/net/ssh/transport/server_version.rb' + - 'lib/net/ssh/authentication/pageant.rb' + - 'lib/net/ssh/transport/openssl.rb' + - 'test/test_key_factory.rb' # Offense count: 2 # Cop supports --auto-correct. @@ -420,8 +491,8 @@ Style/AsciiComments: # Offense count: 11 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods. -# SupportedStyles: line_count_based, semantic, braces_for_chaining +# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners. +# 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 # IgnoredMethods: lambda, proc, it @@ -573,12 +644,20 @@ Style/FormatStringToken: Exclude: - 'lib/net/ssh/loggable.rb' +# Offense count: 161 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle. +# SupportedStyles: always, never +Style/FrozenStringLiteralComment: + Enabled: false + # Offense count: 35 # Configuration parameters: MinBodyLength. Style/GuardClause: Enabled: false # Offense count: 1 +# Configuration parameters: AllowIfModifier. Style/IfInsideElse: Exclude: - 'lib/net/ssh/connection/session.rb' @@ -614,6 +693,7 @@ Style/LineEndConcatenation: # Offense count: 12 # Cop supports --auto-correct. +# Configuration parameters: IgnoredMethods. Style/MethodCallWithoutArgsParentheses: Exclude: - 'test/authentication/test_key_manager.rb' @@ -631,7 +711,12 @@ Style/MethodDefParentheses: - 'test/integration/common.rb' # Offense count: 1 -Style/MethodMissing: +Style/MethodMissingSuper: + Exclude: + - 'lib/net/ssh/connection/session.rb' + +# Offense count: 1 +Style/MissingRespondToMissing: Exclude: - 'lib/net/ssh/connection/session.rb' @@ -642,14 +727,26 @@ Style/MultilineIfThen: - 'lib/net/ssh/buffered_io.rb' - 'lib/net/ssh/service/forward.rb' -# Offense count: 3 +# Offense count: 6 +# 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 Style/MultipleComparison: Exclude: + - 'lib/net/ssh/authentication/agent.rb' - 'lib/net/ssh/authentication/pageant.rb' - 'lib/net/ssh/known_hosts.rb' + - 'lib/net/ssh/verifiers/accept_new_or_local_tunnel.rb' -# Offense count: 44 +# Offense count: 45 # Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle. +# SupportedStyles: literals, strict Style/MutableConstant: Enabled: false @@ -685,6 +782,8 @@ Style/Next: # Offense count: 2 # Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle. +# SupportedStyles: predicate, comparison Style/NilComparison: Exclude: - 'lib/net/ssh/proxy/command.rb' @@ -702,20 +801,12 @@ Style/Not: Style/NumericLiterals: MinDigits: 310 -# Offense count: 10 +# Offense count: 29 # Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, EnforcedStyle. +# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods. # SupportedStyles: predicate, comparison Style/NumericPredicate: - Exclude: - - 'spec/**/*' - - 'lib/net/ssh/authentication/methods/password.rb' - - 'lib/net/ssh/authentication/pageant.rb' - - 'lib/net/ssh/buffer.rb' - - 'lib/net/ssh/service/forward.rb' - - 'lib/net/ssh/test/extensions.rb' - - 'lib/net/ssh/transport/key_expander.rb' - - 'test/transport/test_packet_stream.rb' + Enabled: false # Offense count: 15 # Cop supports --auto-correct. @@ -733,7 +824,7 @@ Style/ParallelAssignment: # Offense count: 5 # Cop supports --auto-correct. -# Configuration parameters: AllowSafeAssignment. +# Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions. Style/ParenthesesAroundCondition: Exclude: - 'lib/net/ssh/authentication/ed25519.rb' @@ -818,6 +909,25 @@ Style/RescueModifier: - 'lib/net/ssh/service/forward.rb' - 'lib/net/ssh/transport/algorithms.rb' +# Offense count: 25 +# Cop supports --auto-correct. +# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist. +# Whitelist: present?, blank?, presence, try, try! +Style/SafeNavigation: + Exclude: + - 'lib/net/ssh/authentication/key_manager.rb' + - 'lib/net/ssh/authentication/methods/keyboard_interactive.rb' + - 'lib/net/ssh/authentication/methods/password.rb' + - 'lib/net/ssh/authentication/session.rb' + - 'lib/net/ssh/connection/channel.rb' + - 'lib/net/ssh/connection/event_loop.rb' + - 'lib/net/ssh/connection/session.rb' + - 'lib/net/ssh/key_factory.rb' + - 'lib/net/ssh/loggable.rb' + - 'lib/net/ssh/test/local_packet.rb' + - 'lib/net/ssh/transport/algorithms.rb' + - 'lib/net/ssh/transport/packet_stream.rb' + # Offense count: 2 # Cop supports --auto-correct. Style/SelfAssignment: @@ -863,7 +973,7 @@ Style/SpecialGlobalVars: - 'test/manual/test_pageant.rb' - 'test/test_all.rb' -# Offense count: 1947 +# Offense count: 1946 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline. # SupportedStyles: single_quotes, double_quotes @@ -895,6 +1005,12 @@ Style/UnlessElse: - 'test/transport/kex/test_ecdh_sha2_nistp521.rb' - 'test/transport/test_server_version.rb' +# Offense count: 1 +# Cop supports --auto-correct. +Style/UnneededCondition: + Exclude: + - 'lib/net/ssh/proxy/command.rb' + # Offense count: 4 # Cop supports --auto-correct. Style/UnneededInterpolation: @@ -933,7 +1049,8 @@ Style/ZeroLengthPredicate: - 'lib/net/ssh/connection/channel.rb' # Offense count: 1633 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# Cop supports --auto-correct. +# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Metrics/LineLength: Max: 932 diff --git a/.travis.yml b/.travis.yml index c82edc9..c18dd23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,11 @@ addon: gateway.netssh rvm: - - 2.2.10 - 2.3.7 - 2.4.5 - 2.5.3 - - 2.6.0-rc2 - - jruby-9.2.5.0 + - 2.6.2 + - jruby-9.2.8.0 - rbx-3.107 - ruby-head env: @@ -21,33 +20,33 @@ env: matrix: exclude: - rvm: rbx-3.107 - - rvm: jruby-9.2.5.0 + - rvm: jruby-9.2.8.0 include: - rvm: rbx-3.107 env: NET_SSH_RUN_INTEGRATION_TESTS= - - rvm: jruby-9.2.5.0 + - rvm: jruby-9.2.8.0 env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false' NET_SSH_RUN_INTEGRATION_TESTS= fast_finish: true allow_failures: - rvm: rbx-3.107 - - rvm: jruby-9.2.5.0 + - rvm: jruby-9.2.8.0 - rvm: ruby-head install: - export JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false' - sudo pip install ansible urllib3 pyOpenSSL ndg-httpsclient pyasn1 - - gem install bundler -v "= 1.16" + - gem install bundler -v "= 1.17" - gem list bundler - - bundle _1.16_ install - - bundle _1.16_ -v - - BUNDLE_GEMFILE=./Gemfile.noed25519 bundle _1.16_ install + - bundle _1.17_ install + - bundle _1.17_ -v + - BUNDLE_GEMFILE=./Gemfile.noed25519 bundle _1.17_ install - sudo ansible-galaxy install rvm.ruby - sudo chown -R travis:travis /home/travis/.ansible - ansible-playbook ./test/integration/playbook.yml -i "localhost," --become -c local -e 'no_rvm=true' -e 'myuser=travis' -e 'mygroup=travis' -e 'homedir=/home/travis' script: - ssh -V - - bundle _1.16_ exec rake test - - BUNDLE_GEMFILE=./Gemfile.noed25519 bundle _1.16_ exec rake test - - bundle _1.16_ exec rake test_test - - bundle _1.16_ exec rubocop + - bundle _1.17_ exec rake test + - BUNDLE_GEMFILE=./Gemfile.noed25519 bundle _1.17_ exec rake test + - bundle _1.17_ exec rake test_test + - bundle _1.17_ exec rubocop diff --git a/Gemfile.noed25519.lock b/Gemfile.noed25519.lock deleted file mode 100644 index 3d15a2f..0000000 --- a/Gemfile.noed25519.lock +++ /dev/null @@ -1,41 +0,0 @@ -PATH - remote: . - specs: - net-ssh (4.2.0) - -GEM - remote: https://rubygems.org/ - specs: - ast (2.3.0) - metaclass (0.0.4) - minitest (5.10.3) - mocha (1.3.0) - metaclass (~> 0.0.1) - parser (2.4.0.2) - ast (~> 2.3) - powerpack (0.1.1) - rainbow (2.2.2) - rake - rake (12.3.0) - rubocop (0.47.1) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - unicode-display_width (1.3.0) - -PLATFORMS - ruby - -DEPENDENCIES - bundler (~> 1.11) - minitest (~> 5.10) - mocha (>= 1.2.1) - net-ssh! - rake (~> 12.0) - rubocop (~> 0.47.0) - -BUNDLED WITH - 1.14.6 diff --git a/appveyor.yml b/appveyor.yml index 2beadc6..fd18163 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,9 +5,11 @@ skip_tags: true environment: matrix: - ruby_version: "jruby-9.1.2.0" + - ruby_version: "26-x64" + - ruby_version: "25-x64" + - ruby_version: "24-x64" - ruby_version: "23" - ruby_version: "23-x64" - - ruby_version: "22-x64" matrix: allow_failures: @@ -29,7 +31,7 @@ install: - if "%ruby_version%" == "jruby-9.1.2.0" ( cinst jruby --version 9.1.2.0 -i --allow-empty-checksums ) - if "%ruby_version%" == "jruby-9.1.2.0" ( SET "PATH=C:\jruby-9.1.2.0\bin\;%PATH%" ) - ruby --version - - gem install bundler --no-document --user-install -v 1.16 + - gem install bundler --no-document --user-install -v 1.17 - SET BUNDLE_GEMFILE=Gemfile.noed25519 - bundle install --retry=3 - cinst freesshd diff --git a/net-ssh.gemspec b/net-ssh.gemspec index 4bd1354..684c6c0 100644 --- a/net-ssh.gemspec +++ b/net-ssh.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| spec.description = %q{Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.} spec.homepage = "https://github.com/net-ssh/net-ssh" spec.license = "MIT" - spec.required_ruby_version = Gem::Requirement.new(">= 2.2.6") + spec.required_ruby_version = Gem::Requirement.new(">= 2.3") spec.extra_rdoc_files = [ "LICENSE.txt", @@ -33,10 +33,10 @@ Gem::Specification.new do |spec| spec.add_development_dependency("ed25519", "~> 1.2") end - spec.add_development_dependency "bundler", ">= 1.11" + spec.add_development_dependency "bundler", ">= 1.17" spec.add_development_dependency "minitest", "~> 5.10" spec.add_development_dependency "mocha", ">= 1.2.1" spec.add_development_dependency "rake", "~> 12.0" - spec.add_development_dependency "rubocop", "~> 0.54.0" + spec.add_development_dependency "rubocop", "~> 0.74.0" end |