Skip to content

Commit 311cef4

Browse files
DavidSDavidS
committed
Apply remaining rubocop fixes
1 parent 7e7e15d commit 311cef4

File tree

11 files changed

+152
-175
lines changed

11 files changed

+152
-175
lines changed

‎.rubocop.yml

+48-70
Original file line numberDiff line numberDiff line change
@@ -82,66 +82,26 @@ Performance/BigDecimalWithNumericArgument:
8282
Enabled: true
8383
Performance/BlockGivenWithExplicitBlock:
8484
Enabled: true
85-
Performance/Caller:
86-
Enabled: true
8785
Performance/CaseWhenSplat:
8886
Enabled: true
89-
Performance/Casecmp:
90-
Enabled: true
91-
Performance/CollectionLiteralInLoop:
92-
Enabled: true
93-
Performance/CompareWithBlock:
94-
Enabled: true
9587
Performance/ConstantRegexp:
9688
Enabled: true
97-
Performance/Count:
98-
Enabled: true
99-
Performance/Detect:
100-
Enabled: true
101-
Performance/DoubleStartEndWith:
102-
Enabled: true
103-
Performance/EndWith:
104-
Enabled: true
105-
Performance/FixedSize:
106-
Enabled: true
107-
Performance/FlatMap:
108-
Enabled: true
10989
Performance/MethodObjectAsBlock:
11090
Enabled: true
111-
Performance/RangeInclude:
112-
Enabled: true
113-
Performance/RedundantBlockCall:
114-
Enabled: true
115-
Performance/RedundantMatch:
116-
Enabled: true
117-
Performance/RedundantMerge:
118-
Enabled: true
11991
Performance/RedundantSortBlock:
12092
Enabled: true
12193
Performance/RedundantStringChars:
12294
Enabled: true
123-
Performance/RegexpMatch:
124-
Enabled: true
125-
Performance/ReverseEach:
126-
Enabled: true
12795
Performance/ReverseFirst:
12896
Enabled: true
129-
Performance/Size:
130-
Enabled: true
13197
Performance/SortReverse:
13298
Enabled: true
13399
Performance/Squeeze:
134100
Enabled: true
135-
Performance/StartWith:
136-
Enabled: true
137101
Performance/StringInclude:
138102
Enabled: true
139-
Performance/StringReplacement:
140-
Enabled: true
141103
Performance/Sum:
142104
Enabled: true
143-
Performance/TimesMap:
144-
Enabled: true
145105
Style/CollectionMethods:
146106
Enabled: true
147107
Style/MethodCalledOnDoEndBlock:
@@ -198,20 +158,12 @@ Lint/DeprecatedOpenSSLConstant:
198158
Enabled: false
199159
Lint/DisjunctiveAssignmentInConstructor:
200160
Enabled: false
201-
Lint/DuplicateBranch:
202-
Enabled: false
203161
Lint/DuplicateElsifCondition:
204162
Enabled: false
205-
Lint/DuplicateRegexpCharacterClassElement:
206-
Enabled: false
207163
Lint/DuplicateRequire:
208164
Enabled: false
209165
Lint/DuplicateRescueException:
210166
Enabled: false
211-
Lint/EmptyBlock:
212-
Enabled: false
213-
Lint/EmptyClass:
214-
Enabled: false
215167
Lint/EmptyConditionalBody:
216168
Enabled: false
217169
Lint/EmptyFile:
@@ -232,8 +184,6 @@ Lint/MixedRegexpCaptureTypes:
232184
Enabled: false
233185
Lint/NestedPercentLiteral:
234186
Enabled: false
235-
Lint/NoReturnInBeginEndBlocks:
236-
Enabled: false
237187
Lint/NonDeterministicRequireOrder:
238188
Enabled: false
239189
Lint/OrderedMagicComments:
@@ -268,18 +218,12 @@ Lint/ShadowedArgument:
268218
Enabled: false
269219
Lint/StructNewOverride:
270220
Enabled: false
271-
Lint/ToEnumArguments:
272-
Enabled: false
273221
Lint/ToJSON:
274222
Enabled: false
275223
Lint/TopLevelReturnWithArgument:
276224
Enabled: false
277225
Lint/TrailingCommaInAttributeDeclaration:
278226
Enabled: false
279-
Lint/UnexpectedBlockArity:
280-
Enabled: false
281-
Lint/UnmodifiedReduceAccumulator:
282-
Enabled: false
283227
Lint/UnreachableLoop:
284228
Enabled: false
285229
Lint/UriEscapeUnescape:
@@ -294,6 +238,8 @@ Metrics/AbcSize:
294238
Enabled: false
295239
Metrics/BlockLength:
296240
Enabled: false
241+
Metrics/BlockNesting:
242+
Enabled: false
297243
Metrics/ClassLength:
298244
Enabled: false
299245
Metrics/CyclomaticComplexity:
@@ -308,6 +254,8 @@ Metrics/PerceivedComplexity:
308254
Enabled: false
309255
Migration/DepartmentName:
310256
Enabled: false
257+
Naming/AccessorMethodName:
258+
Enabled: false
311259
Naming/BlockParameterName:
312260
Enabled: false
313261
Naming/HeredocDelimiterCase:
@@ -320,6 +268,18 @@ Naming/MethodParameterName:
320268
Enabled: false
321269
Naming/RescuedExceptionsVariableName:
322270
Enabled: false
271+
Performance/BindCall:
272+
Enabled: false
273+
Performance/DeletePrefix:
274+
Enabled: false
275+
Performance/DeleteSuffix:
276+
Enabled: false
277+
Performance/InefficientHashSearch:
278+
Enabled: false
279+
Performance/UnfreezeString:
280+
Enabled: false
281+
Performance/UriDefaultParser:
282+
Enabled: false
323283
RSpec/Be:
324284
Enabled: false
325285
RSpec/Capybara/CurrentPathExpectation:
@@ -408,8 +368,6 @@ Style/AccessModifierDeclarations:
408368
Enabled: false
409369
Style/AccessorGrouping:
410370
Enabled: false
411-
Style/ArgumentsForwarding:
412-
Enabled: false
413371
Style/AsciiComments:
414372
Enabled: false
415373
Style/BisectedAttrAccessor:
@@ -418,8 +376,6 @@ Style/CaseLikeIf:
418376
Enabled: false
419377
Style/ClassEqualityComparison:
420378
Enabled: false
421-
Style/CollectionCompact:
422-
Enabled: false
423379
Style/ColonMethodDefinition:
424380
Enabled: false
425381
Style/CombinableLoops:
@@ -428,8 +384,6 @@ Style/CommentedKeyword:
428384
Enabled: false
429385
Style/Dir:
430386
Enabled: false
431-
Style/DocumentDynamicEvalDefinition:
432-
Enabled: false
433387
Style/DoubleCopDisableDirective:
434388
Enabled: false
435389
Style/EmptyBlockParameter:
@@ -468,12 +422,8 @@ Style/MixinUsage:
468422
Enabled: false
469423
Style/MultilineWhenThen:
470424
Enabled: false
471-
Style/NegatedIfElseCondition:
472-
Enabled: false
473425
Style/NegatedUnless:
474426
Enabled: false
475-
Style/NilLambda:
476-
Enabled: false
477427
Style/NumericPredicate:
478428
Enabled: false
479429
Style/OptionalBooleanParameter:
@@ -482,8 +432,6 @@ Style/OrAssignment:
482432
Enabled: false
483433
Style/RandomWithOffset:
484434
Enabled: false
485-
Style/RedundantArgument:
486-
Enabled: false
487435
Style/RedundantAssignment:
488436
Enabled: false
489437
Style/RedundantCondition:
@@ -516,8 +464,6 @@ Style/StringConcatenation:
516464
Enabled: false
517465
Style/Strip:
518466
Enabled: false
519-
Style/SwapValues:
520-
Enabled: false
521467
Style/SymbolProc:
522468
Enabled: false
523469
Style/TrailingBodyOnClass:
@@ -532,3 +478,35 @@ Style/TrailingMethodEndStatement:
532478
Enabled: false
533479
Style/UnpackFirst:
534480
Enabled: false
481+
Lint/DuplicateBranch:
482+
Enabled: false
483+
Lint/DuplicateRegexpCharacterClassElement:
484+
Enabled: false
485+
Lint/EmptyBlock:
486+
Enabled: false
487+
Lint/EmptyClass:
488+
Enabled: false
489+
Lint/NoReturnInBeginEndBlocks:
490+
Enabled: false
491+
Lint/ToEnumArguments:
492+
Enabled: false
493+
Lint/UnexpectedBlockArity:
494+
Enabled: false
495+
Lint/UnmodifiedReduceAccumulator:
496+
Enabled: false
497+
Performance/CollectionLiteralInLoop:
498+
Enabled: false
499+
Style/ArgumentsForwarding:
500+
Enabled: false
501+
Style/CollectionCompact:
502+
Enabled: false
503+
Style/DocumentDynamicEvalDefinition:
504+
Enabled: false
505+
Style/NegatedIfElseCondition:
506+
Enabled: false
507+
Style/NilLambda:
508+
Enabled: false
509+
Style/RedundantArgument:
510+
Enabled: false
511+
Style/SwapValues:
512+
Enabled: false

