facter 4.0.8.pre → 4.0.9.pre

data/lib/facts/solaris/solaris_zones/current.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Solaris
-    class SolarisZonesCurrent
-      FACT_NAME = 'solaris_zones.current'
+    module SolarisZones
+      class Current
+        FACT_NAME = 'solaris_zones.current'
 
-      def call_the_resolver
-        fact_value = Resolvers::SolarisZoneName.resolve(:current_zone_name)
-        ResolvedFact.new(FACT_NAME, fact_value)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::SolarisZoneName.resolve(:current_zone_name)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
       end
     end
   end

data/lib/facts/solaris/solaris_zones/zone.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Solaris
-    class Zone
-      FACT_NAME = 'solaris_zones.zones'
+    module SolarisZones
+      class Zone
+        FACT_NAME = 'solaris_zones.zones'
 
-      def call_the_resolver
-        results = Facter::Resolvers::SolarisZone.resolve(:zone)
-        zones_fact = {}
-        results&.each do |result|
-          fact_value = { result[:name].to_sym => {
-            brand: result[:brand],
-            id: result[:id],
-            ip_type: result[:ip_type],
-            path: result[:path],
-            status: result[:status]
-          } }
-          zones_fact.merge!(fact_value)
+        def call_the_resolver
+          results = Facter::Resolvers::SolarisZone.resolve(:zone)
+          zones_fact = {}
+          results&.each do |result|
+            fact_value = { result[:name].to_sym => {
+              brand: result[:brand],
+              id: result[:id],
+              ip_type: result[:ip_type],
+              path: result[:path],
+              status: result[:status]
+            } }
+            zones_fact.merge!(fact_value)
+          end
+          Facter::ResolvedFact.new(FACT_NAME, zones_fact)
         end
-        ResolvedFact.new(FACT_NAME, zones_fact)
       end
     end
   end

data/lib/facts/solaris/zfs_featurenumbers.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Solaris
-    class ZFSFeatureNumbers
+    class ZfsFeaturenumbers
       FACT_NAME = 'zfs_featurenumbers'
 
       def call_the_resolver
-        fact_value = Resolvers::Solaris::ZFS.resolve(:zfs_featurenumbers)
-        ResolvedFact.new(FACT_NAME, fact_value)
+        fact_value = Facter::Resolvers::Solaris::ZFS.resolve(:zfs_featurenumbers)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/solaris/zfs_version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Solaris
-    class ZFSVersion
+    class ZfsVersion
       FACT_NAME = 'zfs_version'
 
       def call_the_resolver
-        fact_value = Resolvers::Solaris::ZFS.resolve(:zfs_version)
-        ResolvedFact.new(FACT_NAME, fact_value)
+        fact_value = Facter::Resolvers::Solaris::ZFS.resolve(:zfs_version)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/solaris/zpool_featurenumbers.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Solaris
-    class ZPoolFeatureNumbers
+    class ZpoolFeaturenumbers
       FACT_NAME = 'zpool_featurenumbers'
 
       def call_the_resolver
-        fact_value = Resolvers::Solaris::ZPool.resolve(:zpool_featurenumbers)
-        ResolvedFact.new(FACT_NAME, fact_value)
+        fact_value = Facter::Resolvers::Solaris::ZPool.resolve(:zpool_featurenumbers)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/solaris/zpool_version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Solaris
-    class ZPoolVersion
+    class ZpoolVersion
       FACT_NAME = 'zpool_version'
 
       def call_the_resolver
-        fact_value = Resolvers::Solaris::ZPool.resolve(:zpool_version)
-        ResolvedFact.new(FACT_NAME, fact_value)
+        fact_value = Facter::Resolvers::Solaris::ZPool.resolve(:zpool_version)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/windows/dhcp_servers.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
     class DhcpServers
       FACT_NAME = 'dhcp_servers'
 
       def call_the_resolver
         fact_value = construct_addresses_hash
-        ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value, :legacy)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value, :legacy)
       end
 
       private
 
       def construct_addresses_hash
-        servers = { system: Resolvers::Networking.resolve(:dhcp) }
-        interfaces = Resolvers::Networking.resolve(:interfaces)
+        servers = { system: Facter::Resolvers::Networking.resolve(:dhcp) }
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
         servers
       end

data/lib/facts/windows/dmi/manufacturer.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class DmiManufacturer
-      FACT_NAME = 'dmi.manufacturer'
-      ALIASES = 'manufacturer'
+    module Dmi
+      class Manufacturer
+        FACT_NAME = 'dmi.manufacturer'
+        ALIASES = 'manufacturer'
 
-      def call_the_resolver
-        fact_value = Resolvers::DMIBios.resolve(:manufacturer)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::DMIBios.resolve(:manufacturer)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
       end
     end
   end

data/lib/facts/windows/dmi/product/name.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class DmiProductName
-      FACT_NAME = 'dmi.product.name'
-      ALIASES = 'productname'
+    module Dmi
+      module Product
+        class Name
+          FACT_NAME = 'dmi.product.name'
+          ALIASES = 'productname'
 
-      def call_the_resolver
-        fact_value = Resolvers::DMIComputerSystem.resolve(:name)
+          def call_the_resolver
+            fact_value = Facter::Resolvers::DMIComputerSystem.resolve(:name)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
       end
     end
   end

data/lib/facts/windows/dmi/product/serial_number.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class DmiProductSerialNumber
-      FACT_NAME = 'dmi.product.serial_number'
-      ALIASES = 'serialnumber'
+    module Dmi
+      module Product
+        class SerialNumber
+          FACT_NAME = 'dmi.product.serial_number'
+          ALIASES = 'serialnumber'
 
-      def call_the_resolver
-        fact_value = Resolvers::DMIBios.resolve(:serial_number)
+          def call_the_resolver
+            fact_value = Facter::Resolvers::DMIBios.resolve(:serial_number)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
       end
     end
   end

data/lib/facts/windows/dmi/product/uuid.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class DmiProductUUID
-      FACT_NAME = 'dmi.product.uuid'
-      ALIASES = 'uuid'
+    module Dmi
+      module Product
+        class Uuid
+          FACT_NAME = 'dmi.product.uuid'
+          ALIASES = 'uuid'
 
-      def call_the_resolver
-        fact_value = Resolvers::DMIComputerSystem.resolve(:uuid)
+          def call_the_resolver
+            fact_value = Facter::Resolvers::DMIComputerSystem.resolve(:uuid)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
       end
     end
   end

data/lib/facts/windows/facterversion.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
     class Facterversion
       FACT_NAME = 'facterversion'
 
       def call_the_resolver
-        fact_value = Resolvers::Facterversion.resolve(:facterversion)
+        fact_value = Facter::Resolvers::Facterversion.resolve(:facterversion)
 
