simp-rspec-puppet-facts 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a12d6bcf5fdd2521b56df92db28ae803dd532d0072bbc956b3a9e5622e9cf6
-  data.tar.gz: 2f2555883a27c9846fa786d0bad11c93f4ebd763b1f570f47705395bd844a842
+  metadata.gz: 140c028f5870337de6f143ba7c8f73508f312fe10fe0017333b85454d1f8db3e
+  data.tar.gz: a0e791c59faff98c6612697b13b755b6d2327d4e58628c4cb15d0fd81faaec01
 SHA512:
-  metadata.gz: 7086aae58dcd5bb341c1b93fe2709b13d3e9dec51cc6bbda51667e400dcc1d9aa5edd0368d470dd06be83cff8307aecebf4ae8fa51b253c03f930a2a98e9882b
-  data.tar.gz: c8fa84b8332bb0bf5f267ef7efca4bfd02ce94826e96c5047149d57e95f4d54a65c19cfdeff3d88e224189cf0a28c47824e05191c11608c5f9017431634af4ed
+  metadata.gz: 9e80e1cf1e316a51ae0bfc00410395fec10b9c95e3473c35ad0574752eea866b0638b7fdade85aa9917a17addaf295497c7f76477c8c669ec6f5dac102409342
+  data.tar.gz: a09bfe14fbd0b8bf067d9d8fdc97a036fa82ddcf66842fed692742e7fcd81d1910cda0bfa4cf0cede5d2f1f9139c408805b2d8068e6da87f705a326e25acbeb6

data/Rakefile

@@ -1,7 +1,14 @@
-require 'simp/rake/beaker'
 require 'bundler/gem_tasks'
-
-Simp::Rake::Beaker.new(__dir__)
+require 'rspec/core/rake_task'
+
+begin
+  require 'simp/rake/beaker'
+  Simp::Rake::Beaker.new(__dir__)
+rescue LoadError => e
+  # simp-beaker-helpers' rake tasks need puppetlabs_spec_helper, which isn't
+  # installable on Ruby 4 (it requires the legacy `puppet` gem)
+  warn "WARNING: skipping Simp::Rake::Beaker tasks (#{e.message})"
+end
 
 def syntax_check(task, glob)
   warn "---> #{task.name}"

data/lib/simp/rspec-puppet-facts.rb

@@ -11,7 +11,9 @@ module Simp::RspecPuppetFacts
   SELINUX_MODES = [:enforcing, :disabled, :permissive].freeze
 
   def supported_os_strings(opts, known_os_list = [])
-    supported_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os)
+    # The default has to be a block so that metadata.json is only consulted
+    # when :supported_os wasn't given
+    supported_os = opts.fetch(:supported_os) { RspecPuppetFacts.meta_supported_os }
     hardwaremodels = opts.fetch(:hardwaremodels, ['x86_64'])
     os_strings = []
     supported_os.each do |os|
@@ -41,7 +43,7 @@ module Simp::RspecPuppetFacts
   # because if it doesn't have them it will crash
   def filter_opts(opts, simp_h)
     rfh_hw = opts.fetch(:hardwaremodels, ['x86_64'])
-    rfh_os = opts.fetch(:supported_os, RspecPuppetFacts.meta_supported_os).dup
+    rfh_os = opts.fetch(:supported_os) { RspecPuppetFacts.meta_supported_os }.dup
 
     filtered_opts = []
     rfh_os.each do |os|
@@ -57,11 +59,13 @@ module Simp::RspecPuppetFacts
 
       next if os['operatingsystemrelease'].empty?
 
-      rfh_hw.each do |hw|
-        os['operatingsystemrelease'].each do |rel|
-          filtered_opts.push(os) unless simp_h.key?([os['operatingsystem'].downcase, rel, hw].join('-'))
-        end
+      # Only pass along the releases we don't have facts for, and only list
+      # each OS once, no matter how many of its releases are missing
+      missing_releases = os['operatingsystemrelease'].select do |rel|
+        rfh_hw.any? { |hw| !simp_h.key?([os['operatingsystem'].downcase, rel, hw].join('-')) }
       end
