Skip to content

Commit 3096405

Browse files
authored
Merge pull request #22 from voxpupuli/modulesync
modulesync 7.0.0
2 parents 36be1c1 + 10b04d1 commit 3096405

File tree

5 files changed

+45
-51
lines changed

5 files changed

+45
-51
lines changed

.github/CONTRIBUTING.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
232232
with:
233233

234234
```sh
235-
BEAKER_setfile=debian11-64 bundle exec rake beaker
235+
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
236236
```
237237

238-
You can replace the string `debian10` with any common operating system.
238+
You can replace the string `debian11` with any common operating system.
239239
The following strings are known to work:
240240

241-
* ubuntu1804
242241
* ubuntu2004
243-
* debian10
242+
* ubuntu2204
244243
* debian11
245244
* centos7
246245
* centos8
246+
* centos9
247+
* almalinux8
248+
* almalinux9
249+
* fedora36
247250

248251
For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
249252

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '6.0.0'
5+
modulesync_config_version: '7.0.0'

.rubocop_todo.yml

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,50 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2022-11-28 10:04:57 UTC using RuboCop version 1.22.3.
3+
# on 2023-08-17 21:29:51 UTC using RuboCop version 1.50.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

99
# Offense count: 1
10-
# Cop supports --auto-correct.
10+
# This cop supports safe autocorrection (--autocorrect).
1111
# Configuration parameters: EnforcedStyle, IndentationWidth.
1212
# SupportedStyles: with_first_argument, with_fixed_indentation
1313
Layout/ArgumentAlignment:
1414
Exclude:
1515
- 'lib/puppet/provider/pg_hba/augeas.rb'
1616

1717
# Offense count: 2
18-
# Cop supports --auto-correct.
18+
# This cop supports safe autocorrection (--autocorrect).
1919
Layout/EmptyLineAfterGuardClause:
2020
Exclude:
2121
- 'lib/puppet/provider/pg_hba/augeas.rb'
2222
- 'lib/puppet/type/pg_hba.rb'
2323

2424
# Offense count: 26
25-
# Cop supports --auto-correct.
25+
# This cop supports safe autocorrection (--autocorrect).
2626
# Configuration parameters: EnforcedStyle, IndentationWidth.
2727
# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
2828
Layout/FirstArgumentIndentation:
2929
Exclude:
3030
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
3131

32-
# Offense count: 4
33-
# Cop supports --auto-correct.
34-
# Configuration parameters: IndentationWidth.
35-
# SupportedStyles: special_inside_parentheses, consistent, align_braces
36-
Layout/FirstHashElementIndentation:
37-
EnforcedStyle: consistent
38-
3932
# Offense count: 1
40-
# Cop supports --auto-correct.
33+
# This cop supports safe autocorrection (--autocorrect).
4134
# Configuration parameters: EnforcedStyle.
4235
# SupportedStyles: symmetrical, new_line, same_line
4336
Layout/MultilineMethodCallBraceLayout:
4437
Exclude:
4538
- 'lib/puppet/provider/pg_hba/augeas.rb'
4639

4740
# Offense count: 1
48-
# Cop supports --auto-correct.
41+
# This cop supports safe autocorrection (--autocorrect).
4942
Layout/SpaceAfterMethodName:
5043
Exclude:
5144
- 'lib/puppet/provider/pg_hba/augeas.rb'
5245

5346
# Offense count: 34
54-
# Cop supports --auto-correct.
47+
# This cop supports safe autocorrection (--autocorrect).
5548
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
5649
# SupportedStyles: space, no_space, compact
5750
# SupportedStylesForEmptyBrackets: space, no_space
@@ -67,7 +60,7 @@ Lint/ConstantDefinitionInBlock:
6760
- 'lib/puppet/provider/pg_hba/augeas.rb'
6861

6962
# Offense count: 1
70-
# Cop supports --auto-correct.
63+
# This cop supports safe autocorrection (--autocorrect).
7164
Lint/ScriptPermission:
7265
Exclude:
7366
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
@@ -83,20 +76,21 @@ Lint/UselessAssignment:
8376
- 'lib/puppet/provider/pg_hba/augeas.rb'
8477

8578
# Offense count: 2
86-
RSpec/BeforeAfterAll:
79+
# This cop supports unsafe autocorrection (--autocorrect-all).
80+
RSpec/BeEq:
8781
Exclude:
88-
- 'spec/acceptance/**/*'
8982
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
9083

91-
# Offense count: 1
92-
# Cop supports --auto-correct.
93-
RSpec/EmptyLineAfterHook:
84+
# Offense count: 2
85+
RSpec/BeforeAfterAll:
9486
Exclude:
87+
- 'spec/acceptance/**/*'
9588
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
9689

9790
# Offense count: 27
98-
# Cop supports --auto-correct.
99-
# Configuration parameters: CustomTransform, IgnoredWords.
91+
# This cop supports safe autocorrection (--autocorrect).
92+
# Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
93+
# DisallowedExamples: works
10094
RSpec/ExampleWording:
10195
Exclude:
10296
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
@@ -108,21 +102,15 @@ RSpec/InstanceVariable:
108102
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
109103

110104
# Offense count: 3
111-
# Cop supports --auto-correct.
105+
# This cop supports unsafe autocorrection (--autocorrect-all).
112106
# Configuration parameters: EnforcedStyle.
113107
# SupportedStyles: always, conditionals
114108
Style/AndOr:
115109
Exclude:
116110
- 'lib/puppet/type/pg_hba.rb'
117111

