Skip to content

Commit 5005d3a

Browse files
Merge pull request #5 from puppetlabs/cat-2788-namespace-rename
Rename namespace/CLI hook to PuppetlabsOnceover::CodeQuality (Gate 3) + coupled dependency swaps (CAT-2788, CAT-2789, CAT-2791)
2 parents 1768e3c + 8028a6c commit 5005d3a

23 files changed

Lines changed: 175 additions & 154 deletions

.rubocop_todo.yml

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ Gemspec/RequireMFA:
1818
# This cop supports safe autocorrection (--autocorrect).
1919
Lint/AmbiguousRegexpLiteral:
2020
Exclude:
21-
- 'spec/onceover/environment_spec.rb'
22-
- 'spec/onceover/lint_spec.rb'
23-
- 'spec/onceover/puppetfile_spec.rb'
24-
- 'spec/onceover/syntax_spec.rb'
21+
- 'spec/puppetlabs-onceover/environment_spec.rb'
22+
- 'spec/puppetlabs-onceover/lint_spec.rb'
23+
- 'spec/puppetlabs-onceover/puppetfile_spec.rb'
24+
- 'spec/puppetlabs-onceover/syntax_spec.rb'
2525

2626
# Offense count: 2
2727
# This cop supports safe autocorrection (--autocorrect).
2828
# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
2929
Lint/UnusedBlockArgument:
3030
Exclude:
31-
- 'lib/onceover/codequality/cli.rb'
31+
- 'lib/puppetlabs-onceover/codequality/cli.rb'
3232

3333
# Offense count: 1
3434
Lint/UselessAssignment:
3535
Exclude:
36-
- 'lib/onceover/codequality/environment.rb'
36+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
3737

3838
# Offense count: 2
3939
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
@@ -64,26 +64,26 @@ Metrics/PerceivedComplexity:
6464
# Offense count: 1
6565
Naming/AccessorMethodName:
6666
Exclude:
67-
- 'lib/onceover/codequality/environment.rb'
67+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
6868

6969
# Offense count: 1
7070
# Configuration parameters: EnforcedStyleForLeadingUnderscores.
7171
# SupportedStylesForLeadingUnderscores: disallowed, required, optional
7272
Naming/MemoizedInstanceVariableName:
7373
Exclude:
74-
- 'lib/onceover/codequality/cli.rb'
74+
- 'lib/puppetlabs-onceover/codequality/cli.rb'
7575

7676
# Offense count: 1
7777
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
7878
# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
7979
Naming/MethodParameterName:
8080
Exclude:
81-
- 'lib/onceover/codequality/formatter.rb'
81+
- 'lib/puppetlabs-onceover/codequality/formatter.rb'
8282

8383
# Offense count: 1
8484
Security/Open:
8585
Exclude:
86-
- 'lib/onceover/codequality/environment.rb'
86+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
8787

8888
# Offense count: 7
8989
# This cop supports safe autocorrection (--autocorrect).
@@ -94,39 +94,39 @@ Security/Open:
9494
# AllowedMethods: lambda, proc, it
9595
Style/BlockDelimiters:
9696
Exclude:
97-
- 'lib/onceover/codequality/docs.rb'
98-
- 'lib/onceover/codequality/environment.rb'
99-
- 'lib/onceover/codequality/lint.rb'
97+
- 'lib/puppetlabs-onceover/codequality/docs.rb'
98+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
99+
- 'lib/puppetlabs-onceover/codequality/lint.rb'
100100

101101
# Offense count: 1
102102
# This cop supports safe autocorrection (--autocorrect).
103103
# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
104104
# SupportedStyles: assign_to_condition, assign_inside_condition
105105
Style/ConditionalAssignment:
106106
Exclude:
107-
- 'lib/onceover/codequality/lint.rb'
107+
- 'lib/puppetlabs-onceover/codequality/lint.rb'
108108

109109
# Offense count: 1
110110
# This cop supports safe autocorrection (--autocorrect).
111111
Style/DefWithParentheses:
112112
Exclude:
113-
- 'lib/onceover/codequality/environment.rb'
113+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
114114

