facter 4.0.30 → 4.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e212e7eb5f2af98a17f55977fe98b41d7a804f8efdfe5f7bcc20f9c0627a7334
-  data.tar.gz: 6e6c8734fdf45b0a5d088bbb56c4c489f2b1cde69770ba887a01c8ee973431b3
+  metadata.gz: 58032c19dc544418cdd5bdc8598a48d6d8cc2b9c67f3ef3ac081fe98cf03ac6a
+  data.tar.gz: db8bd43f5f28c4c7ea30d67c2ecb02367d398b70c2096fa5ee5f0319c2473640
 SHA512:
-  metadata.gz: be1b614104b6f08789b49c73c9948eb6687bee06cb73722a5749d268bb5927bb1bc82ec29944a03ed07f5520318620ce8ee567e32a84d423e124d959a3931354
-  data.tar.gz: 90da2d17a9e80b5aeb4104c51d5bfa3912fa3f3560f04ad965bf4df15f830eef634d92aab71b93a067a8e4257ac733f21bf9b8ba562a28f8c00f0f7d066388f1
+  metadata.gz: 52a387b13db0d8064f5cfc7e968b1b8c65843098071e04b662ee76a5c57bbdf5cbcbc669230a30544007fecc648645553496e4ccf000eba81cf7dbb0e6103d90
+  data.tar.gz: 61e0b00e59b79820c2ec91118c8bba3b3d692bc620807a29341e0cc2530565d574fd80648167547e55d556db145176ca78d126f2e8ff7f4093155c95534fe5a5

data/lib/facter.rb

@@ -13,7 +13,6 @@ module Facter
   Options.init
   Log.output(STDOUT)
   @already_searched = {}
-  @trace = false
 
   class << self
     def clear_messages
@@ -196,7 +195,7 @@ module Facter
     #
     # @api public
     def trace?
-      @trace
+      Options[:trace]
     end
 
     # Enable or disable trace
@@ -206,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.
@@ -255,7 +254,7 @@ module Facter
       elsif message
         arr << message
       end
-      if @trace
+      if Options[:trace]
         arr << 'backtrace:'
         arr.concat(exception.backtrace)
       end

data/lib/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

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class AvailableBytes
+          FACT_NAME = 'memory.system.available_bytes'
+          ALIASES = 'memoryfree_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
+            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/system/capacity.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class Capacity
+          FACT_NAME = 'memory.system.capacity'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
+            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/system/total.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class Total
+          FACT_NAME = 'memory.system.total'
+          ALIASES = 'memorysize'
+
+          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[: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/system/total_bytes.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class TotalBytes
+          FACT_NAME = 'memory.system.total_bytes'
+          ALIASES = 'memorysize_mb'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
+            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/system/used.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class Used
+          FACT_NAME = 'memory.system.used'
+
+          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[:used_bytes])
+            end
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    module Memory
+      module System
+        class UsedBytes
+          FACT_NAME = 'memory.system.used_bytes'
+
+          def call_the_resolver
+            fact_value = Facter::Resolvers::Aix::Memory.resolve(:system)
+            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/linux/hypervisors/vmware.rb

@@ -15,7 +15,8 @@ module Facts
             @log.debug('Vmware hypervisor detected')
             fact_value = {}
 
-            fact_value[:version] = Facter::Resolvers::DmiDecode.resolve(:vmware_version) || ''
+            version = Facter::Resolvers::DmiDecode.resolve(:vmware_version)
+            fact_value[:version] = version if version && !version.empty?
 
             return Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end

data/lib/facter/facts/macosx/system_profiler/hardware_uuid.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class HardwareUuid
         FACT_NAME = 'system_profiler.hardware_uuid'
-        ALIASES = 'sp_hardware_uuid'
+        ALIASES = 'sp_platform_uuid'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:hardware_uuid)

data/lib/facter/facts/macosx/system_profiler/l2_cache_per_core.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class L2CachePerCore
         FACT_NAME = 'system_profiler.l2_cache_per_core'
-        ALIASES = 'sp_l2_cache_per_core'
+        ALIASES = 'sp_l2_cache_core'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:l2_cache_per_core)

data/lib/facter/facts/macosx/system_profiler/memory.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class Memory
         FACT_NAME = 'system_profiler.memory'
-        ALIASES = 'sp_memory'
+        ALIASES = 'sp_physical_memory'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:memory)

data/lib/facter/facts/macosx/system_profiler/processor_name.rb

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class ProcessorName
         FACT_NAME = 'system_profiler.processor_name'
-        ALIASES = 'sp_processor_name'
+        ALIASES = 'sp_cpu_type'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:processor_name)

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

@@ -5,7 +5,7 @@ module Facts
     module SystemProfiler
       class Processors
         FACT_NAME = 'system_profiler.processors'
-        ALIASES = 'sp_cpu_type'
+        ALIASES = 'sp_packages'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Macosx::SystemProfiler.resolve(:number_of_processors)

data/lib/facter/framework/cli/cli.rb

@@ -35,6 +35,11 @@ module Facter
                  type: :boolean,
                  desc: 'Print this help message.'
 
+    class_option :man,
+                 hide: true,
+                 type: :boolean,
+                 desc: 'Display manual.'
+
     class_option :hocon,
                  type: :boolean,
                  desc: 'Output in Hocon format.'
@@ -103,6 +108,18 @@ module Facter
                  aliases: '-p',
                  desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
 
+    desc '--man', 'Manual', hide: true
+    map ['--man'] => :man
+    def man(*args)
+      require 'erb'
+      negate_options = %w[block cache custom_facts external_facts]
+
+      template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'man.erb')
+      erb = ERB.new(File.read(template), nil, '-')
+      erb.filename = template
+      puts erb.result(binding)
+    end
+
     desc 'query', 'Default method', hide: true
     desc '[options] [query] [query] [...]', ''
     def query(*args)
@@ -119,13 +136,13 @@ module Facter
       puts Facter::VERSION
     end
 
-    desc '--list-block-groups', 'List block groups'
+    desc '--list-block-groups', 'List block groups', hide: true
     map ['--list-block-groups'] => :list_block_groups
     def list_block_groups(*_args)
       puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
     end
 
-    desc '--list-cache-groups', 'List cache groups'
+    desc '--list-cache-groups', 'List cache groups', hide: true
     map ['--list-cache-groups'] => :list_cache_groups
     def list_cache_groups(*_args)
       puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -40,7 +40,7 @@ module Facter
             fact = CoreFact.new(searched_fact)
             fact.create
           rescue StandardError => e
-            @@log.error(e.message + ' ' + e.backtrace.join("\n"))
+            @@log.log_exception(e)
             nil
           end
         end

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -51,6 +51,8 @@ module Facter
         @external_facts.concat(@external_fact_loader.custom_facts)
       end
 
+      @external_facts = block_facts(@external_facts, options)
+
       if options[:external_facts]
         @log.debug('Loading external facts')
         @external_facts.concat(@external_fact_loader.external_facts)

data/lib/facter/framework/core/options.rb

@@ -45,6 +45,7 @@ module Facter
         Facter::OptionStore.cli = true
         Facter::OptionStore.show_legacy = false
         Facter::OptionStore.user_query = user_query
+        Facter::OptionStore.trace = cli_options[:trace]
         OptionStore.set(:config, cli_options[:config])
         ConfigFileOptions.init(cli_options[:config])
         store(ConfigFileOptions.get)

data/lib/facter/framework/core/options/option_store.rb

@@ -25,13 +25,13 @@ module Facter
     @color = false
 
     class << self
-      attr_reader :debug, :verbose, :log_level, :show_legacy, :trace, :ruby,
+      attr_reader :debug, :verbose, :log_level, :show_legacy, :ruby,
                   :custom_facts, :blocked_facts
 
       attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color
+                    :block_list, :color, :trace
 
       attr_writer :external_dir
 
@@ -131,10 +131,6 @@ module Facter
         end
       end
 
-      def trace=(bool)
-        Facter.trace(bool)
-      end
-
       def set(key, value)
         send("#{key}=".to_sym, value)
       end
@@ -150,6 +146,7 @@ module Facter
         @user_query = []
         @cli = nil
         @cache = true
+        @trace = false
         reset_config
       end
 

data/lib/facter/framework/logging/logger.rb

@@ -3,10 +3,11 @@
 require 'logger'
 
 module Facter
