facterdb 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf53b6a468fc99aede788c2ede930af2176bdef6054e5bac446916ed8be5ca6
-  data.tar.gz: 00b5c7adbb10c83eeeeb9ba085cc1230a3edbf67dff6b1e7582ac2cc2f928ded
+  metadata.gz: 75843f09832f669272fcb7ea1f32d09f931c0ec55e4603e34593ad24ebc80d25
+  data.tar.gz: ad00ec7cf7ca4a579c2ec918312e18d2b16634e5720aed4a94bb8cdbce0bbf65
 SHA512:
-  metadata.gz: 8111bd85279714edf6ea83a2e0ad2b8570577baece7c460ad0851eddee90593b06ae20868389c1fa1335c27de30cf934e217071fb82d51c0f03883e360be9bbe
-  data.tar.gz: f2fbe4e878c723bcb00f6e9cc56f1a20ab3762f2f56095a693451a427fcf0ce39841e256f54c885d37807470a6fc3072b10b1a586d1c65c81d6144ab2c9c4cd6
+  metadata.gz: 2d8145338782bcb755d72bc58ace5285d5ac340ff6252598f04ad4cf95d1648d373afa5b602bf94c942e972c5d43ba1ff1f4e167f41c22c023d0795fe631062d
+  data.tar.gz: fe5f1c7347394dad0505a9c2429dce5f0ece8beb6ab1679b82b8e269ecac8dc309cf7c42f158c1628b1f721c59acdb39097cdb934e2b96bcc41fdbbe42d55bff

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-12-12 12:48:14 UTC using RuboCop version 1.57.2.
+# on 2024-06-08 21:54:16 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
@@ -20,11 +20,12 @@ Lint/SuppressedException:
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
     - 'spec/facts_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
@@ -38,7 +39,7 @@ Performance/MapCompact:
   Exclude:
     - 'lib/facterdb.rb'
 
-# Offense count: 7
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/StringInclude:
   Exclude:
@@ -64,7 +65,7 @@ RSpec/DescribeClass:
 
 # Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
   Exclude:
@@ -79,7 +80,7 @@ RSpec/ExampleLength:
 RSpec/MultipleExpectations:
   Max: 7
 
-# Offense count: 11
+# Offense count: 19
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 6
@@ -114,7 +115,7 @@ Style/Documentation:
     - 'lib/facterdb.rb'
     - 'lib/facterdb/bin.rb'
 
-# Offense count: 13
+# Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
@@ -141,24 +142,6 @@ Style/HashEachMethods:
   Exclude:
     - 'spec/facts_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/HashTransformKeys:
-  Exclude:
-    - 'lib/facterdb.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/facterdb.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MapToHash:
-  Exclude:
-    - 'lib/facterdb.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
@@ -189,12 +172,6 @@ Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/facterdb.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/SlicingWithRange:
-  Exclude:
-    - 'Rakefile'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
@@ -215,4 +192,4 @@ Style/SymbolProc:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 179
+  Max: 154

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.1.0](https://rubygems.org/gems/facterdb/versions/2.1.0) (2024-06-08)
+
+[Full Changelog](https://github.com/voxpupuli/facterdb/compare/2.0.1...2.1.0)
+
+**Implemented enhancements:**
+
+- Make symbolize keys optional  [\#364](https://github.com/voxpupuli/facterdb/pull/364) ([bastelfreak](https://github.com/bastelfreak))
+
+**Fixed bugs:**
+
+- Fix Arch Linux factsets [\#366](https://github.com/voxpupuli/facterdb/pull/366) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Add tests for OS core facts [\#367](https://github.com/voxpupuli/facterdb/pull/367) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [2.0.1](https://rubygems.org/gems/facterdb/versions/2.0.1) (2024-05-28)
 
 [Full Changelog](https://github.com/voxpupuli/facterdb/compare/2.0.0...2.0.1)

data/facts/4.2/archlinux-x86_64.facts

@@ -427,12 +427,23 @@
   "operatingsystem": "Archlinux",
   "os": {
     "architecture": "x86_64",
+    "distro": {
+      "codename": "n/a",
+      "description": "Arch Linux",
+      "id": "Arch",
+      "release": {
+        "full": "rolling",
+        "major": "rolling"
+      },
+      "specification": "n/a"
+    },
     "family": "Archlinux",
     "hardware": "x86_64",
     "name": "Archlinux",
     "release": {
-      "full": null,
-      "major": null
+      "full": "6.8.7-hardened1-2-hardened",
+      "major": "6",
+      "minor": "8"
     },
     "selinux": {
       "enabled": false

data/facts/4.3/archlinux-x86_64.facts

@@ -427,12 +427,23 @@
   "operatingsystem": "Archlinux",
   "os": {
     "architecture": "x86_64",
+    "distro": {
+      "codename": "n/a",
+      "description": "Arch Linux",
+      "id": "Arch",
+      "release": {
+        "full": "rolling",
+        "major": "rolling"
+      },
+      "specification": "n/a"
+    },
     "family": "Archlinux",
     "hardware": "x86_64",
     "name": "Archlinux",
     "release": {
-      "full": null,
-      "major": null
+      "full": "6.8.7-hardened1-2-hardened",
+      "major": "6",
+      "minor": "8"
     },
     "selinux": {
       "enabled": false

data/facts/4.4/archlinux-x86_64.facts

@@ -427,12 +427,23 @@
   "operatingsystem": "Archlinux",
   "os": {
     "architecture": "x86_64",
+    "distro": {
+      "codename": "n/a",
+      "description": "Arch Linux",
+      "id": "Arch",
+      "release": {
+        "full": "rolling",
+        "major": "rolling"
+      },
+      "specification": "n/a"
+    },
     "family": "Archlinux",
     "hardware": "x86_64",
     "name": "Archlinux",
     "release": {
-      "full": null,
-      "major": null
+      "full": "6.8.7-hardened1-2-hardened",
+      "major": "6",
+      "minor": "8"
     },
     "selinux": {
       "enabled": false

data/facts/4.5/archlinux-x86_64.facts

@@ -433,12 +433,23 @@
   "operatingsystem": "Archlinux",
   "os": {
     "architecture": "x86_64",
+    "distro": {
+      "codename": "n/a",
+      "description": "Arch Linux",
+      "id": "Arch",
+      "release": {
+        "full": "rolling",
+        "major": "rolling"
+      },
+      "specification": "n/a"
+    },
     "family": "Archlinux",
     "hardware": "x86_64",
     "name": "Archlinux",
     "release": {
-      "full": null,
-      "major": null
+      "full": "6.8.7-hardened1-2-hardened",
+      "major": "6",
+      "minor": "8"
     },
     "selinux": {
       "enabled": false

data/facts/4.6/archlinux-x86_64.facts

@@ -434,12 +434,23 @@
   "operatingsystem": "Archlinux",
   "os": {
     "architecture": "x86_64",
+    "distro": {
+      "codename": "n/a",
+      "description": "Arch Linux",
+      "id": "Arch",
+      "release": {
+        "full": "rolling",
+        "major": "rolling"
+      },
+      "specification": "n/a"
+    },
     "family": "Archlinux",
     "hardware": "x86_64",
     "name": "Archlinux",
     "release": {
-      "full": null,
-      "major": null
+      "full": "6.8.7-hardened1-2-hardened",
+      "major": "6",
+      "minor": "8"
     },
     "selinux": {
       "enabled": false

data/facts/4.7/archlinux-x86_64.facts

@@ -434,12 +434,23 @@
   "operatingsystem": "Archlinux",
   "os": {
     "architecture": "x86_64",
+    "distro": {
+      "codename": "n/a",
+      "description": "Arch Linux",
+      "id": "Arch",
+      "release": {
+        "full": "rolling",
+        "major": "rolling"
+      },
+      "specification": "n/a"
+    },
     "family": "Archlinux",
     "hardware": "x86_64",
     "name": "Archlinux",
     "release": {
-      "full": null,
-      "major": null
+      "full": "6.8.7-hardened1-2-hardened",
+      "major": "6",
+      "minor": "8"
     },
     "selinux": {
       "enabled": false

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '2.0.1'
+    STRING = '2.1.0'
   end
 end

data/lib/facterdb.rb

@@ -137,13 +137,17 @@ module FacterDB
 
   # @return [Array[Hash[Symbol, Any]]] array of hashes of facts
   # @param filter [Object] The filter to convert to jgrep string
-  def self.get_facts(filter = nil, cache = true)
+  # @param symbolize_keys [Boolean]
+  #   Whether to symbolize the keys. Note this is only on the top level and not
+  #   on nested values.
+  def self.get_facts(filter = nil, cache = true, symbolize_keys: true)
     if cache && filter && filter == Thread.current[:facterdb_last_filter_seen]
       return Thread.current[:facterdb_last_facts_seen]
     end
 
     filter_str = generate_filter_str(filter)
-    result = JGrep.jgrep(database, filter_str).map { |hash| hash.map { |k, v| [k.to_sym, v] }.to_h }
+    result = JGrep.jgrep(database, filter_str)
+    result = result.map { |hash| hash.transform_keys(&:to_sym) } if symbolize_keys
     if cache
       Thread.current[:facterdb_last_filter_seen] = filter
       Thread.current[:facterdb_last_facts_seen] = result

data/spec/facter_db_spec.rb

@@ -319,14 +319,35 @@ describe FacterDB do
   end
 
   describe '.get_facts' do
-    subject(:result) { FacterDB.get_facts(filter) }
+    subject(:result) { FacterDB.get_facts(filter, symbolize_keys: symbolize_keys) }
 
     let(:filter) { nil }
+    let(:symbolize_keys) { nil }
 
     context 'without parameters' do
       include_examples 'returns a result'
     end
 
+    context 'with stringified output' do
+      let(:symbolize_keys) { false }
+
+      it 'returns strings as keys in factsets' do
+        result.each do |factset|
+          expect(factset.keys).to all(be_an_instance_of(String))
+        end
+      end
+    end
+
+    context 'with symbolized output' do
+      let(:symbolize_keys) { true }
+
+      it 'returns strings as keys in factsets' do
+        result.each do |factset|
+          expect(factset.keys).to all(be_an_instance_of(Symbol))
+        end
+      end
+    end
+
     context 'with an Array filter' do
       let(:filter) { [osfamily: 'Debian'] }
 

data/spec/facts_spec.rb

@@ -117,6 +117,14 @@ describe 'Default Facts' do
         expect(content['systemd_version']).to be_nil
         expect(content['systemd_internal_services']).to be_nil
       end
+
+      # those are used in newer rspec-puppet-facts versions
+      # by ensuring those facts exists, we can drop a huge amount of logic in rspec-puppet-facts
+      it 'contains the mandatory OS facts' do
+        expect(content['os']['release']['major']).to not_be_nil.and not_be_empty
+        expect(content['os']['name']).to not_be_nil.and not_be_empty
+        expect(content['os']['hardware']).to not_be_nil.and not_be_empty
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 2024-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls