facter 4.1.1 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ca2540a7ccad083604f2a0a1142cd0e870714dae635dc2fd8d60baa1b1bcbf
-  data.tar.gz: 25cec4e7c98a145d3950dd8c345ae04ee2bdc1b04ae78b08acb1674678c24d64
+  metadata.gz: 353d24b45ac4083ff9a2f7de05702a93e8701487cc6020de93ed974d527e7f53
+  data.tar.gz: c02329462e40922777fac34fab775ea1d68b884b7d4d8f8e99544bdb737f57e8
 SHA512:
-  metadata.gz: e43bf9233eca175b442b0cbda693efcae3f3b0f1e370b9b9ef5bca1c81a9450e4bfc3000d957463cbf49900abc6bf9769ba9664cc6750c17f58ad8abd4cf9730
-  data.tar.gz: 47c5a45dd7dfc505cda3d71634258ed7c7ca13e24ee6858219d89480f9b260e278cd8b602a59501a24ec61a7fcb62f1b929330cc5c4b54d34b13718b818280d5
+  metadata.gz: 1ccd6eb8e93836cf558c7ed12c943d8c30d14bad521f2de821b014ceb30b3d1f4fc92cc3c54690ff853b5d62dd4c3521293127f87d08fe6525d5ff2f317e3637
+  data.tar.gz: d4a75033160dac87a2244855c7a2ff8d34fb733b527cc8ffd45279c3e2821b0860f3b1982ab1e0e4182c9c75cf45129ebe0c68738eeb605b9e435b5d460da309

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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
 
@@ -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
 
@@ -555,7 +549,7 @@ module Facter
       begin
         value = fact_collection.value(user_query)
         add_fact_to_searched_facts(user_query, value)
-      rescue KeyError
+      rescue KeyError, TypeError
         nil
       end
     end

data/lib/facter/config.rb

@@ -166,6 +166,7 @@ module Facter
           macosx_productversion
           macosx_productversion_major
           macosx_productversion_minor
+          macosx_productversion_patch
           windows_edition_id
           windows_installation_type
           windows_product_name
@@ -301,6 +302,7 @@ module Facter
           'macosx_productversion',
           'macosx_productversion_major',
           'macosx_productversion_minor',
+          'macosx_productversion_patch',
           'manufacturer',
           'memoryfree',
           'memoryfree_mb',

data/lib/facter/custom_facts/core/execution/posix.rb

@@ -29,8 +29,8 @@ module Facter
           !!(path =~ ABSOLUTE_PATH_REGEX)
         end
 
-        DOUBLE_QUOTED_COMMAND = /^"(.+?)"(?:\s+(.*))?/.freeze
-        SINGLE_QUOTED_COMMAND = /^'(.+?)'(?:\s+(.*))?/.freeze
+        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/.freeze
+        SINGLE_QUOTED_COMMAND = /\A'(.+?)'(?:\s+(.*))?/.freeze
 
         def expand_command(command)
           exe = nil

data/lib/facter/custom_facts/core/execution/windows.rb

@@ -38,7 +38,7 @@ module Facter
           !!(path =~ ABSOLUTE_PATH_REGEX)
         end
 
-        DOUBLE_QUOTED_COMMAND = /^"(.+?)"(?:\s+(.*))?/.freeze
+        DOUBLE_QUOTED_COMMAND = /\A"(.+?)"(?:\s+(.*))?/.freeze
 
         def expand_command(command)
           exe = nil

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

@@ -1,6 +1,5 @@
 # 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'

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

@@ -38,8 +38,6 @@ module LegacyFacter
   include Comparable
   include Enumerable
 
-  extend LegacyFacter::Core::Logging
-
   # module methods
 
   # Accessor for the collection object which holds all the facts

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

@@ -103,7 +103,7 @@ module LegacyFacter
 
         finishtime = Time.now.to_f
         ms = (finishtime - starttime) * 1000
