facter 4.0.50 → 4.2.0

data/lib/facter/facts/linux/network_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         arr = []
-        interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Linux::Networking.resolve(:interfaces)
         interfaces&.each do |interface_name, info|
           arr << Facter::ResolvedFact.new("network_#{interface_name}", info[:network], :legacy) if info[:network]
         end

data/lib/facter/facts/linux/networking/dhcp.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.dhcp'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:dhcp)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:dhcp)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/linux/networking/domain.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'domain'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Hostname.resolve(:domain)
+          fact_value = Facter::Resolvers::Linux::Hostname.resolve(:domain)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/fqdn.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'fqdn'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Hostname.resolve(:fqdn)
+          fact_value = Facter::Resolvers::Linux::Hostname.resolve(:fqdn)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/hostname.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'hostname'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Hostname.resolve(:hostname)
+          fact_value = Facter::Resolvers::Linux::Hostname.resolve(:hostname)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/interfaces.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.interfaces'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:interfaces)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/linux/networking/ip.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:ip)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:ip)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/ip6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'ipaddress6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:ip6)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:ip6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/mac.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'macaddress'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:mac)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:mac)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/mtu.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.mtu'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:mtu)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:mtu)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/linux/networking/netmask.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:netmask)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:netmask)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/netmask6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:netmask6)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/network.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:network)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/network6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:network6)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/linux/networking/primary.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.primary'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:primary_interface)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/linux/networking/scope6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'scope6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::NetworkingLinux.resolve(:scope6)
+          fact_value = Facter::Resolvers::Linux::Networking.resolve(:scope6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value),
            Facter::ResolvedFact.new('scope6', fact_value, :legacy)]

data/lib/facter/facts/linux/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Lscpu.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Linux::Lscpu.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/scope6_interfaces.rb

@@ -8,7 +8,7 @@ module Facts
 
       def call_the_resolver
         resolved_facts = []
-        interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Linux::Networking.resolve(:interfaces)
 
         interfaces&.each do |interface_name, info|
           if info[:scope6]

data/lib/facter/facts/linux/virtual.rb

@@ -7,12 +7,11 @@ module Facts
 
       def initialize
         @log = Facter::Log.new(self)
-        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
 
       def call_the_resolver
         @log.debug('Linux Virtual Resolver')
-        fact_value = @virtual.platform
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
         @log.debug("Fact value is: #{fact_value}")
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)

data/lib/facter/facts/macosx/os/macosx/version.rb

@@ -6,17 +6,28 @@ module Facts
       module Macosx
         class Version
           FACT_NAME = 'os.macosx.version'
-          ALIASES = %w[macosx_productversion macosx_productversion_major macosx_productversion_minor].freeze
+          ALIASES = %w[macosx_productversion macosx_productversion_major macosx_productversion_minor
+                       macosx_productversion_patch].freeze
 
           def call_the_resolver
             fact_value = Facter::Resolvers::SwVers.resolve(:productversion)
-            versions = fact_value.split('.')
-            ver = { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
+            ver = version_hash(fact_value)
 
             [Facter::ResolvedFact.new(FACT_NAME, ver),
              Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
              Facter::ResolvedFact.new(ALIASES[1], ver['major'], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], ver['minor'], :legacy)]
+             Facter::ResolvedFact.new(ALIASES[2], ver['minor'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[3], ver['patch'], :legacy)]
+          end
+
+          def version_hash(fact_value)
+            versions = fact_value.split('.')
+            if versions[0] == '10'
+              { 'full' => fact_value, 'major' => "#{versions[0]}.#{versions[1]}", 'minor' => versions[-1] }
+            else
+              { 'full' => fact_value, 'major' => versions[0], 'minor' => versions.fetch(1, '0'),
+                'patch' => versions.fetch(2, '0') }
+            end
           end
         end
       end

data/lib/facter/facts/macosx/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/macosx/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/rhel/lsbdistcodename.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Rhel
+    class Lsbdistcodename
+      FACT_NAME = 'lsbdistcodename'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/rhel/lsbdistdescription.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Rhel
+    class Lsbdistdescription
+      FACT_NAME = 'lsbdistdescription'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/rhel/lsbdistid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Rhel
+    class Lsbdistid
+      FACT_NAME = 'lsbdistid'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/rhel/os/distro/codename.rb

@@ -6,13 +6,11 @@ module Facts
       module Distro
         class Codename
           FACT_NAME = 'os.distro.codename'
-          ALIASES = 'lsbdistcodename'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+            fact_value = Facter::Resolvers::RedHatRelease.resolve(:codename)
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facter/facts/rhel/os/distro/description.rb

@@ -6,13 +6,11 @@ module Facts
       module Distro
         class Description
           FACT_NAME = 'os.distro.description'
-          ALIASES = 'lsbdistdescription'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
+            fact_value = Facter::Resolvers::RedHatRelease.resolve(:description)
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facter/facts/rhel/os/distro/id.rb

@@ -6,13 +6,11 @@ module Facts
       module Distro
         class Id
           FACT_NAME = 'os.distro.id'
-          ALIASES = 'lsbdistid'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+            fact_value = Facter::Resolvers::RedHatRelease.resolve(:distributor_id)
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facter/facts/rhel/os/distro/release.rb

@@ -9,20 +9,21 @@ module Facts
           ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
+            version = determine_release_version
 
-            versions = fact_value.split('.')
-            release = {
-              'full' => fact_value,
-              'major' => versions[0],
-              'minor' => versions[1]
-            }
+            return Facter::ResolvedFact.new(FACT_NAME, nil) unless version
 
-            [Facter::ResolvedFact.new(FACT_NAME, release),
-             Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
-             Facter::ResolvedFact.new(ALIASES[1], versions[0], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], versions[1], :legacy)]
+            [Facter::ResolvedFact.new(FACT_NAME, version),
+             Facter::ResolvedFact.new(ALIASES[0], version['full'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[1], version['major'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[2], version['minor'], :legacy)]
+          end
+
+          def determine_release_version
+            version = Facter::Resolvers::RedHatRelease.resolve(:version)
+            version ||= Facter::Resolvers::OsRelease.resolve(:version_id)
+
+            Facter::Util::Facts.release_hash_from_string(version)
           end
         end
       end

data/lib/facter/facts/sles/lsbdistcodename.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Sles
+    class Lsbdistcodename
+      FACT_NAME = 'lsbdistcodename'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end