facter 4.0.16 → 4.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2152e5f7eabbae2f7ecbd79149167e8ec542c55f9dbda10c606bd4e4cdd6cf06
-  data.tar.gz: 25cbcb4a4d7ac89508041cc1e0c1833dac198dc2702c0ca3505cb77295f55da8
+  metadata.gz: 5045cd46bc46b826aee23e2da1e62dc583e5daf0216a3ca31098970f55bd3d77
+  data.tar.gz: 6ebd3870b201a82fad831783ee0d3b2cc84fa0bce81e4600b56f6d2ec8ecdc4b
 SHA512:
-  metadata.gz: 64ffad2e78106f6c15fc5712a32b3970ad67c2b44dd21e06192f61865c9a4b33fcca3f8ebc6c82810c6249b95b6e577dd9e975ef94c0edb55058e99e802ad6f4
-  data.tar.gz: 8f9efff21eb866000c71fe6bc4f481741248d39ddbfceda0d651d34612de38346a68818ebafcd89b22c5363444213bb6398d46960133a56a9cb5122b4fbdf193
+  metadata.gz: 61874498a45ac854b2da205e441bed65880f9cf92ff094c7c04ad3d984189873bfb25be34ac9221f3266839a7f977eda610323fb1db033eafc58a918d71eaf02
+  data.tar.gz: 5ee49a1e8742b4ba9f63a6436a637366d316c170f43c5da677130ad9a6036442c81456265b37935d5c527feb82df78bfaa2e69c05918fd1fb70e55c442e51fbc

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+PLEASE LABEL YOUR PULL REQUEST ACCORDINGLY!
+
+Choose only one of the following:
+
+"backwards-incompatible" - use this label for PRs that breaks some old functionality
+
+"feature" - use this label for new added functionality
+
+"bugfix" - use this label for PRs that contain fixes
+
+"maintenance" - use this label for PRs that contain trivial changes (eg. changes in unit tests)
+
+Also please add "community" additional label if you're part of puppet community (special attention will be provided for those PRs).

data/.travis.yml

@@ -23,6 +23,7 @@ jobs:
         - bundle exec rubocop
         - bundle exec rubycritic --no-browser -f console
         - bundle exec rake spec
+        - bundle exec rake commits
 
     - rvm: 2.5
       script:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 
 
+## [4.0.17](https://github.com/puppetlabs/facter-ng/tree/4.0.17) (2020-04-21)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.16...4.0.17)
+
+### Fixed
+
+- \(FACT-2562\) Correctly load custom and external fact directories [\#458](https://github.com/puppetlabs/facter-ng/pull/458) ([IrimieBogdan](https://github.com/IrimieBogdan))
+
+
+
 ## [4.0.16](https://github.com/puppetlabs/facter-ng/tree/4.0.16) (2020-04-15)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.15...4.0.16)

data/Rakefile

@@ -8,7 +8,39 @@ Dir.glob(File.join('tasks/**/*.rake')).each { |file| load file }
 
 task default: :spec
 
+desc 'verify that commit messages match CONTRIBUTING.md requirements'
+task(:commits) do
+  # This rake task looks at the summary from every commit from this branch not
+  # in the branch targeted for a PR. This is accomplished by using the
+  # TRAVIS_COMMIT_RANGE environment variable, which is present in travis CI and
+  # populated with the range of commits the PR contains. If not available, this
+  # falls back to `master..HEAD` as a next best bet as `master` is unlikely to
+  # ever be absent.
+  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master..HEAD' : ENV['TRAVIS_COMMIT_RANGE'].sub(/\.\.\./, '..')
+  puts "Checking commits #{commit_range}"
+  `git log --no-merges --pretty=%s #{commit_range}`.each_line do |commit_summary|
+    # This regex tests for the currently supported commit summary tokens: maint, doc, gem, or fact-<number>.
+    # The exception tries to explain it in more full.
+    if /^\((maint|doc|docs|gem|fact-\d+)\)|revert/i.match(commit_summary).nil?
+      raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
+        "\n\t\t#{commit_summary}\n" \
+        "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
+        "\t\t(FACT-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
+        "\t\t(docs)\n" \
+        "\t\t(docs)(DOCUMENT-<digits>)\n" \
+        "\t\t(maint)\n" \
+        "\t\t(gem)\n" \
+        "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
+    else
+      puts commit_summary.to_s
+    end
+    puts '...passed'
+  end
+end
+
 def retrieve_from_keyboard
+  return unless ARGV =~ /changelog/
+
   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)

data/VERSION

@@ -1 +1 @@
-4.0.16
+4.0.17

data/lib/facter.rb

@@ -131,6 +131,8 @@ module Facter
     # @api public
     def reset
       LegacyFacter.reset
+      Options[:custom_dir] = []
+      Options[:external_dir] = []
       LegacyFacter.search(*Options.custom_dir)
       LegacyFacter.search_external(Options.external_dir)
       nil
@@ -145,6 +147,7 @@ module Facter
     #
     # @api public
     def search(*dirs)
+      Options[:custom_dir] += dirs
       LegacyFacter.search(*dirs)
     end
 
@@ -156,6 +159,7 @@ module Facter
     #
     # @api public
     def search_external(dirs)
+      Options[:external_dir] += dirs
       LegacyFacter.search_external(dirs)
     end
 
@@ -165,7 +169,7 @@ module Facter
     #
     # @api public
     def search_external_path
-      LegacyFacter.search_external_path
+      Options.external_dir
     end
 
     # Returns the registered search directories for custom facts.
@@ -174,7 +178,7 @@ module Facter
     #
     # @api public
     def search_path
-      LegacyFacter.search_path
+      Options.custom_dir
     end
 
     # Gets a hash mapping fact names to their values
@@ -186,7 +190,6 @@ module Facter
     def to_hash
       log_blocked_facts
 
-      reset
       resolved_facts = Facter::FactManager.instance.resolve_facts
       Facter::SessionCache.invalidate_all_caches
       Facter::FactCollection.new.build_fact_collection!(resolved_facts)

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

@@ -19,6 +19,7 @@ module Facter
     # The search paths must be set before creating the fact collection.
     # If we set them after, they will not be visible.
     def load_search_paths
+      LegacyFacter.reset_search_path!
       LegacyFacter.search(*Options.custom_dir) if Options.custom_dir?
       LegacyFacter.search_external(Options.external_dir) if Options.external_dir?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.16
+  version: 4.0.17
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/rtc.yml"
 - ".gitignore"
 - ".jrubyrc"