Skip to content

Commit 5a33df1

Browse files
authored
Merge pull request #364 from puppetlabs/cat-1404-fix_rubocop_nightly_failures
(CAT-1404)- Fix rubocop nightly failures
2 parents 029e9e2 + 6718f5b commit 5a33df1

File tree

3 files changed

+43
-32
lines changed

3 files changed

+43
-32
lines changed

.rubocop_todo.yml

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2023-04-13 12:45:07 UTC using RuboCop version 1.50.1.
3+
# on 2023-09-12 16:29:51 UTC using RuboCop version 1.56.3.
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-
Naming/FileName:
10-
Exclude:
11-
- 'lib/puppet-strings.rb'
12-
13-
Naming/MethodName:
14-
Exclude:
15-
- 'lib/puppet-strings/yard/handlers/ruby/data_type_handler.rb'
16-
- 'lib/puppet-strings/yard/parsers/puppet/parser.rb'
17-
189
# Offense count: 1
1910
# This cop supports safe autocorrection (--autocorrect).
2011
# Configuration parameters: Severity, Include.
@@ -23,16 +14,16 @@ Gemspec/RequireMFA:
2314
Exclude:
2415
- 'puppet-strings.gemspec'
2516

26-
# Offense count: 46
17+
# Offense count: 45
2718
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
2819
Metrics/AbcSize:
29-
Max: 98
20+
Max: 95
3021

31-
# Offense count: 11
22+
# Offense count: 10
3223
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
3324
# AllowedMethods: refine
3425
Metrics/BlockLength:
35-
Max: 119
26+
Max: 44
3627

3728
# Offense count: 1
3829
# Configuration parameters: CountBlocks.
@@ -44,23 +35,23 @@ Metrics/BlockNesting:
4435
Metrics/ClassLength:
4536
Max: 283
4637

47-
# Offense count: 33
38+
# Offense count: 34
4839
# Configuration parameters: AllowedMethods, AllowedPatterns.
4940
Metrics/CyclomaticComplexity:
5041
Max: 36
5142

52-
# Offense count: 44
43+
# Offense count: 42
5344
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
5445
Metrics/MethodLength:
5546
Max: 75
5647

57-
# Offense count: 2
48+
# Offense count: 3
5849
# Configuration parameters: CountKeywordArgs.
5950
Metrics/ParameterLists:
6051
MaxOptionalParameters: 5
6152
Max: 10
6253

63-
# Offense count: 28
54+
# Offense count: 29
6455
# Configuration parameters: AllowedMethods, AllowedPatterns.
6556
Metrics/PerceivedComplexity:
6657
Max: 37
@@ -71,13 +62,27 @@ Naming/AccessorMethodName:
7162
- 'lib/puppet-strings/yard/handlers/puppet/base.rb'
7263
- 'lib/puppet-strings/yard/handlers/ruby/type_base.rb'
7364

65+
# Offense count: 1
66+
# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
67+
# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
68+
# 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
69+
Naming/FileName:
70+
Exclude:
71+
- 'lib/puppet-strings.rb'
72+
7473
# Offense count: 1
7574
# Configuration parameters: ForbiddenDelimiters.
7675
# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
7776
Naming/HeredocDelimiterNaming:
7877
Exclude:
7978
- 'spec/acceptance/generate_markdown_spec.rb'
8079

80+
# Offense count: 24
81+
# Configuration parameters: AllowedPatterns.
82+
# SupportedStyles: snake_case, camelCase
83+
Naming/MethodName:
84+
EnforcedStyle: snake_case
85+
8186
# Offense count: 24
8287
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
8388
# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
@@ -96,9 +101,9 @@ Performance/CollectionLiteralInLoop:
96101
# Offense count: 1
97102
RSpec/BeforeAfterAll:
98103
Exclude:
99-
- 'spec/spec_helper.rb'
100-
- 'spec/rails_helper.rb'
101-
- 'spec/support/**/*.rb'
104+
- '**/spec/spec_helper.rb'
105+
- '**/spec/rails_helper.rb'
106+
- '**/spec/support/**/*.rb'
102107
- 'spec/acceptance/running_strings_generate_spec.rb'
103108

104109
# Offense count: 7
@@ -124,7 +129,7 @@ RSpec/DescribeClass:
124129
- 'spec/acceptance/generate_markdown_spec.rb'
125130
- 'spec/acceptance/running_strings_generate_spec.rb'
126131

127-
# Offense count: 48
132+
# Offense count: 51
128133
# Configuration parameters: CountAsOne.
129134
RSpec/ExampleLength:
130135
Max: 66
@@ -134,12 +139,6 @@ RSpec/ExpectInHook:
134139
Exclude:
135140
- 'spec/unit/puppet-strings/json_spec.rb'
136141

137-
# Offense count: 20
138-
# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
139-
# Include: **/*_spec*rb*, **/spec/**/*
140-
RSpec/FilePath:
141-
Enabled: false
142-
143142
# Offense count: 91
144143
RSpec/MultipleExpectations:
145144
Max: 64
@@ -154,24 +153,30 @@ RSpec/RepeatedExampleGroupDescription:
154153
Exclude:
155154
- 'spec/unit/puppet-strings/yard/handlers/ruby/function_handler_spec.rb'
156155

156+
# Offense count: 20
157+
# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
158+
# Include: **/*_spec.rb
159+
RSpec/SpecFilePathFormat:
160+
Enabled: false
161+
157162
# Offense count: 1
158163
Style/ClassVars:
159164
Exclude:
160165
- 'lib/puppet-strings/yard/templates/default/layout/html/setup.rb'
161166

162167
# Offense count: 3
168+
# This cop supports unsafe autocorrection (--autocorrect-all).
163169
Style/CombinableLoops:
164170
Exclude:
165171
- 'lib/puppet-strings/markdown.rb'
166172
- 'lib/puppet-strings/yard/handlers/ruby/data_type_handler.rb'
167-
- 'lib/puppet-strings/tasks/generate.rb'
168173

169174
# Offense count: 1
170175
Style/MixinUsage:
171176
Exclude:
172177
- 'spec/acceptance/running_strings_generate_spec.rb'
173178

174-
# Offense count: 17
179+
# Offense count: 20
175180
# Configuration parameters: AllowedMethods.
176181
# AllowedMethods: respond_to_missing?
177182
Style/OptionalBooleanParameter:
@@ -190,9 +195,9 @@ Style/OptionalBooleanParameter:
190195
- 'lib/puppet-strings/yard/handlers/ruby/data_type_handler.rb'
191196
- 'lib/puppet-strings/yard/handlers/ruby/function_handler.rb'
192197

193-
# Offense count: 139
198+
# Offense count: 136
194199
# This cop supports safe autocorrection (--autocorrect).
195200
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
196201
# URISchemes: http, https
197202
Layout/LineLength:
198-
Max: 200
203+
Max: 199

lib/puppet-strings/yard/handlers/ruby/data_type_handler.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ def literal(ast)
143143
@literal_visitor.visit_this_0(self, ast)
144144
end
145145

146+
# TODO: Fix the rubocop violations in this file between the following rubocop:disable/enable lines
147+
# rubocop:disable Naming/MethodName
146148
# ----- The following methods are different/additions from the original Literal_evaluator
147149
def literal_Object(o)
148150
# Ignore any other object types
@@ -214,6 +216,7 @@ def literal_LiteralHash(o)
214216
result[literal(entry.key)] = literal(entry.value)
215217
end
216218
end
219+
# rubocop:enable Naming/MethodName
217220
end
218221

219222
# Extracts the datatype attributes from a Puppet Data Type interface hash.

lib/puppet-strings/yard/parsers/puppet/parser.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ def enumerator
4040

4141
private
4242

43+
# TODO: Fix the rubocop violations in this file between the following rubocop:disable/enable lines
44+
# rubocop:disable Naming/MethodName
4345
def transform_Program(o)
4446
# Cache the lines of the source text; we'll use this to locate comments
4547
@lines = o.source_text.lines.to_a
@@ -83,4 +85,5 @@ def transform_TypeAlias(o)
8385
def transform_Object(o)
8486
# Ignore anything else (will be compacted out of the resulting array)
8587
end
88+
# rubocop:enable Naming/MethodName
8689
end

0 commit comments

Comments
 (0)