Skip to content

Commit ecf145f

Browse files
committed
More rubocop autocorrect changes
1 parent e31b29e commit ecf145f

File tree

14 files changed

+712
-1021
lines changed

14 files changed

+712
-1021
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 294 deletions
Original file line numberDiff line numberDiff line change
@@ -6,138 +6,6 @@
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: 1
10-
# Cop supports --auto-correct.
11-
# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
12-
Layout/EmptyLineBetweenDefs:
13-
Exclude:
14-
- 'lib/puppet/provider/logical_volume/lvm.rb'
15-
16-
# Offense count: 7
17-
# Cop supports --auto-correct.
18-
Layout/EmptyLines:
19-
Exclude:
20-
- 'lib/puppet/provider/logical_volume/aix.rb'
21-
- 'lib/puppet/provider/logical_volume/lvm.rb'
22-
- 'lib/puppet/type/logical_volume.rb'
23-
24-
# Offense count: 6
25-
# Cop supports --auto-correct.
26-
# Configuration parameters: EnforcedStyle, SupportedStyles.
27-
# SupportedStyles: empty_lines, no_empty_lines
28-
Layout/EmptyLinesAroundBlockBody:
29-
Exclude:
30-
- 'lib/puppet/provider/logical_volume/lvm.rb'
31-
- 'lib/puppet/provider/physical_volume/aix.rb'
32-
- 'lib/puppet/provider/physical_volume/lvm.rb'
33-
- 'lib/puppet/type/filesystem.rb'
34-
- 'lib/puppet/type/logical_volume.rb'
35-
- 'lib/puppet/type/volume_group.rb'
36-
37-
# Offense count: 2
38-
# Cop supports --auto-correct.
39-
# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
40-
Layout/ExtraSpacing:
41-
Exclude:
42-
- 'lib/puppet/provider/physical_volume/aix.rb'
43-
- 'lib/puppet/provider/physical_volume/lvm.rb'
44-
45-
# Offense count: 1
46-
# Cop supports --auto-correct.
47-
# Configuration parameters: EnforcedStyle, SupportedStyles.
48-
# SupportedStyles: normal, rails
49-
Layout/IndentationConsistency:
50-
Exclude:
51-
- 'lib/puppet/provider/physical_volume/lvm.rb'
52-
53-
# Offense count: 112
54-
# Cop supports --auto-correct.
55-
# Configuration parameters: Width, IgnoredPatterns.
56-
Layout/IndentationWidth:
57-
Exclude:
58-
- 'lib/puppet/provider/logical_volume/lvm.rb'
59-
- 'lib/puppet/provider/physical_volume/aix.rb'
60-
- 'lib/puppet/provider/physical_volume/lvm.rb'
61-
- 'lib/puppet/provider/volume_group/aix.rb'
62-
- 'lib/puppet/provider/volume_group/lvm.rb'
63-
- 'lib/puppet/type/logical_volume.rb'
64-
- 'lib/puppet/type/physical_volume.rb'
65-
- 'lib/puppet/type/volume_group.rb'
66-
67-
# Offense count: 7
68-
# Cop supports --auto-correct.
69-
Layout/LeadingCommentSpace:
70-
Exclude:
71-
- 'lib/puppet/provider/logical_volume/lvm.rb'
72-
- 'lib/puppet/provider/physical_volume/aix.rb'
73-
- 'lib/puppet/provider/volume_group/aix.rb'
74-
75-
# Offense count: 8
76-
# Cop supports --auto-correct.
77-
Layout/SpaceAfterComma:
78-
Exclude:
79-
- 'lib/puppet/provider/logical_volume/lvm.rb'
80-
- 'lib/puppet/type/filesystem.rb'
81-
- 'lib/puppet/type/logical_volume.rb'
82-
- 'lib/puppet_x/lvm/output.rb'
83-
84-
# Offense count: 4
85-
# Cop supports --auto-correct.
86-
Layout/SpaceAfterNot:
87-
Exclude:
88-
- 'lib/puppet/provider/physical_volume/aix.rb'
89-
- 'lib/puppet/provider/physical_volume/lvm.rb'
90-
- 'lib/puppet/provider/volume_group/aix.rb'
91-
- 'lib/puppet/provider/volume_group/lvm.rb'
92-
93-
# Offense count: 13
94-
# Cop supports --auto-correct.
95-
# Configuration parameters: AllowForAlignment.
96-
Layout/SpaceAroundOperators:
97-
Exclude:
98-
- 'lib/puppet/provider/logical_volume/lvm.rb'
99-
- 'lib/puppet/provider/physical_volume/aix.rb'
100-
- 'lib/puppet/provider/physical_volume/lvm.rb'
101-
- 'lib/puppet/provider/volume_group/aix.rb'
102-
- 'lib/puppet/type/volume_group.rb'
103-
104-
# Offense count: 14
105-
# Cop supports --auto-correct.
106-
Layout/SpaceBeforeComma:
107-
Exclude:
108-
- 'lib/puppet/type/logical_volume.rb'
109-
- 'lib/puppet/type/physical_volume.rb'
110-
111-
# Offense count: 2
112-
# Cop supports --auto-correct.
113-
Layout/SpaceInsideBrackets:
114-
Exclude:
115-
- 'lib/puppet/provider/logical_volume/lvm.rb'
116-
117-
# Offense count: 46
118-
# Cop supports --auto-correct.
119-
Layout/SpaceInsideParens:
120-
Exclude:
121-
- 'lib/puppet/provider/logical_volume/lvm.rb'
122-
- 'lib/puppet/type/logical_volume.rb'
123-
124-
# Offense count: 2
125-
# Cop supports --auto-correct.
126-
# Configuration parameters: EnforcedStyle, SupportedStyles.
127-
# SupportedStyles: final_newline, final_blank_line
128-
Layout/TrailingBlankLines:
129-
Exclude:
130-
- 'lib/puppet/provider/volume_group/aix.rb'
131-
- 'lib/puppet_x/lvm/output.rb'
132-
133-
# Offense count: 5
134-
# Cop supports --auto-correct.
135-
Layout/TrailingWhitespace:
136-
Exclude:
137-
- 'lib/puppet/provider/physical_volume/aix.rb'
138-
- 'lib/puppet/provider/physical_volume/lvm.rb'
139-
- 'lib/puppet_x/lvm/output.rb'
140-
1419
# Offense count: 1
14210
# Configuration parameters: AllowSafeAssignment.
14311
Lint/AssignmentInCondition:
@@ -208,27 +76,6 @@ Style/AccessorMethodName:
20876
- 'lib/puppet/provider/physical_volume/lvm.rb'
20977
- 'lib/puppet/provider/volume_group/lvm.rb'
21078

