puppet-syntax 3.3.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab13111ffaa03decb11bef1d05aada83ed94f63e3fe2d9b40413fe1c5a1072e
-  data.tar.gz: 29f88eb7f120c0aeb17ad95ab562edd936b7d63540d0c2f24c058c3f691e37ae
+  metadata.gz: 00b51658a2b442427a7acac7c712fb3188d90a66c3d328c5d719b2034b11ad3c
+  data.tar.gz: 33d7cea4918830fd06b91ce02feab1617eaf50a5554cec8d28e59deaff836cd5
 SHA512:
-  metadata.gz: ef76471a592b1ba5affe655b657c7b1d40f02cf65ad81fd384d3be489bbc810852622a8fcb28cba197d8cbf8f494215c803be261791a3d8ddbb0460949ab5b00
-  data.tar.gz: ea4f9da1b8ca9f16d96c639f22213193c1224900d6cbbc480c7063de7580edc1426b31f88b800b1ea1085b3a0fb5eaba58bd816cb73fc7f907f6c15f839d865f
+  metadata.gz: daf199345270be08621d083a76ce169a089dee282a74ebc6de9475c89c36dbef95da3ccf9aac8e4121c267c3d079064e1d0de6f7701a74a4d4d9132b9bb1da72
+  data.tar.gz: 395e92778f90d03e941bf9cd67957cf65fc7ce47cac3816a951f9752e569f6056600a3fa3f42944b086d6e8256ad2596af2bf534f7f3e59fb0d8925f4ba36b3f

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+# raise PRs for gem updates
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'voxpupuli'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
@@ -18,7 +18,7 @@ jobs:
         env:
           BUNDLE_WITHOUT: release
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --strict --verbose *.gemspec
       - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:

data/.github/workflows/test.yml

@@ -9,56 +9,47 @@ env:
   BUNDLE_WITHOUT: development:release
 
 jobs:
+  rubocop:
+    env:
+      BUNDLE_WITHOUT: release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.1"
+          bundler-cache: true
+      - name: Run Rubocop
+        run: bundle exec rake rubocop
   test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ruby:
+          - "3.2"
           - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
-          - "2.4"
         puppet:
+          - "~> 8.0"
           - "~> 7.0"
-          - "~> 6.29"
-          - "~> 5.5.10"
           - "https://github.com/puppetlabs/puppet.git#main"
         exclude:
-          - ruby: "2.6"
-            puppet: "~> 7.0"
-          - ruby: "2.5"
-            puppet: "~> 7.0"
-          - ruby: "2.4"
-            puppet: "~> 7.0"
-
-          - ruby: "3.1"
-            puppet: "~> 6.29"
           - ruby: "3.0"
-            puppet: "~> 6.29"
-
-          - ruby: "3.1"
-            puppet: "~> 5.5.10"
-          - ruby: "3.0"
-            puppet: "~> 5.5.10"
+            puppet: "~> 8.0"
           - ruby: "2.7"
-            puppet: "~> 5.5.10"
-          - ruby: "2.6"
-            puppet: "~> 5.5.10"
-
-          - ruby: "2.6"
-            puppet: "https://github.com/puppetlabs/puppet.git#main"
-          - ruby: "2.5"
+            puppet: "~> 8.0"
+          - ruby: "3.0"
             puppet: "https://github.com/puppetlabs/puppet.git#main"
