puppet-lint 2.3.3 → 2.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c2f7f4e8237599a2215c6e0b7b80126c6ed43cc2
+  data.tar.gz: 91aa136ffbc1370e60d999d9d0f591df2fbbb0f3
+SHA512:
+  metadata.gz: e109be5cd7d30e0660fbc0b839d69e1bcd19870b12a31889076999deb2a0d7fe8519e28e874be556c6ebe9345a5df6a968acbf0c87ba1438d14f63bbb836264e
+  data.tar.gz: 8d65ef648c28a084e13b2450f0bebb69e2ee9ca937a6fee09ad5762c309da27f2496fbb7adf5b6bcc3117e3a2b4a65b790681073ab3956661a508d7586503fcf

data/.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:

data/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)
 

data/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/

data/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.'

data/lib/puppet-lint.rb

@@ -13,6 +13,15 @@ require 'puppet-lint/monkeypatches'
 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 @@ class PuppetLint
     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
 

data/lib/puppet-lint/bin.rb

@@ -19,9 +19,8 @@ class PuppetLint::Bin
   #
   # 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 @@ class PuppetLint::Bin
       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 @@ class PuppetLint::Bin
 
     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 @@ class PuppetLint::Bin
       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

data/lib/puppet-lint/checks.rb

@@ -66,6 +66,19 @@ class PuppetLint::Checks
       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}}, '')

data/lib/puppet-lint/data.rb

@@ -176,6 +176,8 @@ class PuppetLint::Data
           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,

data/lib/puppet-lint/lexer.rb

@@ -172,6 +172,8 @@ class PuppetLint
     # \p{Zs} == ASCII + Unicode non-linebreaking whitespace
     WHITESPACE_RE = RUBY_VERSION == '1.8.7' ? %r{[\t\v\f ]} : %r{[\t\v\f\p{Zs}]}
 
+    LINE_END_RE = %r{(?:\r\n|\r|\n)}
+
     # Internal: Access the internal token storage.
     #
     # Returns an Array of PuppetLint::Lexer::Toxen objects.
@@ -222,7 +224,7 @@ class PuppetLint
 
         elsif chunk.start_with?('"')
           str_contents = slurp_string(code[i + 1..-1])
-          lines_parsed = code[0..i].split("\n")
+          lines_parsed = code[0..i].split(LINE_END_RE)
           interpolate_string(str_contents, lines_parsed.count, lines_parsed.last.length)
           length = str_contents.size + 1
 
@@ -231,12 +233,12 @@ class PuppetLint
           tokens << new_token(:HEREDOC_OPEN, heredoc_name)
           length = heredoc_name.size + 3
 