211-
# Offense count: 10
212-
# Cop supports --auto-correct.
213-
# Configuration parameters: EnforcedStyle, SupportedStyles.
214-
# SupportedStyles: always, conditionals
215-
Style/AndOr:
216-
Exclude:
217-
- 'lib/puppet/provider/logical_volume/lvm.rb'
218-
- 'lib/puppet/type/logical_volume.rb'
219-
220-
# Offense count: 2
221-
# Cop supports --auto-correct.
222-
# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
223-
# SupportedStyles: line_count_based, semantic, braces_for_chaining
224-
# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
225-
# FunctionalMethods: let, let!, subject, watch
226-
# IgnoredMethods: lambda, proc, it
227-
Style/BlockDelimiters:
228-
Exclude:
229-
- 'lib/puppet/provider/volume_group/aix.rb'
230-
- 'lib/puppet/provider/volume_group/lvm.rb'
231-
23279
# Offense count: 1
23380
Style/ClassAndModuleCamelCase:
23481
Exclude:
@@ -241,23 +88,6 @@ Style/ClassAndModuleChildren:
24188
Exclude:
24289
- 'lib/puppet_x/lvm/output.rb'
24390

244-
# Offense count: 3
245-
# Cop supports --auto-correct.
246-
# Configuration parameters: PreferredMethods.
247-
Style/CollectionMethods:
248-
Exclude:
249-
- 'lib/puppet/provider/logical_volume/lvm.rb'
250-
- 'lib/puppet/provider/physical_volume/lvm.rb'
251-
- 'lib/puppet/provider/volume_group/lvm.rb'
252-
253-
# Offense count: 2
254-
# Cop supports --auto-correct.
255-
# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
256-
# SupportedStyles: assign_to_condition, assign_inside_condition
257-
Style/ConditionalAssignment:
258-
Exclude:
259-
- 'lib/puppet/provider/logical_volume/lvm.rb'
260-
26191
# Offense count: 1
26292
Style/Documentation:
26393
Exclude:
@@ -282,68 +112,11 @@ Style/GuardClause:
282112
- 'lib/puppet/provider/volume_group/aix.rb'
283113
- 'lib/puppet/provider/volume_group/lvm.rb'
284114

