Merge pull request #174 from glennsarti/update-lint-2.3.3

(maint) Update puppet-lint to 2.3.3

Author: jpogran

server/Rakefile

@@ -41,7 +41,7 @@ task :gem_revendor do
     {
       :directory => 'puppet-lint',
       :github_repo => 'https://github.com/rodjek/puppet-lint.git',
-      :github_ref => '2.3.0',
+      :github_ref => '2.3.3',
     }
   ]
 

server/vendor/README.md

@@ -11,4 +11,4 @@ Note - To improve the packaging size, test files etc. were stripped from the Gem
 Gem List
 --------
 
-* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.0)
+* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.3)

server/vendor/puppet-lint/.gitignore

@@ -9,3 +9,4 @@ coverage/
 /_site/
 .idea
 /*.pp
+/tmp/

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

@@ -0,0 +1,74 @@
+---
+inherit_from: './.rubocop_todo.yml'
+AllCops:
+    TargetRubyVersion: 1.9
+
+Style/HashSyntax:
+    EnforcedStyle: hash_rockets
+
+Layout/FirstArrayElementLineBreak:
+    Enabled: true
+Layout/FirstHashElementLineBreak:
+    Enabled: true
+Layout/FirstMethodArgumentLineBreak:
+    Enabled: true
+Layout/FirstMethodParameterLineBreak:
+    Enabled: true
+Layout/IndentArray:
+    EnforcedStyle: consistent
+Layout/MultilineArrayBraceLayout:
+    EnforcedStyle: new_line
+Layout/MultilineAssignmentLayout:
+    Enabled: true
+    EnforcedStyle: same_line
+Layout/MultilineHashBraceLayout:
+    EnforcedStyle: new_line
+Layout/MultilineMethodDefinitionBraceLayout:
+    EnforcedStyle: new_line
+
+Style/AutoResourceCleanup:
+    Enabled: true
+Style/BlockDelimiters:
+    EnforcedStyle: braces_for_chaining
+Style/BracesAroundHashParameters:
+    EnforcedStyle: context_dependent
+Style/Encoding:
+    Enabled: false
+Style/MethodCallWithArgsParentheses:
+    Enabled: true
+    IgnoreMacros: true
+    IgnoredMethods:
+        - puts
+        - require
+        - include
+        - it
+        - context
+        - describe
+        - to
+        - to_not
+        - raise
+        - desc
+        - task
+        - exit
+        - should
+        - gem
+        - group
+        - attr_reader
+        - attr_accessor
+        - attr_writer
+        - source
+Style/MethodCalledOnDoEndBlock:
+    Enabled: true
+Style/RegexpLiteral:
+    EnforcedStyle: percent_r
+Style/TrailingCommaInArguments:
+    EnforcedStyleForMultiline: no_comma
+Style/TrailingCommaInLiteral:
+    EnforcedStyleForMultiline: comma
+Style/FormatStringToken:
+    Enabled: false
+Style/FileName:
+    Exclude:
+        - 'lib/puppet-lint.rb'
+        - 'lib/puppet-lint/tasks/puppet-lint.rb'
+        - 'spec/puppet-lint_spec.rb'

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

@@ -0,0 +1,89 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-08-28 12:57:58 +1000 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+# Configuration parameters: Include.
+# Include: **/Gemfile, **/gems.rb
+Bundler/DuplicatedGem:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 9
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/puppet-lint/lexer.rb'
+    - 'lib/puppet-lint/plugins/check_classes/variable_scope.rb'
+
+# Offense count: 52
+Metrics/AbcSize:
+  Max: 153
+
+# Offense count: 121
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 1136
+
+# Offense count: 8
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 383
+
+# Offense count: 20
+Metrics/CyclomaticComplexity:
+  Max: 26
+
+# Offense count: 238
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 223
+
+# Offense count: 65
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 94
+
+# Offense count: 18
+Metrics/PerceivedComplexity:
+  Max: 25
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/RedundantBlockCall:
+  Exclude:
+    - 'lib/puppet-lint/tasks/puppet-lint.rb'
+
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'lib/puppet-lint.rb'
+    - 'lib/puppet-lint/bin.rb'
+    - 'lib/puppet-lint/checkplugin.rb'
+    - 'lib/puppet-lint/checks.rb'
+    - 'lib/puppet-lint/data.rb'
+    - 'lib/puppet-lint/optparser.rb'
+
+# Offense count: 20
+Style/MultilineBlockChain:
+  Enabled: false

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

@@ -6,16 +6,19 @@ branches:
   only:
     - master
 bundler_args: --without development system_tests
+script:
+    - bundle exec rake $CHECK
+env:
+    - CHECK=ci
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.9
-  - 2.3.1
-  - 2.4.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 matrix:
-  allow_failures:
-  - rvm: 1.8.7
-notifications:
-  email:
-    - [email protected]
+    include:
+        - rvm: 2.4.1
+          env: CHECK=rubocop

