(maint) Revendor puppet-lint 2.3.5

This commit updates puppet-lint to 2.3.5 which has some fixes for CRLF handling.

Author: glennsarti

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.3',
+      :github_ref => '2.3.5',
     }
   ]
 

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.3)
+* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.5)

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

@@ -60,7 +60,7 @@ Metrics/LineLength:
 # Offense count: 65
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 94
+  Max: 105
 
 # Offense count: 18
 Metrics/PerceivedComplexity:

server/vendor/puppet-lint/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Change Log
 
+## [2.3.5](https://github.com/rodjek/puppet-lint/tree/2.3.5) (2018-03-27)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.4...2.3.5)
+
+**Fixed bugs:**
+
+- v2.3.4 breakage - 'wrong number of arguments' when using Rake task [\#812](https://github.com/rodjek/puppet-lint/issues/812)
+
+**Merged pull requests:**
+
+- Make PuppetLint::OptParser.build argument optional [\#813](https://github.com/rodjek/puppet-lint/pull/813) ([rodjek](https://github.com/rodjek))
+
+## [2.3.4](https://github.com/rodjek/puppet-lint/tree/2.3.4) (2018-03-26)
+[Full Changelog](https://github.com/rodjek/puppet-lint/compare/2.3.3...2.3.4)
+
+**Implemented enhancements:**
+
+- Allow ignoring default configurations files on the command line [\#787](https://github.com/rodjek/puppet-lint/issues/787)
+- Implement --list-checks feature, to list the names of all available checks from the cli. [\#804](https://github.com/rodjek/puppet-lint/pull/804) ([xraystyle](https://github.com/xraystyle))
+- Option to disable loading default configurations files [\#789](https://github.com/rodjek/puppet-lint/pull/789) ([dioni21](https://github.com/dioni21))
+- Allow passing ignore\_paths from cli [\#783](https://github.com/rodjek/puppet-lint/pull/783) ([keymone](https://github.com/keymone))
+
+**Fixed bugs:**
+
+- Bad value for range [\#801](https://github.com/rodjek/puppet-lint/issues/801)
+- puppet-lint doesn't handle CRLFs very well [\#778](https://github.com/rodjek/puppet-lint/issues/778)
+- Configuration's ignore\_paths is not respected [\#774](https://github.com/rodjek/puppet-lint/issues/774)
+- Error when including class and missing a colon [\#507](https://github.com/rodjek/puppet-lint/issues/507)
+
+**Merged pull requests:**
+
+- Handle single colon in resource name syntax error [\#809](https://github.com/rodjek/puppet-lint/pull/809) ([rodjek](https://github.com/rodjek))
+- \(\#778\) Don't include line ending in single line comment token values [\#782](https://github.com/rodjek/puppet-lint/pull/782) ([rodjek](https://github.com/rodjek))
+- Fix setting ignore\_paths in Rake task [\#777](https://github.com/rodjek/puppet-lint/pull/777) ([alzabo](https://github.com/alzabo))
+- Add support for passing backslash separated paths to puppet-lint [\#769](https://github.com/rodjek/puppet-lint/pull/769) ([rodjek](https://github.com/rodjek))
+
 ## [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)
 

server/vendor/puppet-lint/README.md

@@ -5,7 +5,7 @@ Status](https://secure.travis-ci.org/rodjek/puppet-lint.png)](http://travis-ci.o
 [![Inline docs](http://inch-ci.org/github/rodjek/puppet-lint.png?branch=master)](http://inch-ci.org/github/rodjek/puppet-lint)
 
 Puppet Lint tests Puppet code against the recommended [Puppet language style
-guide](http://docs.puppet.com/puppet/latest/style_guide.html). Puppet Lint validates only code style; it does not validate syntax. To test syntax, use Puppet's `puppet parser validate` command.
+guide](http://puppet.com/docs/puppet/latest/style_guide.html). Puppet Lint validates only code style; it does not validate syntax. To test syntax, use Puppet's `puppet parser validate` command.
 
 ## Compatibility warning
 
@@ -45,6 +45,10 @@ puppet-lint --fix /modules
 
 Puppet Lint options allow you to modify which checks to run. You can disable any of the checks temporarily or permanently, or you can limit testing to specific checks.
 
+#### List all available checks
+
+To list all available checks along with basic usage documentation, use the `--list-checks` option.
+
 #### Run specific checks
 
 To run only specific checks, use the `--only-checks` option, with a comma-separated list of arguments specifying which checks to make:
@@ -65,7 +69,7 @@ You can disable specific Lint checks on the command line, disable them permanent
 
 #### Disable checks on the command line
 
-To disable any of the checks when running the `puppet-lint` command, add a `--no-<check name>-check` flag to the command. For example, to skip the 140-character check, run:
+To disable any of the checks when running the `puppet-lint` command, add a `--no-<check_name>-check` flag to the command. For example, to skip the 140-character check, run:
 
 ```
 puppet-lint --no-140chars-check modules/

server/vendor/puppet-lint/Rakefile

@@ -12,7 +12,8 @@ begin
   GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
     version = PuppetLint::VERSION
     config.future_release = version.to_s
-    config.exclude_labels = %w[duplicate question invalid wontfix release-pr]
+    config.exclude_labels = %w[duplicate question invalid wontfix release-pr documentation]
+    config.enhancement_labels = %w[feature]
   end
 rescue LoadError
   $stderr.puts 'Changelog generation requires Ruby 2.0 or higher'
@@ -23,6 +24,14 @@ begin
 
   RuboCop::RakeTask.new(:rubocop) do |task|
     task.options = %w[-D -E]
+    task.patterns = [
+      'lib/**/*.rb',
+      'spec/**/*.rb',
+      'bin/*',
+      '*.gemspec',
+      'Gemfile',
+      'Rakefile',
+    ]
   end
 rescue LoadError
   $stderr.puts 'Rubocop is not available for this version of Ruby.'

server/vendor/puppet-lint/lib/puppet-lint.rb

@@ -13,6 +13,15 @@
 class PuppetLint::NoCodeError < StandardError; end
 class PuppetLint::NoFix < StandardError; end
 
+# Parser Syntax Errors
+class PuppetLint::SyntaxError < StandardError
+  attr_reader :token
+
+  def initialize(token)
+    @token = token
+  end
+end
+
 # Public: The public interface to puppet-lint.
 class PuppetLint
   # Public: Gets/Sets the String manifest code to be checked.
@@ -75,7 +84,7 @@ def file=(path)
     return unless File.exist?(path)
 
     @path = path
-    File.open(path, 'r:UTF-8') do |f|
+    File.open(path, 'rb:UTF-8') do |f|
       @code = f.read
     end
 

server/vendor/puppet-lint/lib/puppet-lint/bin.rb

@@ -19,9 +19,8 @@ def initialize(args)
   #
   # Returns an Integer exit code to be passed back to the shell.
   def run
-    opts = PuppetLint::OptParser.build
-
     begin
+      opts = PuppetLint::OptParser.build(@args)
       opts.parse!(@args)
     rescue OptionParser::InvalidOption => e
       puts "puppet-lint: #{e.message}"
@@ -34,6 +33,11 @@ def run
       return 0
     end
 
+    if PuppetLint.configuration.list_checks
+      puts PuppetLint.configuration.checks
+      return 0
+    end
+
     if @args[0].nil?
       puts 'puppet-lint: no file specified'
       puts "puppet-lint: try 'puppet-lint --help' for more information"
@@ -42,6 +46,7 @@ def run
 
     begin
       path = @args[0]
+      path = path.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
       path = if File.directory?(path)
                Dir.glob("#{path}/**/*.pp")
              else
@@ -51,9 +56,11 @@ def run
       PuppetLint.configuration.with_filename = true if path.length > 1
 
       return_val = 0
+      ignore_paths = PuppetLint.configuration.ignore_paths
 
       puts '[' if PuppetLint.configuration.json
       path.each do |f|
+        next if ignore_paths.any? { |p| File.fnmatch(p, f) }
         l = PuppetLint.new
         l.file = f
         l.run

server/vendor/puppet-lint/lib/puppet-lint/checks.rb

@@ -66,6 +66,19 @@ def run(fileinfo, data)
       end
     end
 
+    @problems
+  rescue PuppetLint::SyntaxError => e
+    @problems << {
+      :kind     => :error,
+      :check    => :syntax,
+      :message  => 'Syntax error',
+      :fullpath => File.expand_path(fileinfo, ENV['PWD']),
+      :filename => File.basename(fileinfo),
+      :path     => fileinfo,
+      :line     => e.token.line,
+      :column   => e.token.column,
+    }
+
     @problems
   rescue => e
     $stdout.puts <<-END.gsub(%r{^ {6}}, '')

server/vendor/puppet-lint/lib/puppet-lint/data.rb

@@ -176,6 +176,8 @@ def resource_indexes
           end_token = colon_token.next_token_of([:SEMIC, :RBRACE])
           end_idx = tokens.index(end_token)
 
+          raise PuppetLint::SyntaxError, colon_token if end_idx.nil?
+
           result << {
             :start        => start_idx + 1,
             :end          => end_idx,