-        elsif comment = chunk[%r{\A(#.*)}, 1]
+        elsif comment = chunk[%r{\A(#[^\r\n]*)#{LINE_END_RE}?}, 1]
           length = comment.size
           comment.sub!(%r{#}, '')
           tokens << new_token(:COMMENT, comment)
 
-        elsif slash_comment = chunk[%r{\A(//.*)}, 1]
+        elsif slash_comment = chunk[%r{\A(//[^\r\n]*)#{LINE_END_RE}?}, 1]
           length = slash_comment.size
           slash_comment.sub!(%r{//}, '')
           tokens << new_token(:SLASH_COMMENT, slash_comment)
@@ -254,13 +256,13 @@ class PuppetLint
           length = str_content.size + 1
           tokens << new_token(:REGEX, str_content[0..-2])
 
-        elsif eolindent = chunk[%r{\A((\r\n|\r|\n)#{WHITESPACE_RE}+)}m, 1]
-          eol = eolindent[%r{\A([\r\n]+)}m, 1]
+        elsif eolindent = chunk[%r{\A(#{LINE_END_RE}#{WHITESPACE_RE}+)}m, 1]
+          eol = eolindent[%r{\A(#{LINE_END_RE})}m, 1]
           tokens << new_token(:NEWLINE, eol)
           length = eol.size
 
           if heredoc_queue.empty?
-            indent = eolindent[%r{\A[\r\n]+(#{WHITESPACE_RE}+)}m, 1]
+            indent = eolindent[%r{\A#{LINE_END_RE}+(#{WHITESPACE_RE}+)}m, 1]
             tokens << new_token(:INDENT, indent)
             length += indent.size
           else
@@ -275,7 +277,7 @@ class PuppetLint
           length = whitespace.size
           tokens << new_token(:WHITESPACE, whitespace)
 
-        elsif eol = chunk[%r{\A(\r\n|\r|\n)}, 1]
+        elsif eol = chunk[%r{\A(#{LINE_END_RE})}, 1]
           length = eol.size
           tokens << new_token(:NEWLINE, eol)
 
@@ -283,7 +285,7 @@ class PuppetLint
             heredoc_tag = heredoc_queue.shift
             heredoc_name = heredoc_tag[%r{\A"?(.+?)"?(:.+?)?(/.*)?\Z}, 1]
             str_contents = StringScanner.new(code[(i + length)..-1]).scan_until(%r{\|?\s*-?\s*#{heredoc_name}})
-            _ = code[0..(i + length)].split("\n")
+            _ = code[0..(i + length)].split(LINE_END_RE)
             interpolate_heredoc(str_contents, heredoc_tag)
             length += str_contents.size
           end
@@ -386,7 +388,7 @@ class PuppetLint
         @line_no += 1
         @column = 1
       else
-        lines = token.to_manifest.split(%r{(?:\r\n|\r|\n)}, -1)
+        lines = token.to_manifest.split(LINE_END_RE, -1)
         @line_no += lines.length - 1
         if lines.length > 1
           # if the token renders to multiple lines, set the column state to the
@@ -438,7 +440,7 @@ class PuppetLint
           else
             token_column = column + (ss.pos - value.size)
             tokens << new_token(:DQPOST, value, :line => line, :column => token_column)
-            line += value.scan(%r{(\r\n|\r|\n)}).size
+            line += value.scan(LINE_END_RE).size
             @column = column + ss.pos + 1
             @line_no = line
           end
@@ -449,7 +451,7 @@ class PuppetLint
           else
             token_column = column + (ss.pos - value.size)
             tokens << new_token(:DQMID, value, :line => line, :column => token_column)
-            line += value.scan(%r{(\r\n|\r|\n)}).size
+            line += value.scan(LINE_END_RE).size
           end
           if ss.scan(%r{\{}).nil?
             var_name = ss.scan(%r{(::)?(\w+(-\w+)*::)*\w+(-\w+)*})
@@ -461,7 +463,7 @@ class PuppetLint
               tokens << new_token(:UNENC_VARIABLE, var_name, :line => line, :column => token_column)
             end
           else
-            line += value.scan(%r{(\r\n|\r|\n)}).size
+            line += value.scan(LINE_END_RE).size
             contents = ss.scan_until(%r{\}})[0..-2]
             raw = contents.dup
             if contents.match(%r{\A(::)?([\w-]+::)*[\w-]+(\[.+?\])*}) && !contents.match(%r{\A\w+\(})

data/lib/puppet-lint/optparser.rb

@@ -17,14 +17,19 @@ class PuppetLint::OptParser
   # Public: Initialise a new puppet-lint OptionParser.
   #
   # Returns an OptionParser object.
-  def self.build
-    OptionParser.new do |opts|
+  def self.build(args = [])
+    noconfig = false
+    opt_parser = OptionParser.new do |opts|
       opts.banner = HELP_TEXT
 
       opts.on('--version', 'Display the current version.') do
         PuppetLint.configuration.display_version = true
       end
 
+      opts.on('--no-config', 'Do not load default puppet-lint option files.') do
+        noconfig = true
+      end
+
       opts.on('-c', '--config FILE', 'Load puppet-lint options from file.') do |file|
         opts.load(file)
       end
@@ -94,6 +99,10 @@ class PuppetLint::OptParser
         PuppetLint.configuration.json = true
       end
 
+      opts.on('--list-checks', 'List available check names.') do
+        PuppetLint.configuration.list_checks = true
+      end
+
       opts.separator('')
       opts.separator('    Checks:')
 
@@ -108,6 +117,10 @@ class PuppetLint::OptParser
         end
       end
 
+      opts.on('--ignore-paths PATHS', 'A comma separated list of patterns to ignore') do |paths|
+        PuppetLint.configuration.ignore_paths = paths.split(',')
+      end
+
       PuppetLint.configuration.checks.each do |check|
         opts.on("--no-#{check}-check", "Skip the #{check} check.") do
           PuppetLint.configuration.send("disable_#{check}")
@@ -119,13 +132,19 @@ class PuppetLint::OptParser
           PuppetLint.configuration.send("enable_#{check}")
         end
       end
+    end
 
-      opts.load('/etc/puppet-lint.rc')
+    opt_parser.parse!(args) unless args.empty?
+
+    unless noconfig
+      opt_parser.load('/etc/puppet-lint.rc')
       if ENV.key?('HOME') && File.readable?(ENV['HOME'])
         home_dotfile_path = File.expand_path('~/.puppet-lint.rc')
-        opts.load(home_dotfile_path) if File.readable?(home_dotfile_path)
+        opt_parser.load(home_dotfile_path) if File.readable?(home_dotfile_path)
       end
-      opts.load('.puppet-lint.rc')
+      opt_parser.load('.puppet-lint.rc')
     end
+
+    opt_parser
   end
 end

data/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb

@@ -1,7 +1,7 @@
 # Public: Test the manifest tokens for chaining arrow that is
 # on the line of the left operand when the right operand is on another line.
 #
-# https://docs.puppet.com/guides/style_guide.html#chaining-arrow-syntax
+# https://puppet.com/docs/puppet/latest/style_guide.html#chaining-arrow-syntax
 PuppetLint.new_check(:arrow_on_right_operand_line) do
   def check
     tokens.select { |r| Set[:IN_EDGE, :IN_EDGE_SUB].include?(r.type) }.each do |token|

data/lib/puppet-lint/plugins/check_classes/autoloader_layout.rb

@@ -2,7 +2,7 @@
 # not in an appropriately named file for the autoloader to detect and record
 # an error of each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#separate-files
+# https://puppet.com/docs/puppet/latest/style_guide.html#separate-files
 PuppetLint.new_check(:autoloader_layout) do
   def check
     return if fullpath.nil? || fullpath == ''

data/lib/puppet-lint/plugins/check_classes/inherits_across_namespaces.rb

@@ -1,7 +1,7 @@
 # Public: Test the manifest tokens for any classes that inherit across
 # namespaces and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#class-inheritance
+# https://puppet.com/docs/puppet/latest/style_guide.html#class-inheritance
 PuppetLint.new_check(:inherits_across_namespaces) do
   def check
     class_indexes.each do |class_idx|

data/lib/puppet-lint/plugins/check_classes/names_containing_uppercase.rb

@@ -1,6 +1,6 @@
 # Public: Find and warn about module names with illegal uppercase characters.
 #
-# https://docs.puppet.com/puppet/latest/reference/modules_fundamentals.html#allowed-module-names
+# https://puppet.com/docs/puppet/latest/modules_fundamentals.html#allowed-module-names
 # Provides a fix. [puppet-lint #554]
 PuppetLint.new_check(:names_containing_uppercase) do
   def check

data/lib/puppet-lint/plugins/check_classes/nested_classes_or_defines.rb

@@ -1,7 +1,7 @@
 # Public: Test the manifest tokens for any classes or defined types that are
 # defined inside another class.
 #
-# https://docs.puppet.com/guides/style_guide.html#nested-classes-or-defined-types
+# https://puppet.com/docs/puppet/latest/style_guide.html#nested-classes-or-defined-types
 PuppetLint.new_check(:nested_classes_or_defines) do
   TOKENS = Set[:CLASS, :DEFINE]
 

data/lib/puppet-lint/plugins/check_classes/parameter_order.rb

@@ -2,7 +2,7 @@
 # types that take parameters and record a warning if there are any optional
 # parameters listed before required parameters.
 #
-# https://docs.puppet.com/guides/style_guide.html#display-order-of-parameters
+# https://puppet.com/docs/puppet/latest/style_guide.html#display-order-of-parameters
 PuppetLint.new_check(:parameter_order) do
   def check
     (class_indexes + defined_type_indexes).each do |class_idx|

data/lib/puppet-lint/plugins/check_classes/right_to_left_relationship.rb

@@ -1,7 +1,7 @@
 # Public: Test the manifest tokens for any right-to-left (<-) chaining
 # operators and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#chaining-arrow-syntax
+# https://puppet.com/docs/puppet/latest/style_guide.html#chaining-arrow-syntax
 PuppetLint.new_check(:right_to_left_relationship) do
   def check
     tokens.select { |r| r.type == :OUT_EDGE }.each do |token|

data/lib/puppet-lint/plugins/check_classes/variable_scope.rb

@@ -4,7 +4,7 @@
 # defined in the local scope and record a warning for each variable that has
 # not.
 #
-# https://docs.puppet.com/guides/style_guide.html#namespacing-variables
+# https://puppet.com/docs/puppet/latest/style_guide.html#namespacing-variables
 PuppetLint.new_check(:variable_scope) do
   DEFAULT_SCOPE_VARS = Set[
     'name',

data/lib/puppet-lint/plugins/check_comments/slash_comments.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for any comments started with slashes
 # (//) and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#comments
+# https://puppet.com/docs/puppet/latest/style_guide.html#comments
 PuppetLint.new_check(:slash_comments) do
   def check
     tokens.select { |token|

data/lib/puppet-lint/plugins/check_comments/star_comments.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for any comments encapsulated with
 # slash-asterisks (/* */) and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#comments
+# https://puppet.com/docs/puppet/latest/style_guide.html#comments
 PuppetLint.new_check(:star_comments) do
   def check
     tokens.select { |token|

data/lib/puppet-lint/plugins/check_conditionals/case_without_default.rb

@@ -1,7 +1,7 @@
 # Public: Test the manifest tokens for any case statements that do not
 # contain a "default" case and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#defaults-for-case-statements-and-selectors
+# https://puppet.com/docs/puppet/latest/style_guide.html#defaults-for-case-statements-and-selectors
 PuppetLint.new_check(:case_without_default) do
   def check
     case_indexes = []

data/lib/puppet-lint/plugins/check_conditionals/selector_inside_resource.rb

@@ -1,7 +1,7 @@
 # Public: Test the manifest tokens for any selectors embedded within resource
 # declarations and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#keep-resource-declarations-simple
+# https://puppet.com/docs/puppet/latest/style_guide.html#keep-resource-declarations-simple
 PuppetLint.new_check(:selector_inside_resource) do
   def check
     resource_indexes.each do |resource|

data/lib/puppet-lint/plugins/check_documentation/documentation.rb

@@ -2,7 +2,7 @@
 # have a comment directly above it (hopefully, explaining the usage of it) and
 # record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#public-and-private
+# https://puppet.com/docs/puppet/latest/style_guide.html#public-and-private
 PuppetLint.new_check(:documentation) do
   COMMENT_TOKENS = Set[:COMMENT, :MLCOMMENT, :SLASH_COMMENT]
   WHITESPACE_TOKENS = Set[:WHITESPACE, :NEWLINE, :INDENT]

data/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb

@@ -2,7 +2,7 @@
 # and if found, check that it is the first parameter listed.  If it is not
 # the first parameter, record a warning.
 #
-# https://docs.puppet.com/guides/style_guide.html#attribute-ordering
+# https://puppet.com/docs/puppet/latest/style_guide.html#attribute-ordering
 PuppetLint.new_check(:ensure_first_param) do
   def check
     resource_indexes.each do |resource|

data/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb

@@ -2,7 +2,7 @@
 # parameter and record a warning if the value of that parameter looks like
 # a symlink target (starts with a '/').
 #
-# https://docs.puppet.com/guides/style_guide.html#symbolic-links
+# https://puppet.com/docs/puppet/latest/style_guide.html#symbolic-links
 PuppetLint.new_check(:ensure_not_symlink_target) do
   def check
     resource_indexes.each do |resource|

data/lib/puppet-lint/plugins/check_resources/file_mode.rb

@@ -2,7 +2,7 @@
 # parameter and if found, record a warning if the value of that parameter is
 # not a 4 digit octal value (0755) or a symbolic mode ('o=rwx,g+r').
 #
-# https://docs.puppet.com/guides/style_guide.html#file-modes
+# https://puppet.com/docs/puppet/latest/style_guide.html#file-modes
 PuppetLint.new_check(:file_mode) do
   MSG = 'mode should be represented as a 4 digit octal value or symbolic mode'.freeze
   SYM_RE = '([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*'.freeze

data/lib/puppet-lint/plugins/check_resources/unquoted_file_mode.rb

@@ -2,7 +2,7 @@
 # parameter and if found, record a warning if the value of that parameter is
 # not a quoted string.
 #
-# https://docs.puppet.com/guides/style_guide.html#file-modes
+# https://puppet.com/docs/puppet/latest/style_guide.html#file-modes
 PuppetLint.new_check(:unquoted_file_mode) do
   TOKEN_TYPES = Set[:NAME, :NUMBER]
 

data/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for any resource titles / namevars that
 # are not quoted and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#resource-names
+# https://puppet.com/docs/puppet/latest/style_guide.html#resource-names
 PuppetLint.new_check(:unquoted_resource_title) do
   def check
     title_tokens.each do |token|

data/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb

@@ -2,7 +2,7 @@
 # contain any variables or common escape characters and record a warning for
 # each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#quoting
+# https://puppet.com/docs/puppet/latest/style_guide.html#quoting
 PuppetLint.new_check(:double_quoted_strings) do
   ESCAPE_CHAR_RE = %r{(\\\$|\\"|\\'|'|\r|\t|\\t|\n|\\n|\\\\)}
 

data/lib/puppet-lint/plugins/check_strings/only_variable_string.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for double quoted strings that contain
 # a single variable only and record a warning for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#quoting
+# https://puppet.com/docs/puppet/latest/style_guide.html#quoting
 PuppetLint.new_check(:only_variable_string) do
   VAR_TYPES = Set[:VARIABLE, :UNENC_VARIABLE]
 

data/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for any single quoted strings containing
 # a enclosed variable and record an error for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#quoting
+# https://puppet.com/docs/puppet/latest/style_guide.html#quoting
 PuppetLint.new_check(:single_quote_string_with_variables) do
   def check
     tokens.select { |r|

data/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb

@@ -2,7 +2,7 @@
 # not been enclosed by braces ({}) and record a warning for each instance
 # found.
 #
-# https://docs.puppet.com/guides/style_guide.html#quoting
+# https://puppet.com/docs/puppet/latest/style_guide.html#quoting
 PuppetLint.new_check(:variables_not_enclosed) do
   def check
     tokens.select { |r|

data/lib/puppet-lint/plugins/check_whitespace/140chars.rb

@@ -3,7 +3,7 @@
 # to this rule are lines containing URLs and template() calls which would hurt
 # readability if split.
 #
-# https://docs.puppet.com/guides/style_guide.html#spacing-indentation-and-whitespace
+# https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
 PuppetLint.new_check(:'140chars') do
   def check
     manifest_lines.each_with_index do |line, idx|

data/lib/puppet-lint/plugins/check_whitespace/2sp_soft_tabs.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for any indentation not using 2 space soft
 # tabs and record an error for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#spacing-indentation-and-whitespace
+# https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
 PuppetLint.new_check(:'2sp_soft_tabs') do
   def check
     tokens.select { |r|

data/lib/puppet-lint/plugins/check_whitespace/80chars.rb

@@ -2,7 +2,7 @@
 # characters. This is DISABLED by default and behaves like the default
 # 140chars check by excepting URLs and template() calls.
 #
-# https://docs.puppet.com/guides/style_guide.html#spacing-indentation-and-whitespace (older version)
+# https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace (older version)
 PuppetLint.new_check(:'80chars') do
   def check
     manifest_lines.each_with_index do |line, idx|

data/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for any arrows (=>) in a grouping ({}) that
 # are not aligned with other arrows in that grouping.
 #
-# https://docs.puppet.com/guides/style_guide.html#spacing-indentation-and-whitespace
+# https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
 PuppetLint.new_check(:arrow_alignment) do
   COMMENT_TYPES = Set[:COMMENT, :SLASH_COMMENT, :MLCOMMENT]
 

data/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb

@@ -1,7 +1,7 @@
 # Public: Check the raw manifest string for lines containing hard tab
 # characters and record an error for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#spacing-indentation-and-whitespace
+# https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
 PuppetLint.new_check(:hard_tabs) do
   WHITESPACE_TYPES = Set[:INDENT, :WHITESPACE]
 

data/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb

@@ -1,7 +1,7 @@
 # Public: Check the manifest tokens for lines ending with whitespace and record
 # an error for each instance found.
 #
-# https://docs.puppet.com/guides/style_guide.html#spacing-indentation-and-whitespace
+# https://puppet.com/docs/puppet/latest/style_guide.html#spacing-indentation-and-whitespace
 PuppetLint.new_check(:trailing_whitespace) do
   def check
     tokens.select { |token|

data/lib/puppet-lint/tasks/gemfile_rewrite.rb

@@ -0,0 +1,20 @@
+require 'parser/current'
+
+# Simple rewriter using whitequark/parser that rewrites the "gem 'puppet-lint'"
+# entry in the module's Gemfile (if present) to instead use the local
+# puppet-lint working directory.
+class GemfileRewrite < Parser::TreeRewriter
+  def on_send(node)
+    _, method_name, *args = *node
+
+    if method_name == :gem
+      gem_name = args.first
+      if gem_name.type == :str && gem_name.children.first == 'puppet-lint'
+        puppet_lint_root = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+        replace(node.location.expression, "gem 'puppet-lint', :path => '#{puppet_lint_root}'")
+      end
+    end
+
+    super
+  end
+end

data/lib/puppet-lint/tasks/puppet-lint.rb

@@ -64,8 +64,8 @@ class PuppetLint
           PuppetLint.configuration.send("#{config}=".to_sym, value) unless value.nil?
         end
 
-        if PuppetLint.configuration.ignore_paths
-          @ignore_paths ||= PuppetLint.configuration.ignore_paths
+        if PuppetLint.configuration.ignore_paths && @ignore_paths.empty?
+          @ignore_paths = PuppetLint.configuration.ignore_paths
         end
 
         if PuppetLint.configuration.pattern

data/lib/puppet-lint/tasks/release_test.rb

@@ -27,6 +27,33 @@ def run_cmd(message, *cmd)
   [output.strip, status.success?]
 end
 
+def with_puppet_lint_head
+  print('  Updating Gemfile to use puppet-lint HEAD... ')
+
+  buffer = Parser::Source::Buffer.new('Gemfile')
+  buffer.source = File.read('Gemfile')
+  parser = Parser::CurrentRuby.new
+  ast = parser.parse(buffer)
+
+  modified_gemfile = GemfileRewrite.new.rewrite(buffer, ast)
+  if modified_gemfile == buffer.source
+    puppet_lint_root = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+    File.open('Gemfile', 'a') do |f|
+      f.puts "gem 'puppet-lint', :path => '#{puppet_lint_root}'"
+    end
+  else
+    File.open('Gemfile', 'w') do |f|
+      f.puts modified_gemfile
+    end
+  end
+
+  puts 'Done'
+
+  Bundler.with_clean_env { yield }
+
+  run_cmd('Restoring Gemfile', 'git', 'checkout', '--', 'Gemfile')
+end
+
 task :release_test do
   branch = if ENV['APPVEYOR']
              ENV['APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH']
@@ -41,6 +68,13 @@ task :release_test do
     exit
   end
 
+  if RUBY_VERSION.start_with?('1')
+    puts 'Unable to run release_tests on Ruby < 2.0'
+    exit
+  end
+
+  require 'puppet-lint/tasks/gemfile_rewrite'
+
   modules_to_test = [
     'puppetlabs/puppetlabs-apt',
     'puppetlabs/puppetlabs-tomcat',
@@ -72,10 +106,22 @@ task :release_test do
       end
 
       Dir.chdir(module_dir) do
-        output, success = run_cmd('Running puppet-lint', 'bundle', 'exec', 'puppet-lint', '--relative', '--no-documentation-check', 'manifests')
-        unless output.empty?
-          output.split("\n").each do |line|
-            puts "    #{line}"
+        with_puppet_lint_head do
+          _, success = run_cmd('Installing dependencies', 'bundle', 'install', '--path', File.join('..', 'vendor', 'gems'))
+          next unless success
+
+          output, success = run_cmd('Running puppet-lint CLI', 'bundle', 'exec', 'puppet-lint', '--relative', '--no-documentation-check', 'manifests')
+          unless output.empty?
+            output.split("\n").each do |line|
+              puts "    #{line}"
+            end
+          end
+
+          output, success = run_cmd('Running puppet-lint Rake task', 'bundle', 'exec', 'rake', 'lint')
+          unless output.empty?
+            output.split("\n").each do |line|
+              puts "    #{line}"
+            end
           end
         end
       end

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '2.3.3'.freeze
+  VERSION = '2.3.5'.freeze
 end

data/spec/puppet-lint/bin_spec.rb

@@ -55,6 +55,30 @@ describe PuppetLint::Bin do
     its(:stdout) { is_expected.to eq("puppet-lint #{PuppetLint::VERSION}") }
   end
 
+  context 'when asked to display available checks' do
+    let(:args) { '--list-checks' }
+    all_checks = PuppetLint.configuration.checks.map(&:to_s)
+
+    its(:exitstatus) { is_expected.to eq(0) }
+
+    all_checks.each do |c|
+      it "includes check #{c} in its output" do
+        expect(subject.stdout).to include c
+      end
+    end
+  end
+
+  context 'when passed a backslash separated path on Windows', :if => Gem.win_platform? do
+    let(:args) do
+      [
+        'spec\fixtures\test\manifests',
+      ]
+    end
+
+    its(:exitstatus) { is_expected.to eq(1) }
+    its(:stdout) { is_expected.to match(%r{spec/fixtures/test/manifests/warning\.pp - WARNING: optional}m) }
+  end
+
   context 'when passed multiple files' do
     let(:args) do
       [
@@ -82,6 +106,19 @@ describe PuppetLint::Bin do
     its(:stderr) { is_expected.to eq('Try running `puppet parser validate <file>`') }
   end
 
+  context 'when passed ignore paths option' do
+    let(:args) do
+      [
+        '--ignore-paths',
+        'spec/*',
+        'spec/fixtures/test/manifests/malformed.pp',
+      ]
+    end
+
+    its(:exitstatus) { is_expected.to eq(0) }
+    its(:stdout) { is_expected.to eq('') }
+  end
+
   context 'when limited to errors only' do
     let(:args) do
       [

data/spec/puppet-lint/data_spec.rb

@@ -4,6 +4,24 @@ describe PuppetLint::Data do
   subject(:data) { PuppetLint::Data }
   let(:lexer) { PuppetLint::Lexer.new }
 
+  describe '.resource_indexes' do
+    before(:each) do
+      data.tokens = lexer.tokenise(manifest)
+    end
+
+    context 'when a namespaced class name contains a single colon' do
+      let(:manifest) { 'class foo:bar { }' }
+
+      it 'raises a SyntaxError' do
+        expect {
+          data.resource_indexes
+        }.to raise_error(PuppetLint::SyntaxError) { |error|
+          expect(error.token).to eq(data.tokens[3])
+        }
+      end
+    end
+  end
+
   describe '.insert' do
     let(:manifest) { '$x = $a' }
     let(:new_token) { PuppetLint::Lexer::Token.new(:PLUS, '+', 0, 0) }

data/spec/puppet-lint/lexer_spec.rb

@@ -1338,6 +1338,20 @@ END
       expect(token.type).to eq(:COMMENT)
       expect(token.value).to eq(' bar baz')
     end
+
+    it 'should not include DOS line endings in the comment value' do
+      tokens = @lexer.tokenise("foo # bar baz\r\n")
+
+      expect(tokens[2]).to have_attributes(:type => :COMMENT, :value => ' bar baz')
+      expect(tokens[3]).to have_attributes(:type => :NEWLINE, :value => "\r\n")
+    end
+
+    it 'should not include Unix line endings in the comment value' do
+      tokens = @lexer.tokenise("foo # bar baz\n")
+
+      expect(tokens[2]).to have_attributes(:type => :COMMENT, :value => ' bar baz')
+      expect(tokens[3]).to have_attributes(:type => :NEWLINE, :value => "\n")
+    end
   end
 
   context ':MLCOMMENT' do
@@ -1360,6 +1374,20 @@ END
       expect(token.type).to eq(:SLASH_COMMENT)
       expect(token.value).to eq(' bar baz')
     end
+
+    it 'should not include DOS line endings in the comment value' do
+      tokens = @lexer.tokenise("foo // bar baz\r\n")
+
+      expect(tokens[2]).to have_attributes(:type => :SLASH_COMMENT, :value => ' bar baz')
+      expect(tokens[3]).to have_attributes(:type => :NEWLINE, :value => "\r\n")
+    end
+
+    it 'should not include Unix line endings in the comment value' do
+      tokens = @lexer.tokenise("foo // bar baz\n")
+
+      expect(tokens[2]).to have_attributes(:type => :SLASH_COMMENT, :value => ' bar baz')
+      expect(tokens[3]).to have_attributes(:type => :NEWLINE, :value => "\n")
+    end
   end
 
   context ':SSTRING' do

metadata

@@ -1,40 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppet-lint
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 3
-  version: 2.3.3
+version: !ruby/object:Gem::Version
+  version: 2.3.5
 platform: ruby
-authors: 
+authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2017-09-28 00:00:00 +10:00
-default_executable: 
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies: []
-
 description: |-
   Checks your Puppet manifests against the Puppetlabs
     style guide and alerts you to any discrepancies.
 email: tim@sharpe.id.au
-executables: 
+executables:
 - puppet-lint
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -90,6 +79,7 @@ files:
 - lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb
 - lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb
 - lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb
+- lib/puppet-lint/tasks/gemfile_rewrite.rb
 - lib/puppet-lint/tasks/puppet-lint.rb
 - lib/puppet-lint/tasks/release_test.rb
 - lib/puppet-lint/version.rb
@@ -151,39 +141,84 @@ files:
 - spec/puppet-lint/plugins/check_whitespace/trailing_whitespace_spec.rb
 - spec/puppet-lint_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/rodjek/puppet-lint/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ensure your Puppet manifests conform with the Puppetlabs style guide
-test_files: []
-
+test_files:
+- spec/fixtures/test/manifests/fail.pp
+- spec/fixtures/test/manifests/ignore.pp
+- spec/fixtures/test/manifests/ignore_multiple_block.pp
+- spec/fixtures/test/manifests/ignore_multiple_line.pp
+- spec/fixtures/test/manifests/ignore_reason.pp
+- spec/fixtures/test/manifests/init.pp
+- spec/fixtures/test/manifests/malformed.pp
+- spec/fixtures/test/manifests/mismatched_control_comment.pp
+- spec/fixtures/test/manifests/unterminated_control_comment.pp
+- spec/fixtures/test/manifests/url_interpolation.pp
+- spec/fixtures/test/manifests/warning.pp
+- spec/puppet-lint/bin_spec.rb
+- spec/puppet-lint/checks_spec.rb
+- spec/puppet-lint/configuration_spec.rb
+- spec/puppet-lint/data_spec.rb
+- spec/puppet-lint/ignore_overrides_spec.rb
+- spec/puppet-lint/lexer/token_spec.rb
+- spec/puppet-lint/lexer_spec.rb
+- spec/puppet-lint/plugins/check_classes/arrow_on_right_operand_line_spec.rb
+- spec/puppet-lint/plugins/check_classes/autoloader_layout_spec.rb
+- spec/puppet-lint/plugins/check_classes/class_inherits_from_params_class_spec.rb
+- spec/puppet-lint/plugins/check_classes/code_on_top_scope_spec.rb
+- spec/puppet-lint/plugins/check_classes/inherits_across_namespaces_spec.rb
+- spec/puppet-lint/plugins/check_classes/name_contains_uppercase_spec.rb
+- spec/puppet-lint/plugins/check_classes/names_containing_dash_spec.rb
+- spec/puppet-lint/plugins/check_classes/nested_classes_or_defines_spec.rb
+- spec/puppet-lint/plugins/check_classes/parameter_order_spec.rb
+- spec/puppet-lint/plugins/check_classes/right_to_left_relationship_spec.rb
+- spec/puppet-lint/plugins/check_classes/variable_scope_spec.rb
+- spec/puppet-lint/plugins/check_comments/slash_comments_spec.rb
+- spec/puppet-lint/plugins/check_comments/star_comments_spec.rb
+- spec/puppet-lint/plugins/check_conditionals/case_without_default_spec.rb
+- spec/puppet-lint/plugins/check_conditionals/selector_inside_resource_spec.rb
+- spec/puppet-lint/plugins/check_documentation/documentation_spec.rb
+- spec/puppet-lint/plugins/check_nodes/unquoted_node_name_spec.rb
+- spec/puppet-lint/plugins/check_resources/duplicate_params_spec.rb
+- spec/puppet-lint/plugins/check_resources/ensure_first_param_spec.rb
+- spec/puppet-lint/plugins/check_resources/ensure_not_symlink_target_spec.rb
+- spec/puppet-lint/plugins/check_resources/file_mode_spec.rb
+- spec/puppet-lint/plugins/check_resources/unquoted_file_mode_spec.rb
+- spec/puppet-lint/plugins/check_resources/unquoted_resource_title_spec.rb
+- spec/puppet-lint/plugins/check_strings/double_quoted_strings_spec.rb
+- spec/puppet-lint/plugins/check_strings/only_variable_string_spec.rb
+- spec/puppet-lint/plugins/check_strings/puppet_url_without_modules_spec.rb
+- spec/puppet-lint/plugins/check_strings/quoted_booleans_spec.rb
+- spec/puppet-lint/plugins/check_strings/single_quote_string_with_variables_spec.rb
+- spec/puppet-lint/plugins/check_strings/variables_not_enclosed_spec.rb
+- spec/puppet-lint/plugins/check_variables/variable_contains_dash_spec.rb
+- spec/puppet-lint/plugins/check_variables/variable_is_lowercase_spec.rb
+- spec/puppet-lint/plugins/check_whitespace/140chars_spec.rb
+- spec/puppet-lint/plugins/check_whitespace/2sp_soft_tabs_spec.rb
+- spec/puppet-lint/plugins/check_whitespace/80chars_spec.rb
+- spec/puppet-lint/plugins/check_whitespace/arrow_alignment_spec.rb
+- spec/puppet-lint/plugins/check_whitespace/hard_tabs_spec.rb
+- spec/puppet-lint/plugins/check_whitespace/trailing_whitespace_spec.rb
+- spec/puppet-lint_spec.rb
+- spec/spec_helper.rb