Skip to content

Commit 8f88f1d

Browse files
bastelfreakbastelfreak
committed
switch to voxpupuli-rubocop
1 parent 6b4029d commit 8f88f1d

File tree

5 files changed

+198
-41
lines changed

5 files changed

+198
-41
lines changed

Diff for: ‎.rubocop.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1+
---
12
inherit_from: .rubocop_todo.yml
23

3-
require:
4-
- rubocop-performance
5-
- rubocop-rspec
64

7-
AllCops:
8-
Exclude:
9-
- Gemfile
10-
- Rakefile
11-
- spec/fixtures/**/*
12-
- vendor/bundle/**/*
13-
NewCops: enable
14-
SuggestExtensions: false
15-
TargetRubyVersion: '2.7'
5+
inherit_gem:
6+
voxpupuli-rubocop: rubocop.yml
7+
168

179
# Disabled
1810
Style/ClassAndModuleChildren:

Diff for: ‎.rubocop_todo.yml

+186-23
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,93 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-04-18 09:21:48 UTC using RuboCop version 1.50.2.
3+
# on 2024-06-13 10:03:20 UTC using RuboCop version 1.63.5.
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: 4
10+
# Configuration parameters: Severity, Include.
11+
# Include: **/*.gemfile, **/Gemfile, **/gems.rb
12+
Bundler/DuplicatedGem:
13+
Exclude:
14+
- 'spec/fixtures/module/Gemfile'
15+
16+
# Offense count: 5
17+
# This cop supports safe autocorrection (--autocorrect).
18+
# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
19+
# Include: **/*.gemfile, **/Gemfile, **/gems.rb
20+
Bundler/OrderedGems:
21+
Exclude:
22+
- 'spec/fixtures/module/Gemfile'
23+
24+
# Offense count: 5
25+
# This cop supports safe autocorrection (--autocorrect).
26+
Layout/EmptyLineAfterGuardClause:
27+
Exclude:
28+
- 'spec/fixtures/module/Rakefile'
29+
30+
# Offense count: 3
31+
# This cop supports safe autocorrection (--autocorrect).
32+
Layout/EmptyLines:
33+
Exclude:
34+
- 'Gemfile'
35+
- 'Rakefile'
36+
- 'spec/fixtures/module/Rakefile'
37+
938
# Offense count: 1
1039
# This cop supports safe autocorrection (--autocorrect).
11-
# Configuration parameters: Severity, Include.
12-
# Include: **/*.gemspec
13-
Gemspec/RequireMFA:
40+
Layout/HeredocIndentation:
1441
Exclude:
15-
- 'puppet-modulebuilder.gemspec'
42+
- 'spec/fixtures/module/Rakefile'
1643

1744
# Offense count: 1
18-
# Configuration parameters: Severity, Include.
19-
# Include: **/*.gemspec
20-
Gemspec/RequiredRubyVersion:
45+
# This cop supports safe autocorrection (--autocorrect).
46+
# Configuration parameters: Width, AllowedPatterns.
47+
Layout/IndentationWidth:
2148
Exclude:
22-
- 'puppet-modulebuilder.gemspec'
49+
- 'Rakefile'
2350

24-
# Offense count: 5
25-
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
26-
Metrics/AbcSize:
27-
Max: 31
51+
# Offense count: 1
52+
# This cop supports safe autocorrection (--autocorrect).
53+
# Configuration parameters: EnforcedStyle.
54+
# SupportedStyles: final_newline, final_blank_line
55+
Layout/TrailingEmptyLines:
56+
Exclude:
57+
- 'spec/fixtures/module/Rakefile'
58+
59+
# Offense count: 2
60+
Lint/MixedRegexpCaptureTypes:
61+
Exclude:
62+
- 'Gemfile'
63+
- 'spec/fixtures/module/Gemfile'
2864

