rspec-puppet-facts 2.0.0 → 2.0.5

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 = '2.0.0'
+    STRING = '2.0.5'
   end
 end

data/lib/rspec-puppet-facts.rb

@@ -7,6 +7,8 @@ require 'json'
 # module's RSpec tests by looping through all supported
 # OS'es and their facts data which is received from the FacterDB.
 module RspecPuppetFacts
+  FACTS_CACHE = {}
+
   # Use the provided options or the data from the metadata.json file
   # to find a set of matching facts in the FacterDB.
   # OS names and facts can be used in the Puppet RSpec tests
@@ -32,6 +34,28 @@ module RspecPuppetFacts
     opts[:supported_os] ||= RspecPuppetFacts.meta_supported_os
     opts[:facterversion] ||= RSpec.configuration.default_facter_version
 
+    # This should list all variables that on_supported_os_implementation uses
+    cache_key = [
+      opts.to_s,
+      RspecPuppetFacts.custom_facts.to_s,
+      RspecPuppetFacts.spec_facts_os_filter,
+      RspecPuppetFacts.spec_facts_strict?,
+    ]
+
+    result = FACTS_CACHE[cache_key] ||= on_supported_os_implementation(opts)
+
+    # Marshalling is used to get unique instances which is needed for test
+    # isolation when facts are overridden.
+    Marshal.load(Marshal.dump(result))
+  end
+
+  # The real implementation of on_supported_os.
+  #
+  # Generating facts is slow - this allows memoization of the facts between
+  # multiple calls.
+  #
+  # @api private
+  def on_supported_os_implementation(opts = {})
     unless (facterversion = opts[:facterversion]) =~ /\A\d+\.\d+(?:\.\d+)*\z/
       raise ArgumentError, ":facterversion must be in the format 'n.n' or " \
         "'n.n.n' (n is numeric), not '#{facterversion}'"
@@ -88,6 +112,8 @@ module RspecPuppetFacts
       end
     end
 
+    facterversion_obj = Gem::Version.new(facterversion)
+
     # FacterDB may have newer versions of facter data for which it contains a subset of all possible
     # facter data (see FacterDB 0.5.2 for Facter releases 3.8 and 3.9). In this situation we need to
     # cycle through and downgrade Facter versions per platform type until we find matching Facter data.
@@ -100,8 +126,6 @@ module RspecPuppetFacts
           raise ArgumentError, "No facts were found in the FacterDB for Facter v#{facterversion} on #{filter_spec}, aborting"
         end
 
-        facterversion_obj = Gem::Version.new(facterversion)
-
         version = FacterDB.get_facts(filter_spec).map { |facts| Gem::Version.new(facts[:facterversion]) }.sort.reverse.detect { |v| v <= facterversion_obj }
 
         next unless version
@@ -125,12 +149,17 @@ module RspecPuppetFacts
     os_facts_hash = {}
     received_facts.map do |facts|
       # Fix facter bug
+      # Todo: refactor the whole block to rely on structured facts and use legacy facts as fallback
       if facts[:operatingsystem] == 'Ubuntu'
         operatingsystemmajrelease = facts[:operatingsystemrelease].split('.')[0..1].join('.')
       elsif facts[:operatingsystem] == 'OpenBSD'
         operatingsystemmajrelease = facts[:operatingsystemrelease]
       elsif facts[:operatingsystem] == 'windows' && facts[:operatingsystemrelease].start_with?('10.0.')
         operatingsystemmajrelease = '2016'
+      elsif facts.dig(:os, 'release', 'major')
+        operatingsystemmajrelease = facts[:os]['release']['major']
+      elsif facts.dig(:os, 'distro', 'release', 'major')
+        operatingsystemmajrelease = facts[:os]['distro']['release']['major']
       else
         if facts[:operatingsystemmajrelease].nil?
           operatingsystemmajrelease = facts[:operatingsystemrelease].split('.')[0]
@@ -203,6 +232,13 @@ module RspecPuppetFacts
     facts
   end
 