server/vendor/puppet-lint/CHANGELOG.md

@@ -1,5 +1,83 @@
 # Change Log
 
+## [2.3.3](https://github.com/rodjek/puppet-lint/tree/2.3.3) (2017-09-28)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.2...2.3.3)
+
+**Closed issues:**
+
+- 2.3.2 - Rakefile's ignore\_paths not respected [\#760](https://github.com/rodjek/puppet-lint/issues/760)
+- 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)
+- 2.3.1: puppet-lint does not show errors/warnings --error-level option. [\#756](https://github.com/rodjek/puppet-lint/issues/756)
+
+**Merged pull requests:**
+
+- Add some basic acceptance tests [\#764](https://github.com/rodjek/puppet-lint/pull/764) ([rodjek](https://github.com/rodjek))
+- Restore Ruby 1.8.7 support [\#763](https://github.com/rodjek/puppet-lint/pull/763) ([rodjek](https://github.com/rodjek))
+- 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))
+- Add spec for issue raised in \#754 \#756 [\#761](https://github.com/rodjek/puppet-lint/pull/761) ([rodjek](https://github.com/rodjek))
+- 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))
+
+## [2.3.2](https://github.com/rodjek/puppet-lint/tree/2.3.2) (2017-09-27)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.1...2.3.2)
+
+**Fixed bugs:**
+
+- configuration, method_missing had faulty logic [\#754](https://github.com/rodjek/puppet-lint/issues/754)
+
+## [2.3.1](https://github.com/rodjek/puppet-lint/tree/2.3.1) (2017-09-27)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.0...2.3.1)
+
+**Fixed bugs:**
+
+- NoMethodError: undefined method `type' for nil:NilClass [\#732](https://github.com/rodjek/puppet-lint/issues/732)
+- NoMethodError: undefined method `end\_with?' for nil:NilClass [\#727](https://github.com/rodjek/puppet-lint/issues/727)
+- 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)
+- optional paramter warning false positve when inheriting params [\#716](https://github.com/rodjek/puppet-lint/issues/716)
+- invalid byte sequence in UTF-8 in selmodule-example.pp [\#714](https://github.com/rodjek/puppet-lint/issues/714)
+- puppet-lint --fix encountered an error that it doesn't know how to handle [\#706](https://github.com/rodjek/puppet-lint/issues/706)
+- Mangled file after running puppet-lint due to chained function call [\#703](https://github.com/rodjek/puppet-lint/issues/703)
+- `incompatible encoding regexp match` for non-printing characters in place of space [\#693](https://github.com/rodjek/puppet-lint/issues/693)
+- Unhandled error case [\#691](https://github.com/rodjek/puppet-lint/issues/691)
+
+**Closed issues:**
+
+- puppet-lint has encountered an error that it doesn't know how to handle [\#750](https://github.com/rodjek/puppet-lint/issues/750)
+- 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)
+- using --fix changes line endings [\#748](https://github.com/rodjek/puppet-lint/issues/748)
+- Puppet lint syntax error - puppet parser validate no issues [\#746](https://github.com/rodjek/puppet-lint/issues/746)
+- Error not handled [\#745](https://github.com/rodjek/puppet-lint/issues/745)
+- Whoops, not sure why. ArgumentError: bad value for range [\#742](https://github.com/rodjek/puppet-lint/issues/742)
+- ArgumentError: bad value for range [\#741](https://github.com/rodjek/puppet-lint/issues/741)
+- Line numbers off after multi-line strings with variables [\#736](https://github.com/rodjek/puppet-lint/issues/736)
+- Whoops! It looks like puppet-lint has encountered an error [\#729](https://github.com/rodjek/puppet-lint/issues/729)
+- puppet lint config log\_format not working [\#725](https://github.com/rodjek/puppet-lint/issues/725)
+- Quoted booleans in Puppet5 for Enum type declarations. [\#720](https://github.com/rodjek/puppet-lint/issues/720)
+- Chaining arrow syntax fix introduces trailing whitespaces [\#695](https://github.com/rodjek/puppet-lint/issues/695)
+- Refactor check\_comments.rb [\#587](https://github.com/rodjek/puppet-lint/issues/587)
+- Puppethack 12/2016 Issues [\#583](https://github.com/rodjek/puppet-lint/issues/583)
+- Allow multiple block-level ignore comments [\#498](https://github.com/rodjek/puppet-lint/issues/498)
+- puppet-lint crashes with "invalid byte sequence in UTF-8 \(ArgumentError\)" [\#458](https://github.com/rodjek/puppet-lint/issues/458)
+
+**Merged pull requests:**
+
+- Render the ${} enclosures as part of the string tokens [\#752](https://github.com/rodjek/puppet-lint/pull/752) ([rodjek](https://github.com/rodjek))
+- Open manifest as binary when writing fixed manifest [\#751](https://github.com/rodjek/puppet-lint/pull/751) ([rodjek](https://github.com/rodjek))
+- Remove monkeypatches to implement String\#% [\#744](https://github.com/rodjek/puppet-lint/pull/744) ([rodjek](https://github.com/rodjek))
+- Add unit tests for PuppetLint::Checks [\#743](https://github.com/rodjek/puppet-lint/pull/743) ([rodjek](https://github.com/rodjek))
+- Update CI configuration [\#739](https://github.com/rodjek/puppet-lint/pull/739) ([rodjek](https://github.com/rodjek))
+- Rubocop compliance [\#738](https://github.com/rodjek/puppet-lint/pull/738) ([rodjek](https://github.com/rodjek))
+- 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))
+- Split control comments into words before parsing [\#735](https://github.com/rodjek/puppet-lint/pull/735) ([rodjek](https://github.com/rodjek))
+- Handle unicode spaces in the tokeniser [\#734](https://github.com/rodjek/puppet-lint/pull/734) ([rodjek](https://github.com/rodjek))
+- Handle SE Linux policy package files [\#733](https://github.com/rodjek/puppet-lint/pull/733) ([rodjek](https://github.com/rodjek))
+- Take into account Optional data type when checking parameter order [\#731](https://github.com/rodjek/puppet-lint/pull/731) ([rodjek](https://github.com/rodjek))
+- Read the manifest files as UTF-8 [\#730](https://github.com/rodjek/puppet-lint/pull/730) ([rodjek](https://github.com/rodjek))
+- Improve handling of unterminated double quoted strings [\#728](https://github.com/rodjek/puppet-lint/pull/728) ([rodjek](https://github.com/rodjek))
+- Chaining arrow syntax fix introduces trailing whitespaces [\#708](https://github.com/rodjek/puppet-lint/pull/708) ([rnelson0](https://github.com/rnelson0))
+- 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))
+- Code style improvements [\#661](https://github.com/rodjek/puppet-lint/pull/661) ([Darhazer](https://github.com/Darhazer))
+- Plugins: Improve code readability [\#658](https://github.com/rodjek/puppet-lint/pull/658) ([Darhazer](https://github.com/Darhazer))
+
 ## [2.3.0](https://github.com/rodjek/puppet-lint/tree/2.3.0) (2017-07-12)
 [Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.2.1...2.3.0)
 
@@ -843,4 +921,4 @@ If the additional gems you use for checks are pinned to 1.x, you should pin pupp
 ## [0.0.1](https://github.com/rodjek/puppet-lint/tree/0.0.1) (2011-08-15)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

server/vendor/puppet-lint/Gemfile

@@ -25,6 +25,9 @@ group :test do
     # requires ruby 1.9+, on 1.8 we'll fall back to the old regex parsing
     gem 'rspec-json_expectations', '~> 1.4'
   end
+
+  gem 'rubocop', '0.49.1' if RUBY_VERSION > '2.0'
+  gem 'simplecov', :require => false
 end
 
 group :development do

server/vendor/puppet-lint/Rakefile

@@ -1,19 +1,33 @@
 require 'rake'
 require 'rspec/core/rake_task'
 require 'puppet-lint'
+require 'puppet-lint/tasks/release_test'
 
 task :default => :test
 
 RSpec::Core::RakeTask.new(:test)
 
 begin
   require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
     version = PuppetLint::VERSION
-    config.future_release = "#{version}"
-    config.exclude_labels = %w{duplicate question invalid wontfix release-pr}
+    config.future_release = version.to_s
+    config.exclude_labels = %w[duplicate question invalid wontfix release-pr]
   end
 rescue LoadError
+  $stderr.puts 'Changelog generation requires Ruby 2.0 or higher'
 end
 
+begin
+  require 'rubocop/rake_task'
+
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.options = %w[-D -E]
+  end
+rescue LoadError
+  $stderr.puts 'Rubocop is not available for this version of Ruby.'
+end
+
+task :ci => [:test, :release_test]
+
 # vim: syntax=ruby

server/vendor/puppet-lint/appveyor.yml

@@ -12,6 +12,7 @@ environment:
     - RUBY_VERSION: 21
     - RUBY_VERSION: 22
     - RUBY_VERSION: 23-x64
+    - RUBY_VERSION: 24-x64
 
 install:
   - SET PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -25,8 +26,4 @@ before_test:
   - bundle -v
 
 test_script:
-  - bundle exec rake test
-
-notifications:
-  email:
-    - [email protected]
+  - bundle exec rake ci