puppet-lint-strict_indent-check 2.0.4 → 2.0.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 9dbe725244f34e09b83f12591ed95c06353b0d75
4
- data.tar.gz: 88edad01d3fd4403dd3e276379343958a555aba1
2
+ SHA256:
3
+ metadata.gz: '09a7fc9d7e521e82fe03c39bbff8de887b881c94d8734076e7e0d8458a8d7abd'
4
+ data.tar.gz: ea8c370f9b536f68dff53a1856c539868ef5be86ccf3705e352c2cb29a63175a
5
5
  SHA512:
6
- metadata.gz: 2844e8953fd3bdafe782b189cafa43ff7189b2dca0c8936f3ff17bdb36797256f764dd0b0f8aaddc4197281cd06d390a09c556cc94555ac2eb1d937272db7c25
7
- data.tar.gz: afd5441e0fa2485a00a2e315a14b0f08684e2db6f48e539316050950807b55fc5e41f37a6a0ecfd062db31c16228f955e340ae9e3895b3ed88451c00fcd706e8
6
+ metadata.gz: ee53896501b403c8d8b990c44dba0793bc8eddf34018c0ee7e676d85c8230f62760cd9139f6223568b5766b22a2a9d186c89bcfdbddc390d1e1611be32a40ed5
7
+ data.tar.gz: 4de012c10e7af26d7db33ec381da6517dfb7fcfda16264b47addf18d8d64e5bbde22735f7143ff450da18b9f019e38971249367513443c3e0d920e3967643337
data/LICENSE CHANGED
@@ -1,3 +1,373 @@
1
- This Source Code Form is subject to the terms of the Mozilla Public
2
- License, v. 2.0. If a copy of the MPL was not distributed with this
3
- file, You can obtain one at http://mozilla.org/MPL/2.0/
1
+ Mozilla Public License Version 2.0
2
+ ==================================
3
+
4
+ 1. Definitions
5
+ --------------
6
+
7
+ 1.1. "Contributor"
8
+ means each individual or legal entity that creates, contributes to
9
+ the creation of, or owns Covered Software.
10
+
11
+ 1.2. "Contributor Version"
12
+ means the combination of the Contributions of others (if any) used
13
+ by a Contributor and that particular Contributor's Contribution.
14
+
15
+ 1.3. "Contribution"
16
+ means Covered Software of a particular Contributor.
17
+
18
+ 1.4. "Covered Software"
19
+ means Source Code Form to which the initial Contributor has attached
20
+ the notice in Exhibit A, the Executable Form of such Source Code
21
+ Form, and Modifications of such Source Code Form, in each case
22
+ including portions thereof.
23
+
24
+ 1.5. "Incompatible With Secondary Licenses"
25
+ means
26
+
27
+ (a) that the initial Contributor has attached the notice described
28
+ in Exhibit B to the Covered Software; or
29
+
30
+ (b) that the Covered Software was made available under the terms of
31
+ version 1.1 or earlier of the License, but not also under the
32
+ terms of a Secondary License.
33
+
34
+ 1.6. "Executable Form"
35
+ means any form of the work other than Source Code Form.
36
+
37
+ 1.7. "Larger Work"
38
+ means a work that combines Covered Software with other material, in
39
+ a separate file or files, that is not Covered Software.
40
+
41
+ 1.8. "License"
42
+ means this document.
43
+
44
+ 1.9. "Licensable"
45
+ means having the right to grant, to the maximum extent possible,
46
+ whether at the time of the initial grant or subsequently, any and
47
+ all of the rights conveyed by this License.
48
+
49
+ 1.10. "Modifications"
50
+ means any of the following:
51
+
52
+ (a) any file in Source Code Form that results from an addition to,
53
+ deletion from, or modification of the contents of Covered
54
+ Software; or
55
+
56
+ (b) any new file in Source Code Form that contains any Covered
57
+ Software.
58
+
59
+ 1.11. "Patent Claims" of a Contributor
60
+ means any patent claim(s), including without limitation, method,
61
+ process, and apparatus claims, in any patent Licensable by such
62
+ Contributor that would be infringed, but for the grant of the
63
+ License, by the making, using, selling, offering for sale, having
64
+ made, import, or transfer of either its Contributions or its
65
+ Contributor Version.
66
+
67
+ 1.12. "Secondary License"
68
+ means either the GNU General Public License, Version 2.0, the GNU
69
+ Lesser General Public License, Version 2.1, the GNU Affero General
70
+ Public License, Version 3.0, or any later versions of those
71
+ licenses.
72
+
73
+ 1.13. "Source Code Form"
74
+ means the form of the work preferred for making modifications.
75
+
76
+ 1.14. "You" (or "Your")
77
+ means an individual or a legal entity exercising rights under this
78
+ License. For legal entities, "You" includes any entity that
79
+ controls, is controlled by, or is under common control with You. For
80
+ purposes of this definition, "control" means (a) the power, direct
81
+ or indirect, to cause the direction or management of such entity,
82
+ whether by contract or otherwise, or (b) ownership of more than
83
+ fifty percent (50%) of the outstanding shares or beneficial
84
+ ownership of such entity.
85
+
86
+ 2. License Grants and Conditions
87
+ --------------------------------
88
+
89
+ 2.1. Grants
90
+
91
+ Each Contributor hereby grants You a world-wide, royalty-free,
92
+ non-exclusive license:
93
+
94
+ (a) under intellectual property rights (other than patent or trademark)
95
+ Licensable by such Contributor to use, reproduce, make available,
96
+ modify, display, perform, distribute, and otherwise exploit its
97
+ Contributions, either on an unmodified basis, with Modifications, or
98
+ as part of a Larger Work; and
99
+
100
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
101
+ for sale, have made, import, and otherwise transfer either its
102
+ Contributions or its Contributor Version.
103
+
104
+ 2.2. Effective Date
105
+
106
+ The licenses granted in Section 2.1 with respect to any Contribution
107
+ become effective for each Contribution on the date the Contributor first
108
+ distributes such Contribution.
109
+
110
+ 2.3. Limitations on Grant Scope
111
+
112
+ The licenses granted in this Section 2 are the only rights granted under
113
+ this License. No additional rights or licenses will be implied from the
114
+ distribution or licensing of Covered Software under this License.
115
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
116
+ Contributor:
117
+
118
+ (a) for any code that a Contributor has removed from Covered Software;
119
+ or
120
+
121
+ (b) for infringements caused by: (i) Your and any other third party's
122
+ modifications of Covered Software, or (ii) the combination of its
123
+ Contributions with other software (except as part of its Contributor
124
+ Version); or
125
+
126
+ (c) under Patent Claims infringed by Covered Software in the absence of
127
+ its Contributions.
128
+
129
+ This License does not grant any rights in the trademarks, service marks,
130
+ or logos of any Contributor (except as may be necessary to comply with
131
+ the notice requirements in Section 3.4).
132
+
133
+ 2.4. Subsequent Licenses
134
+
135
+ No Contributor makes additional grants as a result of Your choice to
136
+ distribute the Covered Software under a subsequent version of this
137
+ License (see Section 10.2) or under the terms of a Secondary License (if
138
+ permitted under the terms of Section 3.3).
139
+
140
+ 2.5. Representation
141
+
142
+ Each Contributor represents that the Contributor believes its
143
+ Contributions are its original creation(s) or it has sufficient rights
144
+ to grant the rights to its Contributions conveyed by this License.
145
+
146
+ 2.6. Fair Use
147
+
148
+ This License is not intended to limit any rights You have under
149
+ applicable copyright doctrines of fair use, fair dealing, or other
150
+ equivalents.
151
+
152
+ 2.7. Conditions
153
+
154
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
155
+ in Section 2.1.
156
+
157
+ 3. Responsibilities
158
+ -------------------
159
+
160
+ 3.1. Distribution of Source Form
161
+
162
+ All distribution of Covered Software in Source Code Form, including any
163
+ Modifications that You create or to which You contribute, must be under
164
+ the terms of this License. You must inform recipients that the Source
165
+ Code Form of the Covered Software is governed by the terms of this
166
+ License, and how they can obtain a copy of this License. You may not
167
+ attempt to alter or restrict the recipients' rights in the Source Code
168
+ Form.
169
+
170
+ 3.2. Distribution of Executable Form
171
+
172
+ If You distribute Covered Software in Executable Form then:
173
+
174
+ (a) such Covered Software must also be made available in Source Code
175
+ Form, as described in Section 3.1, and You must inform recipients of
176
+ the Executable Form how they can obtain a copy of such Source Code
177
+ Form by reasonable means in a timely manner, at a charge no more
178
+ than the cost of distribution to the recipient; and
179
+
180
+ (b) You may distribute such Executable Form under the terms of this
181
+ License, or sublicense it under different terms, provided that the
182
+ license for the Executable Form does not attempt to limit or alter
183
+ the recipients' rights in the Source Code Form under this License.
184
+
185
+ 3.3. Distribution of a Larger Work
186
+
187
+ You may create and distribute a Larger Work under terms of Your choice,
188
+ provided that You also comply with the requirements of this License for
189
+ the Covered Software. If the Larger Work is a combination of Covered
190
+ Software with a work governed by one or more Secondary Licenses, and the
191
+ Covered Software is not Incompatible With Secondary Licenses, this
192
+ License permits You to additionally distribute such Covered Software
193
+ under the terms of such Secondary License(s), so that the recipient of
194
+ the Larger Work may, at their option, further distribute the Covered
195
+ Software under the terms of either this License or such Secondary
196
+ License(s).
197
+
198
+ 3.4. Notices
199
+
200
+ You may not remove or alter the substance of any license notices
201
+ (including copyright notices, patent notices, disclaimers of warranty,
202
+ or limitations of liability) contained within the Source Code Form of
203
+ the Covered Software, except that You may alter any license notices to
204
+ the extent required to remedy known factual inaccuracies.
205
+
206
+ 3.5. Application of Additional Terms
207
+
208
+ You may choose to offer, and to charge a fee for, warranty, support,
209
+ indemnity or liability obligations to one or more recipients of Covered
210
+ Software. However, You may do so only on Your own behalf, and not on
211
+ behalf of any Contributor. You must make it absolutely clear that any
212
+ such warranty, support, indemnity, or liability obligation is offered by
213
+ You alone, and You hereby agree to indemnify every Contributor for any
214
+ liability incurred by such Contributor as a result of warranty, support,
215
+ indemnity or liability terms You offer. You may include additional
216
+ disclaimers of warranty and limitations of liability specific to any
217
+ jurisdiction.
218
+
219
+ 4. Inability to Comply Due to Statute or Regulation
220
+ ---------------------------------------------------
221
+
222
+ If it is impossible for You to comply with any of the terms of this
223
+ License with respect to some or all of the Covered Software due to
224
+ statute, judicial order, or regulation then You must: (a) comply with
225
+ the terms of this License to the maximum extent possible; and (b)
226
+ describe the limitations and the code they affect. Such description must
227
+ be placed in a text file included with all distributions of the Covered
228
+ Software under this License. Except to the extent prohibited by statute
229
+ or regulation, such description must be sufficiently detailed for a
230
+ recipient of ordinary skill to be able to understand it.
231
+
232
+ 5. Termination
233
+ --------------
234
+
235
+ 5.1. The rights granted under this License will terminate automatically
236
+ if You fail to comply with any of its terms. However, if You become
237
+ compliant, then the rights granted under this License from a particular
238
+ Contributor are reinstated (a) provisionally, unless and until such
239
+ Contributor explicitly and finally terminates Your grants, and (b) on an
240
+ ongoing basis, if such Contributor fails to notify You of the
241
+ non-compliance by some reasonable means prior to 60 days after You have
242
+ come back into compliance. Moreover, Your grants from a particular
243
+ Contributor are reinstated on an ongoing basis if such Contributor
244
+ notifies You of the non-compliance by some reasonable means, this is the
245
+ first time You have received notice of non-compliance with this License
246
+ from such Contributor, and You become compliant prior to 30 days after
247
+ Your receipt of the notice.
248
+
249
+ 5.2. If You initiate litigation against any entity by asserting a patent
250
+ infringement claim (excluding declaratory judgment actions,
251
+ counter-claims, and cross-claims) alleging that a Contributor Version
252
+ directly or indirectly infringes any patent, then the rights granted to
253
+ You by any and all Contributors for the Covered Software under Section
254
+ 2.1 of this License shall terminate.
255
+
256
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
257
+ end user license agreements (excluding distributors and resellers) which
258
+ have been validly granted by You or Your distributors under this License
259
+ prior to termination shall survive termination.
260
+
261
+ ************************************************************************
262
+ * *
263
+ * 6. Disclaimer of Warranty *
264
+ * ------------------------- *
265
+ * *
266
+ * Covered Software is provided under this License on an "as is" *
267
+ * basis, without warranty of any kind, either expressed, implied, or *
268
+ * statutory, including, without limitation, warranties that the *
269
+ * Covered Software is free of defects, merchantable, fit for a *
270
+ * particular purpose or non-infringing. The entire risk as to the *
271
+ * quality and performance of the Covered Software is with You. *
272
+ * Should any Covered Software prove defective in any respect, You *
273
+ * (not any Contributor) assume the cost of any necessary servicing, *
274
+ * repair, or correction. This disclaimer of warranty constitutes an *
275
+ * essential part of this License. No use of any Covered Software is *
276
+ * authorized under this License except under this disclaimer. *
277
+ * *
278
+ ************************************************************************
279
+
280
+ ************************************************************************
281
+ * *
282
+ * 7. Limitation of Liability *
283
+ * -------------------------- *
284
+ * *
285
+ * Under no circumstances and under no legal theory, whether tort *
286
+ * (including negligence), contract, or otherwise, shall any *
287
+ * Contributor, or anyone who distributes Covered Software as *
288
+ * permitted above, be liable to You for any direct, indirect, *
289
+ * special, incidental, or consequential damages of any character *
290
+ * including, without limitation, damages for lost profits, loss of *
291
+ * goodwill, work stoppage, computer failure or malfunction, or any *
292
+ * and all other commercial damages or losses, even if such party *
293
+ * shall have been informed of the possibility of such damages. This *
294
+ * limitation of liability shall not apply to liability for death or *
295
+ * personal injury resulting from such party's negligence to the *
296
+ * extent applicable law prohibits such limitation. Some *
297
+ * jurisdictions do not allow the exclusion or limitation of *
298
+ * incidental or consequential damages, so this exclusion and *
299
+ * limitation may not apply to You. *
300
+ * *
301
+ ************************************************************************
302
+
303
+ 8. Litigation
304
+ -------------
305
+
306
+ Any litigation relating to this License may be brought only in the
307
+ courts of a jurisdiction where the defendant maintains its principal
308
+ place of business and such litigation shall be governed by laws of that
309
+ jurisdiction, without reference to its conflict-of-law provisions.
310
+ Nothing in this Section shall prevent a party's ability to bring
311
+ cross-claims or counter-claims.
312
+
313
+ 9. Miscellaneous
314
+ ----------------
315
+
316
+ This License represents the complete agreement concerning the subject
317
+ matter hereof. If any provision of this License is held to be
318
+ unenforceable, such provision shall be reformed only to the extent
319
+ necessary to make it enforceable. Any law or regulation which provides
320
+ that the language of a contract shall be construed against the drafter
321
+ shall not be used to construe this License against a Contributor.
322
+
323
+ 10. Versions of the License
324
+ ---------------------------
325
+
326
+ 10.1. New Versions
327
+
328
+ Mozilla Foundation is the license steward. Except as provided in Section
329
+ 10.3, no one other than the license steward has the right to modify or
330
+ publish new versions of this License. Each version will be given a
331
+ distinguishing version number.
332
+
333
+ 10.2. Effect of New Versions
334
+
335
+ You may distribute the Covered Software under the terms of the version
336
+ of the License under which You originally received the Covered Software,
337
+ or under the terms of any subsequent version published by the license
338
+ steward.
339
+
340
+ 10.3. Modified Versions
341
+
342
+ If you create software not governed by this License, and you want to
343
+ create a new license for such software, you may create and use a
344
+ modified version of this License if you rename the license and remove
345
+ any references to the name of the license steward (except to note that
346
+ such modified license differs from this License).
347
+
348
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
349
+ Licenses
350
+
351
+ If You choose to distribute Source Code Form that is Incompatible With
352
+ Secondary Licenses under the terms of this version of the License, the
353
+ notice described in Exhibit B of this License must be attached.
354
+
355
+ Exhibit A - Source Code Form License Notice
356
+ -------------------------------------------
357
+
358
+ This Source Code Form is subject to the terms of the Mozilla Public
359
+ License, v. 2.0. If a copy of the MPL was not distributed with this
360
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
361
+
362
+ If it is not possible or desirable to put the notice in a particular
363
+ file, then You may include the notice in a location (such as a LICENSE
364
+ file in a relevant directory) where a recipient would be likely to look
365
+ for such a notice.
366
+
367
+ You may add additional accurate notices of copyright ownership.
368
+
369
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
370
+ ---------------------------------------------------------
371
+
372
+ This Source Code Form is "Incompatible With Secondary Licenses", as
373
+ defined by the Mozilla Public License, v. 2.0.
data/README.md CHANGED
@@ -1,12 +1,16 @@
1
- Installation
2
- ===
1
+ # Installation
3
2
 
4
- <pre>
5
- gem install puppet-lint-strict_indent-check
6
- </pre>
3
+ [![License](https://img.shields.io/github/license/voxpupuli/puppet-lint-strict_indent-check.svg)](https://github.com/voxpupuli/puppet-lint-strict_indent-check/blob/master/LICENSE)
4
+ [![Test](https://github.com/voxpupuli/puppet-lint-strict_indent-check/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/puppet-lint-strict_indent-check/actions/workflows/test.yml)
5
+ [![codecov](https://codecov.io/gh/voxpupuli/puppet-lint-strict_indent-check/branch/master/graph/badge.svg?token=Mypkl78hvK)](https://codecov.io/gh/voxpupuli/puppet-lint-strict_indent-check)
6
+ [![Release](https://github.com/voxpupuli/puppet-lint-strict_indent-check/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/puppet-lint-strict_indent-check/actions/workflows/release.yml)
7
+ [![RubyGem Version](https://img.shields.io/gem/v/puppet-lint-strict_indent-check.svg)](https://rubygems.org/gems/puppet-lint-strict_indent-check)
8
+ [![RubyGem Downloads](https://img.shields.io/gem/dt/puppet-lint-strict_indent-check.svg)](https://rubygems.org/gems/puppet-lint-strict_indent-check)
9
+ [![Donated by Daniel Thorn](https://img.shields.io/badge/donated%20by-Daniel%20Thorn-fb7047.svg)](#transfer-notice)
7
10
 
8
- Usage
9
- ===
11
+ A puppet-lint plugin to validate Puppet DSL indentation
12
+
13
+ ## Usage
10
14
 
11
15
  This plugin provides an indentation check for puppet-lint `strict_indent`. The check has a strict expectation for all indentation, except comments and whitespace/blank lines.
12
16
 
@@ -14,24 +18,22 @@ supports --fix flag
14
18
 
15
19
  Check will raise a warning for any files that don't have 2-space indent, and follow specific guidelines for increase/decrease of indent.
16
20
 
17
- Alternate Indentation
18
- ===
21
+ ## Alternate Indentation
19
22
 
20
23
  Indentation defaults to 2 spaces. To use a different number of spaces, use the `-l` option to load ruby file changing the `chars_per_indent` config.
21
24
 
22
25
  config file `chars_per_indent_4.rb`:
23
- <pre>
26
+ ```
24
27
  # This could also be set in your Rakefile
25
28
  PuppetLint.configuration.chars_per_indent = 4
26
- </pre>
29
+ ```
27
30
 
28
31
  lint command:
29
- <pre>
32
+ ```
30
33
  puppet-lint -l chars_per_indent_4.rb puppet-mysql/manifests/init.pp
31
- </pre>
34
+ ```
32
35
 
33
- Acceptable Identation
34
- ===
36
+ ## Acceptable Identation
35
37
 
36
38
  * indent should increase by one step the line after each opened brace (square, curly, paren)
37
39
  * indent should decrease by one step the line of every closed brace.
@@ -43,3 +45,26 @@ Acceptable Identation
43
45
  see `spec/fixtures/pass/` for good indentation examples.
44
46
 
45
47
  see `spec/fixtures/fail/` for bad indentation examples.
48
+
49
+ ## Transfer Notice
50
+
51
+ This plugin was originally authored by [Daniel Thorn](https://github.com/relud).
52
+ The maintainer preferred that Vox Pupuli take ownership of the module for future improvement and maintenance.
53
+ Existing pull requests and issues were transferred over, please fork and continue to contribute at https://github.com/voxpupuli/puppet-lint-strict_indent-check.
54
+
55
+ Previously: https://github.com/relud/puppet-lint-strict_indent-check
56
+
57
+ ## License
58
+
59
+ This gem is licensed under the Mozilla Public license 2.
60
+
61
+
62
+ ## Release information
63
+
64
+ To make a new release, please do:
65
+ * update the version in the gemspec file
66
+ * Install gems with `bundle install --with release --path .vendor`
67
+ * generate the changelog with `bundle exec rake changelog`
68
+ * Check if the new version matches the closed issues/PRs in the changelog
69
+ * Create a PR with it
70
+ * After it got merged, push a tag. GitHub actions will do the actual release to rubygems and GitHub Packages
@@ -3,19 +3,27 @@
3
3
 
4
4
  PuppetLint.new_check(:'strict_indent') do
5
5
  def match(tokens)
6
+ opening_token = {
7
+ :RBRACE => :LBRACE,
8
+ :RBRACK => :LBRACK,
9
+ :RPAREN => :LPAREN,
10
+ :HEREDOC => :HEREDOC_OPEN,
11
+ :HEREDOC_POST => :HEREDOC_OPEN,
12
+ }
6
13
  open = {
7
14
  :LBRACE => [],
8
15
  :LBRACK => [],
9
16
  :LPAREN => [],
17
+ :HEREDOC_OPEN => [],
10
18
  }
11
19
 
12
20
  matches = {}
13
21
 
14
22
  tokens.each do |token|
15
- if [:LBRACE, :LBRACK, :LPAREN].include?(token.type)
23
+ if [:LBRACE, :LBRACK, :LPAREN, :HEREDOC_OPEN].include?(token.type)
16
24
  open[token.type] << token
17
- elsif [:RBRACE, :RBRACK, :RPAREN].include?(token.type)
18
- match = open[("L" + token.type.to_s[1..-1]).to_sym].pop
25
+ elsif [:RBRACE, :RBRACK, :RPAREN, :HEREDOC, :HEREDOC_POST].include?(token.type)
26
+ match = open[opening_token[token.type]].pop
19
27
  if not match.nil?
20
28
  matches[token] = match
21
29
  matches[match] = token
@@ -45,6 +53,9 @@ PuppetLint.new_check(:'strict_indent') do
45
53
  open_groups = 0
46
54
  prev_token = token.prev_token
47
55
  while not prev_token.nil? and prev_token.type != :NEWLINE
56
+ if prev_token.type == :HEREDOC_OPEN
57
+ temp_indent += 1
58
+ end
48
59
  if [:LBRACE, :LBRACK, :LPAREN].include?(prev_token.type)
49
60
  if matches[prev_token].nil? or matches[prev_token].line > prev_token.line
50
61
  # left braces not matched in the same line increase indent
@@ -57,7 +68,7 @@ PuppetLint.new_check(:'strict_indent') do
57
68
 
58
69
  # reset prev_token to last non-whitespace token on previous line
59
70
  prev_token = token.prev_token
60
- while not prev_token.nil? and prev_token.type == :WHITESPACE
71
+ while not prev_token.nil? and (prev_token.type == :WHITESPACE or prev_token.type == :COMMENT)
61
72
  prev_token = prev_token.prev_token
62
73
  end
63
74
 
@@ -120,6 +131,10 @@ PuppetLint.new_check(:'strict_indent') do
120
131
  actual = 0
121
132
  if token.next_token.type == :INDENT
122
133
  actual = token.next_token.value.length
134
+ elsif !token.prev_token.nil? and token.prev_token.type == :HEREDOC
135
+ actual = token.prev_token.value.split("\n").last.length
136
+ elsif !token.prev_token.nil? and token.prev_token.type == :HEREDOC_OPEN
137
+ actual = next_token.prev_token.value.split("\n").last.length
123
138
  else
124
139
  actual = 0
125
140
  end
@@ -0,0 +1,4 @@
1
+ $variable = @(EOT)
2
+ This is a multiline
3
+ heredoc string
4
+ | EOT
@@ -0,0 +1,4 @@
1
+ $variable = @(EOT)
2
+ This is a multiline
3
+ heredoc string
4
+ | EOT
@@ -0,0 +1,21 @@
1
+ $variable = @(EOT)
2
+ This is a multiline
3
+ heredoc string
4
+ | EOT
5
+
6
+ $variable_with_interpolation = @("EOT")
7
+ Another example
8
+ ${variable}
9
+ with
10
+ ${variable}
11
+ with interpolation
12
+ | EOT
13
+
14
+ case fact('os.family') {
15
+ 'debian': {
16
+ $greeting = @(EOT)
17
+ Hello
18
+ World
19
+ | EOT
20
+ }
21
+ }
@@ -41,6 +41,24 @@ describe 'strict_indent' do
41
41
  end
42
42
  end
43
43
 
44
+ context 'comment after resource title.' do
45
+ let(:code) {
46
+ <<-EOF.gsub(/^ {8}/, '')
47
+ class (
48
+ ) {
49
+ file {
50
+ 'this': #comment
51
+ ensure => 'present',
52
+ }
53
+ }
54
+ EOF
55
+ }
56
+
57
+ it 'should detect 0 problems' do
58
+ expect(problems).to have(0).problems
59
+ end
60
+ end
61
+
44
62
  context 'invalid array indent' do
45
63
  let(:code) {
46
64
  <<-EOF.gsub(/^ {8}/, '')
@@ -59,4 +77,17 @@ describe 'strict_indent' do
59
77
  expect(problems).to have(1).problems
60
78
  end
61
79
  end
80
+
81
+ context 'blank line at beginning of file' do
82
+ let(:code) {
83
+ <<-EOF.gsub(/^ {8}/, '')
84
+
85
+ class () {}
86
+ EOF
87
+ }
88
+
89
+ it 'should detect 0 problems' do
90
+ expect(problems).to have(0).problems
91
+ end
92
+ end
62
93
  end
data/spec/spec_helper.rb CHANGED
@@ -1,3 +1,29 @@
1
+ # frozen_string_literal: true
2
+
3
+ begin
4
+ require 'simplecov'
5
+ require 'simplecov-console'
6
+ require 'codecov'
7
+ rescue LoadError
8
+ else
9
+ SimpleCov.start do
10
+ track_files 'lib/**/*.rb'
11
+
12
+ add_filter '/spec'
13
+
14
+ enable_coverage :branch
15
+
16
+ # do not track vendored files
17
+ add_filter '/vendor'
18
+ add_filter '/.vendor'
19
+ end
20
+
21
+ SimpleCov.formatters = [
22
+ SimpleCov::Formatter::Console,
23
+ SimpleCov::Formatter::Codecov,
24
+ ]
25
+ end
26
+
1
27
  require 'puppet-lint'
2
28
 
3
29
  PuppetLint::Plugins.load_spec_helper
metadata CHANGED
@@ -1,88 +1,116 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet-lint-strict_indent-check
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.8
5
5
  platform: ruby
6
6
  authors:
7
- - Daniel Thorn
7
+ - Vox Pupuli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-26 00:00:00.000000000 Z
11
+ date: 2021-07-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: puppet-lint
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>'
17
+ - - ">"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>'
24
+ - - ">"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rspec
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '3.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '3.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec-its
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '1.0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '1.0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec-collection_matchers
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: rspec-json_expectations
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ version: '0'
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: rake
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
- - - '>='
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
90
+ type: :development
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ">="
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: simplecov
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
74
102
  - !ruby/object:Gem::Version
75
103
  version: '0'
76
104
  type: :development
77
105
  prerelease: false
78
106
  version_requirements: !ruby/object:Gem::Requirement
79
107
  requirements:
80
- - - '>='
108
+ - - ">="
81
109
  - !ruby/object:Gem::Version
82
110
  version: '0'
83
- description: |2
84
- Extends puppet-lint to ensure that your manifests follow a strict indentation pattern.
85
- email: daniel@relud.com
111
+ description: " Extends puppet-lint to ensure that your manifests follow a strict
112
+ indentation pattern.\n"
113
+ email: voxpupuli@groups.io
86
114
  executables: []
87
115
  extensions: []
88
116
  extra_rdoc_files: []
@@ -91,10 +119,13 @@ files:
91
119
  - README.md
92
120
  - lib/puppet-lint/plugins/check_strict_indent.rb
93
121
  - spec/fixtures/fail/1.pp
122
+ - spec/fixtures/fail/heredoc_extra.pp
123
+ - spec/fixtures/fail/heredoc_unsuficient.pp
94
124
  - spec/fixtures/pass/1.pp
125
+ - spec/fixtures/pass/heredoc.pp
95
126
  - spec/puppet-lint/plugins/check_strict_indent_spec.rb
96
127
  - spec/spec_helper.rb
97
- homepage: https://github.com/relud/puppet-lint-strict_indent-check
128
+ homepage: https://github.com/voxpupuli/puppet-lint-strict_indent-check
98
129
  licenses:
99
130
  - Mozilla 2.0
100
131
  metadata: {}
@@ -104,22 +135,24 @@ require_paths:
104
135
  - lib
105
136
  required_ruby_version: !ruby/object:Gem::Requirement
106
137
  requirements:
107
- - - '>='
138
+ - - ">="
108
139
  - !ruby/object:Gem::Version
109
140
  version: '0'
110
141
  required_rubygems_version: !ruby/object:Gem::Requirement
111
142
  requirements:
112
- - - '>='
143
+ - - ">="
113
144
  - !ruby/object:Gem::Version
114
145
  version: '0'
115
146
  requirements: []
116
- rubyforge_project:
117
- rubygems_version: 2.6.0
147
+ rubygems_version: 3.2.22
118
148
  signing_key:
119
149
  specification_version: 4
120
150
  summary: puppet-lint strict indent check
121
151
  test_files:
122
152
  - spec/fixtures/fail/1.pp
153
+ - spec/fixtures/fail/heredoc_extra.pp
154
+ - spec/fixtures/fail/heredoc_unsuficient.pp
123
155
  - spec/fixtures/pass/1.pp
156
+ - spec/fixtures/pass/heredoc.pp
124
157
  - spec/puppet-lint/plugins/check_strict_indent_spec.rb
125
158
  - spec/spec_helper.rb