‎lib/puppet/provider/mysql.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,23 @@ def self.mysqld_version
7474
# NOTE: be prepared for '5.7.6-rc-log' etc results
7575
# versioncmp detects 5.7.6-log to be newer then 5.7.6
7676
# this is why we need the trimming.
77-
mysqld_version_string.scan(%r{\d+\.\d+\.\d+}).first unless mysqld_version_string.nil?
77+
mysqld_version_string&.scan(%r{\d+\.\d+\.\d+})&.first
7878
end
7979

8080
def mysqld_version
8181
self.class.mysqld_version
8282
end
8383

8484
def self.newer_than(forks_versions)
85-
forks_versions.keys.include?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) >= 0
85+
forks_versions.key?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) >= 0
8686
end
8787

8888
def newer_than(forks_versions)
8989
self.class.newer_than(forks_versions)
9090
end
9191

9292
def self.older_than(forks_versions)
93-
forks_versions.keys.include?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) < 0
93+
forks_versions.key?(mysqld_type) && Puppet::Util::Package.versioncmp(mysqld_version, forks_versions[mysqld_type]) < 0
9494
end
9595

9696
def older_than(forks_versions)

‎lib/puppet/provider/mysql_database/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def self.instances
2424
# the contents of the property_hash generated by self.instances
2525
def self.prefetch(resources)
2626
databases = instances
27-
resources.keys.each do |database|
27+
resources.each_key do |database|
2828
provider = databases.find { |db| db.name == database }
2929
resources[database].provider = provider if provider
3030
end

