puppet-lint 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbb51ba5c4cc604cd5eb02b2d51791f6df279db955fcd9e77747f79b6890cff
-  data.tar.gz: 0e187bb2ab101f20669c387ca3297513ff781edf20d2708e2271ba2778f8df4e
+  metadata.gz: 9b11b8ac88b45741f4cc6ec8a5eca05da09c52c1064a0bbd89394459981845b6
+  data.tar.gz: ed5b7f181a30f706ca4224a526d29212ed2a7e9fb4d2fea0927e2e2a3e02ae8c
 SHA512:
-  metadata.gz: 221dc05dc214701d1ffc688ec01fc2c6aa9c3adddc699c55e62894124c66b08a222f864f285bc1e8a65c4466b90967778e02f4f2f7ab805874057ce02db52b72
-  data.tar.gz: ba771036c9326dbd2e6831c4fc1ec17f7e81f7f4a41967c801ea78e3d74944dc61f51bda246428b62bedfa58891561bff078a7386d64cd61b6f3b78c5bfa6a66
+  metadata.gz: b79ad1ee950cc2dde1c61dd3adaf0b1900b80c63916d28f6ed5fba99f84ae76608ccfba01e533c6f7014f05b659904dc80ea9631b7ebfef573166a4a930b69ac
+  data.tar.gz: 927256f4add5e6c2fd2e0336ba6244b730223429de681fd73644e0c45df36b8d4237899af8bc2c92b7f3e4b159beedbe8c1071c94e5504178ea7dbfcaeb86d93

data/lib/puppet-lint/checks.rb

@@ -121,7 +121,7 @@ class PuppetLint::Checks
   # Returns an Array of String check names.
   def enabled_checks
     @enabled_checks ||= PuppetLint.configuration.checks.select do |check|
-      PuppetLint.configuration.send("#{check}_enabled?")
+      PuppetLint.configuration.send(:"#{check}_enabled?")
     end
   end
 

data/lib/puppet-lint/configuration.rb

@@ -17,21 +17,21 @@ class PuppetLint::Configuration
     # Public: Determine if the named check is enabled.
     #
     # Returns true if the check is enabled, otherwise return false.
-    define_method("#{check}_enabled?") do
+    define_method(:"#{check}_enabled?") do
       settings["#{check}_disabled"] != true
     end
 
     # Public: Disable the named check.
     #
     # Returns nothing.
-    define_method("disable_#{check}") do
+    define_method(:"disable_#{check}") do
       settings["#{check}_disabled"] = true
     end
 
     # Public: Enable the named check.
     #
     # Returns nothing.
-    define_method("enable_#{check}") do
+    define_method(:"enable_#{check}") do
       settings["#{check}_disabled"] = false
     end
   end
@@ -92,7 +92,7 @@ class PuppetLint::Configuration
     # value - The value to set the option to.
     #
     # Returns nothing.
-    define_method("#{option}=") do |value|
+    define_method(:"#{option}=") do |value|
       settings[option] = value
     end
 

data/lib/puppet-lint/optparser.rb

@@ -117,9 +117,9 @@ class PuppetLint::OptParser
         enable_checks = checks.split(',').map(&:to_sym)
         PuppetLint.configuration.checks.each do |check|
           if enable_checks.include?(check)
-            PuppetLint.configuration.send("enable_#{check}")
+            PuppetLint.configuration.send(:"enable_#{check}")
           else
-            PuppetLint.configuration.send("disable_#{check}")
+            PuppetLint.configuration.send(:"disable_#{check}")
           end
         end
       end
@@ -130,13 +130,13 @@ class PuppetLint::OptParser
 
       PuppetLint.configuration.checks.each do |check|
         opts.on("--no-#{check}-check", "Skip the #{check} check.") do
-          PuppetLint.configuration.send("disable_#{check}")
+          PuppetLint.configuration.send(:"disable_#{check}")
         end
 
-        next if PuppetLint.configuration.send("#{check}_enabled?")
+        next if PuppetLint.configuration.send(:"#{check}_enabled?")
 
         opts.on("--#{check}-check", "Enable the #{check} check.") do
-          PuppetLint.configuration.send("enable_#{check}")
+          PuppetLint.configuration.send(:"enable_#{check}")
         end
       end
     end

data/lib/puppet-lint/plugins/top_scope_facts/top_scope_facts.rb

