From 9d1e2d09c1ed90184922891fbc99426375a49c89 Mon Sep 17 00:00:00 2001
From: Glenn Sarti <glennsarti@users.noreply.github.com>
Date: Tue, 24 Oct 2017 17:02:52 -0700
Subject: [PATCH] (maint) Update puppet-lint to 2.3.3

This commit updates the vendored puppet-lint gem to 2.3.3.
---
 server/Rakefile                               |   2 +-
 server/vendor/README.md                       |   2 +-
 server/vendor/puppet-lint/.gitignore          |   1 +
 server/vendor/puppet-lint/.rubocop.yml        |  74 +++
 server/vendor/puppet-lint/.rubocop_todo.yml   |  89 ++++
 server/vendor/puppet-lint/.travis.yml         |  19 +-
 server/vendor/puppet-lint/CHANGELOG.md        |  80 +++-
 server/vendor/puppet-lint/Gemfile             |   3 +
 server/vendor/puppet-lint/Rakefile            |  20 +-
 server/vendor/puppet-lint/appveyor.yml        |   7 +-
 server/vendor/puppet-lint/bin/puppet-lint     |   2 +-
 server/vendor/puppet-lint/lib/puppet-lint.rb  |  47 +-
 .../vendor/puppet-lint/lib/puppet-lint/bin.rb |  34 +-
 .../lib/puppet-lint/checkplugin.rb            |  41 +-
 .../puppet-lint/lib/puppet-lint/checks.rb     |  73 +--
 .../lib/puppet-lint/configuration.rb          |  19 +-
 .../puppet-lint/lib/puppet-lint/data.rb       | 400 +++++++++-------
 .../puppet-lint/lib/puppet-lint/lexer.rb      | 428 +++++++++---------
 .../lib/puppet-lint/lexer/token.rb            |  52 ++-
 .../lib/puppet-lint/monkeypatches.rb          |  53 ++-
 .../monkeypatches/string_percent.rb           |  52 ---
 .../monkeypatches/string_prepend.rb           |  13 -
 .../puppet-lint/lib/puppet-lint/optparser.rb  |  63 +--
 .../puppet-lint/lib/puppet-lint/plugins.rb    |  80 ++--
 .../arrow_on_right_operand_line.rb            |  54 ++-
 .../check_classes/autoloader_layout.rb        |  41 +-
 .../class_inherits_from_params_class.rb       |  17 +-
 .../check_classes/code_on_top_scope.rb        |  17 +-
 .../inherits_across_namespaces.rb             |  23 +-
 .../check_classes/names_containing_dash.rb    |  25 +-
 .../names_containing_uppercase.rb             |  27 +-
 .../nested_classes_or_defines.rb              |  19 +-
 .../plugins/check_classes/parameter_order.rb  |  71 +--
 .../right_to_left_relationship.rb             |   7 +-
 .../plugins/check_classes/variable_scope.rb   |  45 +-
 .../plugins/check_comments/slash_comments.rb  |   7 +-
 .../plugins/check_comments/star_comments.rb   |  13 +-
 .../case_without_default.rb                   |  41 +-
 .../selector_inside_resource.rb               |  23 +-
 .../check_documentation/documentation.rb      |  43 +-
 .../plugins/check_nodes/unquoted_node_name.rb |  24 +-
 .../check_resources/duplicate_params.rb       |   9 +-
 .../check_resources/ensure_first_param.rb     |  35 +-
 .../ensure_not_symlink_target.rb              |  33 +-
 .../plugins/check_resources/file_mode.rb      |  45 +-
 .../check_resources/unquoted_file_mode.rb     |  27 +-
 .../unquoted_resource_title.rb                |  17 +-
 .../check_strings/double_quoted_strings.rb    |  18 +-
 .../check_strings/only_variable_string.rb     |  71 ++-
 .../puppet_url_without_modules.rb             |  11 +-
 .../plugins/check_strings/quoted_booleans.rb  |   7 +-
 .../single_quote_string_with_variables.rb     |   9 +-
 .../check_strings/variables_not_enclosed.rb   |   7 +-
 .../check_variables/variable_contains_dash.rb |  17 +-
 .../check_variables/variable_is_lowercase.rb  |  17 +-
 .../plugins/check_whitespace/140chars.rb      |  18 +-
 .../plugins/check_whitespace/2sp_soft_tabs.rb |   9 +-
 .../plugins/check_whitespace/80chars.rb       |  20 +-
 .../check_whitespace/arrow_alignment.rb       |  45 +-
 .../plugins/check_whitespace/hard_tabs.rb     |   7 +-
 .../check_whitespace/trailing_whitespace.rb   |   7 +-
 .../lib/puppet-lint/tasks/puppet-lint.rb      |   8 +-
 .../lib/puppet-lint/tasks/release_test.rb     |  84 ++++
 .../puppet-lint/lib/puppet-lint/version.rb    |   2 +-
 server/vendor/puppet-lint/puppet-lint.gemspec |   8 +-
 65 files changed, 1582 insertions(+), 1100 deletions(-)
 create mode 100644 server/vendor/puppet-lint/.rubocop.yml
 create mode 100644 server/vendor/puppet-lint/.rubocop_todo.yml
 delete mode 100644 server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_percent.rb
 delete mode 100644 server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_prepend.rb
 create mode 100644 server/vendor/puppet-lint/lib/puppet-lint/tasks/release_test.rb

diff --git a/server/Rakefile b/server/Rakefile
index 7d3593c9..37dbb187 100644
--- a/server/Rakefile
+++ b/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',
     }
   ]
 
diff --git a/server/vendor/README.md b/server/vendor/README.md
index 6ad30739..570d9ba7 100644
--- a/server/vendor/README.md
+++ b/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)
diff --git a/server/vendor/puppet-lint/.gitignore b/server/vendor/puppet-lint/.gitignore
index ef64ab04..03ba157d 100644
--- a/server/vendor/puppet-lint/.gitignore
+++ b/server/vendor/puppet-lint/.gitignore
@@ -9,3 +9,4 @@ coverage/
 /_site/
 .idea
 /*.pp
+/tmp/
diff --git a/server/vendor/puppet-lint/.rubocop.yml b/server/vendor/puppet-lint/.rubocop.yml
new file mode 100644
index 00000000..9625d507
--- /dev/null
+++ b/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'
diff --git a/server/vendor/puppet-lint/.rubocop_todo.yml b/server/vendor/puppet-lint/.rubocop_todo.yml
new file mode 100644
index 00000000..c4446754
--- /dev/null
+++ b/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
diff --git a/server/vendor/puppet-lint/.travis.yml b/server/vendor/puppet-lint/.travis.yml
index 51d3210c..0b396968 100644
--- a/server/vendor/puppet-lint/.travis.yml
+++ b/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:
-    - tim@bombasticmonkey.com
+    include:
+        - rvm: 2.4.1
+          env: CHECK=rubocop
diff --git a/server/vendor/puppet-lint/CHANGELOG.md b/server/vendor/puppet-lint/CHANGELOG.md
index 5ba8c408..3fc8b33d 100644
--- a/server/vendor/puppet-lint/CHANGELOG.md
+++ b/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)*
\ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/server/vendor/puppet-lint/Gemfile b/server/vendor/puppet-lint/Gemfile
index 917f32d8..cd905784 100644
--- a/server/vendor/puppet-lint/Gemfile
+++ b/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
diff --git a/server/vendor/puppet-lint/Rakefile b/server/vendor/puppet-lint/Rakefile
index 3e3d320e..a32b64be 100644
--- a/server/vendor/puppet-lint/Rakefile
+++ b/server/vendor/puppet-lint/Rakefile
@@ -1,6 +1,7 @@
 require 'rake'
 require 'rspec/core/rake_task'
 require 'puppet-lint'
+require 'puppet-lint/tasks/release_test'
 
 task :default => :test
 
@@ -8,12 +9,25 @@ 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
diff --git a/server/vendor/puppet-lint/appveyor.yml b/server/vendor/puppet-lint/appveyor.yml
index 955379f7..79d4814c 100644
--- a/server/vendor/puppet-lint/appveyor.yml
+++ b/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:
-    - tim@bombasticmonkey.com
+  - bundle exec rake ci
diff --git a/server/vendor/puppet-lint/bin/puppet-lint b/server/vendor/puppet-lint/bin/puppet-lint
index 3e83f38d..ea05b9f5 100644
--- a/server/vendor/puppet-lint/bin/puppet-lint
+++ b/server/vendor/puppet-lint/bin/puppet-lint
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'puppet-lint'
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint.rb b/server/vendor/puppet-lint/lib/puppet-lint.rb
index bf5a8a5a..b8003215 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'set'
 require 'json'
 require 'puppet-lint/version'
@@ -47,7 +49,7 @@ class PuppetLint
   # Public: Initialise a new PuppetLint object.
   def initialize
     @code = nil
-    @statistics = {:error => 0, :warning => 0, :fixed => 0, :ignored => 0}
+    @statistics = { :error => 0, :warning => 0, :fixed => 0, :ignored => 0 }
     @manifest = ''
   end
 
@@ -70,10 +72,16 @@ def configuration
   #
   # Returns nothing.
   def file=(path)
-    if File.exist? path
-      @path = path
-      @code = File.read(path)
+    return unless File.exist?(path)
+
+    @path = path
+    File.open(path, 'r:UTF-8') do |f|
+      @code = f.read
     end
+
+    # Check if the input is an SE Linux policy package file (which also use
+    # the .pp extension), which all have the first 4 bytes 0xf97cff8f.
+    @code = '' if @code[0..3].unpack('V').first == 0xf97cff8f
   end
 
   # Internal: Retrieve the format string to be used when writing problems to
@@ -82,15 +90,14 @@ def file=(path)
   #
   # Returns a format String to be used with String#%.
   def log_format
-    if configuration.log_format == ''
+    if configuration.log_format.nil? || configuration.log_format.empty?
       ## recreate previous old log format as far as thats possible.
       format = '%{KIND}: %{message} on line %{line}'
-      if configuration.with_filename
-        format.prepend '%{path} - '
-      end
+      format.prepend('%{path} - ') if configuration.with_filename
       configuration.log_format = format
     end
-    return configuration.log_format
+
+    configuration.log_format
   end
 
   # Internal: Format a problem message and print it to STDOUT.
@@ -101,9 +108,8 @@ def log_format
   def format_message(message)
     format = log_format
     puts format % message
-    if message[:kind] == :ignored && !message[:reason].nil?
-      puts "  #{message[:reason]}"
-    end
+
+    puts "  #{message[:reason]}" if message[:kind] == :ignored && !message[:reason].nil?
   end
 
   # Internal: Get the line of the manifest on which the problem was found
@@ -112,8 +118,7 @@ def format_message(message)
   #
   # Returns the problematic line as a string.
   def get_context(message)
-    line = PuppetLint::Data.manifest_lines[message[:line] - 1]
-    return line.strip
+    PuppetLint::Data.manifest_lines[message[:line] - 1].strip
   end
 
   # Internal: Print out the line of the manifest on which the problem was found
@@ -126,9 +131,9 @@ def print_context(message)
     return if message[:check] == 'documentation'
     return if message[:kind] == :fixed
     line = get_context(message)
-    offset = line.index(/\S/) || 1
+    offset = line.index(%r{\S}) || 1
     puts "\n  #{line.strip}"
-    printf "%#{message[:column] + 2 - offset}s\n\n", '^'
+    printf("%#{message[:column] + 2 - offset}s\n\n", '^')
   end
 
   # Internal: Print the reported problems with a manifest to stdout.
@@ -149,12 +154,14 @@ def report(problems)
           message['context'] = get_context(message) if configuration.with_context
           json << message
         else
-          format_message message
+          format_message(message)
           print_context(message) if configuration.with_context
         end
       end
     end
     puts JSON.pretty_generate(json) if configuration.json
+
+    $stderr.puts 'Try running `puppet parser validate <file>`' if problems.any? { |p| p[:check] == :syntax }
   end
 
   # Public: Determine if PuppetLint found any errors in the manifest.
@@ -177,9 +184,7 @@ def warnings?
   # Returns nothing.
   # Raises PuppetLint::NoCodeError if no manifest code has been loaded.
   def run
-    if @code.nil?
-      raise PuppetLint::NoCodeError
-    end
+    raise PuppetLint::NoCodeError if @code.nil?
 
     if @code.empty?
       @problems = []
@@ -198,7 +203,7 @@ def run
   #
   # Returns nothing.
   def print_problems
-    report @problems
+    report(@problems)
   end
 
   # Public: Define a new check.
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/bin.rb b/server/vendor/puppet-lint/lib/puppet-lint/bin.rb
index 6c967958..73d6b8a4 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/bin.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/bin.rb
@@ -23,8 +23,8 @@ def run
 
     begin
       opts.parse!(@args)
-    rescue OptionParser::InvalidOption
-      puts "puppet-lint: #{$!.message}"
+    rescue OptionParser::InvalidOption => e
+      puts "puppet-lint: #{e.message}"
       puts "puppet-lint: try 'puppet-lint --help' for more information"
       return 1
     end
@@ -35,22 +35,20 @@ def run
     end
 
     if @args[0].nil?
-      puts "puppet-lint: no file specified"
+      puts 'puppet-lint: no file specified'
       puts "puppet-lint: try 'puppet-lint --help' for more information"
       return 1
     end
 
     begin
       path = @args[0]
-      if File.directory?(path)
-        path = Dir.glob("#{path}/**/*.pp")
-      else
-        path = @args
-      end
+      path = if File.directory?(path)
+               Dir.glob("#{path}/**/*.pp")
+             else
+               @args
+             end
 
-      if path.length > 1
-        PuppetLint.configuration.with_filename = true
-      end
+      PuppetLint.configuration.with_filename = true if path.length > 1
 
       return_val = 0
 
@@ -60,24 +58,22 @@ def run
         l.file = f
         l.run
         l.print_problems
-        puts ',' if f != path.last and PuppetLint.configuration.json
+        puts ',' if f != path.last && PuppetLint.configuration.json
 
-        if l.errors? or (l.warnings? and PuppetLint.configuration.fail_on_warnings)
+        if l.errors? || (l.warnings? && PuppetLint.configuration.fail_on_warnings)
           return_val = 1
         end
 
-        if PuppetLint.configuration.fix && !l.problems.any? { |e| e[:check] == :syntax }
-          File.open(f, 'w') do |fd|
-            fd.write l.manifest
-          end
+        next unless PuppetLint.configuration.fix && l.problems.none? { |r| r[:check] == :syntax }
+        File.open(f, 'wb') do |fd|
+          fd.write(l.manifest)
         end
       end
       puts ']' if PuppetLint.configuration.json
 
       return return_val
-
     rescue PuppetLint::NoCodeError
-      puts "puppet-lint: no file specified or specified file does not exist"
+      puts 'puppet-lint: no file specified or specified file does not exist'
       puts "puppet-lint: try 'puppet-lint --help' for more information"
       return 1
     end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/checkplugin.rb b/server/vendor/puppet-lint/lib/puppet-lint/checkplugin.rb
index fb952c4b..a1fa6573 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/checkplugin.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/checkplugin.rb
@@ -21,11 +21,11 @@ def run
     check
 
     @problems.each do |problem|
-      if problem[:check] != :syntax && PuppetLint::Data.ignore_overrides[problem[:check]].has_key?(problem[:line])
-        problem[:kind] = :ignored
-        problem[:reason] = PuppetLint::Data.ignore_overrides[problem[:check]][problem[:line]]
-        next
-      end
+      next if problem[:check] == :syntax
+      next unless PuppetLint::Data.ignore_overrides[problem[:check]].key?(problem[:line])
+
+      problem[:kind] = :ignored
+      problem[:reason] = PuppetLint::Data.ignore_overrides[problem[:check]][problem[:line]]
     end
 
     @problems
@@ -36,14 +36,13 @@ def run
   # Returns an Array of problem Hashes.
   def fix_problems
     @problems.reject { |problem| problem[:kind] == :ignored || problem[:check] == :syntax }.each do |problem|
-      if self.respond_to?(:fix)
-        begin
-          fix(problem)
-        rescue PuppetLint::NoFix
-          # noop
-        else
-          problem[:kind] = :fixed
-        end
+      next unless respond_to?(:fix)
+
+      begin
+        fix(problem)
+        problem[:kind] = :fixed
+      rescue PuppetLint::NoFix # rubocop:disable Lint/HandleExceptions
+        # noop
       end
     end
 
@@ -59,6 +58,14 @@ def tokens
     PuppetLint::Data.tokens
   end
 
+  def add_token(index, token)
+    PuppetLint::Data.insert(index, token)
+  end
+
+  def remove_token(token)
+    PuppetLint::Data.delete(token)
+  end
+
   # Public: Provides the resource titles to the check plugins.
   #
   # Returns an Array of PuppetLint::Lexer::Token objects.
@@ -159,14 +166,14 @@ def default_info
   # Returns nothing.
   def notify(kind, problem)
     problem[:kind] = kind
