Merge branch 'master' into FACT-2600

# Conflicts:
#	lib/framework/core/fact/internal/internal_fact_manager.rb
#	lib/framework/formatters/legacy_fact_formatter.rb
#	spec/framework/core/fact/internal/internal_fact_manager_spec.rb

.github/actions/presuite.rb

@@ -10,7 +10,7 @@ def install_facter_3_dependencies
   run('bundle install')
 end
 
-def install_custom_beaker
+def use_custom_beaker
   message('USE CUSTOM BEAKER')
   beaker_path, _ = run('bundle info beaker --path', FACTER_3_ACCEPTANCE_PATH)
   Dir.chdir(beaker_path.split("\n").last) do
@@ -25,7 +25,7 @@ def initialize_beaker
   beaker_platform_with_options = platform_with_options(beaker_platform)
 
   message('BEAKER INITIALIZE')
-  run("beaker init -h #{beaker_platform_with_options} -o config/aio/options.rb")
+  run("beaker init -h #{beaker_platform_with_options} -o #{File.join('config', 'aio', 'options.rb')}")
 
   message('BEAKER PROVISION')
   run('beaker provision')
@@ -50,7 +50,7 @@ def install_puppet_agent
   message('INSTALL PUPPET AGENT')
 
   beaker_puppet_root, _ = run('bundle info beaker-puppet --path')
-  presuite_file_path = "#{beaker_puppet_root.chomp}/setup/aio/010_Install_Puppet_Agent.rb"
+  presuite_file_path = File.join(beaker_puppet_root.chomp, 'setup', 'aio', '010_Install_Puppet_Agent.rb')
 
   run("beaker exec pre-suite --pre-suite #{presuite_file_path} --preserve-state", './', env_path_var)
 end
@@ -86,7 +86,6 @@ def replace_facter_3_with_facter_4
 
   extension = (HOST_PLATFORM.include? 'windows') ? '.bat' : ''
   run("mv facter-ng#{extension} facter#{extension}", puppet_bin_dir)
-  # run("facter -v", puppet_bin_dir)
 end
 
 
@@ -104,7 +103,7 @@ def install_latest_facter_4(gem_command)
 def run_acceptance_tests
   message('RUN ACCEPTANCE TESTS')
 
-  run('beaker exec tests', './', env_path_var)
+  run('beaker exec tests --test-tag-exclude=server,facter_3 --test-tag-or=risk:high,audit:high', './', env_path_var)
 end
 
 def message(message)
@@ -136,7 +135,7 @@ def run(command, dir = './', env = {})
 install_bundler
 
 Dir.chdir(FACTER_3_ACCEPTANCE_PATH) { install_facter_3_dependencies }
-install_custom_beaker
+use_custom_beaker
 
 Dir.chdir(FACTER_3_ACCEPTANCE_PATH) do
   initialize_beaker

.github/workflows/acceptance_tests.yml

@@ -14,7 +14,7 @@ jobs:
     name: Platform
     strategy:
       matrix:
-        os: [windows-2016]
+        os: [windows-2016, windows-2019, ubuntu-16.04, ubuntu-18.04, macos-10.15]
     runs-on: ${{ matrix.os }}
     env:
       FACTER_3_ROOT: facter_3

.github/workflows/checks.yaml

@@ -37,6 +37,8 @@ jobs:
     steps:
       - name: Checkout current PR
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
 
       - name: Commit message checks
         uses: ruby/setup-ruby@v1

CHANGELOG.md

@@ -193,7 +193,4 @@
 
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
-
-
 \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

lib/custom_facts/util/loader.rb

@@ -40,7 +40,6 @@ def load_all
         paths = search_path
         paths&.each do |dir|
           # dir is already an absolute path
-          dir = dir.gsub(/[\/\\]+/, File::SEPARATOR)
           Dir.glob(File.join(dir, '*.rb')).each do |path|
             # exclude dirs that end with .rb
             load_file(path) if FileTest.file?(path)

lib/facter.rb

@@ -289,6 +289,9 @@ def resolve_fact(user_query)
       user_query = user_query.to_s
       resolved_facts = Facter::FactManager.instance.resolve_facts([user_query])
       SessionCache.invalidate_all_caches
+      # we must make a distinction between custom facts that return nil and nil facts
+      # Nil facts should not be packaged as ResolvedFacts! (add_fact_to_searched_facts packages facts)
+      resolved_facts = resolved_facts.reject { |fact| fact.type == :nil }
       fact_collection = FactCollection.new.build_fact_collection!(resolved_facts)
       splitted_user_query = Facter::Utils.split_user_query(user_query)
 

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