-        ResolvedFact.new(FACT_NAME, fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/windows/fips_enabled.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
     class FipsEnabled
       FACT_NAME = 'fips_enabled'
 
       def call_the_resolver
-        fact_value = Resolvers::Windows::Fips.resolve(:fips_enabled)
+        fact_value = Facter::Resolvers::Windows::Fips.resolve(:fips_enabled)
 
-        ResolvedFact.new(FACT_NAME, fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/windows/hypervisors/hyperv.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class HypervisorsHyperv
-      FACT_NAME = 'hypervisors.hyperv'
+    module Hypervisors
+      class Hyperv
+        FACT_NAME = 'hypervisors.hyperv'
 
-      def call_the_resolver
-        fact_value = {} if hyperv?
+        def call_the_resolver
+          fact_value = {} if hyperv?
 
-        ResolvedFact.new(FACT_NAME, fact_value)
-      end
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
 
-      private
+        private
 
-      def hyperv?
-        Resolvers::Virtualization.resolve(:virtual) == 'hyperv' ||
-          Resolvers::DMIBios.resolve(:manufacturer).include?('Microsoft')
+        def hyperv?
+          Facter::Resolvers::Virtualization.resolve(:virtual) == 'hyperv' ||
+            Facter::Resolvers::DMIBios.resolve(:manufacturer).include?('Microsoft')
+        end
       end
     end
   end

data/lib/facts/windows/hypervisors/kvm.rb

@@ -1,33 +1,35 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class HypervisorsKvm
-      FACT_NAME = 'hypervisors.kvm'
+    module Hypervisors
+      class Kvm
+        FACT_NAME = 'hypervisors.kvm'
 
-      def call_the_resolver
-        fact_value = discover_provider || {} if kvm?
+        def call_the_resolver
+          fact_value = discover_provider || {} if kvm?
 
-        ResolvedFact.new(FACT_NAME, fact_value)
-      end
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
 
-      private
+        private
 
-      def kvm?
-        product_name = Resolvers::DMIComputerSystem.resolve(:name)
+        def kvm?
+          product_name = Facter::Resolvers::DMIComputerSystem.resolve(:name)
 
-        (Resolvers::Virtualization.resolve(:virtual) == 'kvm' || Resolvers::NetKVM.resolve(:kvm)) &&
-          product_name != 'VirtualBox' && !product_name.match(/^Parallels/)
-      end
+          (Facter::Resolvers::Virtualization.resolve(:virtual) == 'kvm' || Facter::Resolvers::NetKVM.resolve(:kvm)) &&
+            product_name != 'VirtualBox' && !product_name.match(/^Parallels/)
+        end
 
-      def discover_provider
-        manufacturer = Resolvers::DMIBios.resolve(:manufacturer)
+        def discover_provider
+          manufacturer = Facter::Resolvers::DMIBios.resolve(:manufacturer)
 
-        return { google: true } if manufacturer == 'Google'
+          return { google: true } if manufacturer == 'Google'
 
-        return { openstack: true } if Resolvers::DMIComputerSystem.resolve(:name) =~ /^OpenStack/
+          return { openstack: true } if Facter::Resolvers::DMIComputerSystem.resolve(:name) =~ /^OpenStack/
 
-        return { amazon: true } if manufacturer =~ /^Amazon/
+          return { amazon: true } if manufacturer =~ /^Amazon/
+        end
       end
     end
   end

data/lib/facts/windows/hypervisors/virtualbox.rb

@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class HypervisorsVirtualbox
-      FACT_NAME = 'hypervisors.virtualbox'
+    module Hypervisors
+      class Virtualbox
+        FACT_NAME = 'hypervisors.virtualbox'
 
-      def call_the_resolver
-        fact_value = populate_version_and_revision if virtualbox?
+        def call_the_resolver
+          fact_value = populate_version_and_revision if virtualbox?
 
-        ResolvedFact.new(FACT_NAME, fact_value)
-      end
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
 
-      private
+        private
 
-      def virtualbox?
-        Resolvers::Virtualization.resolve(:virtual) == 'virtualbox' ||
-          Resolvers::DMIComputerSystem.resolve(:name) == 'VirtualBox'
-      end
+        def virtualbox?
+          Facter::Resolvers::Virtualization.resolve(:virtual) == 'virtualbox' ||
+            Facter::Resolvers::DMIComputerSystem.resolve(:name) == 'VirtualBox'
+        end
 
-      def populate_version_and_revision
-        oem_strings = Resolvers::Virtualization.resolve(:oem_strings)
-        return unless oem_strings
+        def populate_version_and_revision
+          oem_strings = Facter::Resolvers::Virtualization.resolve(:oem_strings)
+          return unless oem_strings
 
-        version = revision = ''
+          version = revision = ''
 
-        oem_strings.each do |string|
-          version = string[8, string.size] if string.start_with?('vboxVer_') && version.empty?
-          revision = string[8, string.size] if string.start_with?('vboxRev_') && revision.empty?
+          oem_strings.each do |string|
+            version = string[8, string.size] if string.start_with?('vboxVer_') && version.empty?
+            revision = string[8, string.size] if string.start_with?('vboxRev_') && revision.empty?
+          end
+          { version: version, revision: revision }
         end
-        { version: version, revision: revision }
       end
     end
   end