-    problem.merge!(default_info) { |key, v1, v2| v1 }
+    problem.merge!(default_info) { |_key, v1, _v2| v1 }
 
-    unless [:warning, :error, :fixed].include? kind
-      raise ArgumentError, "unknown value passed for kind"
+    unless [:warning, :error, :fixed].include?(kind)
+      raise ArgumentError, 'unknown value passed for kind'
     end
 
     [:message, :line, :column, :check].each do |attr|
-      unless problem.has_key? attr
+      unless problem.key?(attr)
         raise ArgumentError, "problem hash must contain #{attr.inspect}"
       end
     end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/checks.rb b/server/vendor/puppet-lint/lib/puppet-lint/checks.rb
index 3936af16..40707631 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/checks.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/checks.rb
@@ -25,10 +25,16 @@ def load_data(path, content)
       PuppetLint::Data.tokens = lexer.tokenise(content)
       PuppetLint::Data.parse_control_comments
     rescue PuppetLint::LexerError => e
+      message = if e.reason.nil?
+                  'Syntax error'
+                else
+                  "Syntax error (#{e.reason})"
+                end
+
       problems << {
         :kind     => :error,
         :check    => :syntax,
-        :message  => 'Syntax error (try running `puppet parser validate <file>`)',
+        :message  => message,
         :line     => e.line_no,
         :column   => e.column,
         :fullpath => PuppetLint::Data.fullpath,
@@ -41,20 +47,16 @@ def load_data(path, content)
 
   # Internal: Run the lint checks over the manifest code.
   #
-  # fileinfo - A Hash containing the following:
-  #   :fullpath - The expanded path to the file as a String.
-  #   :filename - The name of the file as a String.
-  #   :path     - The original path to the file as passed to puppet-lint as
-  #               a String.
+  # fileinfo - The path to the file as passed to puppet-lint as a String.
   # data     - The String manifest code to be checked.
   #
   # Returns an Array of problem Hashes.
   def run(fileinfo, data)
     load_data(fileinfo, data)
 
-    checks_run = []
     enabled_checks.each do |check|
       klass = PuppetLint.configuration.check_object[check].new
+      # FIXME: shadowing #problems
       problems = klass.run
 
       if PuppetLint.configuration.fix
@@ -66,25 +68,34 @@ def run(fileinfo, data)
 
     @problems
   rescue => e
-    puts <<-END
-Whoops! It looks like puppet-lint has encountered an error that it doesn't
-know how to handle. Please open an issue at https://github.com/rodjek/puppet-lint
-and paste the following output into the issue description.
----
-puppet-lint version: #{PuppetLint::VERSION}
-ruby version: #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}
-platform: #{RUBY_PLATFORM}
-file path: #{fileinfo}
-file contents:
-```
-#{File.read(fileinfo) if File.readable?(fileinfo)}
-```
-error:
-```
-#{e.class}: #{e.message}
-#{e.backtrace.join("\n")}
-```
-END
+    $stdout.puts <<-END.gsub(%r{^ {6}}, '')
+      Whoops! It looks like puppet-lint has encountered an error that it doesn't
+      know how to handle. Please open an issue at https://github.com/rodjek/puppet-lint
+      and paste the following output into the issue description.
+      ---
+      puppet-lint version: #{PuppetLint::VERSION}
+      ruby version: #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}
+      platform: #{RUBY_PLATFORM}
+      file path: #{fileinfo}
+    END
+
+    if File.readable?(fileinfo)
+      $stdout.puts [
+        'file contents:',
+        '```',
+        File.read(fileinfo),
+        '```',
+      ].join("\n")
+    end
+
+    $stdout.puts [
+      'error:',
+      '```',
+      "#{e.class}: #{e.message}",
+      e.backtrace.join("\n"),
+      '```',
+    ].join("\n")
+
     exit 1
   end
 
@@ -92,17 +103,17 @@ def run(fileinfo, data)
   #
   # Returns an Array of String check names.
   def enabled_checks
-    @enabled_checks ||= Proc.new do
-      PuppetLint.configuration.checks.select { |check|
+    @enabled_checks ||= begin
+      PuppetLint.configuration.checks.select do |check|
         PuppetLint.configuration.send("#{check}_enabled?")
-      }
-    end.call
+      end
+    end
   end
 
   # Internal: Render the fixed manifest.
   #
   # Returns the manifest as a String.
   def manifest
-    PuppetLint::Data.tokens.map { |t| t.to_manifest }.join('')
+    PuppetLint::Data.tokens.map(&:to_manifest).join('')
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/configuration.rb b/server/vendor/puppet-lint/lib/puppet-lint/configuration.rb
index 0862edcd..8912ab03 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/configuration.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/configuration.rb
@@ -49,14 +49,16 @@ def self.add_check(check)
     # Signature
     #
     #   <option>=(value)
-    def method_missing(method, *args, &block)
-      if method.to_s =~ /^(\w+)=$/
-        option = $1
-        add_option(option.to_s) if settings[option].nil?
-        settings[option] = args[0]
-      else
-        nil
-      end
+    def method_missing(method, *args, &_block)
+      super unless method.to_s =~ %r{^(\w+)=?$}
+
+      option = Regexp.last_match(1)
+      add_option(option.to_s) if settings[option].nil?
+      settings[option] = args[0] unless args.empty?
+    end
+
+    def respond_to_missing?(method, *)
+      method.to_s =~ %r{^\w+=?$} || super
     end
 
     # Internal: Add options to the PuppetLint::Configuration object from inside
@@ -149,6 +151,7 @@ def defaults
       self.fix = false
       self.json = false
       self.show_ignored = false
+      self.ignore_paths = ['vendor/**/*.pp']
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/data.rb b/server/vendor/puppet-lint/lib/puppet-lint/data.rb
index b7b8fd0f..0c083220 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/data.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/data.rb
@@ -32,15 +32,28 @@ def tokens=(tokens)
       @defaults_indexes = nil
     end
 
+    def ruby1?
+      @ruby1 = RbConfig::CONFIG['MAJOR'] == '1' if @ruby1.nil?
+      @ruby1
+    end
+
     # Public: Get the tokenised manifest.
     #
     # Returns an Array of PuppetLint::Lexer::Token objects.
     def tokens
-      calling_method = begin
-        caller[0][/`.*'/][1..-2]
-      rescue NoMethodError
-        caller[1][/`.*'/][1..-2]
-      end
+      calling_method = if ruby1?
+                         begin
+                           caller[0][%r{`.*'}][1..-2] # rubocop:disable Performance/Caller
+                         rescue NoMethodError
+                           caller[1][%r{`.*'}][1..-2] # rubocop:disable Performance/Caller
+                         end
+                       else
+                         begin
+                           caller(0..0).first[%r{`.*'}][1..-2]
+                         rescue NoMethodError
+                           caller(1..1).first[%r{`.*'}][1..-2]
+                         end
+                       end
 
       if calling_method == 'check'
         @tokens.dup
@@ -49,6 +62,55 @@ def tokens
       end
     end
 
+    # Public: Add new token.
+    def insert(index, token)
+      current_token = tokens[index - 1]
+      token.next_token = current_token.next_token
+      token.prev_token = current_token
+
+      current_token.next_token.prev_token = token unless current_token.next_token.nil?
+
+      unless formatting_tokens.include?(token.type)
+        current_token.next_token.prev_code_token = token unless current_token.next_token.nil?
+        next_nf_idx = tokens[index..-1].index { |r| !formatting_tokens.include?(r.type) }
+        unless next_nf_idx.nil?
+          next_nf_token = tokens[index + next_nf_idx]
+          token.next_code_token = next_nf_token
+          next_nf_token.prev_code_token = token
+        end
+      end
+
+      if formatting_tokens.include?(current_token.type)
+        prev_nf_idx = tokens[0..index - 1].rindex { |r| !formatting_tokens.include?(r.type) }
+        unless prev_nf_idx.nil?
+          prev_nf_token = tokens[prev_nf_idx]
+          token.prev_code_token = prev_nf_token
+          prev_nf_token.next_code_token = token
+        end
+      else
+        token.prev_code_token = current_token
+      end
+
+      current_token.next_token = token
+      unless formatting_tokens.include?(token.type)
+        current_token.next_code_token = token
+      end
+
+      tokens.insert(index, token)
+    end
+
+    # Public: Removes a token
+    def delete(token)
+      token.next_token.prev_token = token.prev_token unless token.next_token.nil?
+      token.prev_token.next_token = token.next_token unless token.prev_token.nil?
+      unless formatting_tokens.include?(token.type)
+        token.prev_code_token.next_code_token = token.next_code_token unless token.prev_code_token.nil?
+        token.next_code_token.prev_code_token = token.prev_code_token unless token.next_code_token.nil?
+      end
+
+      tokens.delete(token)
+    end
+
     # Internal: Store the path to the manifest file and populate fullpath and
     # filename.
     #
@@ -70,29 +132,27 @@ def path=(val)
     #
     # Returns an Array of PuppetLint::Lexer::Token objects.
     def title_tokens
-      @title_tokens ||= Proc.new do
+      @title_tokens ||= begin
         result = []
         tokens.each_index do |token_idx|
           if tokens[token_idx].type == :COLON
             # gather a list of tokens that are resource titles
-            if tokens[token_idx-1].type == :RBRACK
-              array_start_idx = tokens.rindex { |r|
+            if tokens[token_idx - 1].type == :RBRACK
+              array_start_idx = tokens.rindex do |r|
                 r.type == :LBRACK
-              }
+              end
               title_array_tokens = tokens[(array_start_idx + 1)..(token_idx - 2)]
-              result += title_array_tokens.select { |token|
-                {:STRING => true, :NAME => true}.include? token.type
-              }
+              result += title_array_tokens.select do |token|
+                { :STRING => true, :NAME => true }.include?(token.type)
+              end
             else
               next_token = tokens[token_idx].next_code_token
-              if next_token.type != :LBRACE
-                result << tokens[token_idx - 1]
-              end
+              result << tokens[token_idx - 1] unless next_token.type == :LBRACE
             end
           end
         end
         result
-      end.call
+      end
     end
 
     # Internal: Calculate the positions of all resource declarations within the
@@ -109,21 +169,21 @@ def resource_indexes
         marker = 0
         result = []
         tokens.select { |t| t.type == :COLON }.each do |colon_token|
-          if colon_token.next_code_token && colon_token.next_code_token.type != :LBRACE
-            start_idx = tokens.index(colon_token)
-            next if start_idx < marker
-            end_token = colon_token.next_token_of([:SEMIC, :RBRACE])
-            end_idx = tokens.index(end_token)
-
-            result << {
-              :start        => start_idx + 1,
-              :end          => end_idx,
-              :tokens       => tokens[start_idx..end_idx],
-              :type         => find_resource_type_token(start_idx),
-              :param_tokens => find_resource_param_tokens(tokens[start_idx..end_idx]),
-            }
-            marker = end_idx
-          end
+          next unless colon_token.next_code_token && colon_token.next_code_token.type != :LBRACE
+
+          start_idx = tokens.index(colon_token)
+          next if start_idx < marker
+          end_token = colon_token.next_token_of([:SEMIC, :RBRACE])
+          end_idx = tokens.index(end_token)
+
+          result << {
+            :start        => start_idx + 1,
+            :end          => end_idx,
+            :tokens       => tokens[start_idx..end_idx],
+            :type         => find_resource_type_token(start_idx),
+            :param_tokens => find_resource_param_tokens(tokens[start_idx..end_idx]),
+          }
+          marker = end_idx
         end
         result
       end
@@ -136,9 +196,9 @@ def resource_indexes
     #
     # Returns a Token object.
     def find_resource_type_token(index)
-      lbrace_idx = tokens[0..index].rindex { |token|
+      lbrace_idx = tokens[0..index].rindex do |token|
         token.type == :LBRACE && token.prev_code_token.type != :QMARK
-      }
+      end
       tokens[lbrace_idx].prev_code_token
     end
 
@@ -150,9 +210,9 @@ def find_resource_type_token(index)
     #
     # Returns an Array of Token objects.
     def find_resource_param_tokens(resource_tokens)
-      resource_tokens.select { |token|
+      resource_tokens.select do |token|
         token.type == :NAME && token.next_code_token.type == :FARROW
-      }
+      end
     end
 
     # Internal: Calculate the positions of all class definitions within the
@@ -210,38 +270,38 @@ def node_indexes
     def definition_indexes(type)
       result = []
       tokens.each_with_index do |token, i|
-        if token.type == type
-          brace_depth = 0
-          paren_depth = 0
-          in_params = false
-          inherited_class = nil
-          tokens[i+1..-1].each_with_index do |definition_token, j|
-            case definition_token.type
-            when :INHERITS
-              inherited_class = definition_token.next_code_token
-            when :LPAREN
-              in_params = true if paren_depth == 0
-              paren_depth += 1
-            when :RPAREN
-              in_params = false if paren_depth == 1
-              paren_depth -= 1
-            when :LBRACE
-              brace_depth += 1
-            when :RBRACE
-              brace_depth -= 1
-              if brace_depth == 0 && !in_params
-                if token.next_code_token.type != :LBRACE
-                  result << {
-                    :start           => i,
-                    :end             => i + j + 1,
-                    :tokens          => tokens[i..(i + j + 1)],
-                    :param_tokens    => param_tokens(tokens[i..(i + j + 1)]),
-                    :type            => type,
-                    :name_token      => token.next_code_token,
-                    :inherited_token => inherited_class,
-                  }
-                  break
-                end
+        next unless token.type == type
+
+        brace_depth = 0
+        paren_depth = 0
+        in_params = false
+        inherited_class = nil
+        tokens[i + 1..-1].each_with_index do |definition_token, j|
+          case definition_token.type
+          when :INHERITS
+            inherited_class = definition_token.next_code_token
+          when :LPAREN
+            in_params = true if paren_depth.zero?
+            paren_depth += 1
+          when :RPAREN
+            in_params = false if paren_depth == 1
+            paren_depth -= 1
+          when :LBRACE
+            brace_depth += 1
+          when :RBRACE
+            brace_depth -= 1
+            if brace_depth.zero? && !in_params
+              if token.next_code_token.type != :LBRACE
+                result << {
+                  :start           => i,
+                  :end             => i + j + 1,
+                  :tokens          => tokens[i..(i + j + 1)],
+                  :param_tokens    => param_tokens(tokens[i..(i + j + 1)]),
+                  :type            => type,
+                  :name_token      => token.next_code_token,
+                  :inherited_token => inherited_class,
+                }
+                break
               end
             end
           end
@@ -261,41 +321,42 @@ def definition_indexes(type)
     #   :tokens - An Array consisting of all the Token objects that make up the
     #             function call.
     def function_indexes
-      @function_indexes ||= Proc.new do
+      @function_indexes ||= begin
         functions = []
         tokens.each_with_index do |token, token_idx|
-          if token.type == :NAME && \
-            (token_idx == 0 || (token_idx == 1 && tokens[0].type == :WHITESPACE) || token.prev_token.type == :NEWLINE || token.prev_token.type == :INDENT || \
-              # function in a function
-              (token.prev_code_token && token.prev_code_token.type == :LPAREN))
-
-              # Hash key
-              next if token.next_code_token && token.next_code_token.type == :FARROW
-
-              level = 0
-              real_idx = 0
-              in_paren = false
-              tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
-                break if level == 0 && in_paren
-                break if level == 0 && cur_token.type == :NEWLINE
-
-                if cur_token.type == :LPAREN
-                  level += 1
-                  in_paren = true
-                end
-                level -= 1 if cur_token.type == :RPAREN
-                real_idx = token_idx + 1 + cur_token_idx
-              end
-
-              functions << {
-                :start  => token_idx,
-                :end    => real_idx,
-                :tokens => tokens[token_idx..real_idx],
-              }         
+          next unless token.type == :NAME
+          next unless token_idx.zero? ||
+                      (token_idx == 1 && tokens[0].type == :WHITESPACE) ||
+                      [:NEWLINE, :INDENT].include?(token.prev_token.type) ||
+                      # function in a function
+                      (token.prev_code_token && token.prev_code_token.type == :LPAREN)
+
+          # Hash key
+          next if token.next_code_token && token.next_code_token.type == :FARROW
+
+          level = 0
+          real_idx = 0
+          in_paren = false
+          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+            break if level.zero? && in_paren
+            break if level.zero? && cur_token.type == :NEWLINE
+
+            if cur_token.type == :LPAREN
+              level += 1
+              in_paren = true
+            end
+            level -= 1 if cur_token.type == :RPAREN
+            real_idx = token_idx + 1 + cur_token_idx
           end
+
+          functions << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
         end
         functions
-      end.call
+      end
     end
 
     # Internal: Calculate the positions of all array values within
@@ -309,28 +370,29 @@ def function_indexes
     #   :tokens - An Array consisting of all the Token objects that make up the
     #             array value.
     def array_indexes
-      @array_indexes ||= Proc.new do
+      @array_indexes ||= begin
         arrays = []
         tokens.each_with_index do |token, token_idx|
-          if token.type == :LBRACK
-            real_idx = 0
-            tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
-              real_idx = token_idx + 1 + cur_token_idx
-              break if cur_token.type == :RBRACK
-            end
+          next unless token.type == :LBRACK
 
-            # Ignore resource references
-            next if token.prev_code_token && \
-              token.prev_code_token.type == :CLASSREF
-            arrays << {
-              :start  => token_idx,
-              :end    => real_idx,
-              :tokens => tokens[token_idx..real_idx],
-            }
+          real_idx = 0
+          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+            real_idx = token_idx + 1 + cur_token_idx
+            break if cur_token.type == :RBRACK
           end
+
+          # Ignore resource references
+          next if token.prev_code_token &&
+                  token.prev_code_token.type == :CLASSREF
+
+          arrays << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
         end
         arrays
-      end.call
+      end
     end
 
     # Internal: Calculate the positions of all hash values within
@@ -344,31 +406,31 @@ def array_indexes
     #   :tokens - An Array consisting of all the Token objects that make up the
     #             hash value.
     def hash_indexes
-      @hash_indexes ||= Proc.new do
+      @hash_indexes ||= begin
         hashes = []
         tokens.each_with_index do |token, token_idx|
+          next unless token.type == :LBRACE
           next unless token.prev_code_token
-          next unless [:EQUALS, :ISEQUAL, :FARROW, :LPAREN].include? token.prev_code_token.type
-          if token.type == :LBRACE
-            level = 0
-            real_idx = 0
-            tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
-              real_idx = token_idx + 1 + cur_token_idx
-
-              level += 1 if cur_token.type == :LBRACE
-              level -= 1 if cur_token.type == :RBRACE
-              break if level < 0
-            end
+          next unless [:EQUALS, :ISEQUAL, :FARROW, :LPAREN].include?(token.prev_code_token.type)
+
+          level = 0
+          real_idx = 0
+          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+            real_idx = token_idx + 1 + cur_token_idx
 
-            hashes << {
-              :start  => token_idx,
-              :end    => real_idx,
-              :tokens => tokens[token_idx..real_idx],
-            }
+            level += 1 if cur_token.type == :LBRACE
+            level -= 1 if cur_token.type == :RBRACE
+            break if level < 0
           end
+
+          hashes << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
         end
         hashes
-      end.call
+      end
     end
 
     # Internal: Calculate the positions of all defaults declarations within
@@ -382,27 +444,27 @@ def hash_indexes
     #   :tokens - An Array consisting of all the Token objects that make up the
     #             defaults declaration.
     def defaults_indexes
-      @defaults_indexes ||= Proc.new do
+      @defaults_indexes ||= begin
         defaults = []
         tokens.each_with_index do |token, token_idx|
-          if token.type == :CLASSREF && token.next_code_token && \
-            token.next_code_token.type == :LBRACE
-            real_idx = 0
+          next unless token.type == :CLASSREF
+          next unless token.next_code_token && token.next_code_token.type == :LBRACE
 
-            tokens[token_idx+1..-1].each_with_index do |cur_token, cur_token_idx|
-              real_idx = token_idx + 1 + cur_token_idx
-              break if cur_token.type == :RBRACE
-            end
+          real_idx = 0
 
-            defaults << {
-              :start  => token_idx,
-              :end    => real_idx,
-              :tokens => tokens[token_idx..real_idx],
-            }
+          tokens[token_idx + 1..-1].each_with_index do |cur_token, cur_token_idx|
+            real_idx = token_idx + 1 + cur_token_idx
+            break if cur_token.type == :RBRACE
           end
+
+          defaults << {
+            :start  => token_idx,
+            :end    => real_idx,
+            :tokens => tokens[token_idx..real_idx],
+          }
         end
         defaults
-      end.call
+      end
     end
 
     # Internal: Finds all the tokens that make up the defined type or class
@@ -424,17 +486,17 @@ def param_tokens(these_tokens)
           lparen_idx = i if depth == 1
         elsif token.type == :RPAREN
           depth -= 1
-          if depth == 0
+          if depth.zero?
             rparen_idx = i
             break
           end
-        elsif token.type == :LBRACE && depth == 0
+        elsif token.type == :LBRACE && depth.zero?
           # no parameters
           break
         end
       end
 
-      if lparen_idx.nil? or rparen_idx.nil?
+      if lparen_idx.nil? || rparen_idx.nil?
         nil
       else
         these_tokens[(lparen_idx + 1)..(rparen_idx - 1)]
@@ -465,25 +527,35 @@ def ignore_overrides
     # Returns nothing.
     def parse_control_comments
       @ignore_overrides.each_key { |check| @ignore_overrides[check].clear }
-      control_re = /\A(lint:\S+)(\s+lint:\S+)*(.*)/
 
       comment_token_types = Set[:COMMENT, :MLCOMMENT, :SLASH_COMMENT]
 
-      comment_tokens = tokens.select { |token|
+      comment_tokens = tokens.select do |token|
         comment_token_types.include?(token.type)
-      }
-      control_comment_tokens = comment_tokens.select { |token|
-        token.value.strip =~ /\Alint:(ignore:[\w\d]+|endignore)/
-      }
+      end
+      control_comment_tokens = comment_tokens.select do |token|
+        token.value.strip =~ %r{\Alint\:(ignore\:[\w\d]+|endignore)}
+      end
 
       stack = []
       control_comment_tokens.each do |token|
-        comment_data = control_re.match(token.value.strip).to_a[1..-1].compact.map(&:strip)
-        if comment_data.last =~ /\Alint:(ignore|endignore)/
-          comment_data << ''
+        comment_data = []
+        reason = []
+
+        comment_words = token.value.strip.split(%r{\s+})
+        comment_words.each_with_index do |word, i|
+          if word =~ %r{\Alint\:(ignore|endignore)}
+            comment_data << word
+          else
+            # Once we reach the first non-controlcomment word, assume the rest
+            # of the words are the reason.
+            reason = comment_words[i..-1]
+            break
+          end
         end
-        reason = comment_data.pop
+
         stack_add = []
+
         comment_data.each do |control|
           split_control = control.split(':')
           command = split_control[1]
@@ -493,9 +565,9 @@ def parse_control_comments
             if token.prev_token && !Set[:NEWLINE, :INDENT].include?(token.prev_token.type)
               # control comment at the end of the line, override applies to
               # a single line only
-              (ignore_overrides[check] ||= {})[token.line] = reason
+              (ignore_overrides[check] ||= {})[token.line] = reason.join(' ')
             else
-              stack_add << [token.line, reason, check]
+              stack_add << [token.line, reason.join(' '), check]
             end
           else
             top_override = stack.pop
@@ -505,10 +577,10 @@ def parse_control_comments
               puts "WARNING: lint:endignore comment with no opening lint:ignore:<check> comment found on line #{token.line}"
             else
               top_override.each do |start|
-                unless start.nil?
-                  (start[0]..token.line).each do |i|
-                    (ignore_overrides[start[2]] ||= {})[i] = start[1]
-                  end
+                next if start.nil?
+
+                (start[0]..token.line).each do |i|
+                  (ignore_overrides[start[2]] ||= {})[i] = start[1]
                 end
               end
             end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/lexer.rb b/server/vendor/puppet-lint/lib/puppet-lint/lexer.rb
index bb5a756f..cbdcb74e 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/lexer.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/lexer.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'pp'
 require 'strscan'
 require 'puppet-lint/lexer/token'
@@ -13,23 +15,35 @@ class LexerError < StandardError
     # Internal: Get the Integer column number of the location of the error.
     attr_reader :column
 
+    # Internal: Get the String reason for the error (if known).
+    attr_reader :reason
+
     # Internal: Initialise a new PuppetLint::LexerError object.
     #
     # line_no - The Integer line number of the location of the error.
     # column  - The Integer column number of the location of the error.
-    def initialize(line_no, column)
+    # reason  - A String describing the cause of the error (if known).
+    def initialize(line_no, column, reason = nil)
       @line_no = line_no
       @column = column
+      @reason = reason
     end
   end
 
   # Internal: The puppet-lint lexer. Converts your manifest into its tokenised
   # form.
-  class Lexer
+  class Lexer # rubocop:disable Metrics/ClassLength
     def initialize
       @line_no = 1
       @column = 1
-      @@heredoc_queue ||= []
+    end
+
+    def self.heredoc_queue
+      @heredoc_queue ||= []
+    end
+
+    def heredoc_queue
+      self.class.heredoc_queue
     end
 
     # Internal: A Hash whose keys are Strings representing reserved keywords in
@@ -58,8 +72,8 @@ def initialize
       'type'     => true,
       'attr'     => true,
       'private'  => true,
-    }
-    
+    }.freeze
+
     # Internal: A Hash whose keys are Strings representing reserved keywords in
     # the Puppet DSL when Application Management is enabled
     # From https://github.com/puppetlabs/puppet/blob/master/lib/puppet/pops/parser/lexer2.rb#L142-L159
@@ -70,7 +84,7 @@ def initialize
       'consumes'    => true,
       'produces'    => true,
       'site'        => true,
-    }
+    }.freeze
 
     # Internal: A Hash whose keys are Symbols representing token types which
     # a regular expression can follow.
@@ -85,60 +99,60 @@ def initialize
       :IF      => true,
       :ELSIF   => true,
       :LPAREN  => true,
-    }
+    }.freeze
 
     # Internal: An Array of Arrays containing tokens that can be described by
     # a single regular expression.  Each sub-Array contains 2 elements, the
     # name of the token as a Symbol and a regular expression describing the
     # value of the token.
