facter 4.2.0 → 4.2.4

data/lib/facter/resolvers/partitions.rb

@@ -107,9 +107,7 @@ module Facter
 
           return blkid_and_lsblk[command_exists_key] unless blkid_and_lsblk[command_exists_key].nil?
 
-          output = Facter::Core::Execution.execute("which #{command}", logger: log)
-
-          blkid_and_lsblk[command_exists_key] = !output.empty?
+          blkid_and_lsblk[command_exists_key] = !Facter::Core::Execution.which(command).nil?
         end
 
         def execute_and_extract_blkid_info

data/lib/facter/resolvers/windows/ffi/kernel_ffi.rb

@@ -7,7 +7,7 @@ module KernelFFI
   extend FFI::Library
 
   ffi_convention :stdcall
-  ffi_lib [FFI::CURRENT_PROCESS, :ntdll]
+  ffi_lib :ntdll
   attach_function :RtlGetVersion, [:pointer], :int32
 
   STATUS_SUCCESS = 0

data/lib/facter/util/aix/info_extractor.rb

@@ -6,17 +6,68 @@ module Facter
       module InfoExtractor
         MEGABYTES_EXPONENT = 1024**2
         GIGABYTES_EXPONENT = 1024**3
+        PROPERTIES = {
+          lslv: [
+            'LOGICAL VOLUME:',
+            'VOLUME GROUP:',
+            'LV IDENTIFIER:',
+            'PERMISSION:',
+            'VG STATE:',
+            'LV STATE:',
+            'TYPE:',
+            'WRITE VERIFY:',
+            'MAX LPs:',
+            'PP SIZE:',
+            'COPIES:',
+            'SCHED POLICY:',
+            'LPs:',
+            'PPs:',
+            'STALE PPs:',
+            'BB POLICY:',
+            'INTER-POLICY:',
+            'RELOCATABLE:',
+            'INTRA-POLICY:',
+            'UPPER BOUND:',
+            'MOUNT POINT:',
+            'LABEL:',
+            'MIRROR WRITE CONSISTENCY:',
+            'EACH LP COPY ON A SEPARATE PV ?:',
+            'Serialize IO ?:'
+          ],
+          lspv: [
+            'PHYSICAL VOLUME:',
+            'VOLUME GROUP:',
+            'PV IDENTIFIER:',
+            'VG IDENTIFIER',
+            'PV STATE:',
+            'STALE PARTITIONS:',
+            'ALLOCATABLE:',
+            'PP SIZE:',
+            'LOGICAL VOLUMES:',
+            'TOTAL PPs:',
+            'VG DESCRIPTORS:',
+            'FREE PPs:',
+            'HOT SPARE:',
+            'USED PPs:',
+            'MAX REQUEST:',
+            'FREE DISTRIBUTION:',
+            'USED DISTRIBUTION:',
+            'MIRROR POOL:'
+          ]
+        }.freeze
 
