Skip to content

Update for ruby 3.4 #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby:
- "3.0"
Expand All @@ -26,6 +27,6 @@ jobs:
- "jruby-9.4"
- "truffleruby"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Run tests with Ruby ${{ matrix.ruby }}
run: docker compose run ci-${{ matrix.ruby }}
105 changes: 51 additions & 54 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-03-29 17:13:45 UTC using RuboCop version 1.48.1.
# on 2025-05-31 20:03:27 UTC using RuboCop version 1.75.8.
# 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
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
# Include: **/*.gemspec
Gemspec/OrderedDependencies:
Exclude:
- 'net-ldap.gemspec'

# Offense count: 1
# Configuration parameters: Severity, Include.
# Include: **/*.gemspec
Gemspec/RequiredRubyVersion:
Exclude:
- 'net-ldap.gemspec'

# Offense count: 3
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, IndentationWidth.
Expand Down Expand Up @@ -61,7 +46,7 @@ Layout/EmptyLineAfterMagicComment:

# Offense count: 6
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
Layout/EmptyLineBetweenDefs:
Exclude:
- 'lib/net/ldap/dataset.rb'
Expand Down Expand Up @@ -104,7 +89,7 @@ Layout/EndAlignment:
Exclude:
- 'testserver/ldapserver.rb'

# Offense count: 2
# Offense count: 6
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: IndentationWidth.
# SupportedStyles: special_inside_parentheses, consistent, align_brackets
Expand Down Expand Up @@ -148,9 +133,9 @@ Layout/IndentationWidth:
- 'lib/net/ldap/password.rb'
- 'lib/net/snmp.rb'

# Offense count: 15
# Offense count: 14
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment, AllowRBSInlineAnnotation, AllowSteepAnnotation.
Layout/LeadingCommentSpace:
Exclude:
- 'lib/net/ber/core_ext/array.rb'
Expand All @@ -168,7 +153,7 @@ Layout/MultilineMethodCallBraceLayout:
Exclude:
- 'lib/net/ldap/filter.rb'

# Offense count: 7
# Offense count: 8
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: space, no_space
Expand All @@ -186,8 +171,9 @@ Layout/SpaceAroundKeyword:

# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
# SupportedStylesForExponentOperator: space, no_space
# SupportedStylesForRationalLiterals: space, no_space
Layout/SpaceAroundOperators:
Exclude:
- 'lib/net/ber/ber_parser.rb'
Expand All @@ -214,8 +200,8 @@ Layout/SpaceInsideParens:
- 'lib/net/snmp.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AllowComments.
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AutoCorrect, AllowComments.
Lint/EmptyConditionalBody:
Exclude:
- 'lib/net/ldap/filter.rb'
Expand All @@ -227,6 +213,7 @@ Lint/EmptyWhen:
- 'lib/net/ldap/pdu.rb'

# Offense count: 30
# This cop supports safe autocorrection (--autocorrect).
Lint/ImplicitStringConcatenation:
Exclude:
- 'test/test_filter.rb'
Expand All @@ -241,17 +228,18 @@ Lint/RescueException:
Exclude:
- 'lib/net/ldap/pdu.rb'

# Offense count: 9
# Offense count: 10
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
# Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
Lint/UnusedBlockArgument:
Exclude:
- 'lib/net/ldap.rb'
- 'lib/net/snmp.rb'

# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
# NotImplementedExceptions: NotImplementedError
Lint/UnusedMethodArgument:
Exclude:
- 'lib/net/ldap/entry.rb'
Expand All @@ -262,19 +250,21 @@ Lint/UnusedMethodArgument:

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
# Configuration parameters: AutoCorrect, ContextCreatingMethods, MethodCreatingMethods.
Lint/UselessAccessModifier:
Exclude:
- 'lib/net/ldap/connection.rb'

# Offense count: 5
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AutoCorrect.
Lint/UselessAssignment:
Exclude:
- 'test/integration/test_add.rb'
- 'test/test_ldap_connection.rb'
- 'test/test_search.rb'

# Offense count: 38
# Offense count: 42
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
Metrics/AbcSize:
Max: 124
Expand All @@ -285,22 +275,22 @@ Metrics/AbcSize:
Metrics/BlockLength:
Max: 119

# Offense count: 11
# Configuration parameters: CountBlocks.
# Offense count: 6
# Configuration parameters: CountBlocks, CountModifierForms.
Metrics/BlockNesting:
Max: 4

# Offense count: 11
# Offense count: 12
# Configuration parameters: CountComments, CountAsOne.
Metrics/ClassLength:
Max: 451

# Offense count: 20
# Offense count: 21
# Configuration parameters: AllowedMethods, AllowedPatterns.
Metrics/CyclomaticComplexity:
Max: 45

# Offense count: 74
# Offense count: 79
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
Metrics/MethodLength:
Max: 130
Expand Down Expand Up @@ -333,7 +323,7 @@ Naming/ClassAndModuleCamelCase:
Exclude:
- 'lib/net/ldap/auth_adapter/gss_spnego.rb'

