facter 4.0.25 → 4.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 258f3076e55739266049906ec76f9813481b5289a90e45ba96ad06ff59e4bc8c
-  data.tar.gz: 5797140df4c3063e3121bf5d9118aa23975c563517181c17263607a27c1939ec
+  metadata.gz: d90029b76954a57efa0f989018162ae7f86e26d9b111db2167086de82ef55f57
+  data.tar.gz: 65abc86b8335b04f49e533286313e86602050b097140b8462c911cb6cf44b139
 SHA512:
-  metadata.gz: f810ad19ee6d8246684844aa388979089d4283ddea1dccb5cbdf3e1116c87f383a194e5ceb88c7c1894578196980271c6b6f0a435edaf89e0b0699e65b6aacc4
-  data.tar.gz: 828a1dadd8c44eb2dedfd1e6c4b8a1bfc77c05794bcad4e9cae5ad251f3e8a18f85b4b0c9ed6f3cb9be7f3ed6233e3a9d3a33bb34186e9c69be2b51bcad11a3a
+  metadata.gz: d94ca6623630e5889c10472cdfd083c3b34ba6f200c8e3ddf1bcdbe16f00a59a674b350e5c2bf0e7f99dd0339a26899bd5a7525096a2b1e36a341e9b2adac116
+  data.tar.gz: c0909ade0eab953884e87e4fe731453c1ef60e1fea653ed7d65c4d0891cdc8f75d21221a07e4a68389e1c0f280ecb18975455e1802d1864135c1115c4fc44eed

data/.github/actions/presuite.rb

@@ -5,55 +5,91 @@ def install_bundler
   run('gem install bundler')
 end
 
-def install_facter_3_dependecies
+def install_facter_3_dependencies
   message('INSTALL FACTER 3 ACCEPTANCE DEPENDENCIES')
   run('bundle install')
 end
 
-def install_custom_beaker
-  message('BUILD CUSTOM BEAKER GEM')
-  run('gem build beaker.gemspec')
-
-  message('INSTALL CUSTOM BEAKER GEM')
-  run('gem install beaker-*.gem')
+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
+    run('git init')
+    run("git remote add origin https://github.com/Filipovici-Andrei/beaker.git")
+    run('git fetch')
+    run("git reset --hard origin/github_actions")
+  end
 end
 
 def initialize_beaker
-  beaker_options = "#{get_beaker_platform(ENV['ImageOS'].to_sym)}{hypervisor=none\\,hostname=localhost}"
+  beaker_platform_with_options = platform_with_options(beaker_platform)
 
   message('BEAKER INITIALIZE')