115115
# Offense count: 9
116116
# Configuration parameters: AllowedConstants.
117117
Style/Documentation:
118118
Exclude:
119119
- 'spec/**/*'
120120
- 'test/**/*'
121-
- 'lib/onceover/codequality.rb'
122-
- 'lib/onceover/codequality/cli.rb'
123-
- 'lib/onceover/codequality/docs.rb'
124-
- 'lib/onceover/codequality/environment.rb'
125-
- 'lib/onceover/codequality/executor.rb'
126-
- 'lib/onceover/codequality/formatter.rb'
127-
- 'lib/onceover/codequality/lint.rb'
128-
- 'lib/onceover/codequality/puppetfile.rb'
129-
- 'lib/onceover/codequality/syntax.rb'
121+
- 'lib/puppetlabs-onceover/codequality.rb'
122+
- 'lib/puppetlabs-onceover/codequality/cli.rb'
123+
- 'lib/puppetlabs-onceover/codequality/docs.rb'
124+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
125+
- 'lib/puppetlabs-onceover/codequality/executor.rb'
126+
- 'lib/puppetlabs-onceover/codequality/formatter.rb'
127+
- 'lib/puppetlabs-onceover/codequality/lint.rb'
128+
- 'lib/puppetlabs-onceover/codequality/puppetfile.rb'
129+
- 'lib/puppetlabs-onceover/codequality/syntax.rb'
130130

131131
# Offense count: 1
132132
# This cop supports safe autocorrection (--autocorrect).
@@ -151,16 +151,16 @@ Style/FrozenStringLiteralComment:
151151
# Configuration parameters: AllowedVariables.
152152
Style/GlobalVars:
153153
Exclude:
154-
- 'spec/onceover/lint_spec.rb'
155-
- 'spec/onceover/puppetfile_spec.rb'
156-
- 'spec/onceover/syntax_spec.rb'
154+
- 'spec/puppetlabs-onceover/lint_spec.rb'
155+
- 'spec/puppetlabs-onceover/puppetfile_spec.rb'
156+
- 'spec/puppetlabs-onceover/syntax_spec.rb'
157157

158158
# Offense count: 1
159159
# This cop supports safe autocorrection (--autocorrect).
160160
# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
161161
Style/GuardClause:
162162
Exclude:
163-
- 'lib/onceover/codequality/environment.rb'
163+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
164164

165165
# Offense count: 11
166166
# This cop supports safe autocorrection (--autocorrect).
@@ -170,67 +170,67 @@ Style/GuardClause:
170170
Style/HashSyntax:
171171
Exclude:
172172
- 'Rakefile'
173-
- 'lib/onceover/codequality/cli.rb'
174-
- 'lib/onceover/codequality/syntax.rb'
173+
- 'lib/puppetlabs-onceover/codequality/cli.rb'
174+
- 'lib/puppetlabs-onceover/codequality/syntax.rb'
175175
- 'spec/testcase/bad_puppetfile/Puppetfile'
176176
- 'spec/testcase/good_puppetfile/Puppetfile'
177177

178178
# Offense count: 4
179179
# This cop supports safe autocorrection (--autocorrect).
180180
Style/IfUnlessModifier:
181181
Exclude:
182-
- 'lib/onceover/codequality/cli.rb'
182+
- 'lib/puppetlabs-onceover/codequality/cli.rb'
183183

184184
# Offense count: 6
185185
# This cop supports safe autocorrection (--autocorrect).
186186
# Configuration parameters: AllowedMethods, AllowedPatterns.
187187
Style/MethodCallWithoutArgsParentheses:
188188
Exclude:
189-
- 'spec/onceover/environment_spec.rb'
189+
- 'spec/puppetlabs-onceover/environment_spec.rb'
190190

191191
# Offense count: 1
192192
Style/MultilineBlockChain:
193193
Exclude:
194-
- 'lib/onceover/codequality/environment.rb'
194+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
195195

196196
# Offense count: 2
197197
# This cop supports unsafe autocorrection (--autocorrect-all).
198198
# Configuration parameters: EnforcedStyle.
199199
# SupportedStyles: literals, strict
200200
Style/MutableConstant:
201201
Exclude:
202-
- 'lib/onceover/codequality/environment.rb'
203-
- 'lib/onceover/codequality/lint.rb'
202+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
203+
- 'lib/puppetlabs-onceover/codequality/lint.rb'
204204

205205
# Offense count: 4
206206
# This cop supports safe autocorrection (--autocorrect).
207207
# Configuration parameters: EnforcedStyle.
208208
# SupportedStyles: both, prefix, postfix
209209
Style/NegatedIf:
210210
Exclude:
211-
- 'lib/onceover/codequality/cli.rb'
211+
- 'lib/puppetlabs-onceover/codequality/cli.rb'
212212

213213
# Offense count: 1
214214
# This cop supports safe autocorrection (--autocorrect).
215215
Style/NegatedIfElseCondition:
216216
Exclude:
217-
- 'lib/onceover/codequality/lint.rb'
217+
- 'lib/puppetlabs-onceover/codequality/lint.rb'
218218

