rspec-puppet-facts 5.0.0 → 5.4.0

data/lib/rspec-puppet-facts.rb

@@ -1,4 +1,5 @@
-require 'puppet'
+# frozen_string_literal: true
+
 require 'facter'
 require 'facterdb'
 require 'json'
@@ -57,7 +58,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
 
@@ -252,12 +253,23 @@ module RspecPuppetFacts
   def self.common_facts
     return @common_facts if @common_facts
 
+    # from Facter itself
     @common_facts = {
-      puppetversion: Puppet.version,
       rubysitedir: RbConfig::CONFIG['sitelibdir'],
       rubyversion: RUBY_VERSION,
     }
 
+    begin
+      require 'puppet'
+    rescue LoadError
+      warning 'Could not load Puppet'
+    else
+      # from Puppet.initialize_facts
+      @common_facts[:puppetversion] = Puppet.version.to_s
+      # from Puppet::Node::Facts#add_local_facts
+      @common_facts[:implementation] = Puppet.implementation if Puppet.respond_to?(:implementation)
+    end
+
     @common_facts[:mco_version] = MCollective::VERSION if mcollective?
 
     if augeas?
@@ -391,22 +403,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.parse(File.read(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,12 +424,17 @@ 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
 
 RSpec.configure do |c|
-  c.add_setting :default_facter_version, default: RspecPuppetFacts.facter_version_for_puppet_version(Puppet.version)
+  begin
+    require 'puppet'
+  rescue LoadError
+    puppet_version = nil
+  else
+    puppet_version = Puppet.version
+  end
+  c.add_setting :default_facter_version, default: RspecPuppetFacts.facter_version_for_puppet_version(puppet_version)
   c.add_setting :facterdb_string_keys, default: false
 end

data/rspec-puppet-facts.gemspec

@@ -23,10 +23,9 @@ 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', '~> 2.8.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
 
-  s.add_runtime_dependency 'deep_merge', '~> 1.2'
-  s.add_runtime_dependency 'facter', '< 5'
-  s.add_runtime_dependency 'facterdb', '~> 3.1'
-  s.add_runtime_dependency 'puppet', '>= 7', '< 9'
+  s.add_dependency 'deep_merge', '~> 1.2'
+  s.add_dependency 'facter', '< 5'
+  s.add_dependency 'facterdb', '~> 3.1'
 end

data/spec/rspec_puppet_facts_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 require 'stringio'
@@ -19,7 +21,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 +62,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(File).to receive(:read).with(component_json_path).and_return('not json')
         allow(described_class).to receive(:warning)
       end
 
@@ -88,14 +89,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
 
@@ -208,7 +206,7 @@ describe RspecPuppetFacts do
           end
 
           it 'returns a hash' do
-            is_expected.to be_a Hash
+            expect(subject).to be_a Hash
           end
 
           it 'returns supported OS' do
@@ -280,7 +278,7 @@ describe RspecPuppetFacts do
       end
 
       it 'returns a hash' do
-        is_expected.to be_a Hash
+        expect(subject).to be_a Hash
       end
 
       it 'returns supported OS' do
@@ -643,7 +641,7 @@ describe RspecPuppetFacts do
       end
 
       it 'returns facts from the specified default Facter version' do
-        is_expected.to match(
+        expect(subject).to match(
           'centos-9-x86_64' => include(
             facterversion: /\A4\.6\./,
           ),
@@ -666,7 +664,7 @@ describe RspecPuppetFacts do
       end
 
       it 'returns facts from a facter version matching version and below' do
-        is_expected.to match(
+        expect(subject).to match(
           'centos-9-x86_64' => include(
             facterversion: /\A4\.[0-7]\./,
           ),
@@ -695,7 +693,7 @@ describe RspecPuppetFacts do
       end
 
       it 'returns facts from a facter version matching 4.6' do
-        is_expected.to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
+        expect(subject).to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
       end
     end
 
@@ -710,7 +708,7 @@ describe RspecPuppetFacts do
       end
 
       it 'returns facts from a facter version matching 4.6.1' do
-        is_expected.to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
+        expect(subject).to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
       end
     end
 
@@ -751,11 +749,11 @@ describe RspecPuppetFacts do
       end
 
       it 'returns CentOS facts from a facter version matching 4.5' do
-        is_expected.to include('centos-9-x86_64' => include(facterversion: '4.5.2'))
+        expect(subject).to include('centos-9-x86_64' => include(facterversion: '4.5.2'))
       end
 
       it 'returns Debian facts from a facter version matching 4.6.1' do
-        is_expected.to include('debian-12-x86_64' => include(facterversion: '4.6.1'))
+        expect(subject).to include('debian-12-x86_64' => include(facterversion: '4.6.1'))
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,26 +1,4 @@
-begin
-  require 'simplecov'
-  require 'simplecov-console'
-  require 'codecov'
-rescue LoadError
-else
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-
-    add_filter '/spec'
-
-    enable_coverage :branch
-
-    # do not track vendored files
-    add_filter '/vendor'
-    add_filter '/.vendor'
-  end
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov,
-  ]
-end
+# frozen_string_literal: true
 
 require 'rspec'
 require 'rspec-puppet-facts'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -78,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -128,26 +127,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9'
 description: Contains facts from many Facter version on many Operating Systems
 email:
 - voxpupuli@groups.io
@@ -156,6 +135,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/release.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -168,7 +148,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 +160,6 @@ homepage: http://github.com/voxpupuli/rspec-puppet-facts
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Standard facts fixtures for Puppet
 test_files: []