# Offense count: 87
# Offense count: 88
Naming/ConstantName:
Exclude:
- 'lib/net/ldap.rb'
Expand All @@ -350,6 +340,7 @@ Naming/ConstantName:
# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
Naming/FileName:
Exclude:
- 'Rakefile.rb'
- 'lib/net-ldap.rb'

# Offense count: 11
Expand Down Expand Up @@ -380,7 +371,7 @@ Style/AccessorGrouping:
- 'lib/net/ldap.rb'
- 'lib/net/ldap/pdu.rb'

# Offense count: 10
# Offense count: 11
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: prefer_alias, prefer_alias_method
Expand Down Expand Up @@ -434,8 +425,10 @@ Style/CharacterLiteral:

# Offense count: 23
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
# SupportedStyles: nested, compact
# SupportedStylesForClasses: ~, nested, compact
# SupportedStylesForModules: ~, nested, compact
Style/ClassAndModuleChildren:
Enabled: false

Expand Down Expand Up @@ -493,7 +486,7 @@ Style/Documentation:

# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# Configuration parameters: AutoCorrect, EnforcedStyle.
# SupportedStyles: compact, expanded
Style/EmptyMethod:
Exclude:
Expand Down Expand Up @@ -525,7 +518,7 @@ Style/ExplicitBlockArgument:
- 'lib/net/ldap.rb'
- 'lib/net/ldap/dataset.rb'

# Offense count: 54
# Offense count: 57
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Expand All @@ -545,11 +538,11 @@ Style/GuardClause:
Exclude:
- 'lib/net/ldap/filter.rb'

# Offense count: 159
# Offense count: 164
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
# SupportedShorthandSyntax: always, never, either, consistent
# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
Style/HashSyntax:
Exclude:
- 'lib/net/ber.rb'
Expand All @@ -573,7 +566,7 @@ Style/IfInsideElse:
Exclude:
- 'lib/net/ldap/instrumentation.rb'

# Offense count: 25
# Offense count: 28
# This cop supports safe autocorrection (--autocorrect).
Style/IfUnlessModifier:
Exclude:
Expand Down Expand Up @@ -618,7 +611,14 @@ Style/MultilineWhenThen:
Exclude:
- 'lib/net/ldap/dn.rb'

# Offense count: 25
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
Style/MultipleComparison:
Exclude:
- 'lib/net/ldap/dataset.rb'

# Offense count: 26
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: literals, strict
Expand Down Expand Up @@ -650,7 +650,7 @@ Style/NegatedWhile:

# Offense count: 3
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, MinBodyLength.
# Configuration parameters: EnforcedStyle, MinBodyLength, AllowConsecutiveConditionals.
# SupportedStyles: skip_modifier_ifs, always
Style/Next:
Exclude:
Expand Down Expand Up @@ -678,7 +678,7 @@ Style/Not:
Exclude:
- 'lib/net/ldap/filter.rb'

# Offense count: 11
# Offense count: 13
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
Style/NumericLiterals:
Expand All @@ -704,15 +704,12 @@ Style/OptionalBooleanParameter:
Exclude:
- 'lib/net/ldap/entry.rb'

# Offense count: 6
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
Style/ParenthesesAroundCondition:
Exclude:
- 'lib/net/ldap.rb'
- 'lib/net/ldap/auth_adapter/gss_spnego.rb'
- 'lib/net/ldap/auth_adapter/sasl.rb'
- 'lib/net/ldap/auth_adapter/simple.rb'

# Offense count: 13
# This cop supports safe autocorrection (--autocorrect).
Expand All @@ -737,7 +734,7 @@ Style/PerlBackrefs:
- 'testserver/ldapserver.rb'

# Offense count: 10
# This cop supports safe autocorrection (--autocorrect).
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle, AllowedCompactTypes.
# SupportedStyles: compact, exploded
Style/RaiseArgs:
Expand Down Expand Up @@ -874,7 +871,7 @@ Style/StringConcatenation:
- 'test/test_ldif.rb'
- 'test/test_snmp.rb'

# Offense count: 683
# Offense count: 728
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
# SupportedStyles: single_quotes, double_quotes
Expand Down Expand Up @@ -907,7 +904,7 @@ Style/TernaryParentheses:
# Offense count: 38
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyleForMultiline.
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
Style/TrailingCommaInHashLiteral:
Enabled: false

Expand Down Expand Up @@ -955,9 +952,9 @@ Style/ZeroLengthPredicate:
- 'lib/net/ldap/filter.rb'
- 'testserver/ldapserver.rb'

# Offense count: 24
# Offense count: 27
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
# URISchemes: http, https
Layout/LineLength:
Max: 360
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
source 'https://rubygems.org'
gemspec

gem "debug", platform: :mri
gem "flexmock", "~> 1.3"
gem "rake", "~> 12.3.3"
gem "rubocop", "~> 1.48"
gem "test-unit"
1 change: 1 addition & 0 deletions ci-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
set -e

gem install bundler
ruby -v | grep jruby && apt update && apt install -y gcc
bundle check || bundle install
bundle exec rake ci
Loading