-        LegacyFacter.show_time format('%<qn>s: %<ms>.2fms', qn: qualified_name, ms: ms)
+        Facter::Log.show_time format('%<qn>s: %<ms>.2fms', qn: qualified_name, ms: ms)
       end
 
       def qualified_name

data/lib/facter/custom_facts/util/collection.rb

@@ -32,7 +32,7 @@ module LegacyFacter
 
         fact
       rescue StandardError => e
-        Facter.log_exception(e, "Unable to add fact #{name}: #{e}")
+        log.log_exception("Unable to add fact #{name}: #{e}")
       end
 
       # Add a resolution mechanism for a named fact.  This does not distinguish
@@ -71,9 +71,7 @@ module LegacyFacter
         # Try HARDER
         internal_loader.load_all unless @facts[name]
 
-        if @facts.empty?
-          LegacyFacter.warnonce("No facts loaded from #{internal_loader.search_path.join(File::PATH_SEPARATOR)}")
-        end
+        log.warnonce("No facts loaded from #{internal_loader.search_path.join(File::PATH_SEPARATOR)}") if @facts.empty?
 
         @facts[name]
       end
@@ -181,6 +179,10 @@ module LegacyFacter
         @external_facts_loaded = true
         external_loader.load(self)
       end
+
+      def log
+        @log ||= Facter::Log.new(self)
+      end
     end
   end
 end

data/lib/facter/custom_facts/util/confine.rb

@@ -41,13 +41,13 @@ module LegacyFacter
           begin
             return !!@block.call
           rescue StandardError => e
-            LegacyFacter.debug "Confine raised #{e.class} #{e}"
+            log.debug "Confine raised #{e.class} #{e}"
             return false
           end
         end
 
         unless (fact = Facter[@fact])
-          LegacyFacter.debug format('No fact for %<fact>s', fact: @fact)
+          log.debug format('No fact for %<fact>s', fact: @fact)
           return false
         end
         value = convert(fact.value)
@@ -58,13 +58,19 @@ module LegacyFacter
           begin
             return !!@block.call(value)
           rescue StandardError => e
-            LegacyFacter.debug "Confine raised #{e.class} #{e}"
+            log.debug "Confine raised #{e.class} #{e}"
             return false
           end
         end
 
         @values.any? { |v| convert(v) === value }
       end
+
+      private
+
+      def log
+        @log ||= Facter::Log.new(self)
+      end
     end
   end
 end

data/lib/facter/custom_facts/util/directory_loader.rb

@@ -52,6 +52,10 @@ module LegacyFacter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       def load_directory_entries(_collection)
         cm = Facter::CacheManager.new
         facts = []
@@ -63,7 +67,7 @@ module LegacyFacter
             Facter.log_exception(Exception.new("Caching is enabled for group \"#{basename}\" while "\
               'there are at least two external facts files with the same filename'))
           else
-            searched_fact = Facter::SearchedFact.new(basename, nil, [], nil, :file)
+            searched_fact = Facter::SearchedFact.new(basename, nil, nil, :file)
             searched_fact.file = file
             facts << searched_fact
           end
@@ -87,18 +91,26 @@ module LegacyFacter
           data = resolve_fact(fact, parser)
 
           if data == false
-            LegacyFacter.warn "Could not interpret fact file #{fact.file}"
+            log.warn "Could not interpret fact file #{fact.file}"
           elsif (data == {}) || data.nil?
-            @log.debug("Fact file #{fact.file} was parsed but no key=>value data was returned")
+            log.debug("Fact file #{fact.file} was parsed but no key=>value data was returned")
           else
-            data.each do |p, v|
-              collection.add(p, value: v, fact_type: :external,
-                                file: fact.file) { has_weight(weight) }
-            end
+            add_data(data, collection, fact, weight)
           end
         end
       end
 
+      def add_data(data, collection, fact, weight)
+        data.each do |key, value|
+          collection.add(
+            key,
+            value: value,
+            fact_type: :external,
+            file: fact.file
+          ) { has_weight(weight) }
+        end
+      end
+
       def resolve_fact(fact, parser)
         data = nil
         fact_name = File.basename(fact.file)