‎lib/puppet/provider/mysql_grant/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def self.instances
6969

7070
def self.prefetch(resources)
7171
users = instances
72-
resources.keys.each do |name|
72+
resources.each_key do |name|
7373
if provider = users.find { |user| user.name == name } # rubocop:disable Lint/AssignmentInCondition
7474
resources[name].provider = provider
7575
end

‎lib/puppet/provider/mysql_login_path/inifile.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ def self.load(filename, opts = {})
6868
# #=> an IniFile instance
6969
#
7070
def initialize(opts = {})
71+
super
72+
7173
@comment = opts.fetch(:comment, ';#')
7274
@param = opts.fetch(:parameter, '=')
7375
@encoding = opts.fetch(:encoding, nil)
@@ -440,7 +442,7 @@ def initialize(hash, param, comment, default)
440442
# Returns `true` if the current value starts with a leading double quote.
441443
# Otherwise returns false.
442444
def leading_quote?
443-
value && value.start_with?('"')
445+
value&.start_with?('"')
444446
end
445447

446448
# Given a string, attempt to parse out a value from that string. This

‎lib/puppet/provider/mysql_plugin/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def self.instances
1919
# the contents of the property_hash generated by self.instances
2020
def self.prefetch(resources)
2121
plugins = instances
22-
resources.keys.each do |plugin|
22+
resources.each_key do |plugin|
2323
if provider = plugins.find { |pl| pl.name == plugin } # rubocop:disable Lint/AssignmentInCondition
2424
resources[plugin].provider = provider
2525
end

‎lib/puppet/provider/mysql_user/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def self.instances
5555
def self.prefetch(resources)
5656
users = instances
5757
# rubocop:disable Lint/AssignmentInCondition
58-
resources.keys.each do |name|
58+
resources.each_key do |name|
5959
if provider = users.find { |user| user.name == name }
6060
resources[name].provider = provider
6161
end

‎lib/puppet/type/mysql_user.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ def change_to_s(currentvalue, _newvalue)
5656
(currentvalue == :absent) ? 'created password' : 'changed password'
5757
end
5858

59-
# rubocop:disable Style/PredicateName
59+
# rubocop:disable Naming/PredicateName
6060
def is_to_s(_currentvalue)
6161
'[old password hash redacted]'
6262
end
63-
# rubocop:enable Style/PredicateName
63+
# rubocop:enable Naming/PredicateName
6464

6565
def should_to_s(_newvalue)
6666
'[new password hash redacted]'

0 commit comments

Comments
 (0)