285-
# Offense count: 44
286-
# Cop supports --auto-correct.
287-
# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
288-
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
289-
Style/HashSyntax:
290-
Exclude:
291-
- 'lib/puppet/provider/logical_volume/aix.rb'
292-
- 'lib/puppet/provider/logical_volume/lvm.rb'
293-
- 'lib/puppet/provider/physical_volume/aix.rb'
294-
- 'lib/puppet/provider/physical_volume/lvm.rb'
295-
- 'lib/puppet/provider/volume_group/aix.rb'
296-
- 'lib/puppet/provider/volume_group/lvm.rb'
297-
- 'lib/puppet/type/volume_group.rb'
298-
299-
# Offense count: 6
300-
# Cop supports --auto-correct.
301-
Style/MethodCallWithoutArgsParentheses:
302-
Exclude:
303-
- 'lib/puppet/provider/logical_volume/lvm.rb'
304-
- 'lib/puppet/provider/volume_group/aix.rb'
305-
306-
# Offense count: 1
307-
# Cop supports --auto-correct.
308-
Style/MultilineIfThen:
309-
Exclude:
310-
- 'lib/puppet/type/volume_group.rb'
311-
312115
# Offense count: 1
313116
Style/MultilineTernaryOperator:
314117
Exclude:
315118
- 'lib/puppet/provider/filesystem/lvm.rb'
316119

317-
# Offense count: 1
318-
# Cop supports --auto-correct.
319-
Style/Not:
320-
Exclude:
321-
- 'lib/puppet/provider/logical_volume/lvm.rb'
322-
323-
# Offense count: 1
324-
# Cop supports --auto-correct.
325-
# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
326-
# SupportedOctalStyles: zero_with_o, zero_only
327-
Style/NumericLiteralPrefix:
328-
Exclude:
329-
- 'lib/puppet/provider/logical_volume/lvm.rb'
330-
331-
# Offense count: 1
332-
# Cop supports --auto-correct.
333-
# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
334-
# SupportedStyles: predicate, comparison
335-
Style/NumericPredicate:
336-
Exclude:
337-
- 'spec/**/*'
338-
- 'lib/puppet/provider/logical_volume/lvm.rb'
339-
340-
# Offense count: 15
341-
# Cop supports --auto-correct.
342-
Style/PerlBackrefs:
343-
Exclude:
344-
- 'lib/puppet/provider/logical_volume/lvm.rb'
345-
- 'lib/puppet/type/logical_volume.rb'
346-
347120
# Offense count: 1
348121
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
349122
# NamePrefix: is_, has_, have_
@@ -354,77 +127,10 @@ Style/PredicateName:
354127
- 'spec/**/*'
355128
- 'tests/beaker/lib/lvm_helper.rb'
356129