+
+      filtered_opts.push(os.merge('operatingsystemrelease' => missing_releases)) unless missing_releases.empty?
     end
 
     ret_opts = opts.dup
@@ -203,7 +207,8 @@ module Simp::RspecPuppetFacts
 
       if fallback_version
         fact_dir = File.join(fact_dir_path, fallback_version)
-        warn "WARNING: Using fallback facts for Facter #{fallback_version} (requested #{facter_xy_version})"
+        warn "WARNING: No SIMP factsets for Facter #{facter_xy_version}; " \
+             "falling back to the newest available factsets (Facter #{fallback_version})"
       else
         msg = <<~END_MSG
           Can't find SIMP facts for Facter #{facter_xy_version}, skipping...
@@ -232,5 +237,19 @@ module Simp::RspecPuppetFacts
   class Shim
     require 'rspec-puppet-facts'
     extend ::RspecPuppetFacts
+
+    # `extend ::RspecPuppetFacts` above is not enough to guarantee that
+    # `Shim.on_supported_os` reaches the upstream implementation: if a
+    # spec_helper has already done a top-level `include RspecPuppetFacts`
+    # (voxpupuli-test does this), the module is already in Object's ancestry
+    # and the `extend` is silently skipped.  A later top-level
+    # `include Simp::RspecPuppetFacts` then shadows the upstream method, so
+    # `Shim.on_supported_os` would dispatch back to
+    # Simp::RspecPuppetFacts#on_supported_os and recurse without bound,
+    # exhausting all memory during fact loading (issue #86).  Bind the
+    # upstream method explicitly so dispatch can never be shadowed.
+    def self.on_supported_os(opts = {})
+      ::RspecPuppetFacts.instance_method(:on_supported_os).bind_call(self, opts)
+    end
   end
 end

data/lib/simp/version.rb

@@ -2,5 +2,5 @@
 module Simp; end
 
 module Simp::RspecPuppetFacts
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/spec/acceptance/suites/default/00_default_spec.rb

@@ -4,12 +4,11 @@ test_name 'we just want the facts'
 
 describe 'look out muppets' do
   hosts.each do |host|
-    let(:host_fqdn) { fact_on(host, 'fqdn') }
+    let(:host_fqdn) { fact_on(host, 'networking.fqdn') }
     let(:collection_dir) { 'collected_facts' }
     let(:os_info) { fact_on(host, 'os') }
-    let(:os_arch) { fact_on(host, 'architecture') }
 
-    let(:fact_collection) { File.join(collection_dir, [os_info['name'], os_info['release']['major'].gsub(%r{\s}, '_'), os_arch].join('-').downcase + '.facts') }
+    let(:fact_collection) { File.join(collection_dir, [os_info['name'], os_info['release']['major'].gsub(%r{\s}, '_'), os_info['architecture']].join('-').downcase + '.facts') }
 
     let(:host_data) { JSON.parse(File.read(fact_collection)) }
 
@@ -24,12 +23,12 @@ describe 'look out muppets' do
       end
 
       it 'disables the secondary network interface' do
-        interfaces = fact_on(host, 'interfaces').strip.split(',')
+        interfaces = fact_on(host, 'networking.interfaces').keys
 
         ifaces = {
           'eth1'       => 'ip link set eth1 down',
           'enp0s8'     => 'ip link set enp0s8 down',
-          'Ethernet 2' => 'netsh interface set interface "Ethernet 2" disable'
+          'Ethernet 2' => 'netsh interface set interface "Ethernet 2" disable',
         }
 
         ifaces.each_key do |iface|
@@ -56,12 +55,12 @@ describe 'look out muppets' do
       it 'cleans up the data' do
         str_data = JSON.generate(@output.first)
 