118-
# Offense count: 2
119-
# Cop supports --auto-correct.
120-
Style/CaseLikeIf:
121-
Exclude:
122-
- 'lib/puppet/type/pg_hba.rb'
123-
124112
# Offense count: 3
125-
# Cop supports --auto-correct.
113+
# This cop supports safe autocorrection (--autocorrect).
126114
# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
127115
# SupportedStyles: assign_to_condition, assign_inside_condition
128116
Style/ConditionalAssignment:
@@ -131,7 +119,7 @@ Style/ConditionalAssignment:
131119
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
132120

133121
# Offense count: 3
134-
# Cop supports --auto-correct.
122+
# This cop supports unsafe autocorrection (--autocorrect-all).
135123
# Configuration parameters: EnforcedStyle.
136124
# SupportedStyles: always, always_true, never
137125
Style/FrozenStringLiteralComment:
@@ -141,56 +129,58 @@ Style/FrozenStringLiteralComment:
141129
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
142130

143131
# Offense count: 1
144-
# Configuration parameters: MinBodyLength.
132+
# This cop supports safe autocorrection (--autocorrect).
133+
# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
145134
Style/GuardClause:
146135
Exclude:
147136
- 'lib/puppet/provider/pg_hba/augeas.rb'
148137

149138
# Offense count: 136
150-
# Cop supports --auto-correct.
151-
# Configuration parameters: UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
139+
# This cop supports safe autocorrection (--autocorrect).
140+
# Configuration parameters: EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
152141
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
142+
# SupportedShorthandSyntax: always, never, either, consistent
153143
Style/HashSyntax:
154144
EnforcedStyle: hash_rockets
155145

156146
# Offense count: 2
157-
# Cop supports --auto-correct.
147+
# This cop supports safe autocorrection (--autocorrect).
158148
Style/IfUnlessModifier:
159149
Exclude:
160150
- 'lib/puppet/provider/pg_hba/augeas.rb'
161151
- 'lib/puppet/type/pg_hba.rb'
162152

163153
# Offense count: 1
164-
# Cop supports --auto-correct.
154+
# This cop supports unsafe autocorrection (--autocorrect-all).
165155
# Configuration parameters: EnforcedStyle.
166156
# SupportedStyles: literals, strict
167157
Style/MutableConstant:
168158
Exclude:
169159
- 'lib/puppet/provider/pg_hba/augeas.rb'
170160

171161
# Offense count: 1
172-
# Cop supports --auto-correct.
162+
# This cop supports unsafe autocorrection (--autocorrect-all).
173163
# Configuration parameters: EnforcedStyle.
174164
# SupportedStyles: short, verbose
175165
Style/PreferredHashMethods:
176166
Exclude:
177167
- 'lib/puppet/provider/pg_hba/augeas.rb'
178168

179169
# Offense count: 1
180-
# Cop supports --auto-correct.
170+
# This cop supports safe autocorrection (--autocorrect).
181171
# Configuration parameters: AllowMultipleReturnValues.
182172
Style/RedundantReturn:
183173
Exclude:
184174
- 'lib/puppet/provider/pg_hba/augeas.rb'
185175

186176
# Offense count: 1
187-
# Cop supports --auto-correct.
177+
# This cop supports safe autocorrection (--autocorrect).
188178
Style/RedundantSelf:
189179
Exclude:
190180
- 'lib/puppet/type/pg_hba.rb'
191181

192182
# Offense count: 8
193-
# Cop supports --auto-correct.
183+
# This cop supports safe autocorrection (--autocorrect).
194184
# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
195185
# SupportedStyles: slashes, percent_r, mixed
196186
Style/RegexpLiteral:
@@ -200,7 +190,7 @@ Style/RegexpLiteral:
200190
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
201191

202192
# Offense count: 192
203-
# Cop supports --auto-correct.
193+
# This cop supports safe autocorrection (--autocorrect).
204194
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
205195
# SupportedStyles: single_quotes, double_quotes
206196
Style/StringLiterals:
@@ -210,15 +200,15 @@ Style/StringLiterals:
210200
- 'spec/unit/puppet/provider/pg_hba/augeas_spec.rb'
211201

212202
# Offense count: 1
213-
# Cop supports --auto-correct.
214-
# Configuration parameters: AllowMethodsWithArguments, IgnoredMethods.
215-
# IgnoredMethods: respond_to, define_method
203+
# This cop supports unsafe autocorrection (--autocorrect-all).
204+
# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
205+
# AllowedMethods: define_method
216206
Style/SymbolProc:
217207
Exclude:
218208
- 'lib/puppet/type/pg_hba.rb'
219209

220210
# Offense count: 1
221-
# Cop supports --auto-correct.
211+
# This cop supports safe autocorrection (--autocorrect).
222212
# Configuration parameters: MinSize, WordRegex.
223213
# SupportedStyles: percent, brackets
224214
Style/WordArray:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 6.0', :require => false
7+
gem 'voxpupuli-test', '~> 7.0', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
1010
gem 'puppet_metadata', '~> 3.0', :require => false

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@
1919
end
2020

2121
require 'spec_helper_local'
22+
Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }

0 commit comments

Comments
 (0)