357-
# Offense count: 1
358-
# Cop supports --auto-correct.
359-
Style/RedundantBegin:
360-
Exclude:
361-
- 'lib/puppet/provider/logical_volume/lvm.rb'
362-
363-
# Offense count: 1
364-
# Cop supports --auto-correct.
365-
Style/RedundantParentheses:
366-
Exclude:
367-
- 'lib/puppet/provider/logical_volume/lvm.rb'
368-
369-
# Offense count: 2
370-
# Cop supports --auto-correct.
371-
# Configuration parameters: AllowMultipleReturnValues.
372-
Style/RedundantReturn:
373-
Exclude:
374-
- 'lib/puppet/provider/logical_volume/lvm.rb'
375-
376-
# Offense count: 48
377-
# Cop supports --auto-correct.
378-
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
379-
# SupportedStyles: slashes, percent_r, mixed
380-
Style/RegexpLiteral:
381-
Exclude:
382-
- 'lib/facter/lvm_support.rb'
383-
- 'lib/puppet/provider/logical_volume/lvm.rb'
384-
- 'lib/puppet/provider/physical_volume/lvm.rb'
385-
- 'lib/puppet/provider/volume_group/aix.rb'
386-
- 'lib/puppet/provider/volume_group/lvm.rb'
387-
- 'lib/puppet/type/filesystem.rb'
388-
- 'lib/puppet/type/logical_volume.rb'
389-
- 'lib/puppet/type/physical_volume.rb'
390-
- 'lib/puppet_x/lvm/output.rb'
391-
- 'tests/beaker/pre-suite/02_add_extra_hdd.rb'
392-
393-
# Offense count: 6
394-
# Cop supports --auto-correct.
395-
# Configuration parameters: EnforcedStyle, SupportedStyles.
396-
# SupportedStyles: only_raise, only_fail, semantic
397-
Style/SignalException:
398-
Exclude:
399-
- 'lib/puppet/provider/logical_volume/lvm.rb'
400-
401-
# Offense count: 98
402-
# Cop supports --auto-correct.
403-
# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
404-
# SupportedStyles: single_quotes, double_quotes
405-
Style/StringLiterals:
406-
Exclude:
407-
- 'lib/puppet/provider/logical_volume/aix.rb'
408-
- 'lib/puppet/provider/logical_volume/lvm.rb'
409-
- 'lib/puppet/provider/physical_volume/aix.rb'
410-
- 'lib/puppet/provider/physical_volume/lvm.rb'
411-
- 'lib/puppet/provider/volume_group/aix.rb'
412-
- 'lib/puppet/provider/volume_group/lvm.rb'
413-
- 'lib/puppet/type/filesystem.rb'
414-
- 'lib/puppet/type/logical_volume.rb'
415-
- 'lib/puppet/type/physical_volume.rb'
416-
- 'lib/puppet/type/volume_group.rb'
417-
418130
# Offense count: 1
419131
# Cop supports --auto-correct.
420132
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
421133
# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
422134
Style/TernaryParentheses:
423135
Exclude:
424136
- 'lib/puppet/provider/filesystem/lvm.rb'
425-
426-
# Offense count: 2
427-
# Cop supports --auto-correct.
428-
Style/UnneededInterpolation:
429-
Exclude:
430-
- 'lib/puppet/provider/logical_volume/lvm.rb'

lib/facter/lvm_support.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
3737
res = nil
3838
unless pvs.nil?
39-
res = pvs.split("\n").select { |l| l =~ /^\s+\// }.map(&:strip).sort.join(',')
39+
res = pvs.split("\n").select { |l| l =~ %r{^\s+/} }.map(&:strip).sort.join(',')
4040
end
4141
res
4242
end

lib/puppet/provider/logical_volume/aix.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
require 'open3'
22
Puppet::Type.type(:logical_volume).provide :aix do
3-
desc "Manages LVM logical volumes on AIX"
4-
defaultfor :operatingsystem => :AIX
5-
confine :operatingsystem => :AIX
3+
desc 'Manages LVM logical volumes on AIX'
4+
defaultfor operatingsystem: :AIX
5+
confine operatingsystem: :AIX
66

7-
8-
commands :mklv => 'mklv'
7+
commands mklv: 'mklv'
98

109
def create
1110
# Dont use auto-generated LG names as we need to know what resource

0 commit comments

Comments
 (0)