@@ -44,6 +44,14 @@ PuppetLint.new_check(:top_scope_facts) do
   end
 
   def fix(problem)
-    problem[:token].value = "facts['" + problem[:token].value.sub(%r{^::}, '') + "']"
+    problem[:token].value.sub!(%r{^::}, '')
+    # checks if the fact is a top level structured fact e.g. ::my_structured_fact['foo']['bar']
+    if %r{\[.*}.match?(problem[:token].value)
+      fact_name = problem[:token].value.sub(%r{\[.*}, '')
+      nested_facts = problem[:token].value.scan(%r{\[.*}).first
+      problem[:token].value = "facts['" + fact_name + "']" + nested_facts
+    else
+      problem[:token].value = "facts['" + problem[:token].value + "']"
+    end
   end
 end

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

@@ -52,19 +52,19 @@ class PuppetLint::RakeTask < Rake::TaskLib
         enable_checks = Array(@only_checks).map(&:to_sym)
         PuppetLint.configuration.checks.each do |check|
           if enable_checks.include?(check)
-            PuppetLint.configuration.send("enable_#{check}")
+            PuppetLint.configuration.send(:"enable_#{check}")
           else
-            PuppetLint.configuration.send("disable_#{check}")
+            PuppetLint.configuration.send(:"disable_#{check}")
           end
         end
       end
 
       Array(@disable_checks).each do |check|
-        PuppetLint.configuration.send("disable_#{check}")
+        PuppetLint.configuration.send(:"disable_#{check}")
       end
 
       ['with_filename', 'fail_on_warnings', 'error_level', 'log_format', 'with_context', 'fix', 'show_ignored', 'relative'].each do |config|
-        value = instance_variable_get("@#{config}")
+        value = instance_variable_get(:"@#{config}")
         PuppetLint.configuration.send("#{config}=".to_sym, value) unless value.nil?
       end
 

data/lib/puppet-lint/version.rb

@@ -1,3 +1,3 @@
 class PuppetLint
-  VERSION = '4.2.3'.freeze
+  VERSION = '4.2.4'.freeze
 end

data/lib/puppet-lint.rb

@@ -252,7 +252,7 @@ class PuppetLint
   #   end
   def self.new_check(name, &block)
     class_name = name.to_s.split('_').map(&:capitalize).join
-    klass = PuppetLint.const_set("Check#{class_name}", Class.new(PuppetLint::CheckPlugin))
+    klass = PuppetLint.const_set(:"Check#{class_name}", Class.new(PuppetLint::CheckPlugin))
     klass.const_set(:NAME, name)
     klass.class_exec(&block)
     PuppetLint.configuration.add_check(name, klass)

data/spec/spec_helper.rb

@@ -1,12 +1,22 @@
 # Disable GitHub Actions reporting since it breaks the test suite
 ENV.delete('GITHUB_ACTION')
 
-if ENV['COVERAGE'] == 'yes' && RUBY_VERSION.start_with?('2.7.')
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter('/spec/')
-    add_filter('/vendor/')
-    add_group('Checks', 'lib/puppet-lint/plugins')
+if ENV['COVERAGE'] == 'yes'
+  begin
+    require 'simplecov'
+    require 'simplecov-console'
+    SimpleCov.formatters = [
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::Console,
+    ]
+
+    SimpleCov.start do
+      add_filter('/spec/')
+      add_filter('/vendor/')
+      add_group('Checks', 'lib/puppet-lint/plugins')
+    end
+  rescue LoadError
+    raise 'Add the simplecov & simplecov-console gems to Gemfile to enable this task'
   end
 end
 

data/spec/unit/puppet-lint/plugins/top_scope_facts/top_scope_facts_spec.rb

@@ -102,6 +102,18 @@ describe 'top_scope_facts' do
       end
     end
 
+    context 'top scope structured fact not present on allowlist' do
+      let(:code) { "$::my_structured_fact['foo']['test']" }
+
+      it 'detects a problem' do
+        expect(problems).to contain_fixed('top scope fact instead of facts hash').on_line(1).in_column(1)
+      end
+
+      it 'fixes the problem' do
+        expect(manifest).to eq("$facts['my_structured_fact']['foo']['test']")
+      end
+    end
+
     context 'top scope $::trusted hash' do
       let(:code) { "$::trusted['certname']" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Tim Sharpe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies: []
 description: "    Checks your Puppet manifests against the Puppetlabs style guide
   and alerts you to any discrepancies.\n"