facter 4.0.14 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63754f9680508e1714380c5748e316728b74d146a4b0eb465a00284400439b39
-  data.tar.gz: 822ec4903396d341adacae685abfd81401e2e2bddb9ff63da1ddf6228b7a4153
+  metadata.gz: 4ac142ce04ba0e86b5a01726649b5b779562b472e162fb446261a15d9873efe4
+  data.tar.gz: ed8f02efebff60c27c93be0b6073564c80b38f850b4c564a29e12994b1057636
 SHA512:
-  metadata.gz: 6d4dd2ae2e72badce0b7539d11c30d5eabe6ceb2391dd382b640ede61c93bfb0591ae295c41c348cc7759f62a2904a469925ae85a6ffcf9405fdbabb130a0cf0
-  data.tar.gz: 0cfeb5bb052cd3e6353e77afaca0ece7dc34f49c68c4b03a0851b7862fd9e6bef1faa3478f89ca3b3e3b4ff47d1b9f82888c7ee42423968ac10318b62cfd4b2d
+  metadata.gz: 19ca811ddbfeb3fd48f1376bb8a5694242ecb70ff83e85aff34c38eeeb55a43cf5ccf810494b6bbaebe26b6564e0a66dca5f8b9d578550447c757074b7a36bef
+  data.tar.gz: db4abe8360068573b590dfcf648da8e99decf2f392870b1fd29daa6e32695547bd1bc141c5d82c6fdd28bc3f8025c2f2256891a72d7b0920f87d9aff36bd2f28

data/.rubocop.yml

@@ -8,6 +8,9 @@ require:
 Documentation:
   Enabled: false
 
+Style/TrivialAccessors:
+  AllowDSLWriters: true
+
 Metrics/LineLength:
   Max: 120
 

data/.rubocop_todo.yml

