Skip to content

Commit 9d1e2d0

Browse files
committed
(maint) Update puppet-lint to 2.3.3
This commit updates the vendored puppet-lint gem to 2.3.3.
1 parent 183ff00 commit 9d1e2d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1582
-1100
lines changed

server/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ task :gem_revendor do
4141
{
4242
:directory => 'puppet-lint',
4343
:github_repo => 'https://github.com/rodjek/puppet-lint.git',
44-
:github_ref => '2.3.0',
44+
:github_ref => '2.3.3',
4545
}
4646
]
4747

server/vendor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ Note - To improve the packaging size, test files etc. were stripped from the Gem
1111
Gem List
1212
--------
1313

14-
* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.0)
14+
* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.3)

server/vendor/puppet-lint/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ coverage/
99
/_site/
1010
.idea
1111
/*.pp
12+
/tmp/
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
---
2+
inherit_from: './.rubocop_todo.yml'
3+
AllCops:
4+
TargetRubyVersion: 1.9
5+
6+
Style/HashSyntax:
7+
EnforcedStyle: hash_rockets
8+
9+
Layout/FirstArrayElementLineBreak:
10+
Enabled: true
11+
Layout/FirstHashElementLineBreak:
12+
Enabled: true
13+
Layout/FirstMethodArgumentLineBreak:
14+
Enabled: true
15+
Layout/FirstMethodParameterLineBreak:
16+
Enabled: true
17+
Layout/IndentArray:
18+
EnforcedStyle: consistent
19+
Layout/MultilineArrayBraceLayout:
20+
EnforcedStyle: new_line
21+
Layout/MultilineAssignmentLayout:
22+
Enabled: true
23+
EnforcedStyle: same_line
24+
Layout/MultilineHashBraceLayout:
25+
EnforcedStyle: new_line
26+
Layout/MultilineMethodDefinitionBraceLayout:
27+
EnforcedStyle: new_line
28+
29+
Style/AutoResourceCleanup:
30+
Enabled: true
31+
Style/BlockDelimiters:
32+
EnforcedStyle: braces_for_chaining
33+
Style/BracesAroundHashParameters:
34+
EnforcedStyle: context_dependent
35+
Style/Encoding:
36+
Enabled: false
37+
Style/MethodCallWithArgsParentheses:
38+
Enabled: true
39+
IgnoreMacros: true
40+
IgnoredMethods:
41+
- puts
42+
- require
43+
- include
44+
- it
45+
- context
46+
- describe
47+
- to
48+
- to_not
49+
- raise
50+
- desc
51+
- task
52+
- exit
53+
- should
54+
- gem
55+
- group
56+
- attr_reader
57+
- attr_accessor
58+
- attr_writer
59+
- source
60+
Style/MethodCalledOnDoEndBlock:
61+
Enabled: true
62+
Style/RegexpLiteral:
63+
EnforcedStyle: percent_r
64+
Style/TrailingCommaInArguments:
65+
EnforcedStyleForMultiline: no_comma
66+
Style/TrailingCommaInLiteral:
67+
EnforcedStyleForMultiline: comma
68+
Style/FormatStringToken:
69+
Enabled: false
70+
Style/FileName:
71+
Exclude:
72+
- 'lib/puppet-lint.rb'
73+
- 'lib/puppet-lint/tasks/puppet-lint.rb'
74+
- 'spec/puppet-lint_spec.rb'
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config`
3+
# on 2017-08-28 12:57:58 +1000 using RuboCop version 0.49.1.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.
8+
9+
# Offense count: 3
10+
# Configuration parameters: Include.
11+
# Include: **/Gemfile, **/gems.rb
12+
Bundler/DuplicatedGem:
13+
Exclude:
14+
- 'Gemfile'
15+
16+
# Offense count: 2
17+
# Cop supports --auto-correct.
18+
# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
19+
# Include: **/Gemfile, **/gems.rb
20+
Bundler/OrderedGems:
21+
Exclude:
22+
- 'Gemfile'
23+
24+
# Offense count: 9
25+
# Configuration parameters: AllowSafeAssignment.
26+
Lint/AssignmentInCondition:
27+
Exclude:
28+
- 'lib/puppet-lint/lexer.rb'
29+
- 'lib/puppet-lint/plugins/check_classes/variable_scope.rb'
30+
31+
# Offense count: 52
32+
Metrics/AbcSize:
33+
Max: 153
34+
35+
# Offense count: 121
36+
# Configuration parameters: CountComments, ExcludedMethods.
37+
Metrics/BlockLength:
38+
Max: 1136
39+
40+
# Offense count: 8
41+
# Configuration parameters: CountBlocks.
42+
Metrics/BlockNesting:
43+
Max: 5
44+
45+
# Offense count: 2
46+
# Configuration parameters: CountComments.
47+
Metrics/ClassLength:
48+
Max: 383
49+
50+
# Offense count: 20
51+
Metrics/CyclomaticComplexity:
52+
Max: 26
53+
54+
# Offense count: 238
55+
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
56+
# URISchemes: http, https
57+
Metrics/LineLength:
58+
Max: 223
59+
60+
# Offense count: 65
61+
# Configuration parameters: CountComments.
62+
Metrics/MethodLength:
63+
Max: 94
64+
65+
# Offense count: 18
66+
Metrics/PerceivedComplexity:
67+
Max: 25
68+
69+
# Offense count: 1
70+
# Cop supports --auto-correct.
71+
Performance/RedundantBlockCall:
72+
Exclude:
73+
- 'lib/puppet-lint/tasks/puppet-lint.rb'
74+
75+
# Offense count: 7
76+
# Configuration parameters: EnforcedStyle, SupportedStyles.
77+
# SupportedStyles: nested, compact
78+
Style/ClassAndModuleChildren:
79+
Exclude:
80+
- 'lib/puppet-lint.rb'
81+
- 'lib/puppet-lint/bin.rb'
82+
- 'lib/puppet-lint/checkplugin.rb'
83+
- 'lib/puppet-lint/checks.rb'
84+
- 'lib/puppet-lint/data.rb'
85+
- 'lib/puppet-lint/optparser.rb'
86+
87+
# Offense count: 20
88+
Style/MultilineBlockChain:
89+
Enabled: false