219219
# Offense count: 2
220220
# This cop supports safe autocorrection (--autocorrect).
221221
# Configuration parameters: EnforcedStyle, MinBodyLength.
222222
# SupportedStyles: skip_modifier_ifs, always
223223
Style/Next:
224224
Exclude:
225-
- 'lib/onceover/codequality/docs.rb'
226-
- 'lib/onceover/codequality/lint.rb'
225+
- 'lib/puppetlabs-onceover/codequality/docs.rb'
226+
- 'lib/puppetlabs-onceover/codequality/lint.rb'
227227

228228
# Offense count: 1
229229
# Configuration parameters: AllowedMethods.
230230
# AllowedMethods: respond_to_missing?
231231
Style/OptionalBooleanParameter:
232232
Exclude:
233-
- 'lib/onceover/codequality/formatter.rb'
233+
- 'lib/puppetlabs-onceover/codequality/formatter.rb'
234234

235235
# Offense count: 1
236236
# This cop supports safe autocorrection (--autocorrect).
@@ -250,15 +250,15 @@ Style/RedundantPercentQ:
250250
# Configuration parameters: AllowMultipleReturnValues.
251251
Style/RedundantReturn:
252252
Exclude:
253-
- 'lib/onceover/codequality/executor.rb'
253+
- 'lib/puppetlabs-onceover/codequality/executor.rb'
254254

255255
# Offense count: 1
256256
# This cop supports safe autocorrection (--autocorrect).
257257
# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
258258
# SupportedStyles: slashes, percent_r, mixed
259259
Style/RegexpLiteral:
260260
Exclude:
261-
- 'lib/onceover/codequality/environment.rb'
261+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
262262

263263
# Offense count: 119
264264
# This cop supports safe autocorrection (--autocorrect).
@@ -273,12 +273,12 @@ Style/StringLiterals:
273273
# AllowedMethods: define_method
274274
Style/SymbolProc:
275275
Exclude:
276-
- 'lib/onceover/codequality/environment.rb'
276+
- 'lib/puppetlabs-onceover/codequality/environment.rb'
277277

278278
# Offense count: 2
279279
# This cop supports safe autocorrection (--autocorrect).
280280
# Configuration parameters: EnforcedStyleForMultiline.
281281
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
282282
Style/TrailingCommaInArrayLiteral:
283283
Exclude:
284-
- 'lib/onceover/codequality/lint.rb'
284+
- 'lib/puppetlabs-onceover/codequality/lint.rb'

Gemfile

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
1-
source "https://rubygems.org"
1+
# For puppetcore, set GEM_SOURCE_PUPPETCORE = 'https://rubygems-puppetcore.puppet.com'
2+
gemsource_default = ENV['GEM_SOURCE'] || 'https://rubygems.org'
3+
gemsource_puppetcore = if ENV['GEM_SOURCE']
4+
gemsource_default
5+
elsif ENV['PUPPET_FORGE_TOKEN']
6+
'https://rubygems-puppetcore.puppet.com'
7+
else
8+
ENV['GEM_SOURCE_PUPPETCORE'] || gemsource_default
9+
end
10+
source gemsource_default
211

312
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
413

5-
# Specify your gem's dependencies in onceover-helloworld.gemspec
614
gemspec
715

16+
# Route through gemsource_puppetcore so CI can resolve puppet ~> 9.0 from the
17+
# private Puppetcore registry (public rubygems.org tops out at puppet 8.10.0).
18+
# When PUPPET_FORGE_TOKEN is unset (e.g. fork PRs, local dev without a token),
19+
# gemsource_puppetcore falls through to gemsource_default (public rubygems.org)
20+
# and no auth is attempted against Puppetcore. Without this, bundler was free
21+
# to resolve the lowest puppet version satisfying all constraints (8.10.0),
22+
# which doesn't even boot on Ruby 3.4 ("Cannot determine basic system
23+
# flavour") -- and CI's per-matrix-job PUPPET_GEM_VERSION env var had nothing
24+
# in the Gemfile to actually consume it.
25+
gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 8', source: gemsource_puppetcore
26+
827
# Windows platform runtime deps. The published puppet/onceover rubygems.org
928
# artefacts are built on Linux and guard `ffi` / `win32ole` with build-host
1029
# platform checks, so those deps never make it into the Linux-published
@@ -17,6 +36,10 @@ platforms :mingw, :x64_mingw, :mswin do
1736
gem 'win32ole', '>= 1.8', '< 2.0'
1837
end
1938

