Skip to content

Commit 16d7625

Browse files
Update for ruby 3.4 (#439)
* Update for ruby 3.4 * Update gemfile * Update test workflow * Update ci
1 parent a562790 commit 16d7625

File tree

6 files changed

+68
-67
lines changed

6 files changed

+68
-67
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
test:
1818
runs-on: ubuntu-latest
1919
strategy:
20+
fail-fast: false
2021
matrix:
2122
ruby:
2223
- "3.0"
@@ -26,6 +27,6 @@ jobs:
2627
- "jruby-9.4"
2728
- "truffleruby"
2829
steps:
29-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v4
3031
- name: Run tests with Ruby ${{ matrix.ruby }}
3132
run: docker compose run ci-${{ matrix.ruby }}

.rubocop_todo.yml

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,11 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-03-29 17:13:45 UTC using RuboCop version 1.48.1.
3+
# on 2025-05-31 20:03:27 UTC using RuboCop version 1.75.8.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 1
10-
# This cop supports safe autocorrection (--autocorrect).
11-
# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
12-
# Include: **/*.gemspec
13-
Gemspec/OrderedDependencies:
14-
Exclude:
15-
- 'net-ldap.gemspec'
16-
17-
# Offense count: 1
18-
# Configuration parameters: Severity, Include.
19-
# Include: **/*.gemspec
20-
Gemspec/RequiredRubyVersion:
21-
Exclude:
22-
- 'net-ldap.gemspec'
23-
249
# Offense count: 3
2510
# This cop supports safe autocorrection (--autocorrect).
2611
# Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -61,7 +46,7 @@ Layout/EmptyLineAfterMagicComment:
6146

6247
# Offense count: 6
6348
# This cop supports safe autocorrection (--autocorrect).
64-
# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
49+
# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
6550
Layout/EmptyLineBetweenDefs:
6651
Exclude:
6752
- 'lib/net/ldap/dataset.rb'
@@ -104,7 +89,7 @@ Layout/EndAlignment:
10489
Exclude:
10590
- 'testserver/ldapserver.rb'
10691

107-
# Offense count: 2
92+
# Offense count: 6
10893
# This cop supports safe autocorrection (--autocorrect).
10994
# Configuration parameters: IndentationWidth.
11095
# SupportedStyles: special_inside_parentheses, consistent, align_brackets
@@ -148,9 +133,9 @@ Layout/IndentationWidth:
148133
- 'lib/net/ldap/password.rb'
149134
- 'lib/net/snmp.rb'
150135

151-
# Offense count: 15
136+
# Offense count: 14
152137
# This cop supports safe autocorrection (--autocorrect).
153-
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
138+
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment, AllowRBSInlineAnnotation, AllowSteepAnnotation.
154139
Layout/LeadingCommentSpace:
155140
Exclude:
156141
- 'lib/net/ber/core_ext/array.rb'
@@ -168,7 +153,7 @@ Layout/MultilineMethodCallBraceLayout:
168153
Exclude:
169154
- 'lib/net/ldap/filter.rb'
170155

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

187172
# Offense count: 7
188173
# This cop supports safe autocorrection (--autocorrect).
189-
# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
174+
# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
190175
# SupportedStylesForExponentOperator: space, no_space
176+
# SupportedStylesForRationalLiterals: space, no_space
191177
Layout/SpaceAroundOperators:
192178
Exclude:
193179
- 'lib/net/ber/ber_parser.rb'
@@ -214,8 +200,8 @@ Layout/SpaceInsideParens:
214200
- 'lib/net/snmp.rb'
215201

216202
# Offense count: 1
217-
# This cop supports unsafe autocorrection (--autocorrect-all).
218-
# Configuration parameters: AllowComments.
203+
# This cop supports safe autocorrection (--autocorrect).
204+
# Configuration parameters: AutoCorrect, AllowComments.
219205
Lint/EmptyConditionalBody:
220206
Exclude:
221207
- 'lib/net/ldap/filter.rb'
@@ -227,6 +213,7 @@ Lint/EmptyWhen:
227213
- 'lib/net/ldap/pdu.rb'
228214

229215
# Offense count: 30
216+
# This cop supports safe autocorrection (--autocorrect).
230217
Lint/ImplicitStringConcatenation:
231218
Exclude:
232219
- 'test/test_filter.rb'
@@ -241,17 +228,18 @@ Lint/RescueException:
241228
Exclude:
242229
- 'lib/net/ldap/pdu.rb'
243230

244-
# Offense count: 9
231+
# Offense count: 10
245232
# This cop supports safe autocorrection (--autocorrect).
246-
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
233+
# Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
247234
Lint/UnusedBlockArgument:
248235
Exclude:
249236
- 'lib/net/ldap.rb'
250237
- 'lib/net/snmp.rb'
251238

252239
# Offense count: 7
253240
# This cop supports safe autocorrection (--autocorrect).
254-
# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
241+
# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
242+
# NotImplementedExceptions: NotImplementedError
255243
Lint/UnusedMethodArgument:
256244
Exclude:
257245
- 'lib/net/ldap/entry.rb'
@@ -262,19 +250,21 @@ Lint/UnusedMethodArgument:
262250

263251
# Offense count: 1
264252
# This cop supports safe autocorrection (--autocorrect).
265-
# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
253+
# Configuration parameters: AutoCorrect, ContextCreatingMethods, MethodCreatingMethods.
266254
Lint/UselessAccessModifier:
267255
Exclude:
268256
- 'lib/net/ldap/connection.rb'
269257

270258
# Offense count: 5
259+
# This cop supports safe autocorrection (--autocorrect).
260+
# Configuration parameters: AutoCorrect.
271261
Lint/UselessAssignment:
272262
Exclude:
273263
- 'test/integration/test_add.rb'
274264
- 'test/test_ldap_connection.rb'
275265
- 'test/test_search.rb'
276266

277-
# Offense count: 38
267+
# Offense count: 42
278268
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
279269
Metrics/AbcSize:
280270
Max: 124
@@ -285,22 +275,22 @@ Metrics/AbcSize:
285275
Metrics/BlockLength:
286276
Max: 119
287277

288-
# Offense count: 11
289-
# Configuration parameters: CountBlocks.
278+
# Offense count: 6
279+
# Configuration parameters: CountBlocks, CountModifierForms.
290280
Metrics/BlockNesting:
291281
Max: 4
292282

293-
# Offense count: 11
283+
# Offense count: 12
294284
# Configuration parameters: CountComments, CountAsOne.
295285
Metrics/ClassLength:
296286
Max: 451
297287

298-
# Offense count: 20
288+
# Offense count: 21
299289
# Configuration parameters: AllowedMethods, AllowedPatterns.
300290
Metrics/CyclomaticComplexity:
301291
Max: 45
302292

303-
# Offense count: 74
293+
# Offense count: 79
304294
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
305295
Metrics/MethodLength:
306296
Max: 130
@@ -333,7 +323,7 @@ Naming/ClassAndModuleCamelCase:
333323
Exclude:
334324
- 'lib/net/ldap/auth_adapter/gss_spnego.rb'
335325

336-
# Offense count: 87
326+
# Offense count: 88
337327
Naming/ConstantName:
338328
Exclude:
339329
- 'lib/net/ldap.rb'
@@ -350,6 +340,7 @@ Naming/ConstantName:
350340
# 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
351341
Naming/FileName:
352342
Exclude:
343+
- 'Rakefile.rb'
353344
- 'lib/net-ldap.rb'
354345

355346
# Offense count: 11
@@ -380,7 +371,7 @@ Style/AccessorGrouping:
380371
- 'lib/net/ldap.rb'
381372
- 'lib/net/ldap/pdu.rb'
382373

383-
# Offense count: 10
374+
# Offense count: 11
384375
# This cop supports safe autocorrection (--autocorrect).
385376
# Configuration parameters: EnforcedStyle.
386377
# SupportedStyles: prefer_alias, prefer_alias_method
@@ -434,8 +425,10 @@ Style/CharacterLiteral:
434425

435426
# Offense count: 23
436427
# This cop supports unsafe autocorrection (--autocorrect-all).
437-
# Configuration parameters: EnforcedStyle.
428+
# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
438429
# SupportedStyles: nested, compact
430+
# SupportedStylesForClasses: ~, nested, compact
431+
# SupportedStylesForModules: ~, nested, compact
439432
Style/ClassAndModuleChildren:
440433
Enabled: false
441434

@@ -493,7 +486,7 @@ Style/Documentation:
493486

494487
# Offense count: 1
495488
# This cop supports safe autocorrection (--autocorrect).
496-
# Configuration parameters: EnforcedStyle.
489+
# Configuration parameters: AutoCorrect, EnforcedStyle.
497490
# SupportedStyles: compact, expanded
498491
Style/EmptyMethod:
499492
Exclude:
@@ -525,7 +518,7 @@ Style/ExplicitBlockArgument:
525518
- 'lib/net/ldap.rb'
526519
- 'lib/net/ldap/dataset.rb'
527520

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

548-
# Offense count: 159
541+
# Offense count: 164
549542
# This cop supports safe autocorrection (--autocorrect).
550543
# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
551544
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
552-
# SupportedShorthandSyntax: always, never, either, consistent
545+
# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
553546
Style/HashSyntax:
554547
Exclude:
555548
- 'lib/net/ber.rb'
@@ -573,7 +566,7 @@ Style/IfInsideElse:
573566
Exclude:
574567
- 'lib/net/ldap/instrumentation.rb'
575568

576-
# Offense count: 25
569+
# Offense count: 28
577570
# This cop supports safe autocorrection (--autocorrect).
578571
Style/IfUnlessModifier:
579572
Exclude:
@@ -618,7 +611,14 @@ Style/MultilineWhenThen:
618611
Exclude:
619612
- 'lib/net/ldap/dn.rb'
620613

621-
# Offense count: 25
614+
# Offense count: 1
615+
# This cop supports safe autocorrection (--autocorrect).
616+
# Configuration parameters: AllowMethodComparison, ComparisonsThreshold.
617+
Style/MultipleComparison:
618+
Exclude:
619+
- 'lib/net/ldap/dataset.rb'
620+
621+
# Offense count: 26
622622
# This cop supports unsafe autocorrection (--autocorrect-all).
623623
# Configuration parameters: EnforcedStyle.
624624
# SupportedStyles: literals, strict
@@ -650,7 +650,7 @@ Style/NegatedWhile:
650650

651651
# Offense count: 3
652652
# This cop supports safe autocorrection (--autocorrect).
653-
# Configuration parameters: EnforcedStyle, MinBodyLength.
653+
# Configuration parameters: EnforcedStyle, MinBodyLength, AllowConsecutiveConditionals.
654654
# SupportedStyles: skip_modifier_ifs, always
655655
Style/Next:
656656
Exclude:
@@ -678,7 +678,7 @@ Style/Not:
678678
Exclude:
679679
- 'lib/net/ldap/filter.rb'
680680

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

707-
# Offense count: 6
707+
# Offense count: 1
708708
# This cop supports safe autocorrection (--autocorrect).
709709
# Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
710710
Style/ParenthesesAroundCondition:
711711
Exclude:
712-
- 'lib/net/ldap.rb'
713-
- 'lib/net/ldap/auth_adapter/gss_spnego.rb'
714712
- 'lib/net/ldap/auth_adapter/sasl.rb'
715-
- 'lib/net/ldap/auth_adapter/simple.rb'
716713

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

739736
# Offense count: 10
740-
# This cop supports safe autocorrection (--autocorrect).
737+
# This cop supports unsafe autocorrection (--autocorrect-all).
741738
# Configuration parameters: EnforcedStyle, AllowedCompactTypes.
742739
# SupportedStyles: compact, exploded
743740
Style/RaiseArgs:
@@ -874,7 +871,7 @@ Style/StringConcatenation:
874871
- 'test/test_ldif.rb'
875872
- 'test/test_snmp.rb'
876873

877-
# Offense count: 683
874+
# Offense count: 728
878875
# This cop supports safe autocorrection (--autocorrect).
879876
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
880877
# SupportedStyles: single_quotes, double_quotes
@@ -907,7 +904,7 @@ Style/TernaryParentheses:
907904
# Offense count: 38
908905
# This cop supports safe autocorrection (--autocorrect).
909906
# Configuration parameters: EnforcedStyleForMultiline.
910-
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
907+
# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
911908
Style/TrailingCommaInHashLiteral:
912909
Enabled: false
913910

@@ -955,9 +952,9 @@ Style/ZeroLengthPredicate:
955952
- 'lib/net/ldap/filter.rb'
956953
- 'testserver/ldapserver.rb'
957954

958-
# Offense count: 24
955+
# Offense count: 27
959956
# This cop supports safe autocorrection (--autocorrect).
960-
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
957+
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
961958
# URISchemes: http, https
962959
Layout/LineLength:
963960
Max: 360

Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
source 'https://rubygems.org'
22
gemspec
3+
4+
gem "debug", platform: :mri
5+
gem "flexmock", "~> 1.3"
6+
gem "rake", "~> 12.3.3"
7+
gem "rubocop", "~> 1.48"
8+
gem "test-unit"

ci-run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
set -e
44

55
gem install bundler
6+
ruby -v | grep jruby && apt update && apt install -y gcc
67
bundle check || bundle install
78
bundle exec rake ci

0 commit comments

Comments
 (0)