@@ -1,35 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1000`
-# on 2020-03-31 19:10:53 +0300 using RuboCop version 0.74.0.
+# on 2020-04-07 19:23:35 +0300 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 69
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/custom_facts/core/execution/posix_spec.rb'
-    - 'spec/custom_facts/core/execution/windows_spec.rb'
-    - 'spec/custom_facts/shared_contexts/platform.rb'
-    - 'spec/custom_facts/util/parser_spec.rb'
-    - 'spec/facter/fact_filter_spec.rb'
-    - 'spec/facter/facter_spec.rb'
-    - 'spec/facter/facts/macosx/is_virtual_spec.rb'
-    - 'spec/facter/resolvers/solaris/current_zone_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/solaris_release_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/zfs_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/zone_resolver_spec.rb'
-    - 'spec/facter/resolvers/solaris/zpool_resolver_spec.rb'
-    - 'spec/facter/resolvers/ssh_resolver_spec.rb'
-    - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
-    - 'spec/framework/config/config_reader_spec.rb'
-    - 'spec/framework/core/fact_loaders/external_fact_loader_spec.rb'
-    - 'spec/framework/core/options_spec.rb'
-    - 'spec/framework/formatters/legacy_fact_formatter_spec.rb'
-
 # Offense count: 79
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
@@ -122,12 +98,6 @@ RSpec/InstanceVariable:
     - 'spec/custom_facts/util/collection_spec.rb'
     - 'spec/custom_facts/util/confine_spec.rb'
 
-# Offense count: 2
-RSpec/IteratedExpectation:
-  Exclude:
-    - 'spec/custom_facts/core/aggregate_spec.rb'
-    - 'spec/custom_facts/core/suitable_spec.rb'
-
 # Offense count: 16
 RSpec/LeakyConstantDeclaration:
   Exclude:
@@ -138,14 +108,13 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
 
-# Offense count: 290
+# Offense count: 121
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   Exclude:
     - 'spec/custom_facts/core/aggregate_spec.rb'
     - 'spec/custom_facts/core/execution/fact_manager_spec.rb'
-    - 'spec/custom_facts/core/execution/posix_spec.rb'
     - 'spec/custom_facts/core/execution/windows_spec.rb'
     - 'spec/custom_facts/core/execution_spec.rb'
     - 'spec/custom_facts/core/logging_spec.rb'
@@ -159,59 +128,20 @@ RSpec/MessageSpies:
     - 'spec/custom_facts/util/parser_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
     - 'spec/facter/facter_spec.rb'
-    - 'spec/facter/facts/aix/networking/domain_spec.rb'
-    - 'spec/facter/facts/aix/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/aix/networking/hostname_spec.rb'
-    - 'spec/facter/facts/aix/networking/ip_spec.rb'
-    - 'spec/facter/facts/aix/networking/primary_spec.rb'
     - 'spec/facter/facts/aix/os/name_spec.rb'
     - 'spec/facter/facts/aix/os/release_spec.rb'
-    - 'spec/facter/facts/aix/ruby/version_spec.rb'
-    - 'spec/facter/facts/debian/networking/domain_spec.rb'
-    - 'spec/facter/facts/debian/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/debian/networking/hostname_spec.rb'
-    - 'spec/facter/facts/debian/networking/interfaces_spec.rb'
-    - 'spec/facter/facts/debian/networking/ip_spec.rb'
-    - 'spec/facter/facts/debian/networking/primary_spec.rb'
-    - 'spec/facter/facts/debian/os/family_spec.rb'
-    - 'spec/facter/facts/debian/ruby/version_spec.rb'
-    - 'spec/facter/facts/el/networking/domain_spec.rb'
-    - 'spec/facter/facts/el/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/el/networking/hostname_spec.rb'
-    - 'spec/facter/facts/el/networking/interfaces_spec.rb'
-    - 'spec/facter/facts/el/networking/ip_spec.rb'
-    - 'spec/facter/facts/el/networking/primary_spec.rb'
     - 'spec/facter/facts/macosx/is_virtual_spec.rb'
-    - 'spec/facter/facts/macosx/memory/swap/used_spec.rb'
-    - 'spec/facter/facts/macosx/memory/system/used_spec.rb'
     - 'spec/facter/facts/macosx/mountpoints_spec.rb'
-    - 'spec/facter/facts/macosx/networking/domain_spec.rb'
-    - 'spec/facter/facts/macosx/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/macosx/networking/hostname_spec.rb'
     - 'spec/facter/facts/macosx/os/architecture_spec.rb'
     - 'spec/facter/facts/macosx/os/family_spec.rb'
     - 'spec/facter/facts/macosx/os/name_spec.rb'
-    - 'spec/facter/facts/macosx/ruby/version_spec.rb'
-    - 'spec/facter/facts/sles/facterversion_spec.rb'
-    - 'spec/facter/facts/sles/networking/domain_spec.rb'
-    - 'spec/facter/facts/sles/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/sles/networking/hostname_spec.rb'
-    - 'spec/facter/facts/sles/networking/interfaces_spec.rb'
-    - 'spec/facter/facts/sles/networking/ip_spec.rb'
-    - 'spec/facter/facts/sles/networking/primary_spec.rb'
     - 'spec/facter/facts/sles/os/architecture_spec.rb'
     - 'spec/facter/facts/sles/os/name_spec.rb'
     - 'spec/facter/facts/sles/os/release_spec.rb'
-    - 'spec/facter/facts/solaris/facterversion_spec.rb'
-    - 'spec/facter/facts/solaris/networking/domain_spec.rb'
-    - 'spec/facter/facts/solaris/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/solaris/networking/hostname_spec.rb'
     - 'spec/facter/facts/solaris/os/architecture_spec.rb'
     - 'spec/facter/facts/solaris/os/name_spec.rb'
-    - 'spec/facter/facts/solaris/os/release_spec.rb'
     - 'spec/facter/facts/solaris/ruby/platform_spec.rb'
     - 'spec/facter/facts/solaris/ruby/sitedir_spec.rb'
-    - 'spec/facter/facts/solaris/ruby/version_spec.rb'
     - 'spec/facter/facts/windows/dmi/manufacturer_spec.rb'
     - 'spec/facter/facts/windows/dmi/product/name_spec.rb'
     - 'spec/facter/facts/windows/dmi/product/serial_number_spec.rb'
@@ -230,21 +160,10 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/windows/netmask_interfaces_spec.rb'
     - 'spec/facter/facts/windows/network6_interfaces_spec.rb'
     - 'spec/facter/facts/windows/network_interfaces_spec.rb'
-    - 'spec/facter/facts/windows/networking/domain_spec.rb'
-    - 'spec/facter/facts/windows/networking/fqdn_spec.rb'
-    - 'spec/facter/facts/windows/networking/hostname_spec.rb'
-    - 'spec/facter/facts/windows/networking/ip6_spec.rb'
-    - 'spec/facter/facts/windows/networking/mac_spec.rb'
-    - 'spec/facter/facts/windows/networking/netmask6_spec.rb'
-    - 'spec/facter/facts/windows/networking/netmask_spec.rb'
-    - 'spec/facter/facts/windows/networking/network6_spec.rb'
-    - 'spec/facter/facts/windows/networking/network_spec.rb'
-    - 'spec/facter/facts/windows/networking/scope6_spec.rb'
     - 'spec/facter/facts/windows/os/architecture_spec.rb'
     - 'spec/facter/facts/windows/os/family_spec.rb'
     - 'spec/facter/facts/windows/os/hardware_spec.rb'
     - 'spec/facter/facts/windows/os/name_spec.rb'
-    - 'spec/facter/facts/windows/os/release_spec.rb'
     - 'spec/facter/facts/windows/os/windows/edition_id_spec.rb'
     - 'spec/facter/facts/windows/os/windows/installation_type_spec.rb'
     - 'spec/facter/facts/windows/os/windows/product_name_spec.rb'
@@ -255,19 +174,10 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/windows/processors/physicalcount_spec.rb'
     - 'spec/facter/facts/windows/ruby/platform_spec.rb'
     - 'spec/facter/facts/windows/ruby/sitedir_spec.rb'
-    - 'spec/facter/facts/windows/ruby/version_spec.rb'
     - 'spec/facter/facts/windows/scope6_interfaces_spec.rb'
-    - 'spec/facter/resolvers/aix/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/utils/aix/odm_query_spec.rb'
-    - 'spec/framework/config/block_list_spec.rb'
     - 'spec/framework/config/config_reader_spec.rb'
     - 'spec/framework/core/fact_loaders/external_fact_loader_spec.rb'
-    - 'spec/framework/detector/os_detector_spec.rb'
-
-# Offense count: 118
-# Configuration parameters: AggregateFailuresByDefault.
-RSpec/MultipleExpectations:
-  Max: 9
 
 # Offense count: 26
 RSpec/SubjectStub:
@@ -280,7 +190,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 239
+# Offense count: 193
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -291,49 +201,12 @@ RSpec/VerifiedDoubles:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
     - 'spec/facter/facter_spec.rb'
-    - 'spec/facter/facts/aix/facterversion_spec.rb'
-    - 'spec/facter/facts/aix/kernel_spec.rb'
-    - 'spec/facter/facts/aix/kernelmajversion_spec.rb'
-    - 'spec/facter/facts/aix/kernelrelease_spec.rb'
-    - 'spec/facter/facts/aix/kernelversion_spec.rb'
-    - 'spec/facter/facts/aix/path_spec.rb'
     - 'spec/facter/facts/aix/ssh_spec.rb'
-    - 'spec/facter/facts/debian/facterversion_spec.rb'
-    - 'spec/facter/facts/debian/kernel_spec.rb'
-    - 'spec/facter/facts/debian/kernelmajversion_spec.rb'
-    - 'spec/facter/facts/debian/kernelrelease_spec.rb'
-    - 'spec/facter/facts/debian/kernelversion_spec.rb'
-    - 'spec/facter/facts/debian/path_spec.rb'
-    - 'spec/facter/facts/el/facterversion_spec.rb'
-    - 'spec/facter/facts/el/kernel_spec.rb'
-    - 'spec/facter/facts/el/kernelmajversion_spec.rb'
-    - 'spec/facter/facts/el/kernelrelease_spec.rb'
-    - 'spec/facter/facts/el/kernelversion_spec.rb'
-    - 'spec/facter/facts/el/path_spec.rb'
-    - 'spec/facter/facts/macosx/facterversion_spec.rb'
-    - 'spec/facter/facts/macosx/kernel_spec.rb'
-    - 'spec/facter/facts/macosx/kernelmajversion_spec.rb'
-    - 'spec/facter/facts/macosx/kernelrelease_spec.rb'
-    - 'spec/facter/facts/macosx/kernelversion_spec.rb'
     - 'spec/facter/facts/macosx/memory/swap/capacity_spec.rb'
     - 'spec/facter/facts/macosx/memory/swap/used_bytes_spec.rb'
-    - 'spec/facter/facts/macosx/memory/swap/used_spec.rb'
     - 'spec/facter/facts/macosx/memory/system/capacity_spec.rb'
     - 'spec/facter/facts/macosx/memory/system/used_bytes_spec.rb'
-    - 'spec/facter/facts/macosx/memory/system/used_spec.rb'
-    - 'spec/facter/facts/macosx/path_spec.rb'
-    - 'spec/facter/facts/sles/kernel_spec.rb'
-    - 'spec/facter/facts/sles/kernelmajversion_spec.rb'
-    - 'spec/facter/facts/sles/kernelrelease_spec.rb'
-    - 'spec/facter/facts/sles/kernelversion_spec.rb'
-    - 'spec/facter/facts/sles/path_spec.rb'
-    - 'spec/facter/facts/solaris/kernel_spec.rb'
-    - 'spec/facter/facts/solaris/kernelmajversion_spec.rb'
-    - 'spec/facter/facts/solaris/kernelrelease_spec.rb'
-    - 'spec/facter/facts/solaris/kernelversion_spec.rb'
-    - 'spec/facter/facts/solaris/path_spec.rb'
     - 'spec/facter/facts/windows/dmi/product/serial_number_spec.rb'
-    - 'spec/facter/facts/windows/facterversion_spec.rb'
     - 'spec/facter/facts/windows/hypervisors/hyperv_spec.rb'
     - 'spec/facter/facts/windows/hypervisors/kvm_spec.rb'
     - 'spec/facter/facts/windows/hypervisors/virtualbox_spec.rb'
@@ -342,12 +215,10 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/facts/windows/identity/privileged_spec.rb'
     - 'spec/facter/facts/windows/memory/system/capacity_spec.rb'
     - 'spec/facter/facts/windows/memory/system/used_bytes_spec.rb'
-    - 'spec/facter/facts/windows/memory/system/used_spec.rb'
     - 'spec/facter/facts/windows/networking/dhcp_spec.rb'
     - 'spec/facter/facts/windows/networking/interfaces_spec.rb'
     - 'spec/facter/facts/windows/networking/mtu_spec.rb'
     - 'spec/facter/facts/windows/networking/primary_spec.rb'
-    - 'spec/facter/facts/windows/path_spec.rb'
     - 'spec/facter/facts/windows/processors/models_spec.rb'
     - 'spec/facter/facts/windows/virtualization/is_virtual_spec.rb'
     - 'spec/facter/facts/windows/virtualization/virtual_spec.rb'
@@ -378,8 +249,6 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/windows/virtualization_resolver_spec.rb'
     - 'spec/facter/resolvers/windows/win_os_description_resolver_spec.rb'
     - 'spec/framework/config/block_list_spec.rb'
-    - 'spec/framework/core/fact/external/external_fact_manager_spec.rb'
-    - 'spec/framework/core/fact/internal/internal_fact_manager_spec.rb'
     - 'spec/framework/core/fact_loaders/external_fact_loader_spec.rb'
     - 'spec/framework/core/fact_loaders/fact_loader_spec.rb'
     - 'spec/framework/core/fact_manager_spec.rb'

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+
+
+## [4.0.14](https://github.com/puppetlabs/facter-ng/tree/4.0.14) (2020-04-01)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.13...4.0.14)
+
+### Added
+
+- \(FACT-2512\) Handle Raspbian as Debian [\#421](https://github.com/puppetlabs/facter-ng/pull/421) ([mlove-au](https://github.com/mlove-au))
+- \(FACT-2231\) Add AIX mountpoints fact [\#398](https://github.com/puppetlabs/facter-ng/pull/398) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2471\) Add Linux partitions fact [\#393](https://github.com/puppetlabs/facter-ng/pull/393) ([oanatmaria](https://github.com/oanatmaria))
+- Debugger tool [\#391](https://github.com/puppetlabs/facter-ng/pull/391) ([sebastian-miclea](https://github.com/sebastian-miclea))
+- \(FACT-2435\) Expose :expand as an option to execute command [\#342](https://github.com/puppetlabs/facter-ng/pull/342) ([florindragos](https://github.com/florindragos))
+
+### Fixed
+
+- \(FACT-2511\) Remove file logger [\#425](https://github.com/puppetlabs/facter-ng/pull/425) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2498\) Internal fact loader should only load facts once [\#420](https://github.com/puppetlabs/facter-ng/pull/420) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- Avoid exceptions for zone facts on FreeBSD [\#412](https://github.com/puppetlabs/facter-ng/pull/412) ([smortex](https://github.com/smortex))
+- \(FACT-2475\) Fix os.release on Debian [\#410](https://github.com/puppetlabs/facter-ng/pull/410) ([oanatmaria](https://github.com/oanatmaria))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/CONTRIBUTING.md

@@ -0,0 +1,93 @@
+
+# How to contribute
+
+Third-party patches are essential for keeping facter great. We simply can't
+access the huge number of platforms and myriad configurations for running
+Facter. We want to keep it as easy as possible to contribute changes that
+get things working in your environment. There are a few guidelines that we
+need contributors to follow so that we can have a chance of keeping on
+top of things.
+
+## Getting Started
+
+* Make sure you have a [Jira account](https://tickets.puppetlabs.com).
+* Make sure you have a [GitHub account](https://github.com/signup/free).
+* Submit a Jira ticket for your issue if one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Make sure you fill in the earliest version that you know has the issue.
+  * A ticket is not necessary for [trivial changes](https://puppet.com/community/trivial-patch-exemption-policy)
+* Fork the repository on GitHub.
+
+## Making Changes
+
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * Once merged, your work will be automatically promoted to the other release
+    streams when our internal CI passes.
+  * To quickly create a topic branch based on master, run `git checkout -b
+    fix/master/my_contribution master`. Please avoid working directly on the
+    `master` branch.
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in the proper format. We use the [50/72 rule](https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project) in commit messages.
+* If the commit addresses an issue filed in the [Facter Jira project](https://tickets.puppetlabs.com/browse/FACT), start the first line of the commit with the issue number in parentheses.
+
+````
+    (FACT-1234) Make the example in CONTRIBUTING imperative and concrete
+
+    Without this patch applied the example commit message in the CONTRIBUTING
+    document is not a concrete example.  This is a problem because the
+    contributor is left to imagine what the commit message should look like
+    based on a description rather than an example.  This patch fixes the
+    problem by making the example concrete and imperative.
+
+    The first line is a real life imperative statement with a ticket number
+    from our issue tracker.  The body describes the behavior without the patch,
+    why this is a problem, and how the patch fixes the problem when applied.
+````
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+  * We recommend running `./check.sh` to have the same checks run as on github
+
+## Making Trivial Changes
+
+For [changes of a trivial nature](https://puppet.com/community/trivial-patch-exemption-policy), it is not always necessary to create a new
+ticket in Jira. In this case, it is appropriate to start the first line of a
+commit with one of  `(docs)` or `(maint)` instead of a ticket number.
+
+If a Jira ticket exists for the documentation commit, you can include it
+after the `(docs)` token.
+
+```
+    (docs)(DOCUMENT-000) Add docs commit example to CONTRIBUTING
+
+    There is no example for contributing a documentation commit
+    to the Facter repository. This is a problem because the contributor
+    is left to assume how a commit of this nature may appear.
+
+    The first line is a real-life imperative statement with '(docs)' in
+    place of what would have been the FACT project ticket number in a
+    non-documentation related commit. The body describes the nature of
+    the new documentation or comments added.
+```
+
+For commits that address trivial repository maintenance tasks start the first line of the commit with `(maint)`
+
+## Submitting Changes
+
+* Sign the [Contributor License Agreement](http://links.puppet.com/cla).
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request to the repository in the puppetlabs organization.
+* Update your ticket to mark that you have submitted code and are ready for it to be reviewed.
+  * Include a link to the pull request in the ticket
+
+# Additional Resources
+
+* [Puppet community guidelines](https://puppet.com/community/community-guidelines/)
+* [Bug tracker (Jira)](https://tickets.puppetlabs.com/browse/FACT)
+* [Contributor License Agreement](http://links.puppet.com/cla)
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork)
+* [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
+* [Puppet-dev Slack channel](https://puppetcommunity.slack.com/archives/C0W1X7ZAL)

data/Gemfile

@@ -4,5 +4,9 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec name: 'facter'
 
+group(:release, optional: true) do
+  gem 'github_changelog_generator' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
+end
+
 local_gemfile = File.expand_path('Gemfile.local', __dir__)
 eval_gemfile(local_gemfile) if File.exist?(local_gemfile)

data/Rakefile

@@ -7,3 +7,63 @@ RSpec::Core::RakeTask.new(:spec)
 Dir.glob(File.join('tasks/**/*.rake')).each { |file| load file }
 
 task default: :spec
+
+def retrieve_from_keyboard
+  puts "Please provide the next release tag:\n"
+  next_version = $stdin.gets.chomp
+  raise(ArgumentError, ' The string that you entered is invalid!') unless /[0-9]+\.[0-9]+\.[0-9]+/.match?(next_version)
+
+  next_version
+end
+
+if Bundler.rubygems.find_name('github_changelog_generator').any?
+  require 'github_changelog_generator/task'
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    if Rake.application.top_level_tasks.include?('changelog') &&
+       ENV['CHANGELOG_GITHUB_TOKEN'].nil?
+      raise 'Set CHANGELOG_GITHUB_TOKEN environment variable' /
+            " eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'"
+    end
+
+    config.user = 'puppetlabs'
+    config.project = 'facter-ng'
+    config.since_tag = File.read('VERSION').strip
+    config.future_release = retrieve_from_keyboard
+    config.exclude_labels = ['maintenance']
+    config.add_pr_wo_labels = true
+    config.issues = false
+    config.max_issues = 100
+    config.header = ''
+    config.base = 'CHANGELOG.md'
+    config.merge_prefix = '### UNCATEGORIZED PRS; GO LABEL THEM'
+    config.configure_sections = {
+      "Changed": {
+        "prefix": '### Changed',
+        "labels": ['backwards-incompatible']
+      },
+      "Added": {
+        "prefix": '### Added',
+        "labels": ['feature']
+      },
+      "Fixed": {
+        "prefix": '### Fixed',
+        "labels": ['bugfix']
+      }
+    }
+  end
+else
+  desc 'Generate a Changelog from GitHub'
+  task :changelog do
+    raise <<~ERRORMESSAGE
+      The changelog tasks depends on github_changelog_generator gem.
+      Please install github_changelog_generator:
+      ---
+      Gemfile:
+        optional:
+          ':release':
+            - gem: 'github_changelog_generator'
+              condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+    ERRORMESSAGE
+  end
+end

data/VERSION

@@ -1 +1 @@
-4.0.14
+4.0.15

data/lib/custom_facts/util/collection.rb

@@ -32,7 +32,7 @@ module LegacyFacter
 
         fact
       rescue StandardError => e
-        LegacyFacter.log_exception(e, "Unable to add fact #{name}: #{e}")
+        Facter.log_exception(e, "Unable to add fact #{name}: #{e}")
       end
 
       # Add a resolution mechanism for a named fact.  This does not distinguish

data/lib/custom_facts/util/loader.rb

@@ -112,7 +112,7 @@ module LegacyFacter
           # Don't store the path if the file can't be loaded
           # in case it's loadable later on.
           @loaded.delete(file)
-          LegacyFacter.log_exception(e, "Error loading fact #{file}: #{e.message}")
+          Facter.log_exception(e, "Error loading fact #{file}: #{e.message}")
         end
       end
 

data/lib/custom_facts/util/parser.rb

@@ -58,7 +58,7 @@ module LegacyFacter
         def results
           parse_results
         rescue Exception => e
-          LegacyFacter.log_exception(e, "Failed to handle #{filename} as #{self.class} facts: #{e.message}")
+          Facter.log_exception(e, "Failed to handle #{filename} as #{self.class} facts: #{e.message}")
           nil
         end
 

data/lib/facter.rb

@@ -213,7 +213,6 @@ module Facter
     #
     # @api public
     def trace(bool)
-      LegacyFacter.trace(bool)
       @trace = bool
     end
 

data/lib/facts/debian/lsbdistcodename.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Debian
+    class Lsbdistcodename
+      FACT_NAME = 'lsbdistcodename'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facts/debian/lsbdistdescription.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Debian
+    class Lsbdistdescription
+      FACT_NAME = 'lsbdistdescription'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facts/debian/lsbdistid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Debian
+    class Lsbdistid
+      FACT_NAME = 'lsbdistid'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facts/debian/lsbdistrelease.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Debian
+    class Lsbdistrelease
+      FACT_NAME = 'lsbdistrelease'
+      ALIASES = %w[lsbmajdistrelease lsbminordistrelease].freeze
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
+
+        return Facter::ResolvedFact.new(FACT_NAME, nil, :legacy) unless fact_value
+
+        version = fact_value.split('.')
+
+        [Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy),
+         Facter::ResolvedFact.new(ALIASES[0], version[0], :legacy),
+         Facter::ResolvedFact.new(ALIASES[1], version[1], :legacy)]
+      end
+    end
+  end
+end

data/lib/facts/debian/os/distro/codename.rb

@@ -6,13 +6,22 @@ module Facts
       module Distro
         class Codename
           FACT_NAME = 'os.distro.codename'
-          ALIASES = 'lsbdistcodename'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+            fact_value = Facter::Resolvers::OsRelease.resolve(:version_codename)
+            fact_value ||= retreieve_from_version
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+
+          def retreieve_from_version
+            version = Facter::Resolvers::OsRelease.resolve(:version)
+            return unless version
+
+            codename = /\(.*\)$/.match(version).to_s.gsub(/\(|\)/, '')
+            return codename unless codename.empty?
+
+            /[A-Za-z]+\s[A-Za-z]+/.match(version).to_s.split(' ').first.downcase
           end
         end
       end

data/lib/facts/debian/os/distro/description.rb

@@ -6,13 +6,11 @@ module Facts
       module Distro
         class Description
           FACT_NAME = 'os.distro.description'
-          ALIASES = 'lsbdistdescription'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
+            fact_value = Facter::Resolvers::OsRelease.resolve(:pretty_name)
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facts/debian/os/distro/id.rb

@@ -6,13 +6,11 @@ module Facts
       module Distro
         class Id
           FACT_NAME = 'os.distro.id'
-          ALIASES = 'lsbdistid'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+            fact_value = Facter::Resolvers::OsRelease.resolve(:id).capitalize
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facts/debian/os/distro/release.rb

@@ -6,7 +6,6 @@ module Facts
       module Distro
         class Release
           FACT_NAME = 'os.distro.release'
-          ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
             fact_value = determine_release_for_os
@@ -16,10 +15,7 @@ module Facts
             versions = fact_value.split('.')
             release = { 'full' => fact_value, 'major' => versions[0], 'minor' => versions[1].gsub(/^0([1-9])/, '\1') }
 
-            [Facter::ResolvedFact.new(FACT_NAME, release),
-             Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
-             Facter::ResolvedFact.new(ALIASES[1], release['major'], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], release['minor'], :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, release)
           end
 
           private

data/lib/facts/el/processor.rb

@@ -4,6 +4,7 @@ module Facts
   module El
     class Processor
       FACT_NAME = 'processor.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/el/sshalgorithmkey.rb

@@ -4,6 +4,7 @@ module Facts
   module El
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

data/lib/facts/el/sshfp_algorithm.rb

@@ -4,6 +4,7 @@ module Facts
   module El
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

data/lib/facts/macosx/sshalgorithmkey.rb

@@ -4,6 +4,7 @@ module Facts
   module Macosx
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

data/lib/facts/macosx/sshfp_algorithm.rb

@@ -4,6 +4,7 @@ module Facts
   module Macosx
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

data/lib/facts/sles/processor.rb

@@ -4,6 +4,7 @@ module Facts
   module Sles
     class Processor
       FACT_NAME = 'processor.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/sles/sshalgorithmkey.rb

@@ -4,6 +4,7 @@ module Facts
   module Sles
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

data/lib/facts/sles/sshfp_algorithm.rb

@@ -4,6 +4,7 @@ module Facts
   module Sles
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         facts = []

data/lib/facts/windows/ipaddress6_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Ipaddress6Interfaces
       FACT_NAME = 'ipaddress6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/ipaddress_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class IpaddressInterfaces
       FACT_NAME = 'ipaddress_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/macaddress_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class MacaddressInterfaces
       FACT_NAME = 'macaddress_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/mtu_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class MtuInterfaces
       FACT_NAME = 'mtu_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/netmask6_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Netmask6Interfaces
       FACT_NAME = 'netmask6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/netmask_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class NetmaskInterfaces
       FACT_NAME = 'netmask_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/network6_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Network6Interfaces
       FACT_NAME = 'network6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/network_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class NetworkInterfaces
       FACT_NAME = 'network_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/processor.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Processor
       FACT_NAME = 'processor.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/facts/windows/scope6_interfaces.rb

@@ -4,6 +4,7 @@ module Facts
   module Windows
     class Scope6Interfaces
       FACT_NAME = 'scope6_.*'
+      TYPE = :legacy
 
       def call_the_resolver
         arr = []

data/lib/framework/cli/cli.rb

@@ -10,7 +10,7 @@ module Facter
                  desc: 'Enable color output.'
 
     class_option :config,
-                 aliases: :c,
+                 aliases: '-c',
                  type: :string,
                  desc: 'The location of the config file.'
 
@@ -20,7 +20,7 @@ module Facter
                  desc: 'A directory to use for custom facts.'
 
     class_option :debug,
-                 aliases: :d,
+                 aliases: '-d',
                  type: :boolean,
                  desc: 'Enable debug output.'
 
@@ -31,7 +31,7 @@ module Facter
 
     class_option :help,
                  hide: true,
-                 aliases: :h,
+                 aliases: '-h',
                  type: :boolean,
                  desc: 'Print this help message.'
 
@@ -40,7 +40,7 @@ module Facter
                  desc: 'Output in Hocon format.'
 
     class_option :json,
-                 aliases: :j,
+                 aliases: '-j',
                  type: :boolean,
                  desc: 'Output in JSON format.'
 
@@ -53,7 +53,7 @@ module Facter
                  desc: 'List the names of all cacheable fact groups.'
 
     class_option :log_level,
-                 aliases: :l,
+                 aliases: '-l',
                  type: :string,
                  desc: 'Set logging level. Supported levels are: none, trace, debug, info, warn, error, and fatal.'
 
@@ -90,7 +90,7 @@ module Facter
                  desc: 'Show legacy facts when querying all facts.'
 
     class_option :yaml,
-                 aliases: :y,
+                 aliases: '-y',
                  type: :boolean,
                  desc: 'Output in YAML format.'
 
@@ -100,7 +100,7 @@ module Facter
 
     class_option :puppet,
                  type: :boolean,
-                 aliases: :p,
+                 aliases: '-p',
                  desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
 
     desc 'query', 'Default method', hide: true

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

@@ -19,7 +19,10 @@ module Facter
     def start_threads(searched_facts)
       threads = []
 
-      searched_facts.reject { |elem| elem.fact_class.nil? }.each do |searched_fact|
+      # only resolve a fact once, even if multiple search facts depend on that fact
+      searched_facts
+        .uniq { |searched_fact| searched_fact.fact_class.name }
+        .each do |searched_fact|
         threads << Thread.new do
           fact = CoreFact.new(searched_fact)
           fact.create

data/lib/framework/core/fact_loaders/internal_fact_loader.rb

@@ -37,7 +37,7 @@ module Facter
         # if fact is already loaded, skip it
         next if @facts.any? { |fact| fact.name == fact_name }
 
-        type = fact_name.end_with?('.*') ? :legacy : :core
+        type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
         load_fact(fact_name, class_name, type)
         next unless class_name.const_defined?('ALIASES')
 

data/lib/models/resolved_fact.rb

@@ -22,5 +22,9 @@ module Facter
     def core?
       type == :core
     end
+
+    def to_s
+      @value.to_s
+    end
   end
 end

data/lib/resolvers/windows/networking_resolver.rb

@@ -40,7 +40,7 @@ module Facter
             if error == NetworkingFFI::ERROR_BUFFER_OVERFLOW
               adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
             else
-              @log.info 'Unable to retrieve networking facts!'
+              @log.debug 'Unable to retrieve networking facts!'
               return nil
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.14
+  version: 4.0.15
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,7 +200,9 @@ files:
 - ".rubocop_todo.yml"
 - ".rubycritic.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODEOWNERS
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -311,6 +313,10 @@ files:
 - lib/facts/debian/kernelrelease.rb
 - lib/facts/debian/kernelversion.rb
 - lib/facts/debian/load_averages.rb
+- lib/facts/debian/lsbdistcodename.rb
+- lib/facts/debian/lsbdistdescription.rb
+- lib/facts/debian/lsbdistid.rb
+- lib/facts/debian/lsbdistrelease.rb
 - lib/facts/debian/memory/swap/available.rb
 - lib/facts/debian/memory/swap/available_bytes.rb
 - lib/facts/debian/memory/swap/capacity.rb