cookstyle 7.6.1 → 7.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/cookstyle +7 -2
- data/config/upstream.yml +3 -0
- data/lib/cookstyle/version.rb +2 -2
- data/lib/rubocop/cop/chef/sharing/invalid_license_string.rb +55 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c26a8975b37722a6d4b7be270e87fc5e9a7ac499755b2401e8d3ec5dd8627c82
|
|
4
|
+
data.tar.gz: ed69abecf1251fd184ed42b16dcbc0f55bfb06201a98abfd05b6fd69f1812c26
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 332eb06789dc7db421b6d38a8234557225e680725ce949a4d8727f1a613c1cd1bdbdd0cfba2ed09b7e60a7091c1296e505cbacef1b0d40f2acd29af1394a611b
|
|
7
|
+
data.tar.gz: 670702283e8aa31d186156ad809e60d262293b600381a5219c829ca3957a554002888883b74406a6b3f0091fc591265e1780a903fdc7cd353d3115f996c30620
|
data/bin/cookstyle
CHANGED
|
@@ -12,8 +12,13 @@ unless ARGV.include?('--fail-level')
|
|
|
12
12
|
ARGV << 'C'
|
|
13
13
|
end
|
|
14
14
|
|
|
15
|
-
#
|
|
16
|
-
|
|
15
|
+
# we want to link to our docs
|
|
16
|
+
unless ARGV.include?('--display-style-guide')
|
|
17
|
+
ARGV << '--display-style-guide'
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
# if only -v is passed we'll get 4 args (-v, --fail-level. --display-style-guide, and C)
|
|
21
|
+
if ARGV.size == 4 && %w(-v --version).include?(ARGV.first)
|
|
17
22
|
puts "Cookstyle #{Cookstyle::VERSION}"
|
|
18
23
|
print ' * RuboCop '
|
|
19
24
|
end
|
data/config/upstream.yml
CHANGED
|
@@ -3521,6 +3521,9 @@ Style/IfWithBooleanLiteralBranches:
|
|
|
3521
3521
|
Description: 'Checks for redundant `if` with boolean literal branches.'
|
|
3522
3522
|
Enabled: pending
|
|
3523
3523
|
VersionAdded: '1.9'
|
|
3524
|
+
SafeAutoCorrect: false
|
|
3525
|
+
AllowedMethods:
|
|
3526
|
+
- nonzero?
|
|
3524
3527
|
|
|
3525
3528
|
Style/IfWithSemicolon:
|
|
3526
3529
|
Description: 'Do not use if x; .... Use the ternary operator instead.'
|
data/lib/cookstyle/version.rb
CHANGED
|
@@ -31,11 +31,13 @@ module RuboCop
|
|
|
31
31
|
# license 'Apache-2.0'
|
|
32
32
|
# license 'all rights reserved'
|
|
33
33
|
#
|
|
34
|
-
# list of valid SPDX.org license strings. To build an array run this:
|
|
34
|
+
# list of valid SPDX.org license strings. To build an array run this ruby:
|
|
35
|
+
# ```ruby
|
|
35
36
|
# require 'json'
|
|
36
37
|
# require 'net/http'
|
|
37
38
|
# json_data = JSON.parse(Net::HTTP.get(URI('https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json')))
|
|
38
39
|
# licenses = json_data['licenses'].map {|l| l['licenseId'] }.sort
|
|
40
|
+
# ```
|
|
39
41
|
#
|
|
40
42
|
class InvalidLicenseString < Base
|
|
41
43
|
extend AutoCorrector
|
|
@@ -59,6 +61,7 @@ module RuboCop
|
|
|
59
61
|
AML
|
|
60
62
|
AMPAS
|
|
61
63
|
ANTLR-PD
|
|
64
|
+
ANTLR-PD-fallback
|
|
62
65
|
APAFML
|
|
63
66
|
APL-1.0
|
|
64
67
|
APSL-1.0
|
|
@@ -82,6 +85,7 @@ module RuboCop
|
|
|
82
85
|
BSD-2-Clause-FreeBSD
|
|
83
86
|
BSD-2-Clause-NetBSD
|
|
84
87
|
BSD-2-Clause-Patent
|
|
88
|
+
BSD-2-Clause-Views
|
|
85
89
|
BSD-3-Clause
|
|
86
90
|
BSD-3-Clause-Attribution
|
|
87
91
|
BSD-3-Clause-Clear
|
|
@@ -95,6 +99,7 @@ module RuboCop
|
|
|
95
99
|
BSD-Protection
|
|
96
100
|
BSD-Source-Code
|
|
97
101
|
BSL-1.0
|
|
102
|
+
BUSL-1.1
|
|
98
103
|
Bahyph
|
|
99
104
|
Barr
|
|
100
105
|
Beerware
|
|
@@ -102,11 +107,15 @@ module RuboCop
|
|
|
102
107
|
BitTorrent-1.1
|
|
103
108
|
BlueOak-1.0.0
|
|
104
109
|
Borceux
|
|
110
|
+
CAL-1.0
|
|
111
|
+
CAL-1.0-Combined-Work-Exception
|
|
105
112
|
CATOSL-1.1
|
|
106
113
|
CC-BY-1.0
|
|
107
114
|
CC-BY-2.0
|
|
108
115
|
CC-BY-2.5
|
|
109
116
|
CC-BY-3.0
|
|
117
|
+
CC-BY-3.0-AT
|
|
118
|
+
CC-BY-3.0-US
|
|
110
119
|
CC-BY-4.0
|
|
111
120
|
CC-BY-NC-1.0
|
|
112
121
|
CC-BY-NC-2.0
|
|
@@ -117,6 +126,7 @@ module RuboCop
|
|
|
117
126
|
CC-BY-NC-ND-2.0
|
|
118
127
|
CC-BY-NC-ND-2.5
|
|
119
128
|
CC-BY-NC-ND-3.0
|
|
129
|
+
CC-BY-NC-ND-3.0-IGO
|
|
120
130
|
CC-BY-NC-ND-4.0
|
|
121
131
|
CC-BY-NC-SA-1.0
|
|
122
132
|
CC-BY-NC-SA-2.0
|
|
@@ -130,8 +140,10 @@ module RuboCop
|
|
|
130
140
|
CC-BY-ND-4.0
|
|
131
141
|
CC-BY-SA-1.0
|
|
132
142
|
CC-BY-SA-2.0
|
|
143
|
+
CC-BY-SA-2.0-UK
|
|
133
144
|
CC-BY-SA-2.5
|
|
134
145
|
CC-BY-SA-3.0
|
|
146
|
+
CC-BY-SA-3.0-AT
|
|
135
147
|
CC-BY-SA-4.0
|
|
136
148
|
CC-PDDC
|
|
137
149
|
CC0-1.0
|
|
@@ -147,6 +159,9 @@ module RuboCop
|
|
|
147
159
|
CECILL-C
|
|
148
160
|
CERN-OHL-1.1
|
|
149
161
|
CERN-OHL-1.2
|
|
162
|
+
CERN-OHL-P-2.0
|
|
163
|
+
CERN-OHL-S-2.0
|
|
164
|
+
CERN-OHL-W-2.0
|
|
150
165
|
CNRI-Jython
|
|
151
166
|
CNRI-Python
|
|
152
167
|
CNRI-Python-GPL-Compatible
|
|
@@ -168,6 +183,7 @@ module RuboCop
|
|
|
168
183
|
ECL-2.0
|
|
169
184
|
EFL-1.0
|
|
170
185
|
EFL-2.0
|
|
186
|
+
EPICS
|
|
171
187
|
EPL-1.0
|
|
172
188
|
EPL-2.0
|
|
173
189
|
EUDatagrid
|
|
@@ -185,15 +201,28 @@ module RuboCop
|
|
|
185
201
|
Frameworx-1.0
|
|
186
202
|
FreeImage
|
|
187
203
|
GFDL-1.1
|
|
204
|
+
GFDL-1.1-invariants-only
|
|
205
|
+
GFDL-1.1-invariants-or-later
|
|
206
|
+
GFDL-1.1-no-invariants-only
|
|
207
|
+
GFDL-1.1-no-invariants-or-later
|
|
188
208
|
GFDL-1.1-only
|
|
189
209
|
GFDL-1.1-or-later
|
|
190
210
|
GFDL-1.2
|
|
211
|
+
GFDL-1.2-invariants-only
|
|
212
|
+
GFDL-1.2-invariants-or-later
|
|
213
|
+
GFDL-1.2-no-invariants-only
|
|
214
|
+
GFDL-1.2-no-invariants-or-later
|
|
191
215
|
GFDL-1.2-only
|
|
192
216
|
GFDL-1.2-or-later
|
|
193
217
|
GFDL-1.3
|
|
218
|
+
GFDL-1.3-invariants-only
|
|
219
|
+
GFDL-1.3-invariants-or-later
|
|
220
|
+
GFDL-1.3-no-invariants-only
|
|
221
|
+
GFDL-1.3-no-invariants-or-later
|
|
194
222
|
GFDL-1.3-only
|
|
195
223
|
GFDL-1.3-or-later
|
|
196
224
|
GL2PS
|
|
225
|
+
GLWTPL
|
|
197
226
|
GPL-1.0
|
|
198
227
|
GPL-1.0+
|
|
199
228
|
GPL-1.0-only
|
|
@@ -218,7 +247,9 @@ module RuboCop
|
|
|
218
247
|
Glulxe
|
|
219
248
|
HPND
|
|
220
249
|
HPND-sell-variant
|
|
250
|
+
HTMLTIDY
|
|
221
251
|
HaskellReport
|
|
252
|
+
Hippocratic-2.1
|
|
222
253
|
IBM-pibs
|
|
223
254
|
ICU
|
|
224
255
|
IJG
|
|
@@ -269,6 +300,7 @@ module RuboCop
|
|
|
269
300
|
MIT-advertising
|
|
270
301
|
MIT-enna
|
|
271
302
|
MIT-feh
|
|
303
|
+
MIT-open-group
|
|
272
304
|
MITNFA
|
|
273
305
|
MPL-1.0
|
|
274
306
|
MPL-1.1
|
|
@@ -280,12 +312,17 @@ module RuboCop
|
|
|
280
312
|
MakeIndex
|
|
281
313
|
MirOS
|
|
282
314
|
Motosoto
|
|
315
|
+
MulanPSL-1.0
|
|
316
|
+
MulanPSL-2.0
|
|
283
317
|
Multics
|
|
284
318
|
Mup
|
|
285
319
|
NASA-1.3
|
|
286
320
|
NBPL-1.0
|
|
321
|
+
NCGL-UK-2.0
|
|
287
322
|
NCSA
|
|
288
323
|
NGPL
|
|
324
|
+
NIST-PD
|
|
325
|
+
NIST-PD-fallback
|
|
289
326
|
NLOD-1.0
|
|
290
327
|
NLPL
|
|
291
328
|
NOSL
|
|
@@ -294,6 +331,7 @@ module RuboCop
|
|
|
294
331
|
NPOSL-3.0
|
|
295
332
|
NRL
|
|
296
333
|
NTP
|
|
334
|
+
NTP-0
|
|
297
335
|
Naumen
|
|
298
336
|
Net-SNMP
|
|
299
337
|
NetCDF
|
|
@@ -301,12 +339,19 @@ module RuboCop
|
|
|
301
339
|
Nokia
|
|
302
340
|
Noweb
|
|
303
341
|
Nunit
|
|
342
|
+
O-UDA-1.0
|
|
304
343
|
OCCT-PL
|
|
305
344
|
OCLC-2.0
|
|
306
345
|
ODC-By-1.0
|
|
307
346
|
ODbL-1.0
|
|
308
347
|
OFL-1.0
|
|
348
|
+
OFL-1.0-RFN
|
|
349
|
+
OFL-1.0-no-RFN
|
|
309
350
|
OFL-1.1
|
|
351
|
+
OFL-1.1-RFN
|
|
352
|
+
OFL-1.1-no-RFN
|
|
353
|
+
OGC-1.0
|
|
354
|
+
OGL-Canada-2.0
|
|
310
355
|
OGL-UK-1.0
|
|
311
356
|
OGL-UK-2.0
|
|
312
357
|
OGL-UK-3.0
|
|
@@ -339,8 +384,12 @@ module RuboCop
|
|
|
339
384
|
PDDL-1.0
|
|
340
385
|
PHP-3.0
|
|
341
386
|
PHP-3.01
|
|
387
|
+
PSF-2.0
|
|
342
388
|
Parity-6.0.0
|
|
389
|
+
Parity-7.0.0
|
|
343
390
|
Plexus
|
|
391
|
+
PolyForm-Noncommercial-1.0.0
|
|
392
|
+
PolyForm-Small-Business-1.0.0
|
|
344
393
|
PostgreSQL
|
|
345
394
|
Python-2.0
|
|
346
395
|
QPL-1.0
|
|
@@ -366,6 +415,8 @@ module RuboCop
|
|
|
366
415
|
SMPPL
|
|
367
416
|
SNIA
|
|
368
417
|
SPL-1.0
|
|
418
|
+
SSH-OpenSSH
|
|
419
|
+
SSH-short
|
|
369
420
|
SSPL-1.0
|
|
370
421
|
SWL
|
|
371
422
|
Saxpath
|
|
@@ -386,6 +437,7 @@ module RuboCop
|
|
|
386
437
|
TOSL
|
|
387
438
|
TU-Berlin-1.0
|
|
388
439
|
TU-Berlin-2.0
|
|
440
|
+
UCL-1.0
|
|
389
441
|
UPL-1.0
|
|
390
442
|
Unicode-DFS-2015
|
|
391
443
|
Unicode-DFS-2016
|
|
@@ -425,10 +477,12 @@ module RuboCop
|
|
|
425
477
|
dvipdfm
|
|
426
478
|
eCos-2.0
|
|
427
479
|
eGenix
|
|
480
|
+
etalab-2.0
|
|
428
481
|
gSOAP-1.3b
|
|
429
482
|
gnuplot
|
|
430
483
|
iMatix
|
|
431
484
|
libpng-2.0
|
|
485
|
+
libselinux-1.0
|
|
432
486
|
libtiff
|
|
433
487
|
mpich2
|
|
434
488
|
psfrag
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cookstyle
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 7.
|
|
4
|
+
version: 7.7.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Thom May
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2021-01
|
|
12
|
+
date: 2021-02-01 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rubocop
|
|
@@ -17,14 +17,14 @@ dependencies:
|
|
|
17
17
|
requirements:
|
|
18
18
|
- - '='
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
|
-
version: 1.9.
|
|
20
|
+
version: 1.9.1
|
|
21
21
|
type: :runtime
|
|
22
22
|
prerelease: false
|
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
24
24
|
requirements:
|
|
25
25
|
- - '='
|
|
26
26
|
- !ruby/object:Gem::Version
|
|
27
|
-
version: 1.9.
|
|
27
|
+
version: 1.9.1
|
|
28
28
|
description:
|
|
29
29
|
email:
|
|
30
30
|
- thom@chef.io
|