Skip to content

Commit 3f5043f

Browse files
committed
Support ruby 3.3.0
And also update rubocop
1 parent b460c0e commit 3f5043f

File tree

5 files changed

+103
-57
lines changed

5 files changed

+103
-57
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ jobs:
3131
key: v3-${{ runner.os }}-${{ hashFiles('pmdtester.gemspec') }}
3232
restore-keys: |
3333
v3-${{ runner.os }}-
34-
- name: Set up Ruby 2.7
34+
- name: Set up Ruby 3.3
3535
uses: ruby/setup-ruby@v1
3636
with:
37-
ruby-version: 2.7
37+
version: 3.3
3838
- name: Setup Environment
3939
shell: bash
4040
run: |
4141
echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
4242
echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3" >> $GITHUB_ENV
43-
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/17/scripts" >> $GITHUB_ENV
43+
#echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/master/scripts" >> $GITHUB_ENV
44+
echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/adangel/build-tools/ruby3/scripts" >> $GITHUB_ENV
4445
- name: Check Environment
4546
shell: bash
4647
run: |

.rubocop_todo.yml

Lines changed: 72 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,88 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2018-11-25 11:00:37 +0100 using RuboCop version 0.51.0.
3+
# on 2024-02-14 19:42:22 UTC using RuboCop version 1.60.2.
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: 30
10-
Metrics/AbcSize:
11-
Max: 47
9+
# Offense count: 3
10+
# Configuration parameters: AllowedParentClasses.
11+
Lint/MissingSuper:
12+
Exclude:
13+
- 'lib/pmdtester/cmd.rb'
14+
- 'lib/pmdtester/parsers/pmd_report_document.rb'
15+
- 'lib/pmdtester/parsers/projects_parser.rb'
1216

13-
# Offense count: 6
14-
# Configuration parameters: CountComments.
15-
Metrics/ClassLength:
16-
Max: 135
17+
# Offense count: 47
18+
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
19+
Metrics/AbcSize:
20+
Max: 44
1721

18-
# Offense count: 38
19-
# Configuration parameters: CountComments.
22+
# Offense count: 93
23+
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
2024
Metrics/MethodLength:
2125
Max: 22
2226

2327
# Offense count: 3
2428
Naming/AccessorMethodName:
2529
Exclude:
2630
- 'lib/pmdtester/builders/pmd_report_builder.rb'
31+
32+
# Offense count: 2
33+
# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
34+
# SupportedStyles: snake_case, normalcase, non_integer
35+
# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
36+
Naming/VariableNumber:
37+
Exclude:
38+
- 'test/test_cmd.rb'
39+
40+
# Offense count: 52
41+
# This cop supports safe autocorrection (--autocorrect).
42+
# Configuration parameters: EnforcedStyle.
43+
# SupportedStyles: separated, grouped
44+
Style/AccessorGrouping:
45+
Exclude:
46+
- 'lib/pmdtester/cmd.rb'
47+
- 'lib/pmdtester/parsers/options.rb'
48+
- 'lib/pmdtester/parsers/pmd_report_document.rb'
49+
- 'lib/pmdtester/pmd_branch_detail.rb'
50+
- 'lib/pmdtester/pmd_report_detail.rb'
51+
- 'lib/pmdtester/project.rb'
52+
- 'lib/pmdtester/report_diff.rb'
53+
54+
# Offense count: 3
55+
# This cop supports safe autocorrection (--autocorrect).
56+
# Configuration parameters: Keywords, RequireColon.
57+
# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
58+
Style/CommentAnnotation:
59+
Exclude:
60+
- 'lib/pmdtester/builders/pmd_report_builder.rb'
61+
- 'lib/pmdtester/builders/project_builder.rb'
62+
- 'test/test_pmd_report_document.rb'
63+
64+
# Offense count: 1
65+
# This cop supports unsafe autocorrection (--autocorrect-all).
66+
Style/GlobalStdStream:
67+
Exclude:
68+
- 'lib/pmdtester.rb'
69+
70+
# Offense count: 1
71+
# This cop supports unsafe autocorrection (--autocorrect-all).
72+
# Configuration parameters: AllowedReceivers.
73+
# AllowedReceivers: Thread.current
74+
Style/HashEachMethods:
75+
Exclude:
76+
- 'lib/pmdtester/report_diff.rb'
77+
78+
# Offense count: 4
79+
# This cop supports safe autocorrection (--autocorrect).
80+
Style/KeywordParametersOrder:
81+
Exclude:
82+
- 'lib/pmdtester/pmd_report_detail.rb'
83+
84+
# Offense count: 1
85+
# This cop supports safe autocorrection (--autocorrect).
86+
Style/RedundantAssignment:
87+
Exclude:
88+
- 'lib/pmdtester/builders/pmd_report_builder.rb'

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Rakefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,23 @@ hoe = Hoe.spec 'pmdtester' do
1818
developer 'Binguo Bao', '[email protected]'
1919
developer 'Clément Fournier', '[email protected]'
2020

