rspec-puppet-facts 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdaf2d116b0a1d982bd70b4948e66d506a05d1a7eab49fb308953cbb2788da23
-  data.tar.gz: 1aa1e7c8af6ee17cdc146abb25cd1b8ea5296ff9798add299053b0a200efac33
+  metadata.gz: 8678116a3cc4e7c0f5d7c6658f33859c61f7ff9df4773b1140012895ca3c8c83
+  data.tar.gz: ad575c16065f79a93331fe1d6bfadce970345916ea41c0b02f26554e20fbb374
 SHA512:
-  metadata.gz: e9a054fd3a64639a6ede9f837e508dbbb7029409d3f3e4b5d596786d154bbcf80ac4a7933287ab935a98cdd3f030884e18cdddd9b267fc25489cb080b74898cb
-  data.tar.gz: 11dbcb1973cffbe6df4b2a826ba995b13f40ba89a6c611fbcc89473d293f4871f076e3c47e0f477ad40f140638cdce0ff03195488249bfe49b28e1944299542d
+  metadata.gz: 6268e78cce4f0e27253ef5ea590cd6a8e1a10da839c8a37259a2ec6598ff15956f0beb58e845e10753989e3214841883a3ffef738b3b082cc35bb1168571ac83
+  data.tar.gz: b3fc0a8a23741abbf153cf7ba937979911261a0ec89c09517ec1497d3523d637f8641cf8fc8d50a40b29d2b7055cebbd65cd259c050107cc4f5bb5b6d367896c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [5.3.0](https://github.com/voxpupuli/rspec-puppet-facts/tree/5.3.0) (2025-04-28)
+
+[Full Changelog](https://github.com/voxpupuli/rspec-puppet-facts/compare/5.2.0...5.3.0)
+
+**Implemented enhancements:**
+
+- Add Puppet 8.12 / Facter 4.12 [\#204](https://github.com/voxpupuli/rspec-puppet-facts/pull/204) ([bastelfreak](https://github.com/bastelfreak))
+- Only store facter versions in JSON [\#203](https://github.com/voxpupuli/rspec-puppet-facts/pull/203) ([ekohl](https://github.com/ekohl))
+
 ## [5.2.0](https://github.com/voxpupuli/rspec-puppet-facts/tree/5.2.0) (2024-10-30)
 
 [Full Changelog](https://github.com/voxpupuli/rspec-puppet-facts/compare/5.1.0...5.2.0)

data/README.md

@@ -572,7 +572,7 @@ When no facts are available for the specific facter/operating system combination
 ## Maintenance
 
 This gem uses information about puppet AIO component versions to build/test.
-They are vendored at `ext/puppet_agent_components.json`. If they are outdated,
+They are stored at `ext/puppet_agent_facter_versions.json`. If they are outdated,
 the `puppet_versions:test` rake task will fail and they need to be updated.
 This is as easy as running: `bundle exec rake puppet_versions:update`
 

data/Rakefile

@@ -1,4 +1,4 @@
-PUPPET_VERSIONS_PATH = File.join(__dir__, 'ext', 'puppet_agent_components.json')
+PUPPET_VERSIONS_PATH = File.join(__dir__, 'ext', 'puppet_agent_facter_versions.json')
 
 begin
   require 'rspec/core/rake_task'
@@ -31,9 +31,14 @@ namespace :puppet_versions do
     response = http.request(request)
     raise unless response.is_a?(Net::HTTPSuccess)
 
-    File.open(PUPPET_VERSIONS_PATH, 'wb:UTF-8') do |fd|
-      fd.write(JSON.pretty_generate(JSON.parse(response.body)))
+    data = JSON.parse(response.body).filter_map do |_, versions|
+      if !versions['puppet'].nil? && !versions['facter'].nil?
+        [versions['puppet'], versions['facter']]
+      end
     end
+    data.sort_by! { |puppet, _facter| Gem::Version.new(puppet) }.reverse!
+
+    File.write(PUPPET_VERSIONS_PATH, "#{JSON.pretty_generate(data.to_h)}\n")
   end
 
   task :test do

data/ext/puppet_agent_facter_versions.json

@@ -0,0 +1,133 @@
+{
+  "8.12.0": "4.12.0",
+  "8.11.0": "4.11.0",
+  "8.10.0": "4.10.0",
+  "8.9.0": "4.9.0",
+  "8.8.1": "4.8.0",
+  "8.8.0": "4.8.0",
+  "8.7.0": "4.7.1",
+  "8.6.0": "4.7.0",
+  "8.5.1": "4.6.1",
+  "8.5.0": "4.6.0",
+  "8.4.0": "4.5.2",
+  "8.3.1": "4.5.1",
+  "8.3.0": "4.5.1",
+  "8.2.0": "4.4.2",
+  "8.1.0": "4.4.1-2-g785cfa2ae",
+  "8.0.0": "4.4.0",
+  "7.35.0": "4.11.0",
+  "7.34.0": "4.10.0",
+  "7.33.0": "4.9.0",
+  "7.32.1": "4.8.0",
+  "7.32.0": "4.8.0",
+  "7.31.0": "4.7.1",
+  "7.30.0": "4.7.0",
+  "7.29.1": "4.6.1",
+  "7.29.0": "4.6.0",
+  "7.28.0": "4.5.2",
+  "7.27.0": "4.5.1",
+  "7.26.0": "4.4.2",
+  "7.25.0": "4.4.1",
+  "7.24.0": "4.3.1",
+  "7.23.0": "4.3.0",
+  "7.21.0": "4.2.14",
+  "7.20.0": "4.2.13",
+  "7.19.0": "4.2.12",
+  "7.18.0": "4.2.11",
+  "7.17.0": "4.2.10",
+  "7.16.0": "4.2.8",
+  "7.15.0": "4.2.8",
+  "7.14.0": "4.2.7",
+  "7.13.1": "4.2.6",
+  "7.13.0": "4.2.6",
+  "7.12.1": "4.2.5",
+  "7.12.0": "4.2.5",
+  "7.11.0": "4.2.4",
+  "7.10.0": "4.2.3",
+  "7.9.0": "4.2.2",
+  "7.8.0": "4.2.1",
+  "7.7.0": "4.2.0",
+  "7.6.1": "4.1.1",
+  "7.6.0": "4.1.0",
+  "7.5.0": "4.0.52",
+  "7.4.1": "4.0.51",
+  "7.4.0": "4.0.51",
+  "7.3.0": "4.0.49",
+  "7.1.0": "4.0.47",
+  "7.0.0": "4.0.46",
+  "6.28.0": "3.14.24",
+  "6.27.0": "3.14.23",
+  "6.26.0": "3.14.22",
+  "6.25.1": "3.14.21",
+  "6.25.0": "3.14.20",
+  "6.24.0": "3.14.19",
+  "6.23.0": "3.14.18",
+  "6.22.1": "3.14.17",
+  "6.22.0": "3.14.17",
+  "6.21.1": "3.14.16",
+  "6.21.0": "3.14.16",
+  "6.20.0": "3.14.15",
+  "6.19.1": "3.14.14",
+  "6.19.0": "3.14.14",
+  "6.18.0": "3.14.13",
+  "6.17.0": "3.14.12",
+  "6.16.0": "3.14.11",
+  "6.15.0": "3.14.10",
+  "6.14.0": "3.14.9",
+  "6.13.0": "3.14.8",
+  "6.12.0": "3.14.7",
+  "6.11.1": "3.14.6",
+  "6.11.0": "3.14.6",
+  "6.10.1": "3.14.5",
+  "6.10.0": "3.14.5",
+  "6.9.0": "3.14.4",
+  "6.8.1": "3.14.3",
+  "6.8.0": "3.14.3",
+  "6.7.2": "3.14.2",
+  "6.7.1": "3.14.2",
+  "6.7.0": "3.14.2",
+  "6.6.0": "3.14.1",
+  "6.5.0": "3.14.0",
+  "6.4.5": "3.13.5",
+  "6.4.4": "3.13.4",
+  "6.4.3": "3.13.3",
+  "6.4.2": "3.13.2",
+  "6.4.1": "3.13.2",
+  "6.4.0": "3.13.1",
+  "6.3.0": "3.13.0",
+  "6.2.0": "3.12.3",
+  "6.0.10": "3.12.5",
+  "6.0.9": "3.12.4",
+  "6.0.8": "3.12.4",
+  "6.0.7": "3.12.4",
+  "6.0.5": "3.12.3",
+  "5.5.22": "3.11.14",
+  "5.5.21": "3.11.14",
+  "5.5.20": "3.11.13",
+  "5.5.19": "3.11.12",
+  "5.5.18": "3.11.11",
+  "5.5.17": "3.11.10",
+  "5.5.16": "3.11.9",
+  "5.5.15": "3.11.9",
+  "5.5.14": "3.11.8",
+  "5.5.13": "3.11.8",
+  "5.5.12": "3.11.8",
+  "5.5.11": "3.11.8",
+  "5.5.10": "3.11.7",
+  "5.5.9": "3.11.7",
+  "5.4.0": "3.10.0",
+  "5.3.5": "3.9.5",
+  "5.3.4": "3.9.4",
+  "5.3.3": "3.9.3",
+  "5.3.2": "3.9.2",
+  "5.3.1": "3.9.2",
+  "5.3.0": "3.9.1",
+  "5.2.0": "3.9.0",
+  "5.1.0": "3.8.0",
+  "4.10.13": "3.6.11",
+  "4.10.10": "3.6.9",
+  "4.10.9": "3.6.8",
+  "4.10.8": "3.6.7",
+  "4.10.7": "3.6.7",
+  "4.10.6": "3.6.6"
+}

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

@@ -2,6 +2,6 @@ module RspecPuppetFacts
   # This module contains the current version constant
   module Version
     # The current version of this gem
-    STRING = '5.2.0'
+    STRING = '5.3.0'
   end
 end

data/lib/rspec-puppet-facts.rb

@@ -57,7 +57,7 @@ module RspecPuppetFacts
   #
   # @api private
   def on_supported_os_implementation(opts = {})
-    unless /\A\d+\.\d+(?:\.\d+)*\z/.match?((facterversion = opts[:facterversion]))
+    unless /\A\d+\.\d+(?:\.\d+)*\z/.match?(facterversion = opts[:facterversion])
       raise ArgumentError, ":facterversion must be in the format 'n.n' or 'n.n.n' (n is numeric), not '#{facterversion}'"
     end
 
@@ -391,22 +391,15 @@ module RspecPuppetFacts
   def self.facter_version_for_puppet_version(puppet_version)
     return Facter.version if puppet_version.nil?
 
-    json_path = File.expand_path(File.join(__dir__, '..', 'ext', 'puppet_agent_components.json'))
+    json_path = File.expand_path(File.join(__dir__, '..', 'ext', 'puppet_agent_facter_versions.json'))
     unless File.file?(json_path) && File.readable?(json_path)
       warning "#{json_path} does not exist or is not readable, defaulting to Facter #{Facter.version}"
       return Facter.version
     end
 
-    fd = File.open(json_path, 'rb:UTF-8')
-    data = JSON.parse(fd.read)
-
-    version_map = data.map do |_, versions|
-      if versions['puppet'].nil? || versions['facter'].nil?
-        nil
-      else
-        [Gem::Version.new(versions['puppet']), versions['facter']]
-      end
-    end.compact
+    version_map = JSON.load_file(json_path).map do |puppet, facter|
+      [Gem::Version.new(puppet), facter]
+    end
 
     puppet_gem_version = Gem::Version.new(puppet_version)
     applicable_versions = version_map.select { |p, _| puppet_gem_version >= p }
@@ -419,8 +412,6 @@ module RspecPuppetFacts
   rescue JSON::ParserError
     warning "#{json_path} contains invalid JSON, defaulting to Facter #{Facter.version}"
     Facter.version
-  ensure
-    fd.close if fd
   end
 end
 

data/rspec-puppet-facts.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.12'
   s.add_development_dependency 'yard', '~> 0.9.34'
 
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.0.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
 
   s.add_dependency 'deep_merge', '~> 1.2'
   s.add_dependency 'facter', '< 5'

data/spec/rspec_puppet_facts_spec.rb

@@ -19,7 +19,7 @@ describe RspecPuppetFacts do
     end
 
     let(:component_json_path) do
-      File.expand_path(File.join(__dir__, '..', 'ext', 'puppet_agent_components.json'))
+      File.expand_path(File.join(__dir__, '..', 'ext', 'puppet_agent_facter_versions.json'))
     end
 
     let(:puppet_version) { Puppet.version }
@@ -60,8 +60,7 @@ describe RspecPuppetFacts do
 
     context 'when the component JSON file is unparseable' do
       before do
-        io = StringIO.new('this is not JSON!')
-        allow(File).to receive(:open).with(component_json_path, anything).and_return(io)
+        allow(JSON).to receive(:load_file).with(component_json_path).and_raise(JSON::ParserError)
         allow(described_class).to receive(:warning)
       end
 
@@ -88,14 +87,11 @@ describe RspecPuppetFacts do
       let(:puppet_version) { '999.0.0' }
 
       it 'returns the Facter version for the highest known Puppet version' do
-        known_facter_versions = JSON.parse(File.read(component_json_path)).map do |_, r|
-          r['facter']
-        end
-        sorted_facter_versions = known_facter_versions.compact.sort do |a, b|
-          Gem::Version.new(b) <=> Gem::Version.new(a)
+        expected = JSON.parse(File.read(component_json_path)).values.max_by do |version|
+          Gem::Version.new(version)
         end
 
-        expect(facter_version).to eq(sorted_facter_versions.first)
+        expect(facter_version).to eq(expected)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- ext/puppet_agent_components.json
+- ext/puppet_agent_facter_versions.json
 - lib/rspec-puppet-facts.rb
 - lib/rspec-puppet-facts/version.rb
 - rspec-puppet-facts.gemspec
@@ -180,7 +180,7 @@ homepage: http://github.com/voxpupuli/rspec-puppet-facts
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Standard facts fixtures for Puppet
 test_files: []