-    NAME_RE = /\A(((::)?[_a-z0-9][-\w]*)(::[a-z0-9][-\w]*)*)/
+    NAME_RE = %r{\A(((::)?[_a-z0-9][-\w]*)(::[a-z0-9][-\w]*)*)}
     KNOWN_TOKENS = [
-      [:TYPE, /\A(Integer|Float|Boolean|Regexp|String|Array|Hash|Resource|Class|Collection|Scalar|Numeric|CatalogEntry|Data|Tuple|Struct|Optional|NotUndef|Variant|Enum|Pattern|Any|Callable|Type|Runtime|Undef|Default)\b/],
-      [:CLASSREF, /\A(((::){0,1}[A-Z][-\w]*)+)/],
-      [:NUMBER, /\A\b((?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?))\b/],
-      [:FUNCTION_NAME, /#{NAME_RE}\(/],
+      [:TYPE, %r{\A(Integer|Float|Boolean|Regexp|String|Array|Hash|Resource|Class|Collection|Scalar|Numeric|CatalogEntry|Data|Tuple|Struct|Optional|NotUndef|Variant|Enum|Pattern|Any|Callable|Type|Runtime|Undef|Default)\b}],
+      [:CLASSREF, %r{\A(((::){0,1}[A-Z][-\w]*)+)}],
+      [:NUMBER, %r{\A\b((?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?))\b}],
+      [:FUNCTION_NAME, %r{#{NAME_RE}\(}],
       [:NAME, NAME_RE],
-      [:LBRACK, /\A(\[)/],
-      [:RBRACK, /\A(\])/],
-      [:LBRACE, /\A(\{)/],
-      [:RBRACE, /\A(\})/],
-      [:LPAREN, /\A(\()/],
-      [:RPAREN, /\A(\))/],
-      [:ISEQUAL, /\A(==)/],
-      [:MATCH, /\A(=~)/],
-      [:FARROW, /\A(=>)/],
-      [:EQUALS, /\A(=)/],
-      [:APPENDS, /\A(\+=)/],
-      [:PARROW, /\A(\+>)/],
-      [:PLUS, /\A(\+)/],
-      [:GREATEREQUAL, /\A(>=)/],
-      [:RSHIFT, /\A(>>)/],
-      [:GREATERTHAN, /\A(>)/],
-      [:LESSEQUAL, /\A(<=)/],
-      [:LLCOLLECT, /\A(<<\|)/],
-      [:OUT_EDGE, /\A(<-)/],
-      [:OUT_EDGE_SUB, /\A(<~)/],
-      [:LCOLLECT, /\A(<\|)/],
-      [:LSHIFT, /\A(<<)/],
-      [:LESSTHAN, /\A(<)/],
-      [:NOMATCH, /\A(!~)/],
-      [:NOTEQUAL, /\A(!=)/],
-      [:NOT, /\A(!)/],
-      [:RRCOLLECT, /\A(\|>>)/],
-      [:RCOLLECT, /\A(\|>)/],
-      [:IN_EDGE, /\A(->)/],
-      [:IN_EDGE_SUB, /\A(~>)/],
-      [:MINUS, /\A(-)/],
-      [:COMMA, /\A(,)/],
-      [:DOT, /\A(\.)/],
-      [:COLON, /\A(:)/],
-      [:SEMIC, /\A(;)/],
-      [:QMARK, /\A(\?)/],
-      [:BACKSLASH, /\A(\\)/],
-      [:TIMES, /\A(\*)/],
-      [:MODULO, /\A(%)/],
-      [:PIPE, /\A(\|)/],
-    ]
+      [:LBRACK, %r{\A(\[)}],
+      [:RBRACK, %r{\A(\])}],
+      [:LBRACE, %r{\A(\{)}],
+      [:RBRACE, %r{\A(\})}],
+      [:LPAREN, %r{\A(\()}],
+      [:RPAREN, %r{\A(\))}],
+      [:ISEQUAL, %r{\A(==)}],
+      [:MATCH, %r{\A(=~)}],
+      [:FARROW, %r{\A(=>)}],
+      [:EQUALS, %r{\A(=)}],
+      [:APPENDS, %r{\A(\+=)}],
+      [:PARROW, %r{\A(\+>)}],
+      [:PLUS, %r{\A(\+)}],
+      [:GREATEREQUAL, %r{\A(>=)}],
+      [:RSHIFT, %r{\A(>>)}],
+      [:GREATERTHAN, %r{\A(>)}],
+      [:LESSEQUAL, %r{\A(<=)}],
+      [:LLCOLLECT, %r{\A(<<\|)}],
+      [:OUT_EDGE, %r{\A(<-)}],
+      [:OUT_EDGE_SUB, %r{\A(<~)}],
+      [:LCOLLECT, %r{\A(<\|)}],
+      [:LSHIFT, %r{\A(<<)}],
+      [:LESSTHAN, %r{\A(<)}],
+      [:NOMATCH, %r{\A(!~)}],
+      [:NOTEQUAL, %r{\A(!=)}],
+      [:NOT, %r{\A(!)}],
+      [:RRCOLLECT, %r{\A(\|>>)}],
+      [:RCOLLECT, %r{\A(\|>)}],
+      [:IN_EDGE, %r{\A(->)}],
+      [:IN_EDGE_SUB, %r{\A(~>)}],
+      [:MINUS, %r{\A(-)}],
+      [:COMMA, %r{\A(,)}],
+      [:DOT, %r{\A(\.)}],
+      [:COLON, %r{\A(:)}],
+      [:SEMIC, %r{\A(;)}],
+      [:QMARK, %r{\A(\?)}],
+      [:BACKSLASH, %r{\A(\\)}],
+      [:TIMES, %r{\A(\*)}],
+      [:MODULO, %r{\A(%)}],
+      [:PIPE, %r{\A(\|)}],
+    ].freeze
 
     # Internal: A Hash whose keys are Symbols representing token types which
     # are considered to be formatting tokens (i.e. tokens that don't contain
@@ -150,7 +164,13 @@ def initialize
       :MLCOMMENT     => true,
       :SLASH_COMMENT => true,
       :INDENT        => true,
-    }
+    }.freeze
+
+    # \t == tab
+    # \v == vertical tab
+    # \f == form feed
+    # \p{Zs} == ASCII + Unicode non-linebreaking whitespace
+    WHITESPACE_RE = RUBY_VERSION == '1.8.7' ? %r{[\t\v\f ]} : %r{[\t\v\f\p{Zs}]}
 
     # Internal: Access the internal token storage.
     #
@@ -175,127 +195,128 @@ def tokenise(code)
         found = false
 
         KNOWN_TOKENS.each do |type, regex|
-          if value = chunk[regex, 1]
-            length = value.size
-            if type == :NAME
-              if KEYWORDS.include? value
-                tokens << new_token(value.upcase.to_sym, value)
-              else
-                tokens << new_token(type, value)
-              end
-            else
-              tokens << new_token(type, value)
-            end
-            i += length
-            found = true
-            break
-          end
+          value = chunk[regex, 1]
+          next if value.nil?
+
+          length = value.size
+          tokens << if type == :NAME && KEYWORDS.include?(value)
+                      new_token(value.upcase.to_sym, value)
+                    else
+                      new_token(type, value)
+                    end
+          i += length
+          found = true
+          break
         end
 
-        unless found
-          if var_name = chunk[/\A\$((::)?(\w+(-\w+)*::)*\w+(-\w+)*(\[.+?\])*)/, 1]
-            length = var_name.size + 1
-            tokens << new_token(:VARIABLE, var_name)
-
-          elsif chunk.match(/\A'(.*?)'/m)
-            str_content = StringScanner.new(code[i+1..-1]).scan_until(/(\A|[^\\])(\\\\)*'/m)
-            length = str_content.size + 1
-            tokens << new_token(:SSTRING, str_content[0..-2])
-
-          elsif chunk.match(/\A"/)
-            str_contents = slurp_string(code[i+1..-1])
-            _ = code[0..i].split("\n")
-            interpolate_string(str_contents, _.count, _.last.length)
-            length = str_contents.size + 1
-
-          elsif heredoc_name = chunk[/\A@\(("?.+?"?(:.+?)?(\/.*?)?)\)/, 1]
-            @@heredoc_queue << heredoc_name
-            tokens << new_token(:HEREDOC_OPEN, heredoc_name)
-            length = heredoc_name.size + 3
-
-          elsif comment = chunk[/\A(#.*)/, 1]
-            length = comment.size
-            comment.sub!(/#/, '')
-            tokens << new_token(:COMMENT, comment)
-
-          elsif slash_comment = chunk[/\A(\/\/.*)/, 1]
-            length = slash_comment.size
-            slash_comment.sub!(/\/\//, '')
-            tokens << new_token(:SLASH_COMMENT, slash_comment)
-
-          elsif mlcomment = chunk[/\A(\/\*.*?\*\/)/m, 1]
-            length = mlcomment.size
-            mlcomment_raw = mlcomment.dup
-            mlcomment.sub!(/\A\/\* ?/, '')
-            mlcomment.sub!(/ ?\*\/\Z/, '')
-            mlcomment.gsub!(/^ *\*/, '')
-            tokens << new_token(:MLCOMMENT, mlcomment, :raw => mlcomment_raw)
-
-          elsif chunk.match(/\A\/.*?\//) && possible_regex?
-            str_content = StringScanner.new(code[i+1..-1]).scan_until(/(\A|[^\\])(\\\\)*\//m)
-            length = str_content.size + 1
-            tokens << new_token(:REGEX, str_content[0..-2])
-
-          elsif eolindent = chunk[/\A((\r\n|\r|\n)[ \t]+)/m, 1]
-            eol = eolindent[/\A([\r\n]+)/m, 1]
-            tokens << new_token(:NEWLINE, eol)
-            length = eol.size
-
-            if @@heredoc_queue.empty?
-              indent = eolindent[/\A[\r\n]+([ \t]+)/m, 1]
-              tokens << new_token(:INDENT, indent)
-              length += indent.size
-            else
-              heredoc_tag = @@heredoc_queue.shift
-              heredoc_name = heredoc_tag[/\A"?(.+?)"?(:.+?)?(\/.*)?\Z/, 1]
-              str_contents = StringScanner.new(code[i+length..-1]).scan_until(/\|?\s*-?\s*#{heredoc_name}/)
-              interpolate_heredoc(str_contents, heredoc_tag)
-              length += str_contents.size
-            end
+        next if found
+
+        if var_name = chunk[%r{\A\$((::)?(\w+(-\w+)*::)*\w+(-\w+)*(\[.+?\])*)}, 1]
+          length = var_name.size + 1
+          tokens << new_token(:VARIABLE, var_name)
+
+        elsif chunk =~ %r{\A'.*?'}m
+          str_content = StringScanner.new(code[i + 1..-1]).scan_until(%r{(\A|[^\\])(\\\\)*'}m)
+          length = str_content.size + 1
+          tokens << new_token(:SSTRING, str_content[0..-2])
+
+        elsif chunk.start_with?('"')
+          str_contents = slurp_string(code[i + 1..-1])
+          lines_parsed = code[0..i].split("\n")
+          interpolate_string(str_contents, lines_parsed.count, lines_parsed.last.length)
+          length = str_contents.size + 1
+
+        elsif heredoc_name = chunk[%r{\A@\(("?.+?"?(:.+?)?(/.*?)?)\)}, 1]
+          heredoc_queue << heredoc_name
+          tokens << new_token(:HEREDOC_OPEN, heredoc_name)
+          length = heredoc_name.size + 3
+
+        elsif comment = chunk[%r{\A(#.*)}, 1]
+          length = comment.size
+          comment.sub!(%r{#}, '')
+          tokens << new_token(:COMMENT, comment)
+
+        elsif slash_comment = chunk[%r{\A(//.*)}, 1]
+          length = slash_comment.size
+          slash_comment.sub!(%r{//}, '')
+          tokens << new_token(:SLASH_COMMENT, slash_comment)
+
+        elsif mlcomment = chunk[%r{\A(/\*.*?\*/)}m, 1]
+          length = mlcomment.size
+          mlcomment_raw = mlcomment.dup
+          mlcomment.sub!(%r{\A/\* ?}, '')
+          mlcomment.sub!(%r{ ?\*/\Z}, '')
+          mlcomment.gsub!(%r{^ *\*}, '')
+          tokens << new_token(:MLCOMMENT, mlcomment, :raw => mlcomment_raw)
+
+        elsif chunk.match(%r{\A/.*?/}) && possible_regex?
+          str_content = StringScanner.new(code[i + 1..-1]).scan_until(%r{(\A|[^\\])(\\\\)*/}m)
+          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]
+          tokens << new_token(:NEWLINE, eol)
+          length = eol.size
+
+          if heredoc_queue.empty?
+            indent = eolindent[%r{\A[\r\n]+(#{WHITESPACE_RE}+)}m, 1]
+            tokens << new_token(:INDENT, indent)
+            length += indent.size
+          else
+            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}})
+            interpolate_heredoc(str_contents, heredoc_tag)
+            length += str_contents.size
+          end
 
-          elsif whitespace = chunk[/\A([ \t]+)/, 1]
-            length = whitespace.size
-            tokens << new_token(:WHITESPACE, whitespace)
-
-          elsif eol = chunk[/\A(\r\n|\r|\n)/, 1]
-            length = eol.size
-            tokens << new_token(:NEWLINE, eol)
-
-            unless @@heredoc_queue.empty?
-              heredoc_tag = @@heredoc_queue.shift
-              heredoc_name = heredoc_tag[/\A"?(.+?)"?(:.+?)?(\/.*)?\Z/, 1]
-              str_contents = StringScanner.new(code[i+length..-1]).scan_until(/\|?\s*-?\s*#{heredoc_name}/)
-              _ = code[0..i+length].split("\n")
-              interpolate_heredoc(str_contents, heredoc_tag)
-              length += str_contents.size
-            end
+        elsif whitespace = chunk[%r{\A(#{WHITESPACE_RE}+)}, 1]
+          length = whitespace.size
+          tokens << new_token(:WHITESPACE, whitespace)
+
+        elsif eol = chunk[%r{\A(\r\n|\r|\n)}, 1]
+          length = eol.size
+          tokens << new_token(:NEWLINE, eol)
+
+          unless heredoc_queue.empty?
+            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")
+            interpolate_heredoc(str_contents, heredoc_tag)
+            length += str_contents.size
+          end
 
-          elsif chunk.match(/\A\//)
-            length = 1
-            tokens << new_token(:DIV, '/')
+        elsif chunk.start_with?('/')
+          length = 1
+          tokens << new_token(:DIV, '/')
 
-          elsif chunk.match(/\A@/)
-            length = 1
-            tokens << new_token(:AT, '@')
+        elsif chunk.start_with?('@')
+          length = 1
+          tokens << new_token(:AT, '@')
 
-          else
-            raise PuppetLint::LexerError.new(@line_no, @column)
-          end
-
-          i += length
+        else
+          raise PuppetLint::LexerError.new(@line_no, @column)
         end
+
+        i += length
       end
 
       tokens
     end
 
-
     def slurp_string(string)
-      dq_str_regexp = /(\$\{|(\A|[^\\])(\\\\)*")/m
+      dq_str_regexp = %r{(\$\{|(\A|[^\\])(\\\\)*")}m
       scanner = StringScanner.new(string)
       contents = scanner.scan_until(dq_str_regexp)
+
+      if scanner.matched.nil?
+        raise LexerError.new(@line_no, @column, 'Double quoted string missing closing quote')
+      end
+
       until scanner.matched.end_with?('"')
-        contents += scanner.scan_until(/\}/m)
+        contents += scanner.scan_until(%r{\}}m)
         contents += scanner.scan_until(dq_str_regexp)
       end
       contents
@@ -307,16 +328,12 @@ def slurp_string(string)
     # Returns true if the next token could be a regex, otherwise return false.
     def possible_regex?
       prev_token = tokens.reject { |r|
-        FORMATTING_TOKENS.include? r.type
+        FORMATTING_TOKENS.include?(r.type)
       }.last
 
       return true if prev_token.nil?
 
-      if REGEX_PREV_TOKENS.include? prev_token.type
-        true
-      else
-        false
-      end
+      REGEX_PREV_TOKENS.include?(prev_token.type)
     end
 
     # Internal: Create a new PuppetLint::Lexer::Token object, calculate its
@@ -337,6 +354,14 @@ def new_token(type, value, *args)
       # passed by 3rd party plugins that haven't updated yet.
       opts = args.last.is_a?(Hash) ? args.last : {}
 
+      # column number is calculated at the end of this method by calling
+      # to_manifest on the token. Because the string tokens (DQPRE, DQMID etc)
+      # are parsed before the variable token, they default to assuming that
+      # they are followed by an enclosed variable and we need to remove 2 from
+      # the column number if we encounter an unenclosed variable because of the
+      # missing ${ at the end of the token value.
+      @column -= 2 if type == :UNENC_VARIABLE
+
       column = opts[:column] || @column
       line_no = opts[:line] || @line_no
 
@@ -346,7 +371,7 @@ def new_token(type, value, *args)
         tokens.last.next_token = token
 
         unless FORMATTING_TOKENS.include?(token.type)
-          prev_nf_idx = tokens.rindex { |r| ! FORMATTING_TOKENS.include? r.type }
+          prev_nf_idx = tokens.rindex { |r| !FORMATTING_TOKENS.include?(r.type) }
           unless prev_nf_idx.nil?
             prev_nf_token = tokens[prev_nf_idx]
             prev_nf_token.next_code_token = token
@@ -355,15 +380,13 @@ def new_token(type, value, *args)
         end
       end
 
-      if opts[:raw]
-        token.raw = opts[:raw]
-      end
+      token.raw = opts[:raw] if opts[:raw]
 
       if type == :NEWLINE
         @line_no += 1
         @column = 1
       else
-        lines = token.to_manifest.split(/(?:\r\n|\r|\n)/, -1)
+        lines = token.to_manifest.split(%r{(?:\r\n|\r|\n)}, -1)
         @line_no += lines.length - 1
         if lines.length > 1
           # if the token renders to multiple lines, set the column state to the
@@ -371,7 +394,7 @@ def new_token(type, value, *args)
           # 1 indexed)
           @column = lines.last.size + 1
         else
-          @column += (lines.last || "").size
+          @column += (lines.last || '').size
         end
       end
 
@@ -388,9 +411,9 @@ def new_token(type, value, *args)
     # Returns an Array consisting of two Strings, the String up to the first
     # terminator and the terminator that was found.
     def get_string_segment(string, terminators)
-      str = string.scan_until(/([^\\]|^|[^\\])([\\]{2})*[#{terminators}]+/)
+      str = string.scan_until(%r{([^\\]|^|[^\\])([\\]{2})*[#{terminators}]+})
       begin
-        [str[0..-2], str[-1,1]]
+        [str[0..-2], str[-1, 1]]
       rescue
         [nil, nil]
       end
@@ -408,14 +431,14 @@ def interpolate_string(string, line, column)
       first = true
       value, terminator = get_string_segment(ss, '"$')
       until value.nil?
-        if terminator == "\""
+        if terminator == '"'
           if first
             tokens << new_token(:STRING, value, :line => line, :column => column)
             first = false
           else
-            line += value.scan(/(\r\n|\r|\n)/).size
             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
             @column = column + ss.pos + 1
             @line_no = line
           end
@@ -424,23 +447,24 @@ def interpolate_string(string, line, column)
             tokens << new_token(:DQPRE, value, :line => line, :column => column)
             first = false
           else
-            line += value.scan(/(\r\n|\r|\n)/).size
             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
           end
-          if ss.scan(/\{/).nil?
-            var_name = ss.scan(/(::)?(\w+(-\w+)*::)*\w+(-\w+)*/)
+          if ss.scan(%r{\{}).nil?
+            var_name = ss.scan(%r{(::)?(\w+(-\w+)*::)*\w+(-\w+)*})
             if var_name.nil?
               token_column = column + ss.pos - 1
-              tokens << new_token(:DQMID, "$", :line => line, :column => token_column)
+              tokens << new_token(:DQMID, '$', :line => line, :column => token_column)
             else
               token_column = column + (ss.pos - var_name.size)
               tokens << new_token(:UNENC_VARIABLE, var_name, :line => line, :column => token_column)
             end
           else
-            contents = ss.scan_until(/\}/)[0..-2]
+            line += value.scan(%r{(\r\n|\r|\n)}).size
+            contents = ss.scan_until(%r{\}})[0..-2]
             raw = contents.dup
-            if contents.match(/\A(::)?([\w-]+::)*[\w-]+(\[.+?\])*/) && !contents.match(/\A\w+\(/)
+            if contents.match(%r{\A(::)?([\w-]+::)*[\w-]+(\[.+?\])*}) && !contents.match(%r{\A\w+\(})
               contents = "$#{contents}"
             end
             lexer = PuppetLint::Lexer.new
@@ -467,12 +491,12 @@ def interpolate_string(string, line, column)
     # Returns nothing.
     def interpolate_heredoc(string, name)
       ss = StringScanner.new(string)
-      eos_text = name[/\A"?(.+?)"?(:.+?)?(\/.*)?\Z/, 1]
+      eos_text = name[%r{\A"?(.+?)"?(:.+?)?(/.*)?\Z}, 1]
       first = true
       interpolate = name.start_with?('"')
       value, terminator = get_heredoc_segment(ss, eos_text, interpolate)
       until value.nil?
-        if terminator =~ /\A\|?\s*-?\s*#{Regexp.escape(eos_text)}/
+        if terminator =~ %r{\A\|?\s*-?\s*#{Regexp.escape(eos_text)}}
           if first
             tokens << new_token(:HEREDOC, value, :raw => "#{value}#{terminator}")
             first = false
@@ -486,18 +510,18 @@ def interpolate_heredoc(string, name)
           else
             tokens << new_token(:HEREDOC_MID, value)
           end
-          if ss.scan(/\{/).nil?
-            var_name = ss.scan(/(::)?(\w+(-\w+)*::)*\w+(-\w+)*/)
-            if var_name.nil?
-              tokens << new_token(:HEREDOC_MID, "$")
-            else
-              tokens << new_token(:UNENC_VARIABLE, var_name)
-            end
+          if ss.scan(%r{\{}).nil?
+            var_name = ss.scan(%r{(::)?(\w+(-\w+)*::)*\w+(-\w+)*})
+            tokens << if var_name.nil?
+                        new_token(:HEREDOC_MID, '$')
+                      else
+                        new_token(:UNENC_VARIABLE, var_name)
+                      end
           else
-            contents = ss.scan_until(/\}/)[0..-2]
+            contents = ss.scan_until(%r{\}})[0..-2]
             raw = contents.dup
-            if contents.match(/\A(::)?([\w-]+::)*[\w-]|(\[.+?\])*/) && !contents.match(/\A\w+\(/)
-              contents = "$#{contents}" unless contents.start_with?("$")
+            if contents.match(%r{\A(::)?([\w-]+::)*[\w-]|(\[.+?\])*}) && !contents.match(%r{\A\w+\(})
+              contents = "$#{contents}" unless contents.start_with?('$')
             end
 
             lexer = PuppetLint::Lexer.new
@@ -524,19 +548,17 @@ def interpolate_heredoc(string, name)
     #
     # Returns an Array consisting of two Strings, the String up to the first
     # terminator and the terminator that was found.
-    def get_heredoc_segment(string, eos_text, interpolate=true)
-      if interpolate
-        regexp = /(([^\\]|^|[^\\])([\\]{2})*[$]+|\|?\s*-?#{Regexp.escape(eos_text)})/
-      else
-        regexp = /\|?\s*-?#{Regexp.escape(eos_text)}/
-      end
+    def get_heredoc_segment(string, eos_text, interpolate = true)
+      regexp = if interpolate
+                 %r{(([^\\]|^|[^\\])([\\]{2})*[$]+|\|?\s*-?#{Regexp.escape(eos_text)})}
+               else
+                 %r{\|?\s*-?#{Regexp.escape(eos_text)}}
+               end
 
       str = string.scan_until(regexp)
       begin
-        str =~ /\A(.*?)([$]+|\|?\s*-?#{Regexp.escape(eos_text)})\Z/m
-        value = $1
-        terminator = $2
-        [value, terminator]
+        str =~ %r{\A(.*?)([$]+|\|?\s*-?#{Regexp.escape(eos_text)})\Z}m
+        [Regexp.last_match(1), Regexp.last_match(2)]
       rescue
         [nil, nil]
       end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/lexer/token.rb b/server/vendor/puppet-lint/lib/puppet-lint/lexer/token.rb
index ae522469..aee445d1 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/lexer/token.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/lexer/token.rb
@@ -73,17 +73,15 @@ def to_manifest
         when :SSTRING
           "'#{@value}'"
         when :DQPRE
-          "\"#{@value}"
+          "\"#{@value}#{string_suffix}"
         when :DQPOST
-          "#{@value}\""
+          "#{string_prefix}#{@value}\""
+        when :DQMID
+          "#{string_prefix}#{@value}#{string_suffix}"
         when :VARIABLE
           enclose_token_types = Set[:DQPRE, :DQMID, :HEREDOC_PRE, :HEREDOC_MID].freeze
           if !@prev_code_token.nil? && enclose_token_types.include?(@prev_code_token.type)
-            if @raw.nil?
-              "${#{@value}}"
-            else
-              "${#{@raw}}"
-            end
+            @raw.nil? ? @value : @raw
           else
             "$#{@value}"
           end
@@ -101,13 +99,35 @@ def to_manifest
           "@(#{@value})"
         when :HEREDOC
           @raw
+        when :HEREDOC_PRE
+          "#{@value}#{string_suffix}"
         when :HEREDOC_POST
-          @raw
+          "#{string_prefix}#{@raw}"
+        when :HEREDOC_MID
+          "#{string_prefix}#{@value}#{string_suffix}"
         else
           @value
         end
       end
 
+      def string_suffix
+        no_enclose_tokens = Set.new([:UNENC_VARIABLE, :DQMID, :DQPOST, :HEREDOC_MID, :HEREDOC_POST])
+        if next_token && no_enclose_tokens.include?(next_token.type)
+          ''
+        else
+          '${'
+        end
+      end
+
+      def string_prefix
+        no_enclose_tokens = Set.new([:UNENC_VARIABLE, :DQPRE, :DQMID, :HEREDOC_PRE, :HEREDOC_MID])
+        if prev_token && no_enclose_tokens.include?(prev_token.type)
+          ''
+        else
+          '}'
+        end
+      end
+
       # Public: Search from this token to find the next token of a given type.
       #
       # type - A Symbol type of the token to find, or an Array of Symbols.
@@ -154,18 +174,14 @@ def find_token_of(direction, type, opts = {})
         opts[:skip_blocks] ||= true
         to_find = Array[*type]
 
-        token_iter = self.send("#{direction}_token".to_sym)
-        while !token_iter.nil?
-          if to_find.include? token_iter.type
-            if opts[:value]
-              return token_iter if token_iter.value == opts[:value]
-            else
-              return token_iter
-            end
+        token_iter = send("#{direction}_token".to_sym)
+        until token_iter.nil?
+          if to_find.include?(token_iter.type)
+            return token_iter if opts[:value].nil? || token_iter.value == opts[:value]
           end
 
-          opening_token = direction == :next ? "L" : "R"
-          closing_token = direction == :next ? "R" : "L"
+          opening_token = direction == :next ? 'L' : 'R'
+          closing_token = direction == :next ? 'R' : 'L'
 
           if opts[:skip_blocks]
             case token_iter.type
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches.rb b/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches.rb
index 4d1c0e59..abb1319d 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches.rb
@@ -1,2 +1,51 @@
-require 'puppet-lint/monkeypatches/string_prepend'
-require 'puppet-lint/monkeypatches/string_percent'
+begin
+  '%{test}' % { :test => 'replaced' } == 'replaced' # rubocop:disable Style/FormatString
+rescue
+  # monkeypatch String#% into Ruby 1.8.7
+  class String
+    Percent = instance_method('%') unless defined?(Percent)
+
+    def %(*a, &b)
+      a.flatten!
+
+      string = case a.last
+               when Hash
+                 expand(a.pop)
+               else
+                 self
+               end
+
+      if a.empty?
+        string
+      else
+        Percent.bind(string).call(a, &b)
+      end
+    end
+
+    def expand!(vars = {})
+      loop do
+        changed = false
+        vars.each do |var, value|
+          var = var.to_s
+          var.gsub!(%r{[^a-zA-Z0-9_]}, '')
+          changed = gsub!(%r{\%\{#{var}\}}, value.to_s)
+        end
+        break unless changed
+      end
+      self
+    end
+
+    def expand(opts = {})
+      dup.expand!(opts)
+    end
+  end
+end
+
+unless String.respond_to?(:prepend)
+  # monkeypatch String#prepend into Ruby 1.8.7
+  class String
+    def prepend(lead)
+      replace("#{lead}#{self}")
+    end
+  end
+end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_percent.rb b/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_percent.rb
deleted file mode 100644
index 074d21ea..00000000
--- a/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_percent.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# If we are using an older ruby version, we back-port the basic functionality
-# we need for formatting output: 'somestring' % <hash>
-begin
-  if ('%{test}' % {:test => 'replaced'} == 'replaced')
-    # If this works, we are all good to go.
-  end
-rescue
-  # If the test failed (threw a error), monkeypatch String.
-  # Most of this code came from http://www.ruby-forum.com/topic/144310 but was
-  # simplified for our use.
-
-  # Basic implementation of 'string' % { } like we need it. needs work.
-  class String
-    Percent = instance_method '%' unless defined? Percent
-    def % *a, &b
-      a.flatten!
-
-      string = case a.last
-      when Hash
-        expand a.pop
-      else
-        self
-      end
-
-      if a.empty?
-        string
-      else
-        Percent.bind(string).call(a, &b)
-      end
-
-    end
-    def expand! vars = {}
-      loop do
-        changed = false
-        vars.each do |var, value|
-          var = var.to_s
-          var.gsub! %r/[^a-zA-Z0-9_]/, ''
-          [
-            %r/\%\{#{ var }\}/,
-          ].each do |pat|
-            changed = gsub! pat, "#{ value }"
-          end
-        end
-        break unless changed
-      end
-      self
-    end
-    def expand opts = {}
-      dup.expand! opts
-    end
-  end
-end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_prepend.rb b/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_prepend.rb
deleted file mode 100644
index 6740f144..00000000
--- a/server/vendor/puppet-lint/lib/puppet-lint/monkeypatches/string_prepend.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-unless String.respond_to?('prepend')
-  # Internal: Monkey patching String.
-  class String
-    # Internal: Prepends a String to self.
-    #
-    # lead - The String to prepend self with.
-    #
-    # Returns a String which is lead and self concatenated.
-    def prepend(lead)
-      self.replace "#{lead}#{self}"
-    end
-  end
-end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/optparser.rb b/server/vendor/puppet-lint/lib/puppet-lint/optparser.rb
index 7805ccf8..73994651 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/optparser.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/optparser.rb
@@ -3,7 +3,7 @@
 # Public: Contains the puppet-lint option parser so that it can be used easily
 # in multiple places.
 class PuppetLint::OptParser
-  HELP_TEXT = <<-EOF
+  HELP_TEXT = <<-EOF.freeze
     puppet-lint
 
     Basic Command Line Usage:
@@ -41,8 +41,11 @@ def self.build
         PuppetLint.configuration.fail_on_warnings = true
       end
 
-      opts.on('--error-level LEVEL', [:all, :warning, :error],
-              'The level of error to return (warning, error or all).') do |el|
+      opts.on(
+        '--error-level LEVEL',
+        [:all, :warning, :error],
+        'The level of error to return (warning, error or all).'
+      ) do |el|
         PuppetLint.configuration.error_level = el
       end
 
@@ -55,13 +58,13 @@ def self.build
       end
 
       opts.on('-l', '--load FILE', 'Load a file containing custom puppet-lint checks.') do |f|
-        load f
+        load(f)
       end
 
       opts.on('--load-from-puppet MODULEPATH', 'Load plugins from the given Puppet module path.') do |path|
         path.split(':').each do |p|
           Dir["#{p}/*/lib/puppet-lint/plugins/*.rb"].each do |file|
-            load file
+            load(file)
           end
         end
       end
@@ -70,18 +73,19 @@ def self.build
         PuppetLint.configuration.fix = true
       end
 
-      opts.on('--log-format FORMAT',
-              'Change the log format.', 'Overrides --with-filename.',
-              'The following placeholders can be used:',
-              '%{filename} - Filename without path.',
-              '%{path}     - Path as provided to puppet-lint.',
-              '%{fullpath} - Expanded path to the file.',
-              '%{line}     - Line number.',
-              '%{column}   - Column number.',
-              '%{kind}     - The kind of message (warning, error).',
-              '%{KIND}     - Uppercase version of %{kind}.',
-              '%{check}    - The name of the check.',
-              '%{message}  - The message.'
+      opts.on(
+        '--log-format FORMAT',
+        'Change the log format.', 'Overrides --with-filename.',
+        'The following placeholders can be used:',
+        '%{filename} - Filename without path.',
+        '%{path}     - Path as provided to puppet-lint.',
+        '%{fullpath} - Expanded path to the file.',
+        '%{line}     - Line number.',
+        '%{column}   - Column number.',
+        '%{kind}     - The kind of message (warning, error).',
+        '%{KIND}     - Uppercase version of %{kind}.',
+        '%{check}    - The name of the check.',
+        '%{message}  - The message.'
       ) do |format|
         PuppetLint.configuration.log_format = format
       end
@@ -90,13 +94,13 @@ def self.build
         PuppetLint.configuration.json = true
       end
 
-      opts.separator ''
-      opts.separator '    Checks:'
+      opts.separator('')
+      opts.separator('    Checks:')
 
       opts.on('--only-checks CHECKS', 'A comma separated list of checks that should be run') do |checks|
         enable_checks = checks.split(',').map(&:to_sym)
-        (PuppetLint.configuration.checks).each do |check|
-          if enable_checks.include? check
+        PuppetLint.configuration.checks.each do |check|
+          if enable_checks.include?(check)
             PuppetLint.configuration.send("enable_#{check}")
           else
             PuppetLint.configuration.send("disable_#{check}")
@@ -108,19 +112,18 @@ def self.build
         opts.on("--no-#{check}-check", "Skip the #{check} check.") do
           PuppetLint.configuration.send("disable_#{check}")
         end
-        unless PuppetLint.configuration.send("#{check}_enabled?")
-          opts.on("--#{check}-check", "Enable the #{check} check.") do
-            PuppetLint.configuration.send("enable_#{check}")
-          end
+
+        next if PuppetLint.configuration.send("#{check}_enabled?")
+
+        opts.on("--#{check}-check", "Enable the #{check} check.") do
+          PuppetLint.configuration.send("enable_#{check}")
         end
       end
 
       opts.load('/etc/puppet-lint.rc')
-      begin
-        opts.load(File.expand_path('~/.puppet-lint.rc')) if ENV['HOME']
-      rescue Errno::EACCES
-        # silently skip loading this file if HOME is set to a directory that
-        # the user doesn't have read access to.
+      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)
       end
       opts.load('.puppet-lint.rc')
     end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins.rb
index f9471515..eef64d44 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins.rb
@@ -14,8 +14,8 @@ def self.load_from_gems
       gem_directories.select { |path|
         (path + 'puppet-lint/plugins').directory?
       }.each do |gem_path|
-        Dir["#{(gem_path + 'puppet-lint/plugins').to_s}/*.rb"].each do |file|
-          load file
+        Dir["#{gem_path + 'puppet-lint/plugins'}/*.rb"].each do |file|
+          load(file)
         end
       end
     end
@@ -25,49 +25,53 @@ def self.load_from_gems
     # Returns nothings.
     def self.load_spec_helper
       gemspec = gemspecs.select { |spec| spec.name == 'puppet-lint' }.first
-      load Pathname.new(gemspec.full_gem_path) + 'spec/spec_helper.rb'
-    end
-  private
-    # Internal: Check if RubyGems is loaded and available.
-    #
-    # Returns true if RubyGems is available, false if not.
-    def self.has_rubygems?
-      defined? ::Gem
+      load(Pathname.new(gemspec.full_gem_path) + 'spec/spec_helper.rb')
     end
 
-    # Internal: Retrieve a list of avaliable gemspecs.
-    #
-    # Returns an Array of Gem::Specification objects.
-    def self.gemspecs
-      @gemspecs ||= if Gem::Specification.respond_to?(:latest_specs)
-        Gem::Specification.latest_specs(load_prerelease_plugins?)
-      else
-        Gem.searcher.init_gemspecs
+    class << self
+      private
+
+      # Internal: Check if RubyGems is loaded and available.
+      #
+      # Returns true if RubyGems is available, false if not.
+      def rubygems?
+        defined?(::Gem)
       end
-    end
 
-    # Internal: Determine whether to load plugins that contain a letter in their version number.
-    #
-    # Returns true if the configuration is set to load "prerelease" gems, false otherwise.
-    def self.load_prerelease_plugins?
-      # Load prerelease plugins (which ruby defines as any gem which has a letter in its version number).
-      # Can't use puppet-lint configuration object here because this code executes before the command line is parsed.
-      if ENV['PUPPET_LINT_LOAD_PRERELEASE_PLUGINS']
-        return %w(true yes).include?(ENV['PUPPET_LINT_LOAD_PRERELEASE_PLUGINS'].downcase)
+      # Internal: Retrieve a list of avaliable gemspecs.
+      #
+      # Returns an Array of Gem::Specification objects.
+      def gemspecs
+        @gemspecs ||= if Gem::Specification.respond_to?(:latest_specs)
+                        Gem::Specification.latest_specs(load_prerelease_plugins?)
+                      else
+                        Gem.searcher.init_gemspecs
+                      end
       end
-      false
-    end
 
-    # Internal: Retrieve a list of available gem paths from RubyGems.
-    #
-    # Returns an Array of Pathname objects.
-    def self.gem_directories
-      if has_rubygems?
-        gemspecs.reject { |spec| spec.name == 'puppet-lint' }.map do |spec|
-          Pathname.new(spec.full_gem_path) + 'lib'
+      # Internal: Determine whether to load plugins that contain a letter in their version number.
+      #
+      # Returns true if the configuration is set to load "prerelease" gems, false otherwise.
+      def load_prerelease_plugins?
+        # Load prerelease plugins (which ruby defines as any gem which has a letter in its version number).
+        # Can't use puppet-lint configuration object here because this code executes before the command line is parsed.
+        if ENV['PUPPET_LINT_LOAD_PRERELEASE_PLUGINS']
+          return %w[true yes].include?(ENV['PUPPET_LINT_LOAD_PRERELEASE_PLUGINS'].downcase)
+        end
+        false
+      end
+
+      # Internal: Retrieve a list of available gem paths from RubyGems.
+      #
+      # Returns an Array of Pathname objects.
+      def gem_directories
+        if rubygems?
+          gemspecs.reject { |spec| spec.name == 'puppet-lint' }.map do |spec|
+            Pathname.new(spec.full_gem_path) + 'lib'
+          end
+        else
+          []
         end
-      else
-        []
       end
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb
index 736c5ea0..f8cfc34c 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/arrow_on_right_operand_line.rb
@@ -5,42 +5,40 @@
 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|
-      if token.next_code_token.line != token.line
-        notify :warning, {
-          :message =>  'arrow should be on the right operand\'s line',
-          :line    => token.line,
-          :column  => token.column,
-          :token   => token,
-        }
-      end
+      next if token.next_code_token.line == token.line
+
+      notify(
+        :warning,
+        :message =>  'arrow should be on the right operand\'s line',
+        :line    => token.line,
+        :column  => token.column,
+        :token   => token
+      )
     end
   end
 
   def fix(problem)
     token = problem[:token]
-    tokens.delete(token)
 
-    # remove any excessive whitespace on the line
-    temp_token = token.prev_code_token
-    while (temp_token = temp_token.next_token)
-      tokens.delete(temp_token) if whitespace?(temp_token)
-      break if temp_token.type == :NEWLINE
-    end
+    prev_code_token = token.prev_code_token
+    next_code_token = token.next_code_token
+    indent_token = prev_code_token.prev_token_of(:INDENT)
 
-    temp_token.next_token = token
-    token.prev_token = temp_token
-    index = tokens.index(token.next_code_token)
-    tokens.insert(index, token)
+    # Delete all tokens between the two code tokens the anchor is between
+    temp_token = prev_code_token
+    while (temp_token = temp_token.next_token) && (temp_token != next_code_token)
+      remove_token(temp_token) unless temp_token == token
+    end
 
-    whitespace_token = PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', temp_token.line + 1, 3)
-    whitespace_token.prev_token = token
-    token.next_token = whitespace_token
-    whitespace_token.next_token = tokens[index + 1]
-    tokens[index + 1].prev_token = whitespace_token
-    tokens.insert(index + 1, whitespace_token)
-  end
+    # Insert a newline and an indent before the arrow
+    index = tokens.index(token)
+    newline_token = PuppetLint::Lexer::Token.new(:NEWLINE, "\n", token.line, 0)
+    add_token(index, newline_token)
+    add_token(index + 1, indent_token) if indent_token
 
-  def whitespace?(token)
-    Set[:INDENT, :WHITESPACE].include?(token.type)
+    # Insert a space between the arrow and the following code token
+    index = tokens.index(token)
+    whitespace_token = PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', token.line, 3)
+    add_token(index + 1, whitespace_token)
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/autoloader_layout.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/autoloader_layout.rb
index 599076c3..4949e700 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/autoloader_layout.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/autoloader_layout.rb
@@ -5,29 +5,30 @@
 # https://docs.puppet.com/guides/style_guide.html#separate-files
 PuppetLint.new_check(:autoloader_layout) do
   def check
-    unless fullpath.nil? || fullpath == ''
-      (class_indexes + defined_type_indexes).each do |class_idx|
-        title_token = class_idx[:name_token]
-        split_title = title_token.value.split('::')
-        mod = split_title.first
-        if split_title.length > 1
-          expected_path = "/#{mod}/manifests/#{split_title[1..-1].join('/')}.pp"
-        else
-          expected_path = "/#{title_token.value}/manifests/init.pp"
-        end
+    return if fullpath.nil? || fullpath == ''
 
-        if PuppetLint.configuration.relative
-          expected_path = expected_path.gsub(/^\//,'').split('/')[1..-1].join('/')
-        end
+    (class_indexes + defined_type_indexes).each do |class_idx|
+      title_token = class_idx[:name_token]
+      split_title = title_token.value.split('::')
+      mod = split_title.first
+      expected_path = if split_title.length > 1
+                        "/#{mod}/manifests/#{split_title[1..-1].join('/')}.pp"
+                      else
+                        "/#{title_token.value}/manifests/init.pp"
+                      end
 
-        unless fullpath.end_with? expected_path
-          notify :error, {
-            :message => "#{title_token.value} not in autoload module layout",
-            :line    => title_token.line,
-            :column  => title_token.column,
-          }
-        end
+      if PuppetLint.configuration.relative
+        expected_path = expected_path.gsub(%r{^/}, '').split('/')[1..-1].join('/')
       end
+
+      next if fullpath.end_with?(expected_path)
+
+      notify(
+        :error,
+        :message => "#{title_token.value} not in autoload module layout",
+        :line    => title_token.line,
+        :column  => title_token.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/class_inherits_from_params_class.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/class_inherits_from_params_class.rb
index 31eb58c2..cadf636f 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/class_inherits_from_params_class.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/class_inherits_from_params_class.rb
@@ -5,15 +5,14 @@
 PuppetLint.new_check(:class_inherits_from_params_class) do
   def check
     class_indexes.each do |class_idx|
-      unless class_idx[:inherited_token].nil?
-        if class_idx[:inherited_token].value.end_with? '::params'
-          notify :warning, {
-            :message => 'class inheriting from params class',
-            :line    => class_idx[:inherited_token].line,
-            :column  => class_idx[:inherited_token].column,
-          }
-        end
-      end
+      next unless class_idx[:inherited_token] && class_idx[:inherited_token].value.end_with?('::params')
+
+      notify(
+        :warning,
+        :message => 'class inheriting from params class',
+        :line    => class_idx[:inherited_token].line,
+        :column  => class_idx[:inherited_token].column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/code_on_top_scope.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/code_on_top_scope.rb
index cd2de2c2..cc9a6089 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/code_on_top_scope.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/code_on_top_scope.rb
@@ -7,14 +7,15 @@ def check
     top_scope   = tokens - class_scope
 
     top_scope.each do |token|
-      unless formatting_tokens.include? token.type
-        notify :warning, {
-          :message => "code outside of class or define block - #{token.value}",
-          :line    => token.line,
-          :column  => token.column
-        }
-      end
+      next if formatting_tokens.include?(token.type)
+
+      notify(
+        :warning,
+        :message => "code outside of class or define block - #{token.value}",
+        :line    => token.line,
+        :column  => token.column
+      )
     end
   end
 end
-PuppetLint.configuration.send("disable_code_on_top_scope")
+PuppetLint.configuration.send('disable_code_on_top_scope')
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/inherits_across_namespaces.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/inherits_across_namespaces.rb
index ed9a870f..30594fd8 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/inherits_across_namespaces.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/inherits_across_namespaces.rb
@@ -5,18 +5,19 @@
 PuppetLint.new_check(:inherits_across_namespaces) do
   def check
     class_indexes.each do |class_idx|
-      unless class_idx[:inherited_token].nil?
-        inherited_module_name = class_idx[:inherited_token].value.split('::').reject { |r| r.empty? }.first
-        class_module_name = class_idx[:name_token].value.split('::').reject { |r| r.empty? }.first
+      next if class_idx[:inherited_token].nil?
 
-        unless class_module_name == inherited_module_name
-          notify :warning, {
-            :message => "class inherits across module namespaces",
-            :line    => class_idx[:inherited_token].line,
-            :column  => class_idx[:inherited_token].column,
-          }
-        end
-      end
+      inherited_module_name = class_idx[:inherited_token].value.split('::').reject(&:empty?).first
+      class_module_name = class_idx[:name_token].value.split('::').reject(&:empty?).first
+
+      next if class_module_name == inherited_module_name
+
+      notify(
+        :warning,
+        :message => 'class inherits across module namespaces',
+        :line    => class_idx[:inherited_token].line,
+        :column  => class_idx[:inherited_token].column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_dash.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_dash.rb
index 32489b57..08c0fd76 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_dash.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_dash.rb
@@ -5,19 +5,20 @@
 PuppetLint.new_check(:names_containing_dash) do
   def check
     (class_indexes + defined_type_indexes).each do |class_idx|
-      if class_idx[:name_token].value.include? '-'
-        if class_idx[:type] == :CLASS
-          obj_type = 'class'
-        else
-          obj_type = 'defined type'
-        end
+      next unless class_idx[:name_token].value.include?('-')
 
-        notify :error, {
-          :message => "#{obj_type} name containing a dash",
-          :line    => class_idx[:name_token].line,
-          :column  => class_idx[:name_token].column,
-        }
-      end
+      obj_type = if class_idx[:type] == :CLASS
+                   'class'
+                 else
+                   'defined type'
+                 end
+
+      notify(
+        :error,
+        :message => "#{obj_type} name containing a dash",
+        :line    => class_idx[:name_token].line,
+        :column  => class_idx[:name_token].column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_uppercase.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_uppercase.rb
index 2451f9cf..d2332470 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_uppercase.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/names_containing_uppercase.rb
@@ -5,20 +5,21 @@
 PuppetLint.new_check(:names_containing_uppercase) do
   def check
     (class_indexes + defined_type_indexes).each do |class_idx|
-      if class_idx[:name_token].value =~ /[A-Z]/
-        if class_idx[:type] == :CLASS
-          obj_type = 'class'
-        else
-          obj_type = 'defined type'
-        end
+      next unless class_idx[:name_token].value =~ %r{[A-Z]}
 
-        notify :error, {
-          :message => "#{obj_type} '#{class_idx[:name_token].value}' contains illegal uppercase",
-          :line    => class_idx[:name_token].line,
-          :column  => class_idx[:name_token].column,
-          :token   => class_idx[:name_token],
-        }
-      end
+      obj_type = if class_idx[:type] == :CLASS
+                   'class'
+                 else
+                   'defined type'
+                 end
+
+      notify(
+        :error,
+        :message => "#{obj_type} '#{class_idx[:name_token].value}' contains illegal uppercase",
+        :line    => class_idx[:name_token].line,
+        :column  => class_idx[:name_token].column,
+        :token   => class_idx[:name_token]
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/nested_classes_or_defines.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/nested_classes_or_defines.rb
index 5f28ab35..0a40c67c 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/nested_classes_or_defines.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/nested_classes_or_defines.rb
@@ -11,17 +11,16 @@ def check
       class_tokens = class_idx[:tokens][1..-1]
 
       class_tokens.each do |token|
-        if TOKENS.include?(token.type)
-          if token.next_code_token.type != :LBRACE
-            type = token.type == :CLASS ? 'class' : 'defined type'
+        next unless TOKENS.include?(token.type)
+        next if token.next_code_token.type == :LBRACE
+        type = token.type == :CLASS ? 'class' : 'defined type'
 
-            notify :warning, {
-              :message => "#{type} defined inside a class",
-              :line    => token.line,
-              :column  => token.column,
-            }
-          end
-        end
+        notify(
+          :warning,
+          :message => "#{type} defined inside a class",
+          :line    => token.line,
+          :column  => token.column
+        )
       end
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/parameter_order.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/parameter_order.rb
index 841d2610..798f7811 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/parameter_order.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/parameter_order.rb
@@ -6,39 +6,48 @@
 PuppetLint.new_check(:parameter_order) do
   def check
     (class_indexes + defined_type_indexes).each do |class_idx|
-      unless class_idx[:param_tokens].nil?
-        paren_stack = []
-        hash_or_array_stack = []
-        class_idx[:param_tokens].each_with_index do |token, i|
-          if token.type == :LPAREN
-            paren_stack.push(true)
-          elsif token.type == :RPAREN
-            paren_stack.pop
-          elsif token.type == :LBRACE || token.type == :LBRACK
-            hash_or_array_stack.push(true)
-          elsif token.type == :RBRACE || token.type == :RBRACK
-            hash_or_array_stack.pop
-          end
-          next if (! hash_or_array_stack.empty?)
-          next unless paren_stack.empty?
-
-          if token.type == :VARIABLE
-            if token.next_code_token.nil? || [:COMMA, :RPAREN].include?(token.next_code_token.type)
-              prev_tokens = class_idx[:param_tokens][0..i]
-              unless prev_tokens.rindex { |r| r.type == :EQUALS }.nil?
-                unless token.prev_code_token.nil? or token.prev_code_token.type == :EQUALS
-                  msg = 'optional parameter listed before required parameter'
-                  notify :warning, {
-                    :message => msg,
-                    :line    => token.line,
-                    :column  => token.column,
-                  }
-                end
-              end
-            end
-          end
+      next if class_idx[:param_tokens].nil?
+
+      paren_stack = []
+      hash_or_array_stack = []
+      class_idx[:param_tokens].each_with_index do |token, i|
+        if token.type == :LPAREN
+          paren_stack.push(true)
+        elsif token.type == :RPAREN
+          paren_stack.pop
+        elsif token.type == :LBRACE || token.type == :LBRACK
+          hash_or_array_stack.push(true)
+        elsif token.type == :RBRACE || token.type == :RBRACK
+          hash_or_array_stack.pop
         end
+
+        next unless hash_or_array_stack.empty? && paren_stack.empty?
+        next unless required_parameter?(token)
+
+        prev_tokens = class_idx[:param_tokens][0..i]
+        next if prev_tokens.rindex { |r| r.type == :EQUALS }.nil?
+
+        msg = 'optional parameter listed before required parameter'
+        notify(
+          :warning,
+          :message => msg,
+          :line    => token.line,
+          :column  => token.column
+        )
       end
     end
   end
+
+  def required_parameter?(token)
+    return false unless token.type == :VARIABLE
+
+    data_type = token.prev_token_of(:TYPE, :skip_blocks => true)
+    return false if data_type && data_type.value == 'Optional'
+
+    if token.next_code_token.nil? || [:COMMA, :RPAREN].include?(token.next_code_token.type)
+      return !(token.prev_code_token && token.prev_code_token.type == :EQUALS)
+    end
+
+    false
+  end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/right_to_left_relationship.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/right_to_left_relationship.rb
index 941d5f34..acc54478 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/right_to_left_relationship.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/right_to_left_relationship.rb
@@ -5,11 +5,12 @@
 PuppetLint.new_check(:right_to_left_relationship) do
   def check
     tokens.select { |r| r.type == :OUT_EDGE }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message =>  'right-to-left (<-) relationship',
         :line    => token.line,
-        :column  => token.column,
-      }
+        :column  => token.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/variable_scope.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/variable_scope.rb
index f9dd35b3..25ca4238 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/variable_scope.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_classes/variable_scope.rb
@@ -43,11 +43,10 @@ def check
 
       unless idx[:param_tokens].nil?
         idx[:param_tokens].each do |token|
-          if token.type == :VARIABLE
-            if POST_VAR_TOKENS.include? token.next_code_token.type
-              variables_in_scope << token.value
-            end
-          end
+          next unless token.type == :VARIABLE
+          next unless POST_VAR_TOKENS.include?(token.next_code_token.type)
+
+          variables_in_scope << token.value
         end
       end
 
@@ -72,10 +71,10 @@ def check
                 brack_depth += 1
               when :LBRACK
                 brack_depth -= 1
-                break if brack_depth == 0
-              when :COMMA
+                break if brack_depth.zero?
+              when :COMMA # rubocop:disable Lint/EmptyWhen
                 # ignore
-              else  # unexpected
+              else # unexpected
                 break
               end
             end
@@ -102,7 +101,7 @@ def check
                 brace_depth += 1
               when :RBRACE
                 brace_depth -= 1
-                if brace_depth == 0
+                if brace_depth.zero?
                   end_token = sub_token
                   break
                 end
@@ -118,25 +117,23 @@ def check
         end
       end
 
-      msg = "top-scope variable being used without an explicit namespace"
+      msg = 'top-scope variable being used without an explicit namespace'
       referenced_variables.each do |token|
         unless future_parser_scopes[token.line].nil?
-          next if future_parser_scopes[token.line].include?(token.value.gsub(/\[.+\]\Z/, ''))
+          next if future_parser_scopes[token.line].include?(token.value.gsub(%r{\[.+\]\Z}, ''))
         end
 
-        unless token.value.include? '::'
-          unless token.value =~ /^(facts|trusted)\[.+\]/
-            unless variables_in_scope.include? token.value.gsub(/\[.+\]\Z/, '')
-              unless token.value =~ /\A\d+\Z/
-                notify :warning, {
-                  :message => msg,
-                  :line    => token.line,
-                  :column  => token.column,
-                }
-              end
-            end
-          end
-        end
+        next if token.value.include?('::')
+        next if token.value =~ %r{^(facts|trusted)\[.+\]}
+        next if variables_in_scope.include?(token.value.gsub(%r{\[.+\]\Z}, ''))
+        next if token.value =~ %r{\A\d+\Z}
+
+        notify(
+          :warning,
+          :message => msg,
+          :line    => token.line,
+          :column  => token.column
+        )
       end
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/slash_comments.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/slash_comments.rb
index 49720944..6f9747a3 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/slash_comments.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/slash_comments.rb
@@ -7,12 +7,13 @@ def check
     tokens.select { |token|
       token.type == :SLASH_COMMENT
     }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message => '// comment found',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/star_comments.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/star_comments.rb
index 30d6b9ab..d2d616f3 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/star_comments.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_comments/star_comments.rb
@@ -7,12 +7,13 @@ def check
     tokens.select { |token|
       token.type == :MLCOMMENT
     }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message => '/* */ comment found',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
@@ -26,9 +27,9 @@ def fix(problem)
     index = tokens.index(problem[:token].next_token) || 1
     comment_lines.reverse.each do |line|
       indent = problem[:token].prev_token.nil? ? nil : problem[:token].prev_token.value.dup
-      tokens.insert(index, PuppetLint::Lexer::Token.new(:COMMENT, " #{line}", 0, 0))
-      tokens.insert(index, PuppetLint::Lexer::Token.new(:INDENT, indent, 0, 0)) if indent
-      tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
+      add_token(index, PuppetLint::Lexer::Token.new(:COMMENT, " #{line}", 0, 0))
+      add_token(index, PuppetLint::Lexer::Token.new(:INDENT, indent, 0, 0)) if indent
+      add_token(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/case_without_default.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/case_without_default.rb
index 0e1789f1..eee9b550 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/case_without_default.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/case_without_default.rb
@@ -7,37 +7,38 @@ def check
     case_indexes = []
 
     tokens.each_index do |token_idx|
-      if tokens[token_idx].type == :CASE
-        depth = 0
-        tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
-          idx = case_token_idx + token_idx + 1
-          if tokens[idx].type == :LBRACE
-            depth += 1
-          elsif tokens[idx].type == :RBRACE
-            depth -= 1
-            if depth == 0
-              case_indexes << {:start => token_idx, :end => idx}
-              break
-            end
+      next unless tokens[token_idx].type == :CASE
+
+      depth = 0
+      tokens[(token_idx + 1)..-1].each_index do |case_token_idx|
+        idx = case_token_idx + token_idx + 1
+        if tokens[idx].type == :LBRACE
+          depth += 1
+        elsif tokens[idx].type == :RBRACE
+          depth -= 1
+          if depth.zero?
+            case_indexes << { :start => token_idx, :end => idx }
+            break
           end
         end
       end
     end
 
-    case_indexes.each_with_index do |kase,kase_index|
+    case_indexes.each_with_index do |kase, kase_index|
       case_tokens = tokens[kase[:start]..kase[:end]]
 
       case_indexes[(kase_index + 1)..-1].each do |successor_kase|
         case_tokens -= tokens[successor_kase[:start]..successor_kase[:end]]
       end
 
-      unless case_tokens.index { |r| r.type == :DEFAULT }
-        notify :warning, {
-          :message => 'case statement without a default case',
-          :line    => case_tokens.first.line,
-          :column  => case_tokens.first.column,
-        }
-      end
+      next if case_tokens.index { |r| r.type == :DEFAULT }
+
+      notify(
+        :warning,
+        :message => 'case statement without a default case',
+        :line    => case_tokens.first.line,
+        :column  => case_tokens.first.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/selector_inside_resource.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/selector_inside_resource.rb
index 49eeeef6..6b61a009 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/selector_inside_resource.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_conditionals/selector_inside_resource.rb
@@ -6,19 +6,16 @@
   def check
     resource_indexes.each do |resource|
       resource[:tokens].each do |token|
-        if token.type == :FARROW
-          if token.next_code_token.type == :VARIABLE
-            unless token.next_code_token.next_code_token.nil?
-              if token.next_code_token.next_code_token.type == :QMARK
-                notify :warning, {
-                  :message => 'selector inside resource block',
-                  :line    => token.line,
-                  :column  => token.column,
-                }
-              end
-            end
-          end
-        end
+        next unless token.type == :FARROW && token.next_code_token.type == :VARIABLE
+        next if token.next_code_token.next_code_token.nil?
+        next unless token.next_code_token.next_code_token.type == :QMARK
+
+        notify(
+          :warning,
+          :message => 'selector inside resource block',
+          :line    => token.line,
+          :column  => token.column
+        )
       end
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_documentation/documentation.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_documentation/documentation.rb
index a3c0217d..11dfaaba 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_documentation/documentation.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_documentation/documentation.rb
@@ -9,25 +9,34 @@
 
   def check
     (class_indexes + defined_type_indexes).each do |item_idx|
-      prev_token = item_idx[:tokens].first.prev_token
-      while (!prev_token.nil?) && WHITESPACE_TOKENS.include?(prev_token.type)
-        prev_token = prev_token.prev_token
-      end
+      comment_token = find_comment_token(item_idx[:tokens].first)
 
-      unless (!prev_token.nil?) && COMMENT_TOKENS.include?(prev_token.type)
-        first_token = item_idx[:tokens].first
-        if first_token.type == :CLASS
-          type = 'class'
-        else
-          type = 'defined type'
-        end
+      next unless comment_token.nil?
 
-        notify :warning, {
-          :message => "#{type} not documented",
-          :line    => first_token.line,
-          :column  => first_token.column,
-        }
-      end
+      first_token = item_idx[:tokens].first
+      type = if first_token.type == :CLASS
+               'class'
+             else
+               'defined type'
+             end
+
+      notify(
+        :warning,
+        :message => "#{type} not documented",
+        :line    => first_token.line,
+        :column  => first_token.column
+      )
+    end
+  end
+
+  def find_comment_token(start_token)
+    prev_token = start_token.prev_token
+    while !prev_token.nil? && WHITESPACE_TOKENS.include?(prev_token.type)
+      prev_token = prev_token.prev_token
     end
+
+    return if prev_token.nil?
+
+    prev_token if COMMENT_TOKENS.include?(prev_token.type)
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb
index 8c8f407c..50a9f141 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_nodes/unquoted_node_name.rb
@@ -9,28 +9,28 @@ def check
       node_token_idx = tokens.index(node)
       node_lbrace_tok = tokens[node_token_idx..-1].find { |token| token.type == :LBRACE }
       if node_lbrace_tok.nil?
-        notify :error, {
+        notify(
+          :error,
           :check    => :syntax,
           :message  => 'Syntax error (try running `puppet parser validate <file>`)',
           :line     => node.line,
-          :column   => node.column,
-        }
+          :column   => node.column
+        )
         next
       end
 
       node_lbrace_idx = tokens.index(node_lbrace_tok)
 
       tokens[node_token_idx..node_lbrace_idx].select { |token|
-        token.type == :NAME
+        token.type == :NAME && token.value != 'default'
       }.each do |token|
-        unless token.value == 'default'
-          notify :warning, {
-            :message => 'unquoted node name found',
-            :line    => token.line,
-            :column  => token.column,
-            :token   => token,
-          }
-        end
+        notify(
+          :warning,
+          :message => 'unquoted node name found',
+          :line    => token.line,
+          :column  => token.column,
+          :token   => token
+        )
       end
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/duplicate_params.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/duplicate_params.rb
index 66847f1d..ac46e314 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/duplicate_params.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/duplicate_params.rb
@@ -8,7 +8,7 @@ def check
       seen_params = {}
       level = 0
 
-      resource[:tokens].each_with_index do |token, idx|
+      resource[:tokens].each do |token|
         case token.type
         when :LBRACE
           level += 1
@@ -22,11 +22,12 @@ def check
           next unless prev_token.type == :NAME
 
           if (seen_params[level] ||= Set.new).include?(prev_token.value)
-            notify :error, {
+            notify(
+              :error,
               :message => 'duplicate parameter found in resource',
               :line    => prev_token.line,
-              :column  => prev_token.column,
-            }
+              :column  => prev_token.column
+            )
           else
             seen_params[level] << prev_token.value
           end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb
index 341344ab..0d3dc42f 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_first_param.rb
@@ -6,22 +6,22 @@
 PuppetLint.new_check(:ensure_first_param) do
   def check
     resource_indexes.each do |resource|
-      next if [:CLASS].include? resource[:type].type
-      ensure_attr_index = resource[:param_tokens].index { |param_token|
-        param_token.value == 'ensure'
-      }
+      next if [:CLASS].include?(resource[:type].type)
 
-      unless ensure_attr_index.nil?
-        if ensure_attr_index > 0
-          ensure_token = resource[:param_tokens][ensure_attr_index]
-          notify :warning, {
-            :message  => "ensure found on line but it's not the first attribute",
-            :line     => ensure_token.line,
-            :column   => ensure_token.column,
-            :resource => resource,
-          }
-        end
+      ensure_attr_index = resource[:param_tokens].index do |param_token|
+        param_token.value == 'ensure'
       end
+
+      next if ensure_attr_index.nil? || ensure_attr_index.zero?
+
+      ensure_token = resource[:param_tokens][ensure_attr_index]
+      notify(
+        :warning,
+        :message  => "ensure found on line but it's not the first attribute",
+        :line     => ensure_token.line,
+        :column   => ensure_token.column,
+        :resource => resource
+      )
     end
   end
 
@@ -31,7 +31,7 @@ def fix(problem)
     ensure_param_name_token = first_param_comma_token.next_token_of(:NAME, :value => 'ensure')
     ensure_param_comma_token = ensure_param_name_token.next_token_of([:COMMA, :SEMIC])
 
-    if first_param_name_token.nil? or first_param_comma_token.nil? or ensure_param_name_token.nil? or ensure_param_comma_token.nil?
+    if first_param_name_token.nil? || first_param_comma_token.nil? || ensure_param_name_token.nil? || ensure_param_comma_token.nil?
       raise PuppetLint::NoFix
     end
 
@@ -54,12 +54,11 @@ def fix(problem)
     ensure_param_comma_token.next_token = next_token
 
     next_code_token = first_param_comma_token.next_code_token
-    first_param_comma_code_token = ensure_param_comma_token.next_code_token
     ensure_param_comma_token.next_code_token = next_code_token
 
     # Update index
-    ensure_tmp = tokens.slice!(ensure_param_name_idx..ensure_param_comma_idx-1)
-    first_tmp = tokens.slice!(first_param_name_idx..first_param_comma_idx-1)
+    ensure_tmp = tokens.slice!(ensure_param_name_idx..ensure_param_comma_idx - 1)
+    first_tmp = tokens.slice!(first_param_name_idx..first_param_comma_idx - 1)
     ensure_tmp.reverse_each do |item|
       tokens.insert(first_param_name_idx, item)
     end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb
index 24c850d2..b3304509 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/ensure_not_symlink_target.rb
@@ -6,21 +6,22 @@
 PuppetLint.new_check(:ensure_not_symlink_target) do
   def check
     resource_indexes.each do |resource|
-      if resource[:type].value == "file"
-        resource[:param_tokens].select { |param_token|
-          param_token.value == 'ensure'
-        }.each do |ensure_token|
-          value_token = ensure_token.next_code_token.next_code_token
-          if value_token.value.start_with? '/'
-            notify :warning, {
-              :message     => 'symlink target specified in ensure attr',
-              :line        => value_token.line,
-              :column      => value_token.column,
-              :param_token => ensure_token,
-              :value_token => value_token,
-            }
-          end
-        end
+      next unless resource[:type].value == 'file'
+
+      resource[:param_tokens].select { |param_token|
+        param_token.value == 'ensure'
+      }.each do |ensure_token|
+        value_token = ensure_token.next_code_token.next_code_token
+        next unless value_token.value.start_with?('/')
+
+        notify(
+          :warning,
+          :message     => 'symlink target specified in ensure attr',
+          :line        => value_token.line,
+          :column      => value_token.column,
+          :param_token => ensure_token,
+          :value_token => value_token
+        )
       end
     end
   end
@@ -37,7 +38,7 @@ def fix(problem)
       PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', 0, 0),
       PuppetLint::Lexer::Token.new(:FARROW, '=>', 0, 0),
       PuppetLint::Lexer::Token.new(:WHITESPACE, ' ', 0, 0),
-    ].reverse.each do |new_token|
+    ].reverse_each do |new_token|
       tokens.insert(index, new_token)
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/file_mode.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/file_mode.rb
index a0f937cf..65304f71 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/file_mode.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/file_mode.rb
@@ -4,39 +4,38 @@
 #
 # https://docs.puppet.com/guides/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'
-  SYM_RE = "([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*"
+  MSG = 'mode should be represented as a 4 digit octal value or symbolic mode'.freeze
+  SYM_RE = '([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*'.freeze
   IGNORE_TYPES = Set[:VARIABLE, :UNDEF, :FUNCTION_NAME]
-  MODE_RE = Regexp.new(/\A([0-7]{4}|#{SYM_RE})\Z/)
+  MODE_RE = %r{\A([0-7]{4}|#{SYM_RE})\Z}
 
   def check
     resource_indexes.each do |resource|
-      if resource[:type].value == "file" or resource[:type].value == "concat"
-        resource[:param_tokens].select { |param_token|
-          param_token.value == 'mode'
-        }.each do |param_token|
-          value_token = param_token.next_code_token.next_code_token
+      next unless resource[:type].value == 'file' || resource[:type].value == 'concat'
 
-          break if IGNORE_TYPES.include?(value_token.type)
-          break if value_token.value =~ MODE_RE
+      resource[:param_tokens].select { |param_token|
+        param_token.value == 'mode'
+      }.each do |param_token|
+        value_token = param_token.next_code_token.next_code_token
 
-          notify :warning, {
-            :message => MSG,
-            :line    => value_token.line,
-            :column  => value_token.column,
-            :token   => value_token,
-          }
-        end
+        break if IGNORE_TYPES.include?(value_token.type)
+        break if value_token.value =~ MODE_RE
+
+        notify(
+          :warning,
+          :message => MSG,
+          :line    => value_token.line,
+          :column  => value_token.column,
+          :token   => value_token
+        )
       end
     end
   end
 
   def fix(problem)
-    if problem[:token].value =~ /\A[0-7]{3}\Z/
-      problem[:token].type = :SSTRING
-      problem[:token].value = "0#{problem[:token].value.to_s}"
-    else
-      raise PuppetLint::NoFix
-    end
+    raise PuppetLint::NoFix unless problem[:token].value =~ %r{\A[0-7]{3}\Z}
+
+    problem[:token].type = :SSTRING
+    problem[:token].value = "0#{problem[:token].value}"
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_file_mode.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_file_mode.rb
index f8c26ba5..79745837 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_file_mode.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_file_mode.rb
@@ -8,19 +8,20 @@
 
   def check
     resource_indexes.each do |resource|
-      if resource[:type].value == "file" or resource[:type].value == "concat"
-        resource[:param_tokens].select { |param_token|
-          param_token.value == 'mode' &&
-            TOKEN_TYPES.include?(param_token.next_code_token.next_code_token.type)
-        }.each do |param_token|
-          value_token = param_token.next_code_token.next_code_token
-          notify :warning, {
-            :message => 'unquoted file mode',
-            :line    => value_token.line,
-            :column  => value_token.column,
-            :token   => value_token,
-          }
-        end
+      next unless resource[:type].value == 'file' || resource[:type].value == 'concat'
+
+      resource[:param_tokens].select { |param_token|
+        param_token.value == 'mode' &&
+          TOKEN_TYPES.include?(param_token.next_code_token.next_code_token.type)
+      }.each do |param_token|
+        value_token = param_token.next_code_token.next_code_token
+        notify(
+          :warning,
+          :message => 'unquoted file mode',
+          :line    => value_token.line,
+          :column  => value_token.column,
+          :token   => value_token
+        )
       end
     end
   end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb
index b4ee6a04..12a3ba46 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_resources/unquoted_resource_title.rb
@@ -5,14 +5,15 @@
 PuppetLint.new_check(:unquoted_resource_title) do
   def check
     title_tokens.each do |token|
-      if token.type == :NAME
-        notify :warning, {
-          :message => 'unquoted resource title',
-          :line    => token.line,
-          :column  => token.column,
-          :token   => token,
-        }
-      end
+      next unless token.type == :NAME
+
+      notify(
+        :warning,
+        :message => 'unquoted resource title',
+        :line    => token.line,
+        :column  => token.column,
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb
index b70b90c1..f20a54e5 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/double_quoted_strings.rb
@@ -4,20 +4,20 @@
 #
 # https://docs.puppet.com/guides/style_guide.html#quoting
 PuppetLint.new_check(:double_quoted_strings) do
+  ESCAPE_CHAR_RE = %r{(\\\$|\\"|\\'|'|\r|\t|\\t|\n|\\n|\\\\)}
+
   def check
     tokens.select { |token|
-      token.type == :STRING
-    }.map { |token|
-      [token, token.value.gsub(' '*token.column, "\n")]
-    }.select { |token, sane_value|
-      sane_value[/(\\\$|\\"|\\'|'|\r|\t|\\t|\n|\\n|\\\\)/].nil?
-    }.each do |token, sane_value|
-      notify :warning, {
+      token.type == :STRING &&
+        token.value.gsub(' ' * token.column, "\n")[ESCAPE_CHAR_RE].nil?
+    }.each do |token|
+      notify(
+        :warning,
         :message => 'double quoted string containing no variables',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/only_variable_string.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/only_variable_string.rb
index 9cf7c6e4..ddbb8b00 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/only_variable_string.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/only_variable_string.rb
@@ -7,57 +7,44 @@
 
   def check
     tokens.each_with_index do |start_token, start_token_idx|
-      if start_token.type == :DQPRE and start_token.value == ''
-        var_token = start_token.next_token
-        if VAR_TYPES.include? var_token.type
-          eos_offset = 2
-          loop do
-            eos_token = tokens[start_token_idx + eos_offset]
-            case eos_token.type
-            when :LBRACK
-              eos_offset += 3
-            when :DQPOST
-              if eos_token.value == ''
-                if eos_token.next_code_token && eos_token.next_code_token.type == :FARROW
-                  break
-                end
-                notify :warning, {
-                  :message     => 'string containing only a variable',
-                  :line        => var_token.line,
-                  :column      => var_token.column,
-                  :start_token => start_token,
-                  :var_token   => var_token,
-                  :end_token   => eos_token,
-                }
-              end
-              break
-            else
+      next unless start_token.type == :DQPRE && start_token.value == ''
+
+      var_token = start_token.next_token
+      next unless VAR_TYPES.include?(var_token.type)
+
+      eos_offset = 2
+      loop do
+        eos_token = tokens[start_token_idx + eos_offset]
+        case eos_token.type
+        when :LBRACK
+          eos_offset += 3
+        when :DQPOST
+          if eos_token.value == ''
+            if eos_token.next_code_token && eos_token.next_code_token.type == :FARROW
               break
             end
+            notify(
+              :warning,
+              :message     => 'string containing only a variable',
+              :line        => var_token.line,
+              :column      => var_token.column,
+              :start_token => start_token,
+              :var_token   => var_token,
+              :end_token   => eos_token
+            )
           end
+          break
+        else
+          break
         end
       end
     end
   end
 
   def fix(problem)
-    prev_token = problem[:start_token].prev_token
-    prev_code_token = problem[:start_token].prev_code_token
-    next_token = problem[:end_token].next_token
-    next_code_token = problem[:end_token].next_code_token
-    var_token = problem[:var_token]
-
-    tokens.delete(problem[:start_token])
-    tokens.delete(problem[:end_token])
+    remove_token(problem[:start_token])
+    remove_token(problem[:end_token])
 
-    prev_token.next_token = var_token unless prev_token.nil?
-    prev_code_token.next_code_token = var_token unless prev_code_token.nil?
-    next_code_token.prev_code_token = var_token unless next_code_token.nil?
-    next_token.prev_token = var_token unless next_token.nil?
-    var_token.type = :VARIABLE
-    var_token.next_token = next_token
-    var_token.next_code_token = next_code_token
-    var_token.prev_code_token = prev_code_token
-    var_token.prev_token = prev_token
+    problem[:var_token].type = :VARIABLE
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/puppet_url_without_modules.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/puppet_url_without_modules.rb
index 67015b0b..7783682f 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/puppet_url_without_modules.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/puppet_url_without_modules.rb
@@ -8,18 +8,19 @@ def check
     tokens.select { |token|
       (token.type == :SSTRING || token.type == :STRING || token.type == :DQPRE) && token.value.start_with?('puppet://')
     }.reject { |token|
-      token.value[/puppet:\/\/.*?\/(.+)/, 1].start_with?('modules/') unless token.value[/puppet:\/\/.*?\/(.+)/, 1].nil?
+      token.value[%r{puppet://.*?/(.+)}, 1].start_with?('modules/') unless token.value[%r{puppet://.*?/(.+)}, 1].nil?
     }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message => 'puppet:// URL without modules/ found',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
   def fix(problem)
-    problem[:token].value.gsub!(/(puppet:\/\/.*?\/)/, '\1modules/')
+    problem[:token].value.gsub!(%r{(puppet://.*?/)}, '\1modules/')
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb
index d04a277f..97d764e8 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/quoted_booleans.rb
@@ -11,12 +11,13 @@ def check
     tokens.select { |r|
       STRING_TYPES.include?(r.type) && BOOLEANS.include?(r.value)
     }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message => 'quoted boolean value found',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb
index b18f3b38..609e43c1 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/single_quote_string_with_variables.rb
@@ -5,13 +5,14 @@
 PuppetLint.new_check(:single_quote_string_with_variables) do
   def check
     tokens.select { |r|
-      r.type == :SSTRING && r.value.include?('${') && (! r.prev_token.prev_token.value.match(%r{inline_(epp|template)}) )
+      r.type == :SSTRING && r.value.include?('${') && !r.prev_token.prev_token.value.match(%r{inline_(epp|template)})
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'single quoted string containing a variable found',
         :line    => token.line,
-        :column  => token.column,
-      }
+        :column  => token.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb
index 7e5620c3..76c69320 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_strings/variables_not_enclosed.rb
@@ -8,12 +8,13 @@ def check
     tokens.select { |r|
       r.type == :UNENC_VARIABLE
     }.each do |token|
-      notify :warning, {
+      notify(
+        :warning,
         :message => 'variable not enclosed in {}',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_contains_dash.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_contains_dash.rb
index 8f790318..5e65e6e4 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_contains_dash.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_contains_dash.rb
@@ -7,15 +7,16 @@
 
   def check
     tokens.select { |r|
-      VARIABLE_DASH_TYPES.include? r.type
+      VARIABLE_DASH_TYPES.include?(r.type)
     }.each do |token|
-      if token.value.gsub(/\[.+?\]/, '').match(/-/)
-        notify :warning, {
-          :message => 'variable contains a dash',
-          :line    => token.line,
-          :column  => token.column,
-        }
-      end
+      next unless token.value.gsub(%r{\[.+?\]}, '') =~ %r{-}
+
+      notify(
+        :warning,
+        :message => 'variable contains a dash',
+        :line    => token.line,
+        :column  => token.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_is_lowercase.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_is_lowercase.rb
index 163b3092..6d90c0f1 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_is_lowercase.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_variables/variable_is_lowercase.rb
@@ -7,15 +7,16 @@
 
   def check
     tokens.select { |r|
-      VARIABLE_LOWERCASE_TYPES.include? r.type
+      VARIABLE_LOWERCASE_TYPES.include?(r.type)
     }.each do |token|
-      if token.value.gsub(/\[.+?\]/, '').match(/[A-Z]/)
-        notify :warning, {
-          :message => 'variable contains an uppercase letter',
-          :line    => token.line,
-          :column  => token.column,
-        }
-      end
+      next unless token.value.gsub(%r{\[.+?\]}, '') =~ %r{[A-Z]}
+
+      notify(
+        :warning,
+        :message => 'variable contains an uppercase letter',
+        :line    => token.line,
+        :column  => token.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/140chars.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/140chars.rb
index c008b465..9377e3e4 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/140chars.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/140chars.rb
@@ -7,15 +7,15 @@
 PuppetLint.new_check(:'140chars') do
   def check
     manifest_lines.each_with_index do |line, idx|
-      unless line =~ /:\/\// || line =~ /template\(/
-        if line.scan(/./mu).size > 140
-          notify :warning, {
-            :message => 'line has more than 140 characters',
-            :line    => idx + 1,
-            :column  => 140,
-          }
-        end
-      end
+      next if line =~ %r{://} || line =~ %r{template\(}
+      next unless line.scan(%r{.}mu).size > 140
+
+      notify(
+        :warning,
+        :message => 'line has more than 140 characters',
+        :line    => idx + 1,
+        :column  => 140
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/2sp_soft_tabs.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/2sp_soft_tabs.rb
index f2d26ec5..1a2f84ed 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/2sp_soft_tabs.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/2sp_soft_tabs.rb
@@ -7,13 +7,14 @@ def check
     tokens.select { |r|
       r.type == :INDENT
     }.reject { |r|
-      r.value.length % 2 == 0
+      r.value.length.even?
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'two-space soft tabs not used',
         :line    => token.line,
-        :column  => token.column,
-      }
+        :column  => token.column
+      )
     end
   end
 end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/80chars.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/80chars.rb
index ccab0baa..e65dcc98 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/80chars.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/80chars.rb
@@ -6,16 +6,16 @@
 PuppetLint.new_check(:'80chars') do
   def check
     manifest_lines.each_with_index do |line, idx|
-      unless line =~ /:\/\// || line =~ /template\(/
-        if line.scan(/./mu).size > 80
-          notify :warning, {
-            :message => 'line has more than 80 characters',
-            :line    => idx + 1,
-            :column  => 80,
-          }
-        end
-      end
+      next if line =~ %r{://} || line =~ %r{template\(}
+      next unless line.scan(%r{.}mu).size > 80
+
+      notify(
+        :warning,
+        :message => 'line has more than 80 characters',
+        :line    => idx + 1,
+        :column  => 80
+      )
     end
   end
 end
-PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.send('disable_80chars')
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb
index 54ba1e8a..4731088d 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/arrow_alignment.rb
@@ -13,7 +13,7 @@ def check
       param_column = [nil]
       resource_tokens = res_idx[:tokens]
       resource_tokens.reject! do |token|
-        COMMENT_TYPES.include? token.type
+        COMMENT_TYPES.include?(token.type)
       end
 
       # If this is a single line resource, skip it
@@ -23,7 +23,7 @@ def check
       next if last_arrow.nil?
       next if resource_tokens[first_arrow].line == resource_tokens[last_arrow].line
 
-      resource_tokens.each_with_index do |token, idx|
+      resource_tokens.each do |token|
         if token.type == :FARROW
           (level_tokens[level_idx] ||= []) << token
           param_token = token.prev_code_token
@@ -31,7 +31,7 @@ def check
           if param_token.type == :DQPOST
             param_length = 0
             iter_token = param_token
-            while iter_token.type != :DQPRE do
+            while iter_token.type != :DQPRE
               param_length += iter_token.to_manifest.length
               iter_token = iter_token.prev_token
             end
@@ -41,11 +41,11 @@ def check
           end
 
           if param_column[level_idx].nil?
-            if param_token.type == :DQPOST
-              param_column[level_idx] = iter_token.column
-            else
-              param_column[level_idx] = param_token.column
-            end
+            param_column[level_idx] = if param_token.type == :DQPOST
+                                        iter_token.column
+                                      else
+                                        param_token.column
+                                      end
           end
 
           this_arrow_column = param_column[level_idx] + param_length + 1
@@ -62,18 +62,19 @@ def check
         elsif token.type == :RBRACE || token.type == :SEMIC
           if (level_tokens[level_idx] ||= []).map(&:line).uniq.length > 1
             level_tokens[level_idx].each do |arrow_tok|
-              unless arrow_tok.column == arrow_column[level_idx] || level_tokens[level_idx].size == 1
-                arrows_on_line = level_tokens[level_idx].select { |t| t.line == arrow_tok.line }
-                notify :warning, {
-                  :message        => "indentation of => is not properly aligned (expected in column #{arrow_column[level_idx]}, but found it in column #{arrow_tok.column})",
-                  :line           => arrow_tok.line,
-                  :column         => arrow_tok.column,
-                  :token          => arrow_tok,
-                  :arrow_column   => arrow_column[level_idx],
-                  :newline        => !(arrows_on_line.index(arrow_tok) == 0),
-                  :newline_indent => param_column[level_idx] - 1,
-                }
-              end
+              next if arrow_tok.column == arrow_column[level_idx] || level_tokens[level_idx].size == 1
+
+              arrows_on_line = level_tokens[level_idx].select { |t| t.line == arrow_tok.line }
+              notify(
+                :warning,
+                :message        => "indentation of => is not properly aligned (expected in column #{arrow_column[level_idx]}, but found it in column #{arrow_tok.column})",
+                :line           => arrow_tok.line,
+                :column         => arrow_tok.column,
+                :token          => arrow_tok,
+                :arrow_column   => arrow_column[level_idx],
+                :newline        => arrows_on_line.index(arrow_tok) != 0,
+                :newline_indent => param_column[level_idx] - 1
+              )
             end
           end
           arrow_column[level_idx] = 0
@@ -89,7 +90,7 @@ def fix(problem)
     if problem[:newline]
       index = tokens.index(problem[:token].prev_code_token.prev_token)
 
-      #insert newline
+      # insert newline
       tokens.insert(index, PuppetLint::Lexer::Token.new(:NEWLINE, "\n", 0, 0))
 
       # indent the parameter to the correct depth
@@ -99,7 +100,7 @@ def fix(problem)
 
     end_param_idx = tokens.index(problem[:token].prev_code_token)
     start_param_idx = tokens.index(problem[:token].prev_token_of([:INDENT, :NEWLINE])) + 1
-    param_length = tokens[start_param_idx..end_param_idx].map { |r| r.to_manifest.length }.inject(0) { |sum,x| sum + x }
+    param_length = tokens[start_param_idx..end_param_idx].map { |r| r.to_manifest.length }.reduce(0) { |sum, x| sum + x }
     new_ws_len = (problem[:arrow_column] - (problem[:newline_indent] + param_length + 1))
     new_ws = ' ' * new_ws_len
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb
index d99ec495..35e976a1 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/hard_tabs.rb
@@ -9,12 +9,13 @@ def check
     tokens.select { |r|
       WHITESPACE_TYPES.include?(r.type) && r.value.include?("\t")
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'tab character found',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb
index 0e9fded3..c9680838 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/plugins/check_whitespace/trailing_whitespace.rb
@@ -9,12 +9,13 @@ def check
     }.select { |token|
       token.next_token.nil? || token.next_token.type == :NEWLINE
     }.each do |token|
-      notify :error, {
+      notify(
+        :error,
         :message => 'trailing whitespace found',
         :line    => token.line,
         :column  => token.column,
-        :token   => token,
-      }
+        :token   => token
+      )
     end
   end
 
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/tasks/puppet-lint.rb b/server/vendor/puppet-lint/lib/puppet-lint/tasks/puppet-lint.rb
index fdfd4158..cbf1c9fa 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/tasks/puppet-lint.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/tasks/puppet-lint.rb
@@ -13,7 +13,7 @@ class PuppetLint
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    DEFAULT_PATTERN = '**/*.pp'
+    DEFAULT_PATTERN = '**/*.pp'.freeze
 
     attr_accessor :name
     attr_accessor :pattern
@@ -59,13 +59,13 @@ def define(args, &task_block)
           PuppetLint.configuration.send("disable_#{check}")
         end
 
-        %w{with_filename fail_on_warnings error_level log_format with_context fix show_ignored relative}.each do |config|
+        %w[with_filename fail_on_warnings error_level log_format with_context fix show_ignored relative].each do |config|
           value = instance_variable_get("@#{config}")
           PuppetLint.configuration.send("#{config}=".to_sym, value) unless value.nil?
         end
 
         if PuppetLint.configuration.ignore_paths
-          @ignore_paths = PuppetLint.configuration.ignore_paths
+          @ignore_paths ||= PuppetLint.configuration.ignore_paths
         end
 
         if PuppetLint.configuration.pattern
@@ -83,7 +83,7 @@ def define(args, &task_block)
             linter.run
             linter.print_problems
 
-            if PuppetLint.configuration.fix && !linter.problems.any? { |e| e[:check] == :syntax }
+            if PuppetLint.configuration.fix && linter.problems.none? { |e| e[:check] == :syntax }
               IO.write(puppet_file, linter.manifest)
             end
           end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/tasks/release_test.rb b/server/vendor/puppet-lint/lib/puppet-lint/tasks/release_test.rb
new file mode 100644
index 00000000..20170431
--- /dev/null
+++ b/server/vendor/puppet-lint/lib/puppet-lint/tasks/release_test.rb
@@ -0,0 +1,84 @@
+require 'rake'
+require 'open3'
+require 'English'
+
+def run_cmd(message, *cmd)
+  print("  #{message}... ")
+
+  if Open3.respond_to?(:capture2e)
+    output, status = Open3.capture2e(*cmd)
+  else
+    output = ''
+
+    Open3.popen3(*cmd) do |stdin, stdout, stderr|
+      stdin.close
+      output += stdout.read
+      output += stderr.read
+    end
+    status = $CHILD_STATUS.dup
+  end
+
+  if status.success?
+    puts 'Done'
+  else
+    puts 'FAILED'
+  end
+
+  [output.strip, status.success?]
+end
+
+task :release_test do
+  branch = if ENV['APPVEYOR']
+             ENV['APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH']
+           elsif ENV['TRAVIS']
+             ENV['TRAVIS_PULL_REQUEST_BRANCH']
+           else
+             false
+           end
+
+  if branch && branch !~ %r{\A\d+_\d+_\d+_release\Z}
+    puts 'Skipping release tests on feature branch'
+    exit
+  end
+
+  modules_to_test = [
+    'puppetlabs/puppetlabs-apt',
+    'puppetlabs/puppetlabs-tomcat',
+    'puppetlabs/puppetlabs-apache',
+    'puppetlabs/puppetlabs-mysql',
+    'puppetlabs/puppetlabs-ntp',
+    'puppetlabs/puppetlabs-chocolatey',
+    'voxpupuli/puppet-archive',
+    'voxpupuli/puppet-collectd',
+    'garethr/garethr-docker',
+    'sensu/sensu-puppet',
+    'jenkinsci/puppet-jenkins',
+  ]
+
+  FileUtils.mkdir_p('tmp')
+  Dir.chdir('tmp') do
+    modules_to_test.each do |module_name|
+      puts "Testing #{module_name}..."
+      module_dir = File.basename(module_name)
+
+      if File.directory?(module_dir)
+        Dir.chdir(module_dir) do
+          _, success = run_cmd('Updating repository', 'git', 'pull', '--rebase')
+          next unless success
+        end
+      else
+        _, success = run_cmd('Cloning repository', 'git', 'clone', "https://github.com/#{module_name}")
+        next unless success
+      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}"
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/server/vendor/puppet-lint/lib/puppet-lint/version.rb b/server/vendor/puppet-lint/lib/puppet-lint/version.rb
index 75d49578..0c004b7d 100644
--- a/server/vendor/puppet-lint/lib/puppet-lint/version.rb
+++ b/server/vendor/puppet-lint/lib/puppet-lint/version.rb
@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '2.3.0'
+  VERSION = '2.3.3'.freeze
 end
diff --git a/server/vendor/puppet-lint/puppet-lint.gemspec b/server/vendor/puppet-lint/puppet-lint.gemspec
index a239a624..70fcd6b6 100644
--- a/server/vendor/puppet-lint/puppet-lint.gemspec
+++ b/server/vendor/puppet-lint/puppet-lint.gemspec
@@ -1,9 +1,9 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push(File.expand_path('../lib', __FILE__))
 require 'puppet-lint/version'
 
 Gem::Specification.new do |s|
   s.name = 'puppet-lint'
-  s.version = PuppetLint::VERSION
+  s.version = PuppetLint::VERSION.dup
   s.homepage = 'https://github.com/rodjek/puppet-lint/'
   s.summary = 'Ensure your Puppet manifests conform with the Puppetlabs style guide'
   s.description = 'Checks your Puppet manifests against the Puppetlabs
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.authors = ['Tim Sharpe']
   s.email = 'tim@sharpe.id.au'