facter 4.0.29 → 4.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b74dafc5ca6ae53d18375036d71456437921a307d85b69ac5da8d74d7e181cb8
-  data.tar.gz: 1b1e51c2f775a2ea9045f39d55a1c5194ad7445ea14a50c65ec22c6bfe41a8cc
+  metadata.gz: f04518bbd83ad1cf3fb6d5d026e1258cf46a374d7535f28066bcab0939e18360
+  data.tar.gz: c7ee4b28049507ce0035377863eca35faf2c5aed82bda495fbc8b8174aa7a3db
 SHA512:
-  metadata.gz: 524e66f0177cac92ec92e728561b525ec77bcbea3625681adfac36e13183f81eb84e19630b70109df5583824dc3247a20770f22c600dcd4b9dce7cf95dcbe976
-  data.tar.gz: cf57b8bdf3b4203f10607ceff79d3ca32449e5554a23f46ba0750f70ff5d4af516f9a63e1f4cea5b636460e6168f2ce912b99e085dd1d4fb3f3f168d25b5af6c
+  metadata.gz: a369de0d02f412b1d385d5f52a7e4d458e076dc765eab53e2bb4fc0866eb56e7e8f28f0664a55eb7f3abe0e6cb23cc830df38d8b3b0862f33ac90e9648386f17
+  data.tar.gz: 905d45c95b4e2802e3fd4e990d75b6afb8d7ce641783283543c11d624ce3764576c5d39ac1d5550e68dd6c43385eca996f0251b2826ef3153e65b937903c9683

data/bin/facter

@@ -2,8 +2,7 @@
 # frozen_string_literal: true
 
 require 'pathname'
-ROOT_DIR = Pathname.new(File.expand_path('..', __dir__)) unless defined?(ROOT_DIR)
-require "#{ROOT_DIR}/lib/framework/cli/cli_launcher.rb"
+require 'facter/framework/cli/cli_launcher.rb'
 
 cli_launcher = CliLauncher.new(ARGV)
 

data/lib/facter.rb

@@ -3,10 +3,9 @@
 require 'pathname'
 require_relative 'util/api_debugger' if ENV['API_DEBUG']
 
-ROOT_DIR = Pathname.new(File.expand_path('..', __dir__)) unless defined?(ROOT_DIR)
-
-require "#{ROOT_DIR}/lib/framework/core/file_loader"
-require "#{ROOT_DIR}/lib/framework/core/options/options_validator"
+require 'facter/version'
+require 'facter/framework/core/file_loader'
+require 'facter/framework/core/options/options_validator'
 
 module Facter
   class ResolveCustomFactError < StandardError; end
@@ -14,7 +13,6 @@ module Facter
   Options.init
   Log.output(STDOUT)
   @already_searched = {}
-  @trace = false
 
   class << self
     def clear_messages
@@ -197,7 +195,7 @@ module Facter
     #
     # @api public
     def trace?
-      @trace
+      Options[:trace]
     end
 
     # Enable or disable trace
@@ -207,7 +205,7 @@ module Facter
     #
     # @api public
     def trace(bool)
-      @trace = bool
+      Options[:trace] = bool
     end
 
     # Gets the value for a fact. Returns `nil` if no such fact exists.
@@ -228,8 +226,7 @@ module Facter
     #
     # @api public
     def version
-      version_file = ::File.join(ROOT_DIR, 'VERSION')
-      ::File.read(version_file).strip
+      Facter::VERSION
     end
 
     # Gets a hash mapping fact names to their values
@@ -257,7 +254,7 @@ module Facter
       elsif message
         arr << message
       end
-      if @trace
+      if Options[:trace]
         arr << 'backtrace:'
         arr.concat(exception.backtrace)
       end

data/lib/{custom_facts → facter/custom_facts}/core/aggregate.rb

@@ -48,6 +48,10 @@ module Facter
         @deps = LegacyFacter::Core::DirectedGraph.new
       end
 
+      def <=>(other)
+        weight <=> other.weight
+      end
+
       def options(options)
         accepted_options = %i[name timeout weight fact_type]
         accepted_options.each do |option_name|

data/lib/facter/custom_facts/core/file_loader.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'facter/custom_facts/core/logging'
+require 'facter/custom_facts/core/legacy_facter'
+require 'facter/custom_facts/util/fact'
+require 'facter/custom_facts/util/collection'
+require 'facter/custom_facts/util/fact'
+require 'facter/custom_facts/util/loader'
+require 'facter/custom_facts/core/execution/base'
+require 'facter/custom_facts/core/execution/windows'
+require 'facter/custom_facts/core/execution/posix'
+require 'facter/custom_facts/util/values'
+require 'facter/custom_facts/util/confine'
+
+require 'facter/custom_facts/util/config'
+
+require 'facter/custom_facts/util/normalization'
+require 'facter/custom_facts/core/execution'
+require 'facter/custom_facts/core/resolvable'
+require 'facter/custom_facts/core/suitable'
+require 'facter/custom_facts/util/resolution'
+require 'facter/custom_facts/core/directed_graph'
+require 'facter/custom_facts/core/resolvable'
+require 'facter/custom_facts/core/aggregate'
+require 'facter/custom_facts/util/composite_loader'
+require 'facter/custom_facts/util/parser'
+require 'facter/custom_facts/util/directory_loader'
+require 'facter/custom_facts/util/nothing_loader'
+require 'facter/custom_facts/util/nothing_loader'

data/lib/{custom_facts → facter/custom_facts}/core/legacy_facter.rb

@@ -18,8 +18,7 @@
 
 require 'pathname'
 
-ROOT_DIR = Pathname.new(File.expand_path('../../../', __dir__)) unless defined?(ROOT_DIR)
-require "#{ROOT_DIR}/lib/custom_facts/core/file_loader"
+require 'facter/custom_facts/core/file_loader'
 
 # Functions as a hash of 'facts' about your system system, such as MAC
 # address, IP address, architecture, etc.

data/lib/{custom_facts → facter/custom_facts}/util/directory_loader.rb

@@ -56,6 +56,8 @@ module LegacyFacter
         facts = []
         entries.each do |file|
           basename = File.basename(file)
+          next if file_blocked?(basename)
+
           if facts.find { |f| f.name == basename } && cm.group_cached?(basename)
             Facter.log_exception(Exception.new("Caching is enabled for group \"#{basename}\" while "\
               'there are at least two external facts files with the same filename'))
@@ -107,6 +109,14 @@ module LegacyFacter
       def should_parse?(file)
         File.basename(file) !~ /^\./
       end
+
+      def file_blocked?(file)
+        if Facter::Options[:blocked_facts].include? file
+          Facter.debug("External fact file #{file} blocked.")
+          return true
+        end
+        false
+      end
     end
   end
 end

data/lib/{custom_facts → facter/custom_facts}/util/parser.rb

@@ -56,7 +56,7 @@ module LegacyFacter
         # wrapper.
         def results
           parse_results
-        rescue Exception => e
+        rescue StandardError => e
           Facter.log_exception(e, "Failed to handle #{filename} as #{self.class} facts: #{e.message}")
           nil
         end
@@ -68,8 +68,8 @@ module LegacyFacter
         def parse_executable_output(output)
           res = nil
           begin
-            res = YAML.safe_load output
-          rescue Exception => e
+            res = YAML.safe_load(output, [Symbol, Time])
+          rescue StandardError => e
             Facter.debug("Could not parse executable fact output as YAML or JSON (#{e.message})")
           end
           res = KeyValuePairOutputFormat.parse output unless res.is_a?(Hash)

data/lib/facter/facts/aix/disks.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class Disks
+      FACT_NAME = 'disks'
+
+      def call_the_resolver
+        disks = Facter::Resolvers::Aix::Disks.resolve(:disks)
+
+        disks = disks&.empty? ? nil : disks
+
+        Facter::ResolvedFact.new(FACT_NAME, disks)
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/available.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class Available
+          FACT_NAME = 'memory.swap.available'
+          ALIASES = 'swapfree'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            if fact_value
+              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
+            end
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/available_bytes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class AvailableBytes
+          FACT_NAME = 'memory.swap.available_bytes'
+          ALIASES = 'swapfree_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            fact_value = fact_value[:available_bytes] if fact_value
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/capacity.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class Capacity
+          FACT_NAME = 'memory.swap.capacity'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            fact_value = fact_value[:capacity] if fact_value
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/total.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class Total
+          FACT_NAME = 'memory.swap.total'
+          ALIASES = 'swapsize'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            if fact_value
+              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:total_bytes])
+            end
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/total_bytes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class TotalBytes
+          FACT_NAME = 'memory.swap.total_bytes'
+          ALIASES = 'swapsize_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            fact_value = fact_value[:total_bytes] if fact_value
+
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES, Facter::FactsUtils::UnitConverter.bytes_to_mb(fact_value), :legacy)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/used.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class Used
+          FACT_NAME = 'memory.swap.used'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            if fact_value
+              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:used_bytes])
+            end
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/swap/used_bytes.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module Swap
+        class UsedBytes
+          FACT_NAME = 'memory.swap.used_bytes'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:swap)
+            fact_value = fact_value[:used_bytes] if fact_value
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/memory/system/available.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class Available
+          FACT_NAME = 'memory.system.available'
+          ALIASES = 'memoryfree'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
+            if fact_value
+              fact_value = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(fact_value[:available_bytes])
+            end
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          end
+        end
+      end
+    end
+  end
+end