-        str_data = str_data.gsub(fact_on(host, 'fqdn'), 'foo.example.com')
-                           .gsub(fact_on(host, 'domain'), 'example.com')
-                           .gsub(%(:"#{fact_on(host, 'hostname')}"), ':"foo"')
-                           .gsub(%(:"#{fact_on(host, 'networking')['ip']}"), ':"10.0.2.15"')
-                           .gsub(%(:"#{fact_on(host, 'networking')['netmask']}"), ':"255.255.0.0"')
-                           .gsub(%(:"#{fact_on(host, 'networking')['network']}"), ':"10.0.2.0"')
+        str_data = str_data.gsub(fact_on(host, 'networking.fqdn'), 'foo.example.com')
+                           .gsub(fact_on(host, 'networking.domain'), 'example.com')
+                           .gsub(%(:"#{fact_on(host, 'networking.hostname')}"), ':"foo"')
+                           .gsub(%(:"#{fact_on(host, 'networking.ip')}"), ':"10.0.2.15"')
+                           .gsub(%(:"#{fact_on(host, 'networking.netmask')}"), ':"255.255.0.0"')
+                           .gsub(%(:"#{fact_on(host, 'networking.network')}"), ':"10.0.2.0"')
                            .gsub(%r{"dhcp":"(.+?)"}, '"dhcp":"10.0.2.2"')
 
         expect { JSON.parse(str_data) }.not_to raise_error

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet'
 require 'simp/rspec-puppet-facts'
 include Simp::RspecPuppetFacts

data/spec/unit/shim_dispatch_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'English'
+require 'timeout'
+
+# Regression tests for https://github.com/simp/rubygem-simp-rspec-puppet-facts/issues/86
+#
+# If a spec_helper does a top-level `include RspecPuppetFacts` before this gem
+# is loaded (voxpupuli-test does this), a plain `extend ::RspecPuppetFacts` on
+# the Shim is silently skipped because the module is already in Object's
+# ancestry.  A later top-level `include Simp::RspecPuppetFacts` then shadows
+# the upstream method, and `Shim.on_supported_os` recurses without bound,
+# consuming all available memory during fact loading.
+describe 'Simp::RspecPuppetFacts::Shim' do
+  describe '.on_supported_os' do
+    it 'dispatches to the upstream rspec-puppet-facts implementation' do
+      expect(Simp::RspecPuppetFacts::Shim.method(:on_supported_os).owner)
+        .not_to eq Simp::RspecPuppetFacts
+    end
+
+    context 'when RspecPuppetFacts was included at the top level before this gem was loaded' do
+      it 'terminates instead of recursing' do
+        # An OS release with no SIMP factset (Debian here) forces
+        # on_supported_os down the Shim path that used to recurse
+        script = <<~SCRIPT
+          require 'rspec'
+          require 'rspec-puppet-facts'
+          include RspecPuppetFacts
+          require 'simp/rspec-puppet-facts'
+          include Simp::RspecPuppetFacts
+          facts = on_supported_os(
+            supported_os: [
+              { 'operatingsystem' => 'RedHat', 'operatingsystemrelease' => ['9'] },
+              { 'operatingsystem' => 'Debian', 'operatingsystemrelease' => ['12'] },
+            ],
+          )
+          exit!(1) unless facts.key?('redhat-9-x86_64')
+          puts 'SHIM_DISPATCH_OK'
+        SCRIPT
+
+        lib_dir = File.expand_path('../../lib', __dir__)
+        output = nil
+        Timeout.timeout(120) do
+          output = IO.popen([RbConfig.ruby, '-I', lib_dir, '-e', script], err: [:child, :out], &:read)
+        end
+        expect($CHILD_STATUS).to be_success, "subprocess failed (#{$CHILD_STATUS}):\n#{output}"
+        expect(output).to include('SHIM_DISPATCH_OK')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-16 00:00:00.000000000 Z
+date: 2026-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: puppetlabs_spec_helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +115,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: rspec-puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +398,7 @@ files:
 - spec/spec_helper.rb
 - spec/spec_helper_acceptance.rb
 - spec/unit/data_normalization_spec.rb
+- spec/unit/shim_dispatch_spec.rb
 - spec/unit/simp_rspec_puppet_facts_spec.rb
 homepage: https://github.com/simp/rubygem-simp-rspec-puppet-facts
 licenses:
@@ -450,6 +451,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/spec_helper_acceptance.rb
 - spec/unit/data_normalization_spec.rb
+- spec/unit/shim_dispatch_spec.rb
 - spec/unit/simp_rspec_puppet_facts_spec.rb
 - facts/2.5/almalinux-8-x86_64.facts
 - facts/2.5/almalinux-9-x86_64.facts