RubyGems - facter - Versions diffs - 4.0.43 → 4.0.49 - Mend

facter 4.0.43 → 4.0.49

Files changed (291) hide show

data/lib/facter/facts/aix/processors/speed.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Aix::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end

data/lib/facter/facts/aix/ssh.rb CHANGED

@@ -16,7 +16,7 @@ module Facts
       end
       def resolver_data
-        Facter::Resolvers::SshResolver.resolve(:ssh)
+        Facter::Resolvers::Ssh.resolve(:ssh)
       end
       def create_ssh_fact(ssh)

data/lib/facter/facts/aix/sshalgorithmkey.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
       def call_the_resolver
         facts = []
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         result.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) }
         facts
       end

data/lib/facter/facts/aix/sshfp_algorithm.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
       def call_the_resolver
         facts = []
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         result.each do |ssh|
           facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
                                             "#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)

data/lib/facter/facts/bsd/processors/speed.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Bsd::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end

data/lib/facter/facts/freebsd/is_virtual.rb ADDED

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Facts
+  module Freebsd
+    class IsVirtual
+      FACT_NAME = 'is_virtual'
+      def initialize
+        @virtual = Facter::Util::Facts::VirtualDetector.new
+      end
+      def call_the_resolver
+        fact_value = @virtual.platform
+        Facter::ResolvedFact.new(FACT_NAME, check_if_virtual(fact_value))
+      end
+      private
+      def check_if_virtual(found_vm)
+        Facter::Util::Facts::PHYSICAL_HYPERVISORS.count(found_vm).zero?
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/memory/swap/available.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:available_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

data/lib/facter/facts/freebsd/memory/swap/available_bytes.rb CHANGED

@@ -11,7 +11,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:available_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/freebsd/memory/swap/total.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:total_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

data/lib/facter/facts/freebsd/memory/swap/total_bytes.rb CHANGED

@@ -11,7 +11,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:total_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/freebsd/memory/swap/used.rb CHANGED

@@ -9,7 +9,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SwapMemory.resolve(:used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

data/lib/facter/facts/freebsd/memory/system/available.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:available_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

data/lib/facter/facts/freebsd/memory/system/available_bytes.rb CHANGED

@@ -11,7 +11,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:available_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/freebsd/memory/system/total.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:total_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

data/lib/facter/facts/freebsd/memory/system/total_bytes.rb CHANGED

@@ -11,7 +11,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:total_bytes)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/freebsd/memory/system/used.rb CHANGED

@@ -9,7 +9,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Freebsd::SystemMemory.resolve(:used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

data/lib/facter/facts/freebsd/processors/speed.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Freebsd::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end

data/lib/facter/facts/freebsd/ssh.rb CHANGED

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'ssh'
       def call_the_resolver
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         ssh_facts = {}
         result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) }
         Facter::ResolvedFact.new(FACT_NAME, ssh_facts)

data/lib/facter/facts/freebsd/sshalgorithmkey.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
       def call_the_resolver
         facts = []
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         result.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) }
         facts
       end

data/lib/facter/facts/freebsd/sshfp_algorithm.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
       def call_the_resolver
         facts = []
-        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
         result.each do |ssh|
           facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
                                             "#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)

data/lib/facter/facts/freebsd/virtual.rb ADDED

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module Facts
+  module Freebsd
+    class Virtual
+      FACT_NAME = 'virtual'
+      def initialize
+        @log = Facter::Log.new(self)
+        @virtual = Facter::Util::Facts::VirtualDetector.new
+      end
+      def call_the_resolver
+        @log.debug('FreeBSD Virtual Resolver')
+        fact_value = @virtual.platform
+        @log.debug("Fact value is: #{fact_value}")
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/linux/dhcp_servers.rb CHANGED

@@ -4,6 +4,7 @@ module Facts
   module Linux
     class DhcpServers
       FACT_NAME = 'dhcp_servers'
+      TYPE = :legacy
       def call_the_resolver
         fact_value = construct_addresses_hash

data/lib/facter/facts/linux/disks.rb CHANGED

@@ -4,7 +4,7 @@ module Facts
   module Linux
     class Disks
       FACT_NAME = 'disks'
-      ALIASES = %w[blockdevices blockdevice_.*_model blockdevice_.*_size blockdevice_.*_vendor'].freeze
+      ALIASES = %w[blockdevices blockdevice_.*_model blockdevice_.*_size blockdevice_.*_vendor].freeze
       def call_the_resolver
         facts = []

data/lib/facter/facts/linux/ec2_metadata.rb CHANGED

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'ec2_metadata'
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
       def call_the_resolver

data/lib/facter/facts/linux/ec2_userdata.rb CHANGED

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'ec2_userdata'
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
       def call_the_resolver

data/lib/facter/facts/linux/hypervisors/kvm.rb CHANGED

@@ -29,7 +29,7 @@ module Facts
           return unless product_name
-          Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+          Facter::Util::Facts::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
           product_name
         end

data/lib/facter/facts/linux/hypervisors/xen.rb CHANGED

@@ -42,7 +42,7 @@ module Facts
           product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
           return unless product_name
-          Facter::FactsUtils::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+          Facter::Util::Facts::HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
           product_name
         end

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

@@ -4,6 +4,7 @@ module Facts
   module Linux
     class Interfaces
       FACT_NAME = 'interfaces'
+      TYPE = :legacy
       def call_the_resolver
         fact_value = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)

data/lib/facter/facts/linux/is_virtual.rb CHANGED

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'is_virtual'
       def initialize
-        @virtual = Facter::VirtualDetector.new
+        @virtual = Facter::Util::Facts::VirtualDetector.new
       end
       def call_the_resolver
@@ -18,7 +18,7 @@ module Facts
       private
       def check_if_virtual(found_vm)
-        Facter::FactsUtils::PHYSICAL_HYPERVISORS.count(found_vm).zero?.to_s
+        Facter::Util::Facts::PHYSICAL_HYPERVISORS.count(found_vm).zero?
       end
     end
   end

data/lib/facter/facts/linux/memory/swap/available.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end
         end

data/lib/facter/facts/linux/memory/swap/available_bytes.rb CHANGED

@@ -12,7 +12,7 @@ module Facts
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_free)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/linux/memory/swap/total.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end
         end

data/lib/facter/facts/linux/memory/swap/total_bytes.rb CHANGED

@@ -11,7 +11,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_total)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/linux/memory/swap/used.rb CHANGED

@@ -9,7 +9,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:swap_used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end

data/lib/facter/facts/linux/memory/system/available.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end

data/lib/facter/facts/linux/memory/system/available_bytes.rb CHANGED

@@ -12,7 +12,7 @@ module Facts
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:memfree)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/linux/memory/system/total.rb CHANGED

@@ -10,7 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:total)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
           end
         end

data/lib/facter/facts/linux/memory/system/total_bytes.rb CHANGED

@@ -11,7 +11,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:total)
             [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+             Facter::ResolvedFact.new(ALIASES, Facter::Util::Facts::UnitConverter.bytes_to_mb(fact_value), :legacy)]
           end
         end
       end

data/lib/facter/facts/linux/memory/system/used.rb CHANGED

@@ -9,7 +9,7 @@ module Facts
           def call_the_resolver
             fact_value = Facter::Resolvers::Linux::Memory.resolve(:used_bytes)
-            fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value)
+            fact_value = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(fact_value)
             Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end

data/lib/facter/facts/linux/os/family.rb CHANGED

@@ -8,8 +8,10 @@ module Facts
         ALIASES = 'osfamily'
         def call_the_resolver
-          fact_value = Facter::Resolvers::OsRelease.resolve(:id_like)
-          fact_value ||= Facter::Resolvers::OsRelease.resolve(:id)
+          id = Facter::Resolvers::OsRelease.resolve(:id_like)
+          id ||= Facter::Resolvers::OsRelease.resolve(:id)
+          fact_value = Facter::Util::Facts.discover_family(id)
           [Facter::ResolvedFact.new(FACT_NAME, fact_value.capitalize),
            Facter::ResolvedFact.new(ALIASES, fact_value.capitalize, :legacy)]

data/lib/facter/facts/linux/processors/speed.rb CHANGED

@@ -8,7 +8,7 @@ module Facts
         def call_the_resolver
           fact_value = Facter::Resolvers::Linux::Processors.resolve(:speed)
-          speed = Facter::FactsUtils::UnitConverter.hertz_to_human_readable(fact_value)
+          speed = Facter::Util::Facts::UnitConverter.hertz_to_human_readable(fact_value)
           Facter::ResolvedFact.new(FACT_NAME, speed)
         end
       end