Merge pull request #175 from bastelfreak/facterdbstrings

work with symbolized strings
voxpupuli · Jun 9, 2024 · cfa4977 · cfa4977
2 parents beadd79 + f5fcdb5
commit cfa4977
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 148 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-07-06 14:12:32 UTC using RuboCop version 1.50.2.
+# on 2024-06-09 13:09:14 UTC using RuboCop version 1.63.5.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,7 +12,7 @@ Performance/MapCompact:
   Exclude:
     - 'lib/rspec-puppet-facts.rb'
 
-# Offense count: 32
+# Offense count: 29
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -29,7 +29,7 @@ RSpec/ExpectInHook:
   Exclude:
     - 'spec/rspec_puppet_facts_spec.rb'
 
-# Offense count: 20
+# Offense count: 8
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
@@ -52,14 +52,14 @@ RSpec/MessageSpies:
 RSpec/MultipleExpectations:
   Max: 2
 
-# Offense count: 46
+# Offense count: 49
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
     - 'spec/rspec_puppet_facts_spec.rb'
 
-# Offense count: 14
+# Offense count: 13
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6

diff --git a/lib/rspec-puppet-facts.rb b/lib/rspec-puppet-facts.rb
@@ -119,7 +119,7 @@ def on_supported_os_implementation(opts = {})
     # 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.
     filter.each do |filter_spec|
-      versions = FacterDB.get_facts(filter_spec).to_h { |facts| [Gem::Version.new(facts[:facterversion]), facts] }
+      versions = FacterDB.get_facts(filter_spec, symbolize_keys: !RSpec.configuration.facterdb_string_keys).to_h { |facts| [Gem::Version.new(facts[:facterversion]), facts] }
 
       version, facts = versions.select { |v, _f| strict_requirement =~ v }.max_by { |v, _f| v }
 
@@ -144,7 +144,7 @@ def on_supported_os_implementation(opts = {})
 
     os_facts_hash = {}
     received_facts.map do |facts|
-      os_fact = facts[:os]
+      os_fact = RSpec.configuration.facterdb_string_keys ? facts['os'] : facts[:os]
       unless os_fact
         RspecPuppetFacts.warning "No os fact was found in FacterDB for: #{facts}"
         next
@@ -156,8 +156,6 @@ def on_supported_os_implementation(opts = {})
       os_facts_hash[os] = RspecPuppetFacts.with_custom_facts(os, facts)
     end
 
-    return stringify_keys(os_facts_hash) if RSpec.configuration.facterdb_string_keys
-
     os_facts_hash
   end
 
@@ -264,6 +262,7 @@ def self.common_facts
     if augeas?
       @common_facts[:augeasversion] = Augeas.open(nil, nil, Augeas::NO_MODL_AUTOLOAD).get('/augeas/version')
     end
+    @common_facts = stringify_keys(@common_facts) if RSpec.configuration.facterdb_string_keys
 
     @common_facts
   end
@@ -424,6 +423,7 @@ def self.facter_version_for_puppet_version(puppet_version)
 
 RSpec.configure do |c|
   c.add_setting :default_facter_version,
-    :default => RspecPuppetFacts.facter_version_for_puppet_version(Puppet.version)
-  c.add_setting :facterdb_string_keys, :default => false
+    default: RspecPuppetFacts.facter_version_for_puppet_version(Puppet.version)
+  c.add_setting :facterdb_string_keys,
+    default: false
 end
diff --git a/rspec-puppet-facts.gemspec b/rspec-puppet-facts.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'deep_merge', '~> 1.2'
   s.add_runtime_dependency 'facter', '< 5'
-  s.add_runtime_dependency 'facterdb', '>= 0.5.0', '< 2'
+  s.add_runtime_dependency 'facterdb', '~> 2.1'
   s.add_runtime_dependency 'puppet', '>= 7', '< 9'
 end
diff --git a/spec/fixtures/metadata.json b/spec/fixtures/metadata.json
@@ -15,16 +15,16 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
-        "8"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "5",
-        "6",
-        "7"
+        "7",
+        "8",
+        "9"
       ]
     }
   ],