-  RED = 31
-  GREEN = 32
-  YELLOW = 33
-  CYAN = 36
+  RED     = "\e[31m"
+  GREEN   = "\e[32m"
+  YELLOW  = "\e[33m"
+  CYAN    = "\e[36m"
+  RESET   = "\e[0m"
 
   DEFAULT_LOG_LEVEL = :warn
 
@@ -104,12 +105,19 @@ module Facter
       end
     end
 
+    def log_exception(exception)
+      msg = colorize(exception.message, RED) + "\n"
+      msg += exception.backtrace.join("\n") if Options[:trace]
+
+      @@logger.error(@class_name + ' - ' + msg)
+    end
+
     private
 
     def colorize(msg, color)
       return msg if OsDetector.instance.identifier.eql?(:windows)
 
-      "\e[0;#{color}m#{msg}\e[0m"
+      "#{color}#{msg}#{RESET}"
     end
 
     def debugging_active?

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Disks < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { execute_lspv(fact_name) }
+          end
+
+          def execute_lspv(fact_name)
+            @fact_list[:disks] = {}
+
+            result = Facter::Core::Execution.execute('lspv', logger: log)
+
+            return if result.empty?
+
+            result.each_line do |line|
+              disk_name = line.split(' ')[0].strip
+              size = find_size(disk_name)
+              @fact_list[:disks][disk_name] = size if size
+            end
+
+            @fact_list[fact_name]
+          end
+
+          def find_size(name)
+            stdout = Facter::Core::Execution.execute("lspv #{name}", logger: log)
+
+            return if stdout.empty?
+
+            info_size = InfoExtractor.extract(stdout, /PP SIZE:|TOTAL PPs:|FREE PPs:|PV STATE:/)
+
+            return unless info_size['PV STATE']
+
+            size_bytes = compute_size(info_size)
+
+            {
+              size_bytes: size_bytes,
+              size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
+            }
+          end
+
+          def compute_size(size_hash)
+            physical_partitions = size_hash['TOTAL PPs'].to_i + size_hash['FREE PPs'].to_i
+            size_physical_partition = size_hash['PP SIZE']
+            exp = if size_physical_partition[/mega/]
+                    InfoExtractor::MEGABYTES_EXPONENT
+                  else
+                    InfoExtractor::GIGABYTES_EXPONENT
+                  end
+            size_physical_partition.to_i * physical_partitions * exp
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/aix/memory.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Memory < BaseResolver
+        # :hardware
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { execute_svmon(fact_name) }
+          end
+
+          def execute_svmon(fact_name)
+            result = Facter::Core::Execution.execute('svmon', logger: log)
+            return if result.empty?
+
+            @fact_list[:system] = @fact_list[:swap] = {}
+
+            pagesize = call_pagesize.to_i
+            return if pagesize.zero?
+
+            result.each_line do |line|
+              @fact_list[:system] = populate_system(line, pagesize) if line.include?('memory')
+              @fact_list[:swap] = populate_swap(line, pagesize) if line =~ /pg\sspace/
+            end
+
+            @fact_list[fact_name]
+          end
+
+          def call_pagesize
+            Facter::Core::Execution.execute('pagesize', logger: log).strip
+          end
+
+          def populate_system(content, pagesize)
+            content = content.split(' ')
+
+            total = content[1].to_i * pagesize
+            used = content[2].to_i * pagesize
+
+            { available_bytes: content[3].to_i * pagesize,
+              total_bytes: total,
+              used_bytes: used,
+              capacity: FilesystemHelper.compute_capacity(used, total) }
+          end
+
+          def populate_swap(content, pagesize)
+            content = content.split(' ')
+
+            total = content[2].to_i * pagesize
+            used = content[3].to_i * pagesize
+
+            { available_bytes: total - used,
+              total_bytes: total,
+              used_bytes: used,
+              capacity: FilesystemHelper.compute_capacity(used, total) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/aix/partitions.rb

@@ -9,9 +9,6 @@ module Facter
         class << self
           private
 
-          MEGABYTES_EXPONENT = 1024**2
-          GIGABYTES_EXPONENT = 1024**3
-
           def post_resolve(fact_name)
             @fact_list.fetch(fact_name) { query_cudv(fact_name) }
           end
@@ -43,7 +40,7 @@ module Facter
 
             return if stdout.empty?
 
-            info_hash = extract_info(stdout)
+            info_hash =  InfoExtractor.extract(stdout, /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/)
             size_bytes = compute_size(info_hash)
 
             part_info = {
@@ -51,29 +48,21 @@ module Facter
               size_bytes: size_bytes,
               size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
             }
-            mount = info_hash['MOUNTPOINT']
+            mount = info_hash['MOUNT POINT']
             label = info_hash['LABEL']
             part_info[:mount] = mount unless %r{N/A} =~ mount
-            part_info[:label] = label unless /None/ =~ label
+            part_info[:label] = label.strip unless /None/ =~ label
             part_info
           end
 
-          def extract_info(lsl_content)
-            lsl_content = lsl_content.strip.split("\n").map do |line|
-              next unless /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/ =~ line
-
-              line.split(/:|\s\s/).reject(&:empty?)
-            end
-
-            lsl_content.flatten!.select! { |elem| elem }.map! { |elem| elem.delete("\s") }
-
-            Hash[*lsl_content]
-          end
-
           def compute_size(info_hash)
             physical_partitions = info_hash['PPs'].to_i
-            size_physical_partition = info_hash['PPSIZE']
-            exp = size_physical_partition[/mega/] ? MEGABYTES_EXPONENT : GIGABYTES_EXPONENT
+            size_physical_partition = info_hash['PP SIZE']
+            exp = if size_physical_partition[/mega/]
+                    InfoExtractor::MEGABYTES_EXPONENT
+                  else
+                    InfoExtractor::GIGABYTES_EXPONENT
+                  end
             size_physical_partition.to_i * physical_partitions * exp
           end
         end

data/lib/facter/resolvers/aix/utils/info_extractor.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facter
+  module InfoExtractor
+    MEGABYTES_EXPONENT = 1024**2
+    GIGABYTES_EXPONENT = 1024**3
+
+    def self.extract(content, regex)
+      content = content.each_line.map do |line|
+        next unless regex =~ line
+
+        line.split(/:\s*|\s{2,}/)
+      end
+
+      content.flatten!.reject!(&:nil?)
+
+      Hash[*content]
+    end
+  end
+end

data/lib/facter/templates/man.erb

@@ -0,0 +1,122 @@
+<%# encoding: UTF-8%>
+SYNOPSIS
+--------
+  facter [options] [query] [query] [...]
+
+DESCRIPTION
+-----------
+Collect and display facts about the current system. The library behind Facter is easy to extend, making Facter an easy way to collect information about a system.
+
+If no queries are given, then all facts will be returned.
+
+Many of the command line options can also be set via the HOCON config file. This file can also be used to block or cache certain fact groups.
+
+OPTIONS
+-------
+<% @Facter::Cli.class_options.each do |name, option| -%><% next if option.hide%>
+  * `<%= option.aliases[0] + '`, `' if option.aliases.any? %>--<%= 'no-' if negate_options.include?(name.to_s)%><%= name.to_s.gsub('_','-') %>`:
+
+    <%= option.description %>
+
+<% end -%>
+
+FILES
+-----
+<em>/etc/puppetlabs/facter/facter.conf</em>
+
+A HOCON config file that can be used to specify directories for custom and external facts, set various command line options, and specify facts to block. See example below for details, or visit the GitHub README.
+
+EXAMPLES
+--------
+Display all facts:
+
+```
+$ facter
+disks => {
+  sda => {
+    model => "Virtual disk",
+    size => "8.00 GiB",
+    size_bytes => 8589934592,
+    vendor => "ExampleVendor"
+  }
+}
+dmi => {
+  bios => {
+    release_date => "06/23/2013",
+    vendor => "Example Vendor",
+    version => "6.00"
+  }
+}
+[\.\.\.]
+```
+
+Display a single structured fact:
+
+```
+$ facter processors
+{
+  count => 2,
+  isa => "x86_64",
+  models => [
+    "Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz",
+    "Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz"
+  ],
+  physicalcount => 2
+}
+```
+
+Display a single fact nested within a structured fact:
+
+```
+$ facter processors.isa
+x86_64
+```
+
+Display a single legacy fact. Note that non-structured facts existing in previous versions of Facter are still available,
+but are not displayed by default due to redundancy with newer structured facts:
+
+```
+$ facter processorcount
+2
+```
+
+Format facts as JSON:
+
+```
+$ facter \-\-json os.name os.release.major processors.isa
+{
+  "os.name": "Ubuntu",
+  "os.release.major": "14.04",
+  "processors.isa": "x86_64"
+}
+```
+
+An example config file.
+
+```
+# always loaded (CLI and as Ruby module)
+global : {
+    external-dir : "~/external/facts",
+    custom-dir   :  [
+       "~/custom/facts",
+       "~/custom/facts/more-facts"
+    ],
+    no-external-facts : false,
+    no-custom-facts   : false,
+    no-ruby           : false
+}
+# loaded when running from the command line
+cli : {
+    debug     : false,
+    trace     : true,
+    verbose   : false,
+    log-level : "info"
+}
+# always loaded, fact-sepcific configuration
+facts : {
+    # for valid blocklist entries, use --list-block-groups
+    blocklist : [ "file system", "EC2" ],
+    # for valid time-to-live entries, use --list-cache-groups
+    ttls : [ { "timezone" : 30 days } ]
+}
+```

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.30
+  version: 4.0.31
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,6 +208,7 @@ files:
 - lib/facter/fact_groups.conf
 - lib/facter/facts/aix/aio_agent_version.rb
 - lib/facter/facts/aix/augeas/version.rb
+- lib/facter/facts/aix/disks.rb
 - lib/facter/facts/aix/facterversion.rb
 - lib/facter/facts/aix/filesystems.rb
 - lib/facter/facts/aix/hypervisors/lpar.rb
@@ -226,6 +227,20 @@ files:
 - lib/facter/facts/aix/kernelversion.rb
 - lib/facter/facts/aix/load_averages.rb
 - lib/facter/facts/aix/macaddress_interfaces.rb
+- lib/facter/facts/aix/memory/swap/available.rb
+- lib/facter/facts/aix/memory/swap/available_bytes.rb
+- lib/facter/facts/aix/memory/swap/capacity.rb
+- lib/facter/facts/aix/memory/swap/total.rb
+- lib/facter/facts/aix/memory/swap/total_bytes.rb
+- lib/facter/facts/aix/memory/swap/used.rb
+- lib/facter/facts/aix/memory/swap/used_bytes.rb
+- lib/facter/facts/aix/memory/system/available.rb
+- lib/facter/facts/aix/memory/system/available_bytes.rb
+- lib/facter/facts/aix/memory/system/capacity.rb
+- lib/facter/facts/aix/memory/system/total.rb
+- lib/facter/facts/aix/memory/system/total_bytes.rb
+- lib/facter/facts/aix/memory/system/used.rb
+- lib/facter/facts/aix/memory/system/used_bytes.rb
 - lib/facter/facts/aix/mountpoints.rb
 - lib/facter/facts/aix/mtu_interfaces.rb
 - lib/facter/facts/aix/netmask6_interfaces.rb
@@ -726,16 +741,19 @@ files:
 - lib/facter/os_hierarchy.json
 - lib/facter/resolvers/aio_agent_version.rb
 - lib/facter/resolvers/aix/architecture_resolver.rb
+- lib/facter/resolvers/aix/disks.rb
 - lib/facter/resolvers/aix/ffi/ffi_helper.rb
 - lib/facter/resolvers/aix/filesystem_resolver.rb
 - lib/facter/resolvers/aix/hardware_resolver.rb
 - lib/facter/resolvers/aix/load_averages_resolver.rb
+- lib/facter/resolvers/aix/memory.rb
 - lib/facter/resolvers/aix/mountpoints.rb
 - lib/facter/resolvers/aix/networking_resolver.rb
 - lib/facter/resolvers/aix/nim.rb
 - lib/facter/resolvers/aix/os_level_resolver.rb
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
+- lib/facter/resolvers/aix/utils/info_extractor.rb
 - lib/facter/resolvers/aix/utils/odm_query.rb
 - lib/facter/resolvers/augeas_resolver.rb
 - lib/facter/resolvers/base_resolver.rb
@@ -842,6 +860,7 @@ files:
 - lib/facter/resolvers/windows/win_os_description_resolver.rb
 - lib/facter/resolvers/wpar_resolver.rb
 - lib/facter/resolvers/xen.rb
+- lib/facter/templates/man.erb
 - lib/facter/util/api_debugger.rb
 - lib/facter/util/file_helper.rb
 - lib/facter/version.rb