-  run("beaker init -h #{beaker_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')
 end
 
-def get_beaker_platform(host_platform)
-  beaker_platforms = {
-      ubuntu18: 'ubuntu1804-64a',
-      ubuntu16: 'ubuntu1604-64a',
-      macos1015: 'osx1015-64a'
-  }
+def beaker_platform
+  {
+      'ubuntu-18.04' => 'ubuntu1804-64a',
+      'ubuntu-16.04' => 'ubuntu1604-64a',
+      'macos-10.15' => 'osx1015-64a',
+      'windows-2016' => 'windows2016-64a',
+      'windows-2019' => 'windows2019-64a'
+  }[HOST_PLATFORM]
+end
 
-  beaker_platforms[host_platform]
+def platform_with_options(platform)
+  return "\"#{platform}{hypervisor=none,hostname=localhost,is_cygwin=false}\"" if platform.include? 'windows'
+  "#{platform}{hypervisor=none\\,hostname=localhost}"
 end
 
 def install_puppet_agent
+  message('INSTALL PUPPET AGENT')
+
   beaker_puppet_root, _ = run('bundle info beaker-puppet --path')
-  install_puppet_file_path = File.join(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')
 
-  message('INSTALL PUPPET AGENT')
-  run("beaker exec pre-suite --pre-suite #{install_puppet_file_path}")
+  run("beaker exec pre-suite --pre-suite #{presuite_file_path} --preserve-state", './', env_path_var)
 end
 
-def replace_facter_3_with_facter_4
+def puppet_bin_dir
   linux_puppet_bin_dir = '/opt/puppetlabs/puppet/bin'
-  gem_command = File.join(linux_puppet_bin_dir, 'gem')
-  puppet_command = File.join(linux_puppet_bin_dir, 'puppet')
+  windows_puppet_bin_dir = 'C:\\Program Files\\Puppet Labs\\Puppet\\bin'
 
+  (HOST_PLATFORM.include? 'windows') ? windows_puppet_bin_dir : linux_puppet_bin_dir
+end
+
+def puppet_command
+  return '/opt/puppetlabs/puppet/bin/puppet' unless HOST_PLATFORM.include? 'windows'
+  "\"C:\\Program Files\\Puppet Labs\\Puppet\\bin\\puppet\""
+end
+
+def gem_command
+  return '/opt/puppetlabs/puppet/bin/gem' unless HOST_PLATFORM.include? 'windows'
+  "\"C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin\\gem\""
+end
+
+def env_path_var
+  (HOST_PLATFORM.include? 'windows') ? { 'PATH' => "#{puppet_bin_dir};#{ENV['PATH']}" } : {}
+end
+
+def replace_facter_3_with_facter_4
   message('SET FACTER 4 FLAG TO TRUE')
   run("#{puppet_command} config set facterng true")
 
+  install_latest_facter_4(gem_command)
+
+  message('CHANGE FACTER 3 WITH FACTER 4')
+
+  extension = (HOST_PLATFORM.include? 'windows') ? '.bat' : ''
+  run("mv facter-ng#{extension} facter#{extension}", puppet_bin_dir)
+end
+
+
+def install_latest_facter_4(gem_command)
   message('BUILD FACTER 4 LATEST AGENT GEM')
   run("#{gem_command} build agent/facter-ng.gemspec", ENV['FACTER_4_ROOT'])
 
@@ -62,14 +98,12 @@ def replace_facter_3_with_facter_4
 
   message('INSTALL FACTER 4 GEM')
   run("#{gem_command} install -f facter-ng-*.gem", ENV['FACTER_4_ROOT'])
-
-  message('CHANGE FACTER 3 WITH FACTER 4')
-  run('mv facter-ng facter', linux_puppet_bin_dir)
 end
 
 def run_acceptance_tests
   message('RUN ACCEPTANCE TESTS')
-  run('beaker exec tests --test-tag-exclude=server,facter_3 --test-tag-or=risk:high,audit:high')
+
+  run('beaker exec tests --test-tag-exclude=server,facter_3 --test-tag-or=risk:high,audit:high', './', env_path_var)
 end
 
 def message(message)
@@ -80,21 +114,28 @@ def message(message)
   puts "\n\n#{result}\n\n"
 end
 
-def run(command, dir = './')
+def run(command, dir = './', env = {})
   puts command
-  output, status = Open3.capture2(command, chdir: dir)
-  puts output
+  output = ''
+  status = 0
+  Open3.popen2e(env, command, chdir: dir) do |_stdin, stdout_and_err, wait_thr|
+    stdout_and_err.each do |line|
+      puts line
+      output += line
+    end
+    status = wait_thr.value
+  end
   [output, status]
 end
 
-ENV['DEBIAN_DISABLE_RUBYGEMS_INTEGRATION'] = 'no_wornings'
+ENV['DEBIAN_DISABLE_RUBYGEMS_INTEGRATION'] = 'no_warnings'
 FACTER_3_ACCEPTANCE_PATH = File.join(ENV['FACTER_3_ROOT'], 'acceptance')
+HOST_PLATFORM = ARGV[0]
 
 install_bundler
 
-Dir.chdir(FACTER_3_ACCEPTANCE_PATH) { install_facter_3_dependecies }
-
-Dir.chdir(ENV['BEAKER_ROOT']) { install_custom_beaker }
+Dir.chdir(FACTER_3_ACCEPTANCE_PATH) { install_facter_3_dependencies }
+use_custom_beaker
 
 Dir.chdir(FACTER_3_ACCEPTANCE_PATH) do
   initialize_beaker

data/.github/workflows/acceptance_tests.yml

@@ -14,14 +14,12 @@ jobs:
     name: Platform
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-16.04, macos-10.15]
+        os: [windows-2016, windows-2019, ubuntu-16.04, ubuntu-18.04, macos-10.15]
     runs-on: ${{ matrix.os }}
     env:
       FACTER_3_ROOT: facter_3
       FACTER_4_ROOT: facter_4
-      BEAKER_ROOT: beaker
       SHA: latest
-      BEAKER_VERSION: 4.21.0
 
     steps:
       - name: Checkout current PR
@@ -33,22 +31,16 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: puppetlabs/facter
-          ref: skip_failures_on_ng
+          ref: windows_github
           path: facter_3
 
-      - name: Clone custom beaker fork
-        uses: actions/checkout@v2
-        with:
-          repository: mihaibuzgau/beaker
-          ref: master
-          path: beaker
-
       - name: Install Ruby 2.6
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
 
-      - name: Fix common permissions
+      - name: Fix common Linux and MacOs permissions
+        if: runner.os != 'Windows'
         run: sudo chmod a-w /opt
 
       - name: Fix Linux permissions
@@ -57,11 +49,17 @@ jobs:
           sudo chmod a-w /home/runner /usr/share &&
           sudo chmod -R a-w /usr/share/rust /home/runner/.config /home/linuxbrew
 
-      - name: Instal dhclient
+      - name: Instal dhclient for Linux
         if: runner.os == 'Linux'
         run: |
           sudo apt install dhcpcd5
           sudo dhclient
 
-      - name: Run acceptance tests
-        run: sudo -E "PATH=$PATH" ruby facter_4/.github/actions/presuite.rb
+      - name: Run acceptance tests on Linux like platform
+        if: runner.os != 'Windows'
+        run: sudo -E "PATH=$PATH" ruby $FACTER_4_ROOT/.github/actions/presuite.rb ${{ matrix.os }}
+
+      - name: Run acceptance tests on Windows like platform
+        if: runner.os == 'Windows'
+        run: ruby $Env:FACTER_4_ROOT/.github/actions/presuite.rb ${{ matrix.os }}
+

data/.github/workflows/checks.yaml

@@ -37,35 +37,12 @@ jobs:
     steps:
       - name: Checkout current PR
         uses: actions/checkout@v2
-
-      - name: Commit message checks
-        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
-      - run: bundle install --jobs 3 --retry 3
-      - run: bundle exec rake commits
-
-  coverage_checks:
-    runs-on: ubuntu-18.04
-    name: coverage
-    steps:
-      - name: Checkout current PR
-        uses: actions/checkout@v2
-
-      - name: Setup Code Climate test-reporter
-        run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
+          fetch-depth: 2
 
       - name: Commit message checks
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.6
       - run: bundle install --jobs 3 --retry 3
-      - run: bundle exec rake spec
-
-      - name: Publish code coverage
-        run: |
-          export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
-          ./cc-test-reporter after-build -r ${{secrets.CC_TEST_REPORTER_ID}}
+      - run: bundle exec rake commits

data/.github/workflows/coverage.yaml

@@ -0,0 +1,33 @@
+---
+name: Coverage
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  coverage_checks:
+    runs-on: ubuntu-18.04
+    name: coverage
+    steps:
+      - name: Checkout current PR
+        uses: actions/checkout@v2
+
+      - name: Setup Code Climate test-reporter
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+
+      - name: Generate coverage
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - run: bundle install --jobs 3 --retry 3
+      - run: bundle exec rake spec
+
+      - name: Publish code coverage
+        run: |
+          export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
+          ./cc-test-reporter after-build -r ${{secrets.CC_TEST_REPORTER_ID}}

data/.github/workflows/unit_tests.yaml

@@ -24,6 +24,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+      - run: gem update bundler
       - run: bundle install --jobs 3 --retry 3
       - run: bundle exec rake spec
 
@@ -37,5 +38,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
+      - run: gem update bundler
       - run: bundle install --jobs 3 --retry 3
       - run: bundle exec rake spec

data/.rubocop_todo.yml

@@ -129,7 +129,6 @@ RSpec/MessageSpies:
     - 'spec/custom_facts/util/loader_spec.rb'
     - 'spec/custom_facts/util/parser_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
-    - 'spec/facter/facter_spec.rb'
     - 'spec/facter/facts/aix/os/name_spec.rb'
     - 'spec/facter/facts/aix/os/release_spec.rb'
     - 'spec/facter/facts/macosx/is_virtual_spec.rb'
@@ -188,7 +187,6 @@ RSpec/VerifiedDoubles:
     - 'spec/custom_facts/util/directory_loader_spec.rb'
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
-    - 'spec/facter/facter_spec.rb'
     - 'spec/facter/facts/aix/ssh_spec.rb'
     - 'spec/facter/facts/macosx/memory/swap/capacity_spec.rb'
     - 'spec/facter/facts/macosx/memory/swap/used_bytes_spec.rb'

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 
 
+## [4.0.26](https://github.com/puppetlabs/facter-ng/tree/4.0.26) (2020-06-11)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.25...4.0.26)
+
+### Added
+
+- \(FACT-2608\) Add is\_virtual fact [\#535](https://github.com/puppetlabs/facter-ng/pull/535) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2609\) Add lspci resolver [\#534](https://github.com/puppetlabs/facter-ng/pull/534) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2245\) Add xen resolver [\#532](https://github.com/puppetlabs/facter-ng/pull/532) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2607\) Add Openvz detector [\#531](https://github.com/puppetlabs/facter-ng/pull/531) ([oanatmaria](https://github.com/oanatmaria))
+- \(FACT-2600\) Run acceptance tests on Windows [\#519](https://github.com/puppetlabs/facter-ng/pull/519) ([Filipovici-Andrei](https://github.com/Filipovici-Andrei))
+
+### Fixed
+
+- \(FACT-2651\) Fix --list-cache-groups when there are multiple arguments before it [\#545](https://github.com/puppetlabs/facter-ng/pull/545) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- FACT-2650 Fix bug when loading external facts [\#543](https://github.com/puppetlabs/facter-ng/pull/543) ([Filipovici-Andrei](https://github.com/Filipovici-Andrei))
+- Use proper encoding [\#539](https://github.com/puppetlabs/facter-ng/pull/539) ([faucct](https://github.com/faucct))
+- \(FACT-2635\) Incorrect output for non existing fact [\#536](https://github.com/puppetlabs/facter-ng/pull/536) ([IrimieBogdan](https://github.com/IrimieBogdan))
+
+
+
 ## [4.0.25](https://github.com/puppetlabs/facter-ng/tree/4.0.25) (2020-05-29)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.24...4.0.25)

data/VERSION

@@ -1 +1 @@
-4.0.25
+4.0.26

data/bin/facter

@@ -4,3 +4,9 @@
 require 'pathname'
 ROOT_DIR = Pathname.new(File.expand_path('..', __dir__)) unless defined?(ROOT_DIR)
 require "#{ROOT_DIR}/lib/framework/cli/cli_launcher.rb"
+
+cli_launcher = CliLauncher.new(ARGV)
+
+cli_launcher.validate_options
+cli_launcher.prepare_arguments
+cli_launcher.start

data/lib/custom_facts/util/loader.rb

@@ -39,6 +39,8 @@ module LegacyFacter
 
         paths = search_path
         paths&.each do |dir|
+          # clean the search path of wrong slashes and backslashes
+          dir = dir.gsub(%r{[\/\\]+}, File::SEPARATOR)
           # dir is already an absolute path
           Dir.glob(File.join(dir, '*.rb')).each do |path|
             # exclude dirs that end with .rb

data/lib/facter.rb

@@ -245,7 +245,7 @@ module Facter
       SessionCache.invalidate_all_caches
       fact_formatter = Facter::FormatterFactory.build(Facter::Options.get)
 
-      status = error_check(args, resolved_facts)
+      status = error_check(resolved_facts)
 
       [fact_formatter.format(resolved_facts), status || 0]
     end
@@ -289,6 +289,9 @@ module Facter
       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)
 
@@ -310,9 +313,10 @@ module Facter
     #  facts that are not found or resolved, otherwise it will return nil
     #
     # @api private
-    def error_check(args, resolved_facts)
+    def error_check(resolved_facts)
       if Options[:strict]
-        missing_names = args - resolved_facts.map(&:user_query).uniq
+        missing_names = resolved_facts.select { |fact| fact.type == :nil }.map(&:user_query)
+
         if missing_names.count.positive?
           status = 1
           log_errors(missing_names)

data/lib/facts/linux/is_virtual.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class IsVirtual
+      FACT_NAME = 'is_virtual'
+      HYPERVISORS_HASH = { 'VMware' => 'vmware', 'VirtualBox' => 'virtualbox', 'Parallels' => 'parallels',
+                           'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
+                           'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
+                           'BHYVE' => 'bhyve' }.freeze
+      PHYSICAL_HYPERVISORS = %w[physical xen0 vmware_server vmware_workstation openvzhn vserver_host].freeze
+
+      def call_the_resolver # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        fact_value = check_docker_lxc || check_gce || retrieve_from_virt_what || check_vmware
+        fact_value ||= check_open_vz || check_vserver || check_xen || check_other_facts || check_lspci || 'physical'
+
+        Facter::ResolvedFact.new(FACT_NAME, check_if_virtual(fact_value))
+      end
+
+      def check_gce
+        bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
+        'gce' if bios_vendor&.include?('Google')
+      end
+
+      def check_docker_lxc
+        Facter::Resolvers::DockerLxc.resolve(:vm)
+      end
+
+      def check_vmware
+        Facter::Resolvers::Vmware.resolve(:vm)
+      end
+
+      def retrieve_from_virt_what
+        Facter::Resolvers::VirtWhat.resolve(:vm)
+      end
+
+      def check_open_vz
+        Facter::Resolvers::OpenVz.resolve(:vm)
+      end
+
+      def check_vserver
+        Facter::Resolvers::VirtWhat.resolve(:vserver)
+      end
+
+      def check_xen
+        Facter::Resolvers::Xen.resolve(:vm)
+      end
+
+      def check_other_facts
+        product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
+        bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
+        return 'kvm' if bios_vendor&.include?('Amazon EC2')
+        return unless product_name
+
+        HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+      end
+
+      def check_lspci
+        Facter::Resolvers::Lspci.resolve(:vm)
+      end
+
+      def check_if_virtual(found_vm)
+        PHYSICAL_HYPERVISORS.count(found_vm).zero?
+      end
+    end
+  end
+end

data/lib/facts/linux/virtual.rb

@@ -4,9 +4,14 @@ module Facts
   module Linux
     class Virtual
       FACT_NAME = 'virtual'
+      HYPERVISORS_HASH = { 'VMware' => 'vmware', 'VirtualBox' => 'virtualbox', 'Parallels' => 'parallels',
+                           'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
+                           'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
+                           'BHYVE' => 'bhyve' }.freeze
 
-      def call_the_resolver
+      def call_the_resolver # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         fact_value = check_docker_lxc || check_gce || retrieve_from_virt_what || check_vmware
+        fact_value ||= check_open_vz || check_vserver || check_xen || check_other_facts || check_lspci || 'physical'
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
@@ -27,6 +32,31 @@ module Facts
       def retrieve_from_virt_what
         Facter::Resolvers::VirtWhat.resolve(:vm)
       end
+
+      def check_open_vz
+        Facter::Resolvers::OpenVz.resolve(:vm)
+      end
+
+      def check_vserver
+        Facter::Resolvers::VirtWhat.resolve(:vserver)
+      end
+
+      def check_xen
+        Facter::Resolvers::Xen.resolve(:vm)
+      end
+
+      def check_other_facts
+        product_name = Facter::Resolvers::Linux::DmiBios.resolve(:product_name)
+        bios_vendor =  Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
+        return 'kvm' if bios_vendor&.include?('Amazon EC2')
+        return unless product_name
+
+        HYPERVISORS_HASH.each { |key, value| return value if product_name.include?(key) }
+      end
+
+      def check_lspci
+        Facter::Resolvers::Lspci.resolve(:vm)
+      end
     end
   end
 end

data/lib/framework/cli/cli_launcher.rb

@@ -7,13 +7,53 @@ Facter::Log.output(STDERR)
 require "#{ROOT_DIR}/lib/facter"
 require "#{ROOT_DIR}/lib/framework/cli/cli"
 
-Facter::OptionsValidator.validate(ARGV)
-ARGV.unshift(Facter::Cli.default_task) unless
-  Facter::Cli.all_tasks.key?(ARGV[0]) ||
-  Facter::Cli.instance_variable_get(:@map).key?(ARGV[0])
-
-begin
-  Facter::Cli.start(ARGV, debug: true)
-rescue Thor::UnknownArgumentError => e
-  Facter::OptionsValidator.write_error_and_exit("unrecognised option '#{e.unknown.first}'")
+class CliLauncher
+  def initialize(args)
+    @args = args
+  end
+
+  def validate_options
+    Facter::OptionsValidator.validate(@args)
+  end
+
+  def prepare_arguments
+    @args.unshift(Facter::Cli.default_task) unless
+      check_if_arguments_is_known(Facter::Cli.all_tasks, @args) ||
+      check_if_arguments_is_known(Facter::Cli.instance_variable_get(:@map), @args)
+
+    @args = reorder_program_arguments(@args)
+  end
+
+  def start
+    Facter::Cli.start(@args, debug: true)
+  rescue Thor::UnknownArgumentError => e
+    Facter::OptionsValidator.write_error_and_exit("unrecognised option '#{e.unknown.first}'")
+  end
+
+  private
+
+  def check_if_arguments_is_known(known_arguments, program_arguments)
+    program_arguments.each do |argument|
+      return true if known_arguments.key?(argument)
+    end
+
+    false
+  end
+
+  def reorder_program_arguments(program_arguments)
+    priority_arguments = Facter::Cli.instance_variable_get(:@map)
+
+    priority_args = []
+    normal_args = []
+
+    program_arguments.each do |argument|
+      if priority_arguments.include?(argument)
+        priority_args << argument
+      else
+        normal_args << argument
+      end
+    end
+
+    priority_args.concat(normal_args)
+  end
 end

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

@@ -5,11 +5,13 @@ module Facter
     @@log = Facter::Log.new(self)
 
     def resolve_facts(searched_facts)
-      searched_facts = filter_internal_facts(searched_facts)
+      internal_searched_facts = filter_internal_facts(searched_facts)
+      threads = start_threads(internal_searched_facts)
+      resolved_facts = join_threads(threads, internal_searched_facts)
 
-      threads = start_threads(searched_facts)
+      nil_resolved_facts = resolve_nil_facts(searched_facts)
 
-      join_threads(threads, searched_facts)
+      resolved_facts.concat(nil_resolved_facts)
     end
 
     private
@@ -18,6 +20,15 @@ module Facter
       searched_facts.select { |searched_fact| %i[core legacy].include? searched_fact.type }
     end
 
+    def resolve_nil_facts(searched_facts)
+      resolved_facts = []
+      searched_facts.select { |fact| fact.type == :nil }.each do |fact|
+        resolved_facts << ResolvedFact.new(fact.name, nil, :nil, fact.name)
+      end
+
+      resolved_facts
+    end
+
     def start_threads(searched_facts)
       threads = []
       # only resolve a fact once, even if multiple search facts depend on that fact

data/lib/framework/formatters/legacy_fact_formatter.rb

@@ -60,7 +60,7 @@ module Facter
       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')
       pretty_json.gsub!(/\"(.*)\"\ =>/, '\1 =>')
@@ -84,8 +84,10 @@ module Facter
     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(/,$|\"/, '') }.join("\n")
+      output.split("\n")
+            .map! { |line| line =~ /^[\s]+/ ? line : line.gsub(/,$|(?<!\\)\"/, '').gsub('\\"', '"') }.join("\n")
     end
   end
 end

data/lib/framework/parsers/query_parser.rb

@@ -50,6 +50,8 @@ module Facter
           return resolvable_fact_list if resolvable_fact_list.any?
         end
 
+        resolvable_fact_list << SearchedFact.new(query, nil, [], query, :nil) if resolvable_fact_list.empty?
+
         resolvable_fact_list
       end
 
@@ -73,9 +75,11 @@ module Facter
       def found_fact?(fact_name, query_fact)
         fact_with_wildcard = fact_name.include?('.*') && !query_fact.include?('.')
 
+        processed_equery_fact = query_fact.gsub('\\', '\\\\\\\\')
+
         return false if fact_with_wildcard && !query_fact.match("^#{fact_name}$")
 
-        return false unless fact_with_wildcard || fact_name.match("^#{query_fact}($|\\.)")
+        return false unless fact_with_wildcard || fact_name.match("^#{processed_equery_fact}($|\\.)")
 
         true
       end

data/lib/resolvers/lspci.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Lspci < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+
+      REGEX_VALUES = { 'VirtualBox' => 'virtualbox', 'XenSource' => 'xenhvm',
+                       'Microsoft Corporation Hyper-V' => 'hyperv', 'Class 8007: Google, Inc' => 'gce',
+                       'VM[wW]are' => 'vmware', '1ab8:' => 'parallels', '[Pp]arallels' => 'parallels',
+                       '(?i)(virtio)' => 'kvm' }.freeze
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { lspci_command(fact_name) }
+        end
+
+        def lspci_command(fact_name)
+          output = Facter::Core::Execution.execute('lspci', logger: log)
+          return if output.empty?
+
+          @fact_list[:vm] = retrieve_vm(output)
+          @fact_list[fact_name]
+        end
+
+        def retrieve_vm(output)
+          output.each_line { |line| REGEX_VALUES.each { |key, value| return value if line =~ /#{key}/ } }
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/macosx/system_profiler_resolver.rb

@@ -44,7 +44,7 @@ module Facter
           log.debug 'Executing command: system_profiler SPSoftwareDataType SPHardwareDataType'
           output = Facter::Core::Execution.execute(
             'system_profiler SPHardwareDataType SPSoftwareDataType', logger: log
-          )
+          ).force_encoding('UTF-8')
           @fact_list = output.scan(/.*:[ ].*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
           normalize_factlist
 

data/lib/resolvers/open_vz.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class OpenVz < BaseResolver
+      # build
+
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { check_proc_vz(fact_name) }
+        end
+
+        def check_proc_vz(fact_name)
+          if !Dir.exist?('/proc/vz') || !File.executable?('/proc/lve/list') || Dir.entries('/proc/vz').count.equal?(2)
+            return
+          end
+
+          @fact_list[:vm] = read_proc_status
+          @fact_list[fact_name]
+        end
+
+        def read_proc_status
+          proc_status_content = Facter::Util::FileHelper.safe_readlines('/proc/self/status', nil)
+          return unless proc_status_content
+
+          proc_status_content.each do |line|
+            parts = line.split("\s")
+            next unless parts.size.equal?(2)
+
+            next unless /^envID:/ =~ parts[0]
+
+            return 'openvzhn' if parts[1] == '0'
+
+            return 'openvzve'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/xen.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Xen < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { chech_xen_dirs(fact_name) }
+        end
+
+        def chech_xen_dirs(fact_name)
+          xen_type = 'xen0' if File.exist?('/dev/xen/evtchn')
+          xen_type = 'xenu' if !xen_type && (File.exist?('/proc/xen') || File.exist?('/dev/xvda1'))
+
+          @fact_list[:vm] = xen_type
+          @fact_list[fact_name]
+        end
+      end
+    end
+  end
+end

data/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"  \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.25
+  version: 4.0.26
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,6 +182,7 @@ files:
 - ".github/actions/presuite.rb"
 - ".github/workflows/acceptance_tests.yml"
 - ".github/workflows/checks.yaml"
+- ".github/workflows/coverage.yaml"
 - ".github/workflows/unit_tests.yaml"
 - ".gitignore"
 - ".jrubyrc"
@@ -321,6 +322,7 @@ files:
 - lib/facts/linux/interfaces.rb
 - lib/facts/linux/ipaddress6_interfaces.rb
 - lib/facts/linux/ipaddress_interfaces.rb
+- lib/facts/linux/is_virtual.rb
 - lib/facts/linux/kernel.rb
 - lib/facts/linux/kernelmajversion.rb
 - lib/facts/linux/kernelrelease.rb
@@ -694,6 +696,7 @@ files:
 - lib/resolvers/load_averages_resolver.rb
 - lib/resolvers/lpar_resolver.rb
 - lib/resolvers/lsb_release_resolver.rb
+- lib/resolvers/lspci.rb
 - lib/resolvers/macosx/dmi_resolver.rb
 - lib/resolvers/macosx/filesystems_resolver.rb
 - lib/resolvers/macosx/ipaddress_resolver.rb
@@ -706,6 +709,7 @@ files:
 - lib/resolvers/memory_resolver.rb
 - lib/resolvers/mountpoints_resolver.rb
 - lib/resolvers/networking_linux_resolver.rb
+- lib/resolvers/open_vz.rb
 - lib/resolvers/os_level_resolver.rb
 - lib/resolvers/os_release_resolver.rb
 - lib/resolvers/partitions.rb
@@ -765,6 +769,7 @@ files:
 - lib/resolvers/windows/virtualization_resolver.rb
 - lib/resolvers/windows/win_os_description_resolver.rb
 - lib/resolvers/wpar_resolver.rb
+- lib/resolvers/xen.rb
 - lib/util/api_debugger.rb
 - lib/util/file_helper.rb
 - os_hierarchy.json