21-
self.clean_globs = %w[target/reports/**/* target/test/**/* target/dynamic-config.xml Gemfile.lock]
21+
self.clean_globs = %w[target/reports/**/* target/test/**/* target/dynamic-config.xml]
2222
self.extra_deps += [
2323
['nokogiri', '~> 1.13'],
2424
['slop', '~> 4.9'],
2525
['differ', '~> 0.1'],
2626
['rufus-scheduler', '~> 3.8'],
2727
['logger-colors', '~> 1.0'],
28-
['liquid', '~> 5.4']
28+
['liquid', '~> 5.4'],
29+
['base64', '~> 0.2'],
30+
['bigdecimal', '~> 3.1'],
2931
]
3032
self.extra_dev_deps += [
3133
['hoe-bundler', '~> 1.5'],
3234
['hoe-git', '~> 1.6'],
3335
['minitest', '~> 5.16'],
3436
['mocha', '~> 1.16'],
35-
# use the same version of rubocop as codacy
36-
['rubocop', '~> 0.93'],
37+
['rubocop', '~> 1.60'],
3738
['test-unit', '~> 3.5'],
3839
['rdoc', '~> 6.4']
3940
]
@@ -43,7 +44,7 @@ hoe = Hoe.spec 'pmdtester' do
4344
end
4445

4546
# Refers to
46-
# http://rubocop.readthedocs.io/en/latest/integration_with_other_tools/#rake-integration
47+
# https://docs.rubocop.org/rubocop/1.60/integration_with_other_tools.html#rake-integration
4748
RuboCop::RakeTask.new(:rubocop)
4849

4950
# Run integration test cases

pmdtester.gemspec

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
Gem::Specification.new do |s|
77
s.name = "pmdtester".freeze
8-
s.version = "1.5.6.pre.SNAPSHOT"
8+
s.version = "1.5.6.pre.SNAPSHOT".freeze
99