2965
# Offense count: 1
30-
# Configuration parameters: CountComments, CountAsOne.
31-
Metrics/ClassLength:
32-
Max: 255
66+
# Configuration parameters: ForbiddenDelimiters.
67+
# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
68+
Naming/HeredocDelimiterNaming:
69+
Exclude:
70+
- 'spec/fixtures/module/Rakefile'
3371

34-
# Offense count: 6
35-
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
36-
Metrics/MethodLength:
37-
Max: 25
72+
# Offense count: 13
73+
# Configuration parameters: EnforcedStyle, AllowedIdentifiers, AllowedPatterns.
74+
# SupportedStyles: snake_case, camelCase
75+
Naming/VariableName:
76+
Exclude:
77+
- 'spec/fixtures/module/Rakefile'
3878

3979
# Offense count: 1
4080
# Configuration parameters: MinSize.
4181
Performance/CollectionLiteralInLoop:
4282
Exclude:
4383
- 'spec/acceptance/puppet/modulebuilder/builder_spec.rb'
4484

85+
# Offense count: 1
86+
# This cop supports safe autocorrection (--autocorrect).
87+
Performance/StringIdentifierArgument:
88+
Exclude:
89+
- 'spec/fixtures/module/Rakefile'
90+
4591
# Offense count: 4
4692
# Configuration parameters: Prefixes, AllowedPatterns.
4793
# Prefixes: when, with, without
@@ -82,14 +128,131 @@ RSpec/NamedSubject:
82128
RSpec/NestedGroups:
83129
Max: 5
84130

85-
# Offense count: 33
131+
# Offense count: 32
86132
RSpec/SubjectStub:
87133
Exclude:
88134
- 'spec/unit/puppet/modulebuilder/builder_spec.rb'
89135

90-
# Offense count: 9
136+
# Offense count: 1
137+
Security/Eval:
138+
Exclude:
139+
- 'spec/fixtures/module/Gemfile'
140+
141+
# Offense count: 3
142+
# This cop supports unsafe autocorrection (--autocorrect-all).
143+
Security/JSONLoad:
144+
Exclude:
145+
- 'spec/fixtures/module/Rakefile'
146+
147+
# Offense count: 1
148+
# This cop supports unsafe autocorrection (--autocorrect-all).
149+
# Configuration parameters: EnforcedStyle.
150+
# SupportedStyles: always, conditionals
151+
Style/AndOr:
152+
Exclude:
153+
- 'spec/fixtures/module/Rakefile'
154+
155+
# Offense count: 4
156+
# This cop supports safe autocorrection (--autocorrect).
157+
# Configuration parameters: AllowedVars.
158+
Style/FetchEnvVar:
159+
Exclude:
160+
- 'Gemfile'
161+
- 'spec/fixtures/module/Gemfile'
162+
163+
# Offense count: 1
164+
# This cop supports unsafe autocorrection (--autocorrect-all).
165+
# Configuration parameters: EnforcedStyle.
166+
# SupportedStyles: always, always_true, never
167+
Style/FrozenStringLiteralComment:
168+
Exclude:
169+
- 'spec/fixtures/module/Gemfile'
170+
171+
# Offense count: 1
172+
# This cop supports safe autocorrection (--autocorrect).
173+
# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
174+
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
175+
# SupportedShorthandSyntax: always, never, either, consistent
176+
Style/HashSyntax:
177+
Exclude:
178+
- 'Gemfile'
179+
180+
# Offense count: 2
181+
# This cop supports safe autocorrection (--autocorrect).
182+
Style/IfUnlessModifier:
183+
Exclude:
184+
- 'spec/fixtures/module/Gemfile'
185+
- 'spec/fixtures/module/Rakefile'
186+
187+
# Offense count: 3
188+
# This cop supports unsafe autocorrection (--autocorrect-all).
189+
Style/RedundantInterpolation:
190+
Exclude:
191+
- 'spec/fixtures/module/Rakefile'
192+
193+
# Offense count: 5
194+
# This cop supports safe autocorrection (--autocorrect).
195+
Style/RedundantRegexpEscape:
196+
Exclude:
197+
- 'Gemfile'
198+
- 'spec/fixtures/module/Gemfile'
199+
- 'spec/fixtures/module/Rakefile'
200+
201+
# Offense count: 1
202+
# This cop supports safe autocorrection (--autocorrect).
203+
# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
204+
# SupportedStyles: slashes, percent_r, mixed
205+
Style/RegexpLiteral:
206+
Exclude:
207+
- 'Gemfile'
208+
209+
# Offense count: 1
210+
# This cop supports unsafe autocorrection (--autocorrect-all).
211+
# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
212+
# AllowedMethods: present?, blank?, presence, try, try!
213+
Style/SafeNavigation:
214+
Exclude:
215+
- 'spec/fixtures/module/Rakefile'
216+
217+
# Offense count: 49
218+
# This cop supports safe autocorrection (--autocorrect).
219+
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
220+
# SupportedStyles: single_quotes, double_quotes
221+
Style/StringLiterals:
222+
Exclude:
223+
- 'spec/fixtures/module/Gemfile'
224+
- 'spec/fixtures/module/Rakefile'
225+
226+
# Offense count: 1
227+
# This cop supports safe autocorrection (--autocorrect).
228+
# Configuration parameters: MinSize.
229+
# SupportedStyles: percent, brackets
230+
Style/SymbolArray:
231+
EnforcedStyle: brackets
232+
233+
# Offense count: 7
234+
# This cop supports safe autocorrection (--autocorrect).
235+
# Configuration parameters: EnforcedStyleForMultiline.
236+
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
237+
Style/TrailingCommaInArrayLiteral:
238+
Exclude:
239+
- 'lib/puppet/modulebuilder/builder.rb'
240+
- 'spec/spec_helper.rb'
241+
- 'spec/unit/puppet/modulebuilder/builder_spec.rb'
242+
243+
# Offense count: 7
244+
# This cop supports safe autocorrection (--autocorrect).
245+
# Configuration parameters: EnforcedStyleForMultiline.
246+
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
247+
Style/TrailingCommaInHashLiteral:
248+
Exclude:
249+
- 'lib/puppet/modulebuilder/builder.rb'
250+
- 'spec/fixtures/module/Rakefile'
251+
- 'spec/unit/puppet/modulebuilder/builder_spec.rb'
252+
253+
# Offense count: 12
91254
# This cop supports safe autocorrection (--autocorrect).
92255
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
93256
# URISchemes: http, https
94257
Layout/LineLength:
95-
Max: 188
258+
Max: 255

Diff for: ‎Gemfile

-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ group :development do
2424
gem 'rake'
2525
gem 'rspec', '~> 3.1'
2626

27-
gem 'rubocop', '~> 1.50.0', require: false
28-
gem 'rubocop-performance', '~> 1.16', require: false
29-
gem 'rubocop-rspec', '~> 2.19', require: false
30-
gem 'rubocop-factory_bot', '!= 2.26.0', require: false
31-
gem 'rubocop-rspec_rails', '!= 2.29.0', require: false
32-
3327
gem 'simplecov'
3428
gem 'simplecov-console'
3529

Diff for: ‎Rakefile

+6
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ RSpec::Core::RakeTask.new(:acceptance) do |t|
2121
end
2222

2323
task default: [:spec, :acceptance]
24+
25+
begin
26+
require 'voxpupuli/rubocop/rake'
27+
rescue LoadError
28+
# the voxpupuli-rubocop gem is optional
29+
end

Diff for: ‎puppet-modulebuilder.gemspec

+2
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@ Gem::Specification.new do |spec|
2727
spec.add_runtime_dependency 'minitar', '~> 0.9'
2828
spec.add_runtime_dependency 'pathspec', '>= 0.2.1', '< 2.0.0'
2929

30+
spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
31+
3032
spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
3133
end

0 commit comments

Comments
 (0)