-          - ruby: "2.4"
+          - ruby: "2.7"
             puppet: "https://github.com/puppetlabs/puppet.git#main"
     name: "Ruby ${{ matrix.ruby }} - Puppet ${{ matrix.puppet }}"
     env:
       PUPPET_VERSION: ${{ matrix.puppet }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -66,3 +57,14 @@ jobs:
           bundler-cache: true
       - name: Run tests
         run: bundle exec rake
+      - name: Build gem
+        run: gem build --strict --verbose *.gemspec
+
+  tests:
+    needs:
+      - rubocop
+      - test
+    runs-on: ubuntu-latest
+    name: Test suite
+    steps:
+      - run: echo Test suite completed

data/.rubocop.yml

@@ -0,0 +1,8 @@
+---
+inherit_from: .rubocop_todo.yml
+
+inherit_gem:
+  voxpupuli-rubocop: rubocop.yml
+
+Metrics:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,252 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-03-08 12:59:05 UTC using RuboCop version 1.61.0.
+# 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: 2
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'lib/puppet-syntax/templates.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedParentClasses.
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/puppet-syntax/tasks/puppet-syntax.rb'
+
+# Offense count: 1
+Lint/RescueException:
+  Exclude:
+    - 'lib/puppet-syntax/hiera.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowNil.
+Lint/SuppressedException:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/puppet-syntax/templates.rb'
+
+# Offense count: 4
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/puppet-syntax.rb'
+    - 'lib/puppet-syntax/tasks/puppet-syntax.rb'
+    - 'spec/puppet-syntax/tasks/puppet-syntax_spec.rb'
+    - 'spec/puppet-syntax_spec.rb'
+
+# Offense count: 11
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/puppet-syntax/hiera_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
+    - 'spec/puppet-syntax/tasks/puppet-syntax_spec.rb'
+
+# Offense count: 19
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/puppet-syntax/hiera_spec.rb'
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax/templates_spec.rb'
+    - 'spec/puppet-syntax_spec.rb'
+
+# Offense count: 7
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 14
+
+# Offense count: 4
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/puppet-syntax/hiera_spec.rb'
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax/templates_spec.rb'
+    - 'spec/puppet-syntax_spec.rb'
+
+# Offense count: 29
+RSpec/MultipleExpectations:
+  Max: 8
+
+# Offense count: 30
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/puppet-syntax/hiera_spec.rb'
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax/templates_spec.rb'
+
+# Offense count: 8
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/puppet-syntax/templates_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - '**/spec/routing/**/*'
+    - 'spec/puppet-syntax/hiera_spec.rb'
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax/templates_spec.rb'
+    - 'spec/puppet-syntax_spec.rb'
+
+# Offense count: 3
+RSpec/SubjectDeclaration:
+  Exclude:
+    - 'spec/puppet-syntax/hiera_spec.rb'
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax/templates_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Rake/Desc:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, conditionals
+Style/AndOr:
+  Exclude:
+    - 'lib/puppet-syntax/templates.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: MinBranchesCount.
+Style/CaseLikeIf:
+  Exclude:
+    - 'lib/puppet-syntax/hiera.rb'
+
+# Offense count: 5
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/puppet-syntax.rb'
+    - 'lib/puppet-syntax/hiera.rb'
+    - 'lib/puppet-syntax/manifests.rb'
+    - 'lib/puppet-syntax/tasks/puppet-syntax.rb'
+    - 'lib/puppet-syntax/templates.rb'
+
+# Offense count: 15
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'lib/puppet-syntax.rb'
+    - 'lib/puppet-syntax/hiera.rb'
+    - 'lib/puppet-syntax/manifests.rb'
+    - 'lib/puppet-syntax/tasks/puppet-syntax.rb'
+    - 'lib/puppet-syntax/templates.rb'
+    - 'lib/puppet-syntax/version.rb'
+    - 'puppet-syntax.gemspec'
+    - 'spec/puppet-syntax/hiera_spec.rb'
+    - 'spec/puppet-syntax/manifests_spec.rb'
+    - 'spec/puppet-syntax/tasks/puppet-syntax_spec.rb'
+    - 'spec/puppet-syntax/templates_spec.rb'
+    - 'spec/puppet-syntax_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/puppet-syntax/templates.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/puppet-syntax/version.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/puppet-syntax/hiera.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+Style/RegexpLiteral:
+  Exclude:
+    - 'spec/puppet-syntax/templates_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/SelectByRegexp:
+  Exclude:
+    - 'lib/puppet-syntax/manifests.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireEnglish, EnforcedStyle.
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
+Style/SpecialGlobalVars:
+  Exclude:
+    - 'puppet-syntax.gemspec'
+
+# Offense count: 4
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
+# AllowedMethods: define_method
+Style/SymbolProc:
+  Exclude:
+    - 'lib/puppet-syntax/hiera.rb'
+    - 'lib/puppet-syntax/manifests.rb'
+    - 'lib/puppet-syntax/templates.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 211

data/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v4.0.1](https://github.com/voxpupuli/puppet-syntax/tree/v4.0.1) (2024-03-12)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v4.0.0...v4.0.1)
+
+**Fixed bugs:**
+
+- Raise warning if hiera check is called but disabled [\#165](https://github.com/voxpupuli/puppet-syntax/pull/165) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Drop Puppet 5.4 check [\#166](https://github.com/voxpupuli/puppet-syntax/pull/166) ([bastelfreak](https://github.com/bastelfreak))
+- README.md: Update required Puppet/Ruby versions [\#164](https://github.com/voxpupuli/puppet-syntax/pull/164) ([bastelfreak](https://github.com/bastelfreak))
+- Update voxpupuli-rubocop requirement from ~\> 2.4.0 to ~\> 2.5.0 [\#163](https://github.com/voxpupuli/puppet-syntax/pull/163) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v4.0.0](https://github.com/voxpupuli/puppet-syntax/tree/v4.0.0) (2024-02-07)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v3.3.0...v4.0.0)
+
+**Breaking changes:**
+
+- Drop Ruby 2.4/2.5/2.6 & Puppet 5/6 support [\#145](https://github.com/voxpupuli/puppet-syntax/pull/145) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- Add Ruby 3.2 / Puppet 8 support [\#147](https://github.com/voxpupuli/puppet-syntax/pull/147) ([bastelfreak](https://github.com/bastelfreak))
+- support aliases in hiera yaml [\#144](https://github.com/voxpupuli/puppet-syntax/pull/144) ([akerl](https://github.com/akerl))
+- Implement RuboCop [\#137](https://github.com/voxpupuli/puppet-syntax/pull/137) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- fix "NameError: uninitialized constant Puppet::Util"  [\#155](https://github.com/voxpupuli/puppet-syntax/pull/155) ([mxey](https://github.com/mxey))
+- add all known hiera-eyaml methods [\#154](https://github.com/voxpupuli/puppet-syntax/pull/154) ([mxey](https://github.com/mxey))
+
+**Merged pull requests:**
+
+- README.md: Fix badges [\#161](https://github.com/voxpupuli/puppet-syntax/pull/161) ([bastelfreak](https://github.com/bastelfreak))
+- gemspec: Add version requirements & CI: Build Gems ins strict & verbose mode [\#160](https://github.com/voxpupuli/puppet-syntax/pull/160) ([bastelfreak](https://github.com/bastelfreak))
+- Update voxpupuli-rubocop requirement from ~\> 2.0.0 to ~\> 2.4.0 [\#159](https://github.com/voxpupuli/puppet-syntax/pull/159) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update voxpupuli-rubocop requirement from ~\> 1.4.0 to ~\> 2.0.0 [\#152](https://github.com/voxpupuli/puppet-syntax/pull/152) ([dependabot[bot]](https://github.com/apps/dependabot))
+- GCG: Add faraday-retry dep [\#149](https://github.com/voxpupuli/puppet-syntax/pull/149) ([bastelfreak](https://github.com/bastelfreak))
+- Switch to voxpupuli-rubocop [\#148](https://github.com/voxpupuli/puppet-syntax/pull/148) ([bastelfreak](https://github.com/bastelfreak))
+- CI: add dummy job to depend on [\#146](https://github.com/voxpupuli/puppet-syntax/pull/146) ([bastelfreak](https://github.com/bastelfreak))
+- Drop Ruby 1.8 testcode [\#142](https://github.com/voxpupuli/puppet-syntax/pull/142) ([bastelfreak](https://github.com/bastelfreak))
+- rubocop: fix whitespace and newline warnings [\#141](https://github.com/voxpupuli/puppet-syntax/pull/141) ([bastelfreak](https://github.com/bastelfreak))
+- rubocop: fix trailing comma [\#140](https://github.com/voxpupuli/puppet-syntax/pull/140) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v3.3.0](https://github.com/voxpupuli/puppet-syntax/tree/v3.3.0) (2023-02-08)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v3.2.1...v3.3.0)

data/Gemfile

@@ -6,11 +6,11 @@ source 'https://rubygems.org'
 # is specified as `file://some/location/on/disk`.
 def location_for(place_or_version, fake_version = nil)
   if place_or_version =~ /^(https[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place_or_version =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
+    [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact
+  elsif place_or_version =~ %r{^file://(.*)}
+    ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }]
   else
-    [place_or_version, { :require => false }]
+    [place_or_version, { require: false }]
   end
 end
 
@@ -25,6 +25,7 @@ group :test do
   gem 'rspec'
 end
 
-group :release do
-  gem 'github_changelog_generator', require: false
+group :release, optional: true do
+  gem 'faraday-retry', '~> 2.1', require: false
+  gem 'github_changelog_generator', '~> 1.16.4', require: false
 end

data/README.md

@@ -1,7 +1,8 @@
 # puppet-syntax
 
 [![License](https://img.shields.io/github/license/voxpupuli/puppet-syntax.svg)](https://github.com/voxpupuli/puppet-syntax/blob/master/LICENSE.txt)
-[![Release](https://github.com/voxpupuli/puppet-syntax/actions/workflows/syntax.yml/badge.svg)](https://github.com/voxpupuli/puppet-syntax/actions/workflows/syntax.yml)
+[![Release](https://github.com/voxpupuli/puppet-syntax/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/puppet-syntax/actions/workflows/release.yml)
+[![Test](https://github.com/voxpupuli/puppet-syntax/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/puppet-syntax/actions/workflows/test.yml)
 [![RubyGem Version](https://img.shields.io/gem/v/puppet-syntax.svg)](https://rubygems.org/gems/puppet-syntax)
 [![RubyGem Downloads](https://img.shields.io/gem/dt/puppet-syntax.svg)](https://rubygems.org/gems/puppet-syntax)
 
@@ -14,8 +15,8 @@ Hiera YAML.
 
 Puppet::Syntax is supported with:
 
-- Puppet >= 5.0 that provides the `validate` face.
-- Ruby >= 2.4
+- Puppet >= 7.0
+- Ruby >= 2.7
 
 For the specific versions that we test against, see the [GitHub Actions workflow](.github/workflows/test.yml).
 

data/Rakefile

@@ -7,17 +7,28 @@ task :publish_gem do
   puts "Published #{gem}" if gem
 end
 
-task :default => [:spec]
+task default: [:spec]
 begin
   require 'github_changelog_generator/task'
   require 'puppet-syntax/version'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     version = PuppetSyntax::VERSION
-    config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
+    config.future_release = "v#{version}" if /^\d+\.\d+.\d+$/.match?(version)
     config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
-    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix modulesync skip-changelog github_actions]
     config.user = 'voxpupuli'
     config.project = 'puppet-syntax'
   end
 rescue LoadError
 end
+
+begin
+  require 'rubocop/rake_task'
+rescue LoadError
+  # RuboCop is an optional group
+else
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    # These make the rubocop experience maybe slightly less terrible
+    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
+  end
+end

data/lib/puppet-syntax/hiera.rb

@@ -3,21 +3,20 @@ require 'base64'
 
 module PuppetSyntax
   class Hiera
-
     def check_hiera_key(key)
       if key.is_a? Symbol
         if key.to_s.start_with?(':')
-          return "Puppet automatic lookup will not use leading '::'"
-        elsif key !~ /^[a-z]+$/ # we allow Hiera's own configuration
-          return "Puppet automatic lookup will not look up symbols"
-        end
-      elsif key !~ /^[a-z][a-z0-9_]+(::[a-z][a-z0-9_]+)*$/
-        if key =~ /[^:]:[^:]/
-          # be extra helpful
-          return "Looks like a missing colon"
-        else
-          return "Not a valid Puppet variable name for automatic lookup"
+          "Puppet automatic lookup will not use leading '::'"
+        elsif !/^[a-z]+$/.match?(key) # we allow Hiera's own configuration
+          'Puppet automatic lookup will not look up symbols'
         end
+      elsif !/^[a-z][a-z0-9_]+(::[a-z][a-z0-9_]+)*$/.match?(key)
+        return 'Looks like a missing colon' if /[^:]:[^:]/.match?(key)
+
+        # be extra helpful
+
+        'Not a valid Puppet variable name for automatic lookup'
+
       end
     end
 
@@ -33,7 +32,7 @@ module PuppetSyntax
           break if error
         end
       elsif val.is_a? Hash
-        val.each do |k,v|
+        val.each do |k, v|
           error = check_eyaml_data("#{name}['#{k}']", v)
           break if error
         end
@@ -42,53 +41,54 @@ module PuppetSyntax
     end
 
     def check_eyaml_blob(val)
-      return unless val =~ /^ENC\[/
+      return unless /^ENC\[/.match?(val)
 
       val.sub!('ENC[', '')
       val.gsub!(/\s+/, '')
-      if val !~ /\]$/
-        return "has unterminated eyaml value"
-      else
-        val.sub!(/\]$/, '')
-        method, base64 = val.split(/,/)
-        if base64 == nil
-          base64 = method
-          method = 'PKCS7'
-        end
-
-        return "has unknown eyaml method #{method}" unless ['PKCS7','GPG','GKMS','KMS'].include? method
-        return "has unpadded or truncated base64 data" unless base64.length % 4 == 0
+      return 'has unterminated eyaml value' unless /\]$/.match?(val)
 
-        # Base64#decode64 will silently ignore characters outside the alphabet,
-        # so we check resulting length of binary data instead
-        pad_length = base64.gsub(/[^=]/, '').length
-        if Base64.decode64(base64).length != base64.length * 3/4 - pad_length
-          return "has corrupt base64 data"
-        end
+      val.sub!(/\]$/, '')
+      method, base64 = val.split(',')
+      if base64.nil?
+        base64 = method
+        method = 'PKCS7'
       end
+
+      known_methods = %w[PKCS7 GPG GKMS KMS TWOFAC SecretBox VAULT GCPKMS RSA SSHAGENT VAULT_RS cli]
+      return "has unknown eyaml method #{method}" unless known_methods.include? method
+      return 'has unpadded or truncated base64 data' unless base64.length % 4 == 0
+
+      # Base64#decode64 will silently ignore characters outside the alphabet,
+      # so we check resulting length of binary data instead
+      pad_length = base64.gsub(/[^=]/, '').length
+      return unless Base64.decode64(base64).length != (base64.length * 3 / 4) - pad_length
+
+      'has corrupt base64 data'
     end
 
     def check(filelist)
-      raise "Expected an array of files" unless filelist.is_a?(Array)
+      raise 'Expected an array of files' unless filelist.is_a?(Array)
 
       errors = []
 
+      yamlargs = (Psych::VERSION >= '4.0') ? { aliases: true } : {}
+
       filelist.each do |hiera_file|
         begin
-          yamldata = YAML.load_file(hiera_file)
-        rescue Exception => error
-          errors << "ERROR: Failed to parse #{hiera_file}: #{error}"
+          yamldata = YAML.load_file(hiera_file, **yamlargs)
+        rescue Exception => e
+          errors << "ERROR: Failed to parse #{hiera_file}: #{e}"
           next
         end
-        if yamldata
-          yamldata.each do |k,v|
-            if PuppetSyntax.check_hiera_keys
-              key_msg = check_hiera_key(k)
-              errors << "WARNING: #{hiera_file}: Key :#{k}: #{key_msg}" if key_msg
-            end
-            eyaml_msg = check_eyaml_data(k, v)
-            errors << "WARNING: #{hiera_file}: #{eyaml_msg}" if eyaml_msg
+        next unless yamldata
+
+        yamldata.each do |k, v|
+          if PuppetSyntax.check_hiera_keys
+            key_msg = check_hiera_key(k)
+            errors << "WARNING: #{hiera_file}: Key :#{k}: #{key_msg}" if key_msg
           end
+          eyaml_msg = check_eyaml_data(k, v)
+          errors << "WARNING: #{hiera_file}: #{eyaml_msg}" if eyaml_msg
         end
       end