39+
group :development do
40+
gem 'rubocop'
41+
end
42+
2043
group :release, optional: true do
2144
gem 'faraday-retry', require: false
2245
gem 'github_changelog_generator', require: false

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Onceover::CodeQuality
1+
# PuppetlabsOnceover::CodeQuality
22

3-
This is the Code Quality plugin for [Onceover](https://github.com/voxpupuli/onceover), _The gateway drug to automated infrastructure testing with Puppet_
3+
This is the Code Quality plugin for [puppetlabs-onceover](https://github.com/puppetlabs/puppetlabs-onceover), _The gateway drug to automated infrastructure testing with Puppet_
44

55
## What does it do?
66

@@ -15,61 +15,61 @@ For sure you can hack around with rake/make and hack something up each time but
1515

1616
## Installation
1717

18-
Install the `onceover-codequality` gem by adding it to your `Gemfile` or by running the following command:
18+
Install the `puppetlabs-onceover-codequality` gem by adding it to your `Gemfile` or by running the following command:
1919

2020
```shell
21-
gem install onceover-codequality
21+
gem install puppetlabs-onceover-codequality
2222
```
2323

2424
## Usage
2525

26-
Installing the codequality gem creates a new item within onceover's `run` command: `codequality`. See `onceover run codequality --help` for all available options.
26+
Installing the codequality gem creates a new item within puppetlabs-onceover's `run` command: `codequality`. See `puppetlabs-onceover run codequality --help` for all available options.
2727

2828
The command will return `1` to the system if any tests fail, otherwise `0`, which makes it perfect to include in build pipelines.
2929

3030
### Check all code in the control repository for Lint and Syntax errors
3131

3232
```shell
33-
onceover run codequality
33+
puppetlabs-onceover run codequality
3434
```
3535

3636
### Skip Lint check
3737

3838
```shell
39-
onceover run codequality --no_lint
39+
puppetlabs-onceover run codequality --no_lint
4040
```
4141

4242
### Skip Puppet syntax check
4343

4444
```shell
45-
onceover run codequality --no_syntax
45+
puppetlabs-onceover run codequality --no_syntax
4646
```
4747

4848
### Skip Puppetfile syntax check
4949

5050
```shell
51-
onceover run codequality --no_puppetfile
51+
puppetlabs-onceover run codequality --no_puppetfile
5252
```
5353

5454
### Skip documentation generation
5555

5656
```shell
57-
onceover run codequality --no_docs
57+
puppetlabs-onceover run codequality --no_docs
5858
```
5959

6060
### Use custom lint setting
6161

62-
Create a file `puppet-lint.rc` in the directory you run `onceover codequality`
62+
Create a file `puppet-lint.rc` in the directory you run `puppetlabs-onceover codequality`
6363
from and it will be automatically used by Puppet Lint. If missing, the built-in
64-
defaults from `lib/onceover/codequality/lint.rb` will be used.
64+
defaults from `lib/puppetlabs-onceover/codequality/lint.rb` will be used.
6565

6666

6767
## Sample output
6868

6969
### All clear
7070

7171
```shell
72-
$ onceover run codequality
72+
$ puppetlabs-onceover run codequality
7373
INFO -> Checking for lint...
7474
INFO -> checking manifests
7575
INFO -> checking site/role
@@ -83,7 +83,7 @@ INFO -> Code Quality tests passed, have a nice day
8383
### Lint and syntax errors
8484

8585
```shell
86-
$ onceover run codequality
86+
$ puppetlabs-onceover run codequality
8787
INFO -> Checking for lint...
8888
INFO -> checking manifests
8989
INFO -> checking site/role
@@ -104,7 +104,7 @@ $ echo $?
104104

105105
**`WARN: Unresolved specs during Gem::Specification.reset`?**
106106

107-
I get these errors when I run `onceover run codequality` but everything seems to work, what gives?:
107+
I get these errors when I run `puppetlabs-onceover run codequality` but everything seems to work, what gives?:
108108

109109
```shell
110110
WARN: Unresolved specs during Gem::Specification.reset:
@@ -118,7 +118,7 @@ Please report a bug if this causes problems.
118118
Beats me - something to do with rubygems. The best way to beat this message is to use [bundler](https://github.com/bundler/bundler) which basically you should already be doing anyway (for your own sanity):
119119
120120
```shell
121-
bundle exec onceover run codequality
121+
bundle exec puppetlabs-onceover run codequality
122122
```
123123
124124
**What are you using under-the-hood?**

0 commit comments

Comments
 (0)