+  # Get custom facts
+  # @return [nil,Hash]
+  # @api private
+  def self.custom_facts
+    @custom_facts
+  end
+
   # If provided this filter can be used to limit the set
   # of retrieved facts only to the matched OS names.
   # The value is being taken from the SPEC_FACTS_OS environment

data/rspec-puppet-facts.gemspec

@@ -6,9 +6,9 @@ require 'rspec-puppet-facts/version'
 Gem::Specification.new do |s|
   s.name        = 'rspec-puppet-facts'
   s.version     = RspecPuppetFacts::Version::STRING
-  s.authors     = ['Mickaël Canévet']
-  s.email       = ['mickael.canevet@camptocamp.com']
-  s.homepage    = 'http://github.com/mcanevet/rspec-puppet-facts'
+  s.authors     = ['Vox Pupuli']
+  s.email       = ['voxpupuli@groups.io']
+  s.homepage    = 'http://github.com/voxpupuli/rspec-puppet-facts'
   s.summary     = 'Standard facts fixtures for Puppet'
   s.description = 'Contains facts from many Facter version on many Operating Systems'
   s.licenses    = 'Apache-2.0'
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_development_dependency 'mime-types'
-  s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'

data/spec/spec_helper.rb

@@ -1,6 +1,25 @@
-if ENV['COVERAGE']
-  require 'coveralls'
-  Coveralls.wear!
+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
 
 require 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-puppet-facts
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.5
 platform: ruby
 authors:
-- Mickaël Canévet
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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
@@ -124,16 +110,19 @@ dependencies:
         version: 0.5.0
 description: Contains facts from many Facter version on many Operating Systems
 email:
-- mickael.canevet@camptocamp.com
+- voxpupuli@groups.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
@@ -145,7 +134,7 @@ files:
 - spec/fixtures/metadata.json_with_missing_operatingsystem_support
 - spec/rspec_puppet_facts_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/mcanevet/rspec-puppet-facts
+homepage: http://github.com/voxpupuli/rspec-puppet-facts
 licenses:
 - Apache-2.0
 metadata: {}
@@ -164,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Standard facts fixtures for Puppet

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-script:
-- bundle exec rake spec
-- bundle exec rake puppet_versions:test
-- bundle exec rake build
-rvm:
-- 2.4
-- 2.5
-- 2.7
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.6
-      env: COVERAGE=true
-notifications:
-  email: false
-deploy:
-  provider: rubygems
-  api_key:
-    secure: EGvtHfBYUSjhZjLPGZHHH7Exsu9xyYSNlbI/F9SNRDmY568tBZs1Pw05Pr9dhUXajs3xXPkHQwMEBgNs2Rg2SPc6+dCyvabbNM2U58yj5R5D7+ZdUWC1APgjiDvBhm0N5hihmAnoBKPlmPKMh91OQwKI/8/GOhWAQaIZRnNBzMQ+gwHQ8xIkqt3unxJ/LtRybFDzTF5aMtIHrfE8kV08BLaKUzJptzj7Wt5Ms1zE/2UV1S7DhSvZnxWaWtNZwaQPo9NFhjHr5k3nLIoWi6Ge3khVSukZcAki9cR37Tjeyms5B10hp6jW5c6EgCDQp5VNcD/1LgtTs8fWI6mvTsa3YCyaQdVy2SvhUD88/CohFvLXbGcdkFFzwhPa57aCKazq14fh5epScRzAfGpJojkPcxdc5/fiuZiaPg+jmT/OMFqNjQW1C6m2S+VltlXVCyjT83Ri9J9/AEu708akErhz7XjcspxJL8//KVvS/3o4hjtoef1OXxRN+oh3VGwbEZSiqOmjxr6/AigaYsrWOTdz+OZa4fGYbUb9hMHnq314cjgGUMyzZ9tQN8v4mMZb1ZKZPuqrP6um1Y7WbHQJvwl3sXEUuDN68eyWp103M1nyma6hON4+F+r58kTuoWRmy06ZsaEjz57bFxdnDjB8It8V7pI0bcmfs/q5tMIPw6Gh14w=
-  gem: rspec-puppet-facts
-  on:
-    tags: true
-    repo: mcanevet/rspec-puppet-facts
-    all_branches: true
-    rvm: 2.6