openfact 5.4.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d2e82c285041a67df8e09555f99b036c71b809b0f2de5b1bf51bffbd4ba6b6
-  data.tar.gz: ed4379f690cc03afd6e55a34f9b92ef71f4092c1f39a5e141f962957cc13da16
+  metadata.gz: 937929da6c35dd97cfd2fcf36876790643ddf49bd0a8cc67b60e5e0f9783086b
+  data.tar.gz: c28a8b66a62eed18ac3dd29ec87f4f054dbc06178d0cb75bfe2b0e1f8227feee
 SHA512:
-  metadata.gz: c355f5cade881c26c9bb534e0db6a60cb1a3bbd4ff9a58d95b43cbe512155b797bdccb9acbc7e2cba5b97b048472c65190a35a7c736a26e604c2749af0627716
-  data.tar.gz: 2f767582f751bbc74a73dd7dd26457f4bcd2c201a2cadfe7fc8aab38b8904a29cc7b3438265bc37de04f6e960c24b1a573c62a4b575025df73f2af524b0bf1d2
+  metadata.gz: 467c57b11e8019de5c6e4ba21686100beb6ad3d7a79d896a333aa0d12ef4561d7a8026d0627aac0ad2ff0d808909883944892459198c0f5941d0bffed1ad02b6
+  data.tar.gz: 690faa02abfad3b086339b62351b4cc78f4a9669f9dec61bcedc7b64dd9d852c73fcc111bfed72bd7ae7ba245c3238ea8fc98b818021bb86784999bb275dfecd

data/lib/facter/resolvers/linux/containers.rb

@@ -52,6 +52,8 @@ module Facter
               vm = 'podman'
             when 'crio'
               vm = 'crio'
+            when 'oci'
+              vm = 'oci'
             when 'zone'
               return nil
             when 'systemd-nspawn'

data/lib/facter/resolvers/networking.rb

@@ -49,8 +49,12 @@ module Facter
           interfaces_data.each do |interface_name, raw_data|
             parsed_interface_data = {}
 
+            extract_flags(raw_data, parsed_interface_data)
+            extract_rdomain(raw_data, parsed_interface_data)
             extract_mtu(raw_data, parsed_interface_data)
             extract_mac(raw_data, parsed_interface_data)
+            extract_description(raw_data, parsed_interface_data)
+            extract_groups(raw_data, parsed_interface_data)
             extract_dhcp(interface_name, raw_data, parsed_interface_data)
             extract_ip_data(raw_data, parsed_interface_data)
 
@@ -59,11 +63,31 @@ module Facter
           @fact_list[:interfaces] = parsed_interfaces_data unless parsed_interfaces_data.empty?
         end
 
+        def extract_flags(raw_data, parsed_interface_data)
+          flags = raw_data.match(/flags=\d+<(.+)>/)&.captures&.first
+          parsed_interface_data[:flags] = flags.split(',') unless flags.nil?
+        end
+
+        def extract_rdomain(raw_data, parsed_interface_data)
+          rdomain = raw_data.match(/rdomain\s+(\d+)/)&.captures&.first&.to_i
+          parsed_interface_data[:rdomain] = rdomain unless rdomain.nil?
+        end
+
         def extract_mtu(raw_data, parsed_interface_data)
           mtu = raw_data.match(/mtu\s+(\d+)/)&.captures&.first&.to_i
           parsed_interface_data[:mtu] = mtu unless mtu.nil?
         end
 
+        def extract_description(raw_data, parsed_interface_data)
+          description = raw_data.match(/description:\s+(.+)/)&.captures&.first
+          parsed_interface_data[:description] = description unless description.nil?
+        end
+
+        def extract_groups(raw_data, parsed_interface_data)
+          groups = raw_data.match(/groups:\s+(.+)/)&.captures&.first
+          parsed_interface_data[:groups] = groups.split("\s") unless groups.nil?
+        end
+
         def extract_mac(raw_data, parsed_interface_data)
           mac = raw_data.match(/(?:ether|lladdr)\s+((?:\w?\w:){5}\w?\w)|(?:infiniband)\s+((?:\w?\w:){19}\w?\w)/)
                         &.captures&.compact&.first

data/lib/facter/resolvers/openbsd/mountpoints.rb

@@ -17,7 +17,7 @@ module Facter
 
           def read_mount(fact_name)
             @fact_list[:mountpoints] = {}
-            output = Facter::Core::Execution.execute('mount', logger: log)
+            output = Facter::Core::Execution.execute('mount -v', logger: log)
             output.split("\n").map do |line|
               add_mount_points_fact(line)
             end
@@ -27,11 +27,21 @@ module Facter
           end
 
           def add_mount_points_fact(line)
-            elem = line.split("\s")
-            options = elem.drop(5)
-            options.each { |option| option.tr!('(),', '') }
-            @fact_list[:mountpoints][elem[2]] = { device: elem[0], filesystem: elem[4],
-                                                  options: options }
+            (*tokens, options) = line.split(/\s*\(|\)\s*/, 0)
+
+            if tokens.length == 3
+              (device, duid, tokens) = tokens
+            else
+              (device, tokens) = tokens[0].split("\s", 2)
+            end
+            (_on, path, _type, filesystem) = tokens.split("\s")
+
+            @fact_list[:mountpoints][path] = {
+              device: device,
+              duid: duid,
+              filesystem: filesystem,
+              options: options.split(",\s")
+            }.compact
           end
 
           def retrieve_sizes_for_mounts

data/lib/facter/resolvers/os_release.rb

@@ -49,7 +49,7 @@ module Facter
 
           pairs = []
           content.each do |line|
-            pairs << line.strip.delete('"').split('=', 2) unless line.start_with?('#')
+            pairs << line.strip.delete(%q('")).split('=', 2) unless line.start_with?('#')
           end
 
           pairs

data/lib/facter/resolvers/uname.rb

@@ -35,6 +35,10 @@ module Facter
             @fact_list[:kernelrelease],
             @fact_list[:kernelname],
             @fact_list[:kernelversion] = uname_results.map(&:strip)
+            # uutils/coreutils uname does not implement -p and returns "unknown".
+            # Fall back to -m (machine), which is the procedure suggested by the
+            # uutils/coreutils developers.
+            @fact_list[:processor] = @fact_list[:machine] if @fact_list[:processor] == 'unknown'
           else
             log.warn('Request to uname returned no output. Uname related facts are not populated.')
           end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '5.4.0' unless defined?(VERSION)
+  VERSION = '5.6.0' unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.6.0
 platform: ruby
 authors:
 - OpenVox Project
@@ -301,6 +301,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: tsort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: You can prove anything with facts!
 email:
 - openvox@voxpupuli.org
@@ -1288,7 +1302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: OpenFact, a system inventory tool
 test_files: []