10-
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
10+
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
1111
s.metadata = { "bug_tracker_uri" => "https://github.com/pmd/pmd-regression-tester/issues", "homepage_uri" => "https://pmd.github.io", "source_code_uri" => "https://github.com/pmd/pmd-regression-tester" } if s.respond_to? :metadata=
1212
s.require_paths = ["lib".freeze]
1313
s.authors = ["Andreas Dangel".freeze, "Binguo Bao".freeze, "Cl\u00E9ment Fournier".freeze]
14-
s.date = "2023-11-16"
14+
s.date = "2024-02-14"
1515
s.description = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
1616
s.email = ["[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze]
1717
s.executables = ["pmdtester".freeze]
@@ -21,44 +21,27 @@ Gem::Specification.new do |s|
2121
s.licenses = ["BSD-2-Clause".freeze]
2222
s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
2323
s.required_ruby_version = Gem::Requirement.new(">= 2.7".freeze)
24-
s.rubygems_version = "3.1.6".freeze
24+
s.rubygems_version = "3.5.3".freeze
2525
s.summary = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
2626

27-
if s.respond_to? :specification_version then
28-
s.specification_version = 4
29-
end
27+
s.specification_version = 4
3028

31-
if s.respond_to? :add_runtime_dependency then
32-
s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.13"])
33-
s.add_runtime_dependency(%q<slop>.freeze, ["~> 4.9"])
34-
s.add_runtime_dependency(%q<differ>.freeze, ["~> 0.1"])
35-
s.add_runtime_dependency(%q<rufus-scheduler>.freeze, ["~> 3.8"])
36-
s.add_runtime_dependency(%q<logger-colors>.freeze, ["~> 1.0"])
37-
s.add_runtime_dependency(%q<liquid>.freeze, ["~> 5.4"])
38-
s.add_development_dependency(%q<hoe-bundler>.freeze, ["~> 1.5"])
39-
s.add_development_dependency(%q<hoe-git>.freeze, ["~> 1.6"])
40-
s.add_development_dependency(%q<minitest>.freeze, ["~> 5.16"])
41-
s.add_development_dependency(%q<mocha>.freeze, ["~> 1.16"])
42-
s.add_development_dependency(%q<rubocop>.freeze, ["~> 0.93"])
43-
s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.5"])
44-
s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.4"])
45-
s.add_development_dependency(%q<hoe>.freeze, ["~> 3.26"])
46-
else
47-
s.add_dependency(%q<nokogiri>.freeze, ["~> 1.13"])
48-
s.add_dependency(%q<slop>.freeze, ["~> 4.9"])
49-
s.add_dependency(%q<differ>.freeze, ["~> 0.1"])
50-
s.add_dependency(%q<rufus-scheduler>.freeze, ["~> 3.8"])
51-
s.add_dependency(%q<logger-colors>.freeze, ["~> 1.0"])
52-
s.add_dependency(%q<liquid>.freeze, ["~> 5.4"])
53-
s.add_dependency(%q<hoe-bundler>.freeze, ["~> 1.5"])
54-
s.add_dependency(%q<hoe-git>.freeze, ["~> 1.6"])
55-
s.add_dependency(%q<minitest>.freeze, ["~> 5.16"])
56-
s.add_dependency(%q<mocha>.freeze, ["~> 1.16"])
57-
s.add_dependency(%q<rubocop>.freeze, ["~> 0.93"])
58-
s.add_dependency(%q<test-unit>.freeze, ["~> 3.5"])
59-
s.add_dependency(%q<rdoc>.freeze, ["~> 6.4"])
60-
s.add_dependency(%q<hoe>.freeze, ["~> 3.26"])
61-
end
29+
s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.13".freeze])
30+
s.add_runtime_dependency(%q<slop>.freeze, ["~> 4.9".freeze])
31+
s.add_runtime_dependency(%q<differ>.freeze, ["~> 0.1".freeze])
32+
s.add_runtime_dependency(%q<rufus-scheduler>.freeze, ["~> 3.8".freeze])
33+
s.add_runtime_dependency(%q<logger-colors>.freeze, ["~> 1.0".freeze])
34+
s.add_runtime_dependency(%q<liquid>.freeze, ["~> 5.4".freeze])
35+
s.add_runtime_dependency(%q<base64>.freeze, ["~> 0.2".freeze])
36+
s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.1".freeze])
37+
s.add_development_dependency(%q<hoe-bundler>.freeze, ["~> 1.5".freeze])
38+
s.add_development_dependency(%q<hoe-git>.freeze, ["~> 1.6".freeze])
39+
s.add_development_dependency(%q<minitest>.freeze, ["~> 5.16".freeze])
40+
s.add_development_dependency(%q<mocha>.freeze, ["~> 1.16".freeze])
41+
s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.60".freeze])
42+
s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.5".freeze])
43+
s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.4".freeze])
44+
s.add_development_dependency(%q<hoe>.freeze, ["~> 3.26".freeze])
6245
end
6346

6447
# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake hoe:spec`.

0 commit comments

Comments
 (0)