-        def self.extract(content, regex)
-          content = content.each_line.map do |line|
-            next unless regex =~ line
-
-            line.split(/:\s*|\s{2,}/)
+        def self.extract(content, cmd)
+          property_hash = {}
+          properties = PROPERTIES[cmd]
+          properties.each do |property|
+            str = (properties - [property]).join('|')
+            matcher = content.match(/#{Regexp.escape(property)}([^\n]*?)(#{str}|\n|$)/s)
+            if matcher
+              value = matcher[1].strip
+              property_hash[property.split(':').first] = value
+            end
           end
-
-          content.flatten!.reject!(&:nil?)
-
-          Hash[*content]
+          property_hash
         end
       end
     end

data/lib/facter/util/linux/dhcp.rb

@@ -75,7 +75,10 @@ module Facter
           def search_with_dhcpcd_command(interface_name)
             @log.debug("Attempt to get DHCP for interface #{interface_name}, from dhcpcd command")
 
-            output = Facter::Core::Execution.execute("dhcpcd -U #{interface_name}", logger: @log)
+            @dhcpcd_command ||= Facter::Core::Execution.which('dhcpcd')
+            return unless @dhcpcd_command
+
+            output = Facter::Core::Execution.execute("#{@dhcpcd_command} -U #{interface_name}", logger: @log)
             dhcp = output.match(/dhcp_server_identifier='(.*)'/)
             dhcp[1] if dhcp
           end

data/lib/facter/util/linux/socket_parser.rb

@@ -59,8 +59,23 @@ module Facter
           end
 
           def bond_master_of(interface_name)
-            content = Facter::Core::Execution.execute("ip link show #{interface_name}", logger: @log)
-            content.match(/master (\S*) /)&.captures&.first
+            content = get_ip_link_show_data(interface_name)
+            content&.match(/master (\S*) /)&.captures&.first
+          end
+
+          def get_ip_link_show_data(interface_name)
+            @ip_link_show_data ||= read_ip_link_show_data
+            @ip_link_show_data[interface_name]
+          end
+
+          def read_ip_link_show_data
+            ip_link_show_data = {}
+            output = Facter::Core::Execution.execute('ip -o link show', logger: @log)
+            output.each_line do |line|
+              interface_name = line.split(':')[1]&.strip if line
+              ip_link_show_data[interface_name] = line if interface_name
+            end
+            ip_link_show_data
           end
 
           def mac_from(ifaddr)

data/lib/facter/version.rb

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

data/lib/facter.rb

@@ -13,8 +13,6 @@ module Facter
   Options.init
   Log.output(STDOUT)
   @already_searched = {}
-  @debug_once = []
-  @warn_once = []
 
   class << self
     # Method used by puppet-agent to retrieve facts
@@ -109,8 +107,7 @@ module Facter
     # @api public
     def clear
       @already_searched = {}
-      @debug_once = []
-      @warn_once = []
+      Facter.clear_messages
       LegacyFacter.clear
       Options[:custom_dir] = []
       LegacyFacter.collection.invalidate_custom_facts
@@ -119,6 +116,13 @@ module Facter
       nil
     end
 
+    # Clears the seen state of debug and warning messages.
+    #
+    # @return [nil]
+    def clear_messages
+      Facter::Log.clear_messages
+    end
+
     # Retrieves the value of a core fact. External or custom facts are
     # not returned with this call. Returns `nil` if no such fact exists.
     #
@@ -153,13 +157,7 @@ module Facter
     #
     # @api public
     def debugonce(message)
-      return unless debugging?
-
-      message_string = message.to_s
-      return if @debug_once.include? message_string
-
-      @debug_once << message_string
-      logger.debug(message_string)
+      logger.debugonce(message)
       nil
     end
 
@@ -392,7 +390,7 @@ module Facter
     #
     # @api public
     def value(user_query)
-      user_query = user_query.to_s
+      user_query = user_query.to_s.downcase
       resolve_fact(user_query)
 
       @already_searched[user_query]&.value
@@ -409,7 +407,7 @@ module Facter
     #
     # @api public
     def fact(user_query)
-      user_query = user_query.to_s
+      user_query = user_query.to_s.downcase
       resolve_fact(user_query)
 
       @already_searched[user_query]
@@ -482,11 +480,7 @@ module Facter
     #
     # @api public
     def warnonce(message)
-      message_string = message.to_s
-      return if @warn_once.include? message_string
-
-      @warn_once << message_string
-      logger.warn(message_string)
+      logger.warnonce(message)
       nil
     end
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -108,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +198,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - bin/facter
 - lib/docs/generate.rb
 - lib/docs/generate_cli.rb
@@ -193,7 +214,6 @@ files:
 - lib/facter/custom_facts/core/execution/windows.rb
 - lib/facter/custom_facts/core/file_loader.rb
 - lib/facter/custom_facts/core/legacy_facter.rb
-- lib/facter/custom_facts/core/logging.rb
 - lib/facter/custom_facts/core/resolvable.rb
 - lib/facter/custom_facts/core/suitable.rb
 - lib/facter/custom_facts/util/collection.rb
@@ -944,7 +964,7 @@ files:
 - lib/facter/resolvers/macosx/filesystems.rb
 - lib/facter/resolvers/macosx/load_averages.rb
 - lib/facter/resolvers/macosx/mountpoints.rb
-- lib/facter/resolvers/macosx/processor.rb
+- lib/facter/resolvers/macosx/processors.rb
 - lib/facter/resolvers/macosx/swap_memory.rb
 - lib/facter/resolvers/macosx/system_memory.rb
 - lib/facter/resolvers/macosx/system_profiler.rb
@@ -1051,7 +1071,7 @@ files:
 - lib/facter/version.rb
 homepage: https://github.com/puppetlabs/facter
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

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

@@ -1,203 +0,0 @@
-# frozen_string_literal: true
-
-module LegacyFacter
-  module Core
-    module Logging
-      extend self
-
-      # @api private
-      GREEN = "\e[0;32m"
-      # @api private
-      RESET = "\e[0m"
-
-      RED = "\e[31m"
-
-      # @api private
-      @@debug = false
-      # @api private
-      @@timing = false
-      # @api private
-      @@trace = false
-
-      # @api private
-      @@warn_messages = {}
-      # @api private
-      @@debug_messages = {}
-
-      # @api private
-      @@message_callback = nil
-
-      # Used to register a callback that is called when a message is logged.
-      # If a block is given, Facter will not log messages.
-      # If a block is not given, Facter will resume logging messages.
-      # @param block [Proc] the callback to call when a message is logged.
-      #   The first argument to the callback will be a symbol representing a level. The supported
-      #   levels are: :trace, :debug, :info, :warn, :error, and :fatal.
-      #   The second argument to the callback will be a string containing the message
-      #   that was logged.
-      # @api public
-      def on_message(&block)
-        @@message_callback = block
-      end
-
-      # Prints a debug message if debugging is turned on
-      #
-      # @param msg [String] the debug message
-      # @return [void]
-      def debug(msg)
-        return unless debugging?
-
-        if msg.nil? || msg.empty?
-          invoker = caller(1..1).first.slice(/.*:\d+/)
-          self.warn "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
-        elsif @@message_callback
-          @@message_callback.call(:debug, msg)
-        else
-          puts GREEN + msg + RESET
-        end
-      end
-
-      # Prints a debug message only once.
-      #
-      # @note Uniqueness is based on the string, not the specific location
-      #   of the method call.
-      #
-      # @param msg [String] the debug message
-      # @return [void]
-      def debugonce(msg)
-        return unless msg && !msg.empty? && @@debug_messages[msg].nil?
-
-        @@debug_messages[msg] = true
-        debug(msg)
-      end
-
-      # Prints a warning message. The message is only printed if debugging
-      # is enabled.
-      #
-      # @param msg [String] the warning message to be printed
-      #
-      # @return [void]
-      def warn(msg)
-        if msg.nil? || msg.empty?
-          invoker = caller(1..1).first.slice(/.*:\d+/)
-          msg = "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
-        end
-        if @@message_callback
-          @@message_callback.call(:warn, msg)
-        else
-          Kernel.warn msg
-        end
-      end
-
-      # Prints a warning message only once per process. Each unique string
-      # is printed once.
-      #
-      # @note Unlike {warn} the message will be printed even if debugging is
-      #   not turned on. This behavior is likely to change and should not be
-      #   relied on.
-      #
-      # @param msg [String] the warning message to be printed
-      #
-      # @return [void]
-      def warnonce(msg)
-        return unless @@warn_messages[msg].nil?
-
-        self.warn(msg)
-        @@warn_messages[msg] = true
-      end
-
-      def log_exception(exception, message = :default)
-        self.warn(format_exception(exception, message, @@trace))
-      end
-
-      def format_exception(exception, message, trace)
-        arr = []
-
-        if message == :default
-          arr << exception.message
-        elsif message
-          arr << message
-        end
-
-        if trace
-          arr << 'backtrace:'
-          arr.concat(exception.backtrace)
-        end
-
-        "#{RED}#{arr.flatten.join("\n")}#{RESET}"
-      end
-
-      # Print an exception message, and optionally a backtrace if trace is set
-
-      # Print timing information
-      #
-      # @param string [String] the time to print
-      # @return [void]
-      #
-      # @api private
-      def show_time(string)
-        return unless string && timing?
-
-        if @@message_callback
-          @@message_callback.call(:info, string)
-        else
-          $stderr.puts "#{GREEN}#{string}#{RESET}"
-        end
-      end
-
-      # Enable or disable logging of debug messages
-      #
-      # @param bool [true, false]
-      # @return [void]
-      #
-      # @api private
-      def debugging(bool)
-        @@debug = bool
-      end
-
-      # Is debugging enabled?
-      #
-      # @return [true, false]
-      #
-      # @api private
-      def debugging?
-        @@debug
-      end
-
-      # Enable or disable logging of timing information
-      #
-      # @param bool [true, false]
-      # @return [void]
-      #
-      # @api private
-      def timing(bool)
-        @@timing = bool
-      end
-
-      # Returns whether timing output is turned on
-      #
-      # @api private
-      def timing?
-        @@timing
-      end
-
-      def trace(bool)
-        @@trace = bool
-      end
-
-      def trace?
-        @@trace
-      end
-
-      # Clears the seen state of debug and warning messages. See {debugonce} and {warnonce}.
-      #
-      # @return [void]
-      #
-      # @api private
-      def clear_messages
-        @@debug_messages.clear
-        @@warn_messages.clear
-      end
-    end
-  end
-end