@@ -9,8 +9,7 @@ def resolve_facts(searched_facts)
       threads = start_threads(internal_searched_facts)
       resolved_facts = join_threads(threads, internal_searched_facts)
 
-      nil_searched_facts = filter_nil_facts(searched_facts)
-      nil_resolved_facts = resolve_nil_facts(nil_searched_facts)
+      nil_resolved_facts = resolve_nil_facts(searched_facts)
 
       resolved_facts.concat(nil_resolved_facts)
     end
@@ -21,10 +20,6 @@ def filter_internal_facts(searched_facts)
       searched_facts.select { |searched_fact| %i[core legacy].include? searched_fact.type }
     end
 
-    def filter_nil_facts(searched_facts)
-      searched_facts.select { |searched_fact| %i[nil].include? searched_fact.type }
-    end
-
     def resolve_nil_facts(searched_facts)
       resolved_facts = []
       searched_facts.select { |fact| fact.type == :nil }.each do |fact|

lib/framework/formatters/legacy_fact_formatter.rb

@@ -60,7 +60,6 @@ def hash_to_facter_format(facts_hash)
       pretty_json = JSON.pretty_generate(facts_hash)
 
       @log.debug('Change key value delimiter from : to =>')
-      # pretty_json.gsub!(/^(.*?)(:)/, '\1 =>')
       pretty_json.gsub!(/":/, '" =>')
 
       @log.debug('Remove quotes from parent nodes')
@@ -85,6 +84,7 @@ def remove_enclosing_accolades(pretty_fact_json)
     end
 
     def remove_comma_and_quation(output)
+      # quotation marks that come after \ are not removed
       @log.debug('Remove unnecessary comma and quotation marks on root facts')
       output.split("\n")
             .map! { |line| line =~ /^[\s]+/ ? line : line.gsub(/,$|(?<!\\)\"/, '').gsub('\\"', '"') }.join("\n")

spec/facter/facter_spec.rb

@@ -166,6 +166,24 @@ def mock_collection(method, os_name = nil, error = nil)
 
       expect(Facter.fact('os.name')).to be_nil
     end
+
+    context 'when there is a resolved fact with type nil' do
+      before do
+        allow(fact_manager_spy).to receive(:resolve_facts).and_return([missing_fact])
+        allow(fact_collection_spy).to receive(:build_fact_collection!).with([]).and_return(empty_fact_collection)
+        allow(fact_collection_spy).to receive(:value).and_raise(KeyError)
+      end
+
+      it 'is rejected' do
+        Facter.fact('missing_fact')
+
+        expect(fact_collection_spy).to have_received(:build_fact_collection!).with([])
+      end
+
+      it 'returns nil' do
+        expect(Facter.fact('missing_fact')).to be_nil
+      end
+    end
   end
 
   describe '#[]' do

spec/facter/query_parser_spec.rb

@@ -88,5 +88,17 @@
       expect(matched_facts).to be_an_instance_of(Array).and \
         contain_exactly(an_instance_of(Facter::SearchedFact).and(having_attributes(fact_class: path_class)))
     end
+
+    context 'when fact does not exist' do
+      let(:query_list) { ['non_existing_fact'] }
+      let(:loaded_facts) { [] }
+
+      it 'creates a nil fact' do
+        matched_facts = Facter::QueryParser.parse(query_list, loaded_facts)
+        expect(matched_facts).to be_an_instance_of(Array).and contain_exactly(
+          an_object_having_attributes(name: 'non_existing_fact', user_query: 'non_existing_fact', type: :nil)
+        )
+      end
+    end
   end
 end

spec/framework/core/fact/internal/internal_fact_manager_spec.rb

@@ -32,7 +32,7 @@
       expect(resolved_facts).to eq([resolved_fact])
     end
 
-    context 'when resolved fac is of type nil' do
+    context 'when resolved fact is of type nil' do
       let(:searched_fact) do
         instance_spy(Facter::SearchedFact, name: 'missing_fact', fact_class: nil,
                                            filter_tokens: [], user_query: '', type: :nil)

tasks/commits.rake

@@ -8,12 +8,12 @@ task(:commits) do
   # 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(/\.\.\./, '..')
+  commit_range = 'HEAD^..HEAD'
   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?
+    if /^\((maint|doc|docs|gem|fact-\d+)\)|revert|merge/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"  \