server/vendor/puppet-lint/.travis.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ branches:
66
only:
77
- master
88
bundler_args: --without development system_tests
9+
script:
10+
- bundle exec rake $CHECK
11+
env:
12+
- CHECK=ci
913
rvm:
1014
- 1.8.7
1115
- 1.9.3
1216
- 2.0.0
13-
- 2.1.9
14-
- 2.3.1
15-
- 2.4.0
17+
- 2.1.10
18+
- 2.2.7
19+
- 2.3.4
20+
- 2.4.1
1621
matrix:
17-
allow_failures:
18-
- rvm: 1.8.7
19-
notifications:
20-
email:
21-
22+
include:
23+
- rvm: 2.4.1
24+
env: CHECK=rubocop

server/vendor/puppet-lint/CHANGELOG.md

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,83 @@
11
# Change Log
22

3+
## [2.3.3](https://github.com/rodjek/puppet-lint/tree/2.3.3) (2017-09-28)
4+
[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.2...2.3.3)
5+
6+
**Closed issues:**
7+
8+
- 2.3.2 - Rakefile's ignore\_paths not respected [\#760](https://github.com/rodjek/puppet-lint/issues/760)
9+
- 2.3.1 - Puppet lint fails with 1.8.7-p371 and Puppet 3.8.0 [\#759](https://github.com/rodjek/puppet-lint/issues/759)
10+
- 2.3.1: puppet-lint does not show errors/warnings --error-level option. [\#756](https://github.com/rodjek/puppet-lint/issues/756)
11+
12+
**Merged pull requests:**
13+
14+
- Add some basic acceptance tests [\#764](https://github.com/rodjek/puppet-lint/pull/764) ([rodjek](https://github.com/rodjek))
15+
- Restore Ruby 1.8.7 support [\#763](https://github.com/rodjek/puppet-lint/pull/763) ([rodjek](https://github.com/rodjek))
16+
- Don't override ignore\_paths set in rake task with default value [\#762](https://github.com/rodjek/puppet-lint/pull/762) ([rodjek](https://github.com/rodjek))
17+
- Add spec for issue raised in \#754 \#756 [\#761](https://github.com/rodjek/puppet-lint/pull/761) ([rodjek](https://github.com/rodjek))
18+
- Fix setup of default log\_format in PuppetLink.configuration when it is empty. [\#757](https://github.com/rodjek/puppet-lint/pull/757) ([zekefast](https://github.com/zekefast))
19+
20+
## [2.3.2](https://github.com/rodjek/puppet-lint/tree/2.3.2) (2017-09-27)
21+
[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.1...2.3.2)
22+
23+
**Fixed bugs:**
24+
25+
- configuration, method_missing had faulty logic [\#754](https://github.com/rodjek/puppet-lint/issues/754)
26+
27+
## [2.3.1](https://github.com/rodjek/puppet-lint/tree/2.3.1) (2017-09-27)
28+
[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.0...2.3.1)
29+
30+
**Fixed bugs:**
31+
32+
- NoMethodError: undefined method `type' for nil:NilClass [\#732](https://github.com/rodjek/puppet-lint/issues/732)
33+
- NoMethodError: undefined method `end\_with?' for nil:NilClass [\#727](https://github.com/rodjek/puppet-lint/issues/727)
34+
- puppet-lint not applying some lint:ignore statements when there are more then 2 on the same line [\#726](https://github.com/rodjek/puppet-lint/issues/726)
35+
- optional paramter warning false positve when inheriting params [\#716](https://github.com/rodjek/puppet-lint/issues/716)
36+
- invalid byte sequence in UTF-8 in selmodule-example.pp [\#714](https://github.com/rodjek/puppet-lint/issues/714)
37+
- puppet-lint --fix encountered an error that it doesn't know how to handle [\#706](https://github.com/rodjek/puppet-lint/issues/706)
38+
- Mangled file after running puppet-lint due to chained function call [\#703](https://github.com/rodjek/puppet-lint/issues/703)
39+
- `incompatible encoding regexp match` for non-printing characters in place of space [\#693](https://github.com/rodjek/puppet-lint/issues/693)
40+
- Unhandled error case [\#691](https://github.com/rodjek/puppet-lint/issues/691)
41+
42+
**Closed issues:**
43+
44+
- puppet-lint has encountered an error that it doesn't know how to handle [\#750](https://github.com/rodjek/puppet-lint/issues/750)
45+
- Variable use like "a+1 = ${$a + 1}" isn't reported but silently changed by --fix to "a+1 = ${a} + 1" [\#749](https://github.com/rodjek/puppet-lint/issues/749)
46+
- using --fix changes line endings [\#748](https://github.com/rodjek/puppet-lint/issues/748)
47+
- Puppet lint syntax error - puppet parser validate no issues [\#746](https://github.com/rodjek/puppet-lint/issues/746)
48+
- Error not handled [\#745](https://github.com/rodjek/puppet-lint/issues/745)
49+
- Whoops, not sure why. ArgumentError: bad value for range [\#742](https://github.com/rodjek/puppet-lint/issues/742)
50+
- ArgumentError: bad value for range [\#741](https://github.com/rodjek/puppet-lint/issues/741)
51+
- Line numbers off after multi-line strings with variables [\#736](https://github.com/rodjek/puppet-lint/issues/736)
52+
- Whoops! It looks like puppet-lint has encountered an error [\#729](https://github.com/rodjek/puppet-lint/issues/729)
53+
- puppet lint config log\_format not working [\#725](https://github.com/rodjek/puppet-lint/issues/725)
54+
- Quoted booleans in Puppet5 for Enum type declarations. [\#720](https://github.com/rodjek/puppet-lint/issues/720)
55+
- Chaining arrow syntax fix introduces trailing whitespaces [\#695](https://github.com/rodjek/puppet-lint/issues/695)
56+
- Refactor check\_comments.rb [\#587](https://github.com/rodjek/puppet-lint/issues/587)
57+
- Puppethack 12/2016 Issues [\#583](https://github.com/rodjek/puppet-lint/issues/583)
58+
- Allow multiple block-level ignore comments [\#498](https://github.com/rodjek/puppet-lint/issues/498)
59+
- puppet-lint crashes with "invalid byte sequence in UTF-8 \(ArgumentError\)" [\#458](https://github.com/rodjek/puppet-lint/issues/458)
60+
61+
**Merged pull requests:**
62+
63+
- Render the ${} enclosures as part of the string tokens [\#752](https://github.com/rodjek/puppet-lint/pull/752) ([rodjek](https://github.com/rodjek))
64+
- Open manifest as binary when writing fixed manifest [\#751](https://github.com/rodjek/puppet-lint/pull/751) ([rodjek](https://github.com/rodjek))
65+
- Remove monkeypatches to implement String\#% [\#744](https://github.com/rodjek/puppet-lint/pull/744) ([rodjek](https://github.com/rodjek))
66+
- Add unit tests for PuppetLint::Checks [\#743](https://github.com/rodjek/puppet-lint/pull/743) ([rodjek](https://github.com/rodjek))
67+
- Update CI configuration [\#739](https://github.com/rodjek/puppet-lint/pull/739) ([rodjek](https://github.com/rodjek))
68+
- Rubocop compliance [\#738](https://github.com/rodjek/puppet-lint/pull/738) ([rodjek](https://github.com/rodjek))
69+
- Fix line numbers being off with multi-line strings containing variables [\#737](https://github.com/rodjek/puppet-lint/pull/737) ([cbowman0](https://github.com/cbowman0))
70+
- Split control comments into words before parsing [\#735](https://github.com/rodjek/puppet-lint/pull/735) ([rodjek](https://github.com/rodjek))
71+
- Handle unicode spaces in the tokeniser [\#734](https://github.com/rodjek/puppet-lint/pull/734) ([rodjek](https://github.com/rodjek))
72+
- Handle SE Linux policy package files [\#733](https://github.com/rodjek/puppet-lint/pull/733) ([rodjek](https://github.com/rodjek))
73+
- Take into account Optional data type when checking parameter order [\#731](https://github.com/rodjek/puppet-lint/pull/731) ([rodjek](https://github.com/rodjek))
74+
- Read the manifest files as UTF-8 [\#730](https://github.com/rodjek/puppet-lint/pull/730) ([rodjek](https://github.com/rodjek))
75+
- Improve handling of unterminated double quoted strings [\#728](https://github.com/rodjek/puppet-lint/pull/728) ([rodjek](https://github.com/rodjek))
76+
- Chaining arrow syntax fix introduces trailing whitespaces [\#708](https://github.com/rodjek/puppet-lint/pull/708) ([rnelson0](https://github.com/rnelson0))
77+
- Add helper methods to add and remove tokens while maintaining the token links [\#694](https://github.com/rodjek/puppet-lint/pull/694) ([Darhazer](https://github.com/Darhazer))
78+
- Code style improvements [\#661](https://github.com/rodjek/puppet-lint/pull/661) ([Darhazer](https://github.com/Darhazer))
79+
- Plugins: Improve code readability [\#658](https://github.com/rodjek/puppet-lint/pull/658) ([Darhazer](https://github.com/Darhazer))
80+
381
## [2.3.0](https://github.com/rodjek/puppet-lint/tree/2.3.0) (2017-07-12)
482
[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.2.1...2.3.0)
583

@@ -843,4 +921,4 @@ If the additional gems you use for checks are pinned to 1.x, you should pin pupp
843921
## [0.0.1](https://github.com/rodjek/puppet-lint/tree/0.0.1) (2011-08-15)
844922

845923

846-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
924+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

server/vendor/puppet-lint/Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ group :test do
2525
# requires ruby 1.9+, on 1.8 we'll fall back to the old regex parsing
2626
gem 'rspec-json_expectations', '~> 1.4'
2727
end
28+
29+
gem 'rubocop', '0.49.1' if RUBY_VERSION > '2.0'
30+
gem 'simplecov', :require => false
2831
end
2932

3033
group :development do

server/vendor/puppet-lint/Rakefile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
11
require 'rake'
22
require 'rspec/core/rake_task'
33
require 'puppet-lint'
4+
require 'puppet-lint/tasks/release_test'
45

56
task :default => :test
67

78
RSpec::Core::RakeTask.new(:test)
89

910
begin
1011
require 'github_changelog_generator/task'
11-
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
12+
GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
1213
version = PuppetLint::VERSION
13-
config.future_release = "#{version}"
14-
config.exclude_labels = %w{duplicate question invalid wontfix release-pr}
14+
config.future_release = version.to_s
15+
config.exclude_labels = %w[duplicate question invalid wontfix release-pr]
1516
end
1617
rescue LoadError
18+
$stderr.puts 'Changelog generation requires Ruby 2.0 or higher'
1719
end
1820

21+
begin
22+
require 'rubocop/rake_task'
23+
24+
RuboCop::RakeTask.new(:rubocop) do |task|
25+
task.options = %w[-D -E]
26+
end
27+
rescue LoadError
28+
$stderr.puts 'Rubocop is not available for this version of Ruby.'
29+
end
30+
31+
task :ci => [:test, :release_test]
32+
1933
# vim: syntax=ruby

server/vendor/puppet-lint/appveyor.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ environment:
1212
- RUBY_VERSION: 21
1313
- RUBY_VERSION: 22
1414
- RUBY_VERSION: 23-x64
15+
- RUBY_VERSION: 24-x64
1516

1617
install:
1718
- SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -25,8 +26,4 @@ before_test:
2526
- bundle -v
2627

2728
test_script:
28-
- bundle exec rake test
29-
30-
notifications:
31-
email:
32-
29+
- bundle exec rake ci

0 commit comments

Comments
 (0)