Skip to content

Commit 1f1b4c5

Browse files
authored
Merge pull request #812 from standardrb/updates-2026-06-10
Updates rubocop to the latest
2 parents 697036e + 711cb6c commit 1f1b4c5

6 files changed

Lines changed: 54 additions & 7 deletions

File tree

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PATH
44
standard (1.54.0)
55
language_server-protocol (~> 3.17.0.2)
66
lint_roller (~> 1.0)
7-
rubocop (~> 1.84.0)
7+
rubocop (~> 1.87.0)
88
standard-custom (~> 1.0.0)
99
standard-performance (~> 1.8)
1010

@@ -32,11 +32,11 @@ GEM
3232
rbs (3.6.1)
3333
logger
3434
regexp_parser (2.11.3)
35-
rubocop (1.84.2)
35+
rubocop (1.87.0)
3636
json (~> 2.3)
3737
language_server-protocol (~> 3.17.0.2)
3838
lint_roller (~> 1.1.0)
39-
parallel (~> 1.10)
39+
parallel (>= 1.10)
4040
parser (>= 3.3.0.2)
4141
rainbow (>= 2.2.2, < 4.0)
4242
regexp_parser (>= 2.9.3, < 3.0)

config/base.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,9 @@ Lint/ConstantResolution:
484484
Lint/CopDirectiveSyntax:
485485
Enabled: true
486486

487+
Lint/DataDefineOverride:
488+
Enabled: false
489+
487490
Lint/Debugger:
488491
Enabled: true
489492

@@ -852,6 +855,9 @@ Lint/UnreachableCode:
852855
Lint/UnreachableLoop:
853856
Enabled: false
854857

858+
Lint/UnreachablePatternBranch:
859+
Enabled: true
860+
855861
Lint/UnusedBlockArgument:
856862
Enabled: false
857863

@@ -1278,6 +1284,9 @@ Style/FileEmpty:
12781284
Style/FileNull:
12791285
Enabled: true
12801286

1287+
Style/FileOpen:
1288+
Enabled: false
1289+
12811290
Style/FileRead:
12821291
Enabled: true
12831292

@@ -1419,6 +1428,9 @@ Style/MapCompactWithConditionalBlock:
14191428
Style/MapIntoArray:
14201429
Enabled: false
14211430

1431+
Style/MapJoin:
1432+
Enabled: true
1433+
14221434
Style/MapToHash:
14231435
Enabled: false
14241436

@@ -1575,6 +1587,9 @@ Style/NumericPredicate:
15751587
Style/ObjectThen:
15761588
Enabled: false
15771589

1590+
Style/OneClassPerFile:
1591+
Enabled: false
1592+
15781593
Style/OneLineConditional:
15791594
Enabled: true
15801595

@@ -1604,6 +1619,9 @@ Style/ParenthesesAroundCondition:
16041619
AllowSafeAssignment: true
16051620
AllowInMultilineConditions: false
16061621

1622+
Style/PartitionInsteadOfDoubleSelect:
1623+
Enabled: false
1624+
16071625
Style/PercentLiteralDelimiters:
16081626
Enabled: true
16091627
PreferredDelimiters:
@@ -1620,6 +1638,9 @@ Style/PercentQLiterals:
16201638
Style/PerlBackrefs:
16211639
Enabled: false
16221640

1641+
Style/PredicateWithKind:
1642+
Enabled: false
1643+
16231644
Style/PreferredHashMethods:
16241645
Enabled: false
16251646

@@ -1636,6 +1657,9 @@ Style/RaiseArgs:
16361657
Style/RandomWithOffset:
16371658
Enabled: true
16381659

1660+
Style/ReduceToHash:
1661+
Enabled: false
1662+
16391663
Style/RedundantArgument:
16401664
Enabled: false
16411665

@@ -1705,6 +1729,9 @@ Style/RedundantInterpolationUnfreeze:
17051729
Style/RedundantLineContinuation:
17061730
Enabled: true
17071731

1732+
Style/RedundantMinMaxBy:
1733+
Enabled: true
1734+
17081735
Style/RedundantParentheses:
17091736
Enabled: true
17101737

@@ -1745,6 +1772,9 @@ Style/RedundantSortBy:
17451772
Style/RedundantStringEscape:
17461773
Enabled: true
17471774

1775+
Style/RedundantStructKeywordInit:
1776+
Enabled: true
1777+
17481778
Style/RegexpLiteral:
17491779
Enabled: false
17501780

@@ -1783,6 +1813,12 @@ Style/SafeNavigationChainLength:
17831813
Style/Sample:
17841814
Enabled: true
17851815

1816+
Style/SelectByKind:
1817+
Enabled: false
1818+
1819+
Style/SelectByRange:
1820+
Enabled: false
1821+
17861822
Style/SelectByRegexp:
17871823
Enabled: false
17881824

@@ -1879,6 +1915,9 @@ Style/SymbolLiteral:
18791915
Style/SymbolProc:
18801916
Enabled: false
18811917

1918+
Style/TallyMethod:
1919+
Enabled: true
1920+
18821921
Style/TernaryParentheses:
18831922
Enabled: true
18841923
EnforcedStyle: require_parentheses_when_complex

config/ruby-2.6.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ Style/NumberedParametersLimit:
1111

1212
Lint/DuplicateMatchPattern:
1313
Enabled: false
14+
15+
Style/TallyMethod:
16+
Enabled: false

config/ruby-3.1.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ Style/DataInheritance:
99
Style/ArgumentsForwarding:
1010
Enabled: false
1111
AllowOnlyRestArgument: true
12+
13+
Style/RedundantStructKeywordInit:
14+
Enabled: false

standard.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.require_paths = ["lib"]
2222
spec.metadata["rubygems_mfa_required"] = "true"
2323

24-
spec.add_dependency "rubocop", "~> 1.84.0"
24+
spec.add_dependency "rubocop", "~> 1.87.0"
2525

2626
spec.add_dependency "lint_roller", "~> 1.0"
2727
spec.add_dependency "standard-custom", "~> 1.0.0"

test/standard/runners/genignore_test.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ def test_todo_generated
1313
FileUtils.mkdir_p("dont_call_it_tmp/genignore_test")
1414
FileUtils.cp_r("test/fixture/genignore/.", "dont_call_it_tmp/genignore_test")
1515

16+
RuboCop::PathUtil.pwd if RuboCop::PathUtil.respond_to?(:pwd)
17+
1618
Dir.chdir("dont_call_it_tmp/genignore_test") do
17-
config = Standard::BuildsConfig.new.call(["--config", "../../config/base.yml"])
19+
config = Standard::BuildsConfig.new.call(["--config", "../../config/base.yml", "."])
1820
@subject.call(config)
1921
end
2022

2123
assert File.exist?("dont_call_it_tmp/genignore_test/.standard_todo.yml")
2224

2325
expected_yaml = {"ignore" => [
24-
{"errors_one.rb" => ["Lint/AssignmentInCondition"]},
25-
{"errors_two.rb" => ["Lint/UselessAssignment"]}
26+
{"dont_call_it_tmp/genignore_test/errors_one.rb" => ["Lint/AssignmentInCondition"]},
27+
{"dont_call_it_tmp/genignore_test/errors_two.rb" => ["Lint/UselessAssignment"]}
2628
]}
2729
assert_equal expected_yaml, YAML.load_file("dont_call_it_tmp/genignore_test/.standard_todo.yml")
2830
ensure

0 commit comments

Comments
 (0)