facter 4.0.7.pre → 4.0.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a95b579c2d3ee03ac3fbf5cb0425502f3e18e33c5e434209c0ed0c71f2accd9
-  data.tar.gz: 790cb477add917be240ffff97c31b276a481e1e5e65748422efbf7a33a4ef10a
+  metadata.gz: 476e88581612a000fbf67c3eb00d8dc338cf15085a3717b32dea1a6214856469
+  data.tar.gz: bb0258fe0e3df51439f90427c5e2afeee3b6057e4e98291f410d9869e44ed350
 SHA512:
-  metadata.gz: d12e9913d3a16d3997b0c4a21f5876e4c96e27fc2dfb0f3b33d777fc04c37930a41a2b81edbfe35d2b9921441b5da78ca8825aa1b210321e589fb18013de16a2
-  data.tar.gz: a57c800847dd860b39e24f11742655aa1deeea5a62e816386e0d9487b0dec0a61f23849fab4e57dc7a6c8d1f2c7f7e9169932077a422787462ae2511ceec1f6e
+  metadata.gz: 2048f930daed9ea2e5b008b8941246af8d094b7d84de1e465828804ef04122812fa7e0b9115a4b76b74de33da46f0ffa2cc321399d6794985858e58c6a55911b
+  data.tar.gz: 40741371996abb97ccfd30d60dfe9a8e6279b757f8eb4fa8f6af1dfaf9f0d2457edbe14ba2ff943a397c13f302cd76f88a819e321259a53c8cfae777fbb1686c

data/.gitignore

@@ -54,3 +54,4 @@ build-iPhoneSimulator/
 
 .rspec_status
 Gemfile.lock
+Gemfile.local

data/.rubocop.yml

@@ -1,13 +1,16 @@
+---
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rspec
+
 Documentation:
   Enabled: false
 
 Metrics/LineLength:
   Max: 120
 
-Metrics/ModuleLength:
-  Exclude:
-    - 'lib/facter-ng.rb'
-
 Metrics/MethodLength:
   Max: 20
   Exclude:
@@ -24,14 +27,17 @@ Metrics/ModuleLength:
 Metrics/BlockLength:
   Exclude:
     - !ruby/regexp /(?:(?!.+_spec.rb).)*$/
+
 Style/ClassVars:
   Exclude:
     - !ruby/regexp /(?:(?!.+_resolver.rb).)*$/
+
 Naming/ClassAndModuleCamelCase:
   Exclude:
     - 'spec/mocks/**/*'
 
 Metrics/AbcSize:
+  Max: 16
   Exclude:
     - 'spec/custom_facts/util/parser_spec.rb'
     - 'spec/custom_facts/core/logging_spec.rb'
@@ -41,6 +47,7 @@ Metrics/AbcSize:
     - 'lib/custom_facts/util/confine.rb'
     - 'lib/custom_facts/core/execution/windows.rb'
     - 'lib/custom_facts/core/execution/base.rb'
+    - 'lib/custom_facts/core/resolvable.rb'
 
 Style/FrozenStringLiteralComment:
   Exclude:
@@ -120,3 +127,9 @@ Naming/FileName:
   Exclude:
     - 'lib/facter.rb'
     - 'agent/lib/facter-ng.rb'
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/DescribedClass:
+  EnforcedStyle: explicit

data/.rubocop_todo.yml

@@ -0,0 +1,119 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-02-21 22:34:28 +0200 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: 75
+RSpec/AnyInstance:
+  Enabled: false
+
+# Offense count: 79
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Enabled: false
+
+# Offense count: 82
+RSpec/ExpectInHook:
+  Enabled: false
+
+# Offense count: 412
+# Configuration parameters: CustomTransform, IgnoreMethods.
+RSpec/FilePath:
+  Enabled: false
+
+# Offense count: 15
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/custom_facts/core/execution/fact_manager_spec.rb'
+    - '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:
+    - 'spec/custom_facts/core/resolvable_spec.rb'
+    - 'spec/custom_facts/core/suitable_spec.rb'
+    - 'spec/custom_facts/shared_contexts/platform.rb'
+    - 'spec/custom_facts/util/collection_spec.rb'
+    - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
+    - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
+
+# Offense count: 428
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  Enabled: false
+
+# Offense count: 146
+# Configuration parameters: AggregateFailuresByDefault.
+RSpec/MultipleExpectations:
+  Max: 9
+
+# Offense count: 250
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  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'
+    - 'spec/custom_facts/core/resolvable_spec.rb'
+    - 'spec/custom_facts/core/suitable_spec.rb'
+    - 'spec/custom_facts/util/directory_loader_spec.rb'
+    - 'spec/custom_facts/util/fact_spec.rb'
+    - 'spec/custom_facts/util/normalization_spec.rb'
+    - 'spec/custom_facts/util/resolution_spec.rb'
+    - 'spec/facter/resolvers/linux/networking_linux_resolver_spec.rb'
+    - 'spec/framework/core/options_spec.rb'
+
+# Offense count: 22
+RSpec/NestedGroups:
+  Max: 4
+
+# Offense count: 7
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/custom_facts/util/confine_spec.rb'
+    - 'spec/facter/resolvers/macosx/system_memory_resolver_spec.rb'
+    - 'spec/facter/resolvers/windows/uptime_resolver_spec.rb'
+
+# Offense count: 4
+RSpec/RepeatedExampleGroupDescription:
+  Exclude:
+    - 'spec/custom_facts/util/parser_spec.rb'
+    - 'spec/facter/resolvers/windows/fips_resolver_spec.rb'
+
+# Offense count: 7
+RSpec/ScatteredLet:
+  Exclude:
+    - 'spec/facter/resolvers/windows/product_release_resolver_spec.rb'
+
+# Offense count: 39
+RSpec/SubjectStub:
+  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/logging_spec.rb'
+    - 'spec/custom_facts/core/resolvable_spec.rb'
+    - 'spec/custom_facts/util/fact_spec.rb'
+    - 'spec/custom_facts/util/resolution_spec.rb'
+
+# Offense count: 392
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Enabled: false

data/Gemfile

@@ -2,6 +2,7 @@
 
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
 gemspec name: 'facter'
+
+local_gemfile = File.expand_path('Gemfile.local', __dir__)
+eval_gemfile(local_gemfile) if File.exist?(local_gemfile)

data/VERSION

@@ -1 +1 @@
-4.0.7.pre
+4.0.8.pre

data/facter.gemspec

@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.38'
   spec.add_development_dependency 'rubycritic', '~> 4.1.0'
   spec.add_development_dependency 'sys-filesystem', '~> 1.3'
 

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

@@ -44,7 +44,7 @@ module LegacyFacter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "'#{expanded}'" if expanded.match(/\s/)
+          expanded = "'#{expanded}'" if expanded =~ /\s/
           expanded << " #{args}" if args
 
           expanded

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

@@ -52,7 +52,7 @@ module LegacyFacter
 
           return unless exe && (expanded = which(exe))
 
-          expanded = "\"#{expanded}\"" if expanded.match(/\s+/)
+          expanded = "\"#{expanded}\"" if expanded =~ /\s+/
           expanded << " #{args}" if args
 
           expanded

data/lib/custom_facts/core/logging.rb

@@ -48,7 +48,7 @@ module LegacyFacter
         return unless debugging?
 
         if msg.nil? || msg.empty?
-          invoker = caller[0].slice(/.*:\d+/)
+          invoker = caller(1..1).first.slice(/.*:\d+/)
           self.warn "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
         elsif @@message_callback
           @@message_callback.call(:debug, msg)
@@ -79,7 +79,7 @@ module LegacyFacter
       # @return [void]
       def warn(msg)
         if msg.nil? || msg.empty?
-          invoker = caller[0].slice(/.*:\d+/)
+          invoker = caller(1..1).first.slice(/.*:\d+/)
           msg = "#{self.class}#debug invoked with invalid message #{msg.inspect}:#{msg.class} at #{invoker}"
         end
         if @@message_callback
@@ -119,7 +119,10 @@ module LegacyFacter
           arr << message
         end
 
-        arr.concat(exception.backtrace) if trace
+        if trace
+          arr << 'backtrace:'
+          arr.concat(exception.backtrace)
+        end
 
         "#{RED}#{arr.flatten.join("\n")}#{RESET}"
       end

data/lib/custom_facts/core/resolvable.rb

@@ -75,8 +75,9 @@ module LegacyFacter
         LegacyFacter.log_exception(e, "Fact resolution #{qualified_name} resolved to an invalid value: #{e.message}")
         nil
       rescue StandardError => e
-        LegacyFacter.log_exception(e, "error while resolving custom fact #{qualified_name}: #{e.message}")
-        nil
+        LegacyFacter.log_exception(e, "Error while resolving custom fact #{qualified_name}: #{e.message}")
+        at_exit { exit 1 }
+        raise Facter::ResolveCustomFactError
       end
 
       private

data/lib/custom_facts/util/confine.rb

@@ -46,7 +46,7 @@ module LegacyFacter
           end
         end
 
-        unless (fact = LegacyFacter[@fact])
+        unless (fact = Facter[@fact])
           LegacyFacter.debug format('No fact for %<fact>s', fact: @fact)
           return false
         end

data/lib/custom_facts/util/fact.rb

@@ -48,7 +48,7 @@ module LegacyFacter
       #
       # @param options [Hash] A hash of options to set on the resolution
       #
-      # @return [LegacyFacter::Util::Resolution]
+      # @return [Facter::Util::Resolution]
       #
       # @api private
       def add(options = {}, &block)
@@ -61,7 +61,7 @@ module LegacyFacter
       #
       # @param resolution_name [String] The name of the resolve to define or look up
       # @param options [Hash] A hash of options to set on the resolution
-      # @return [LegacyFacter::Util::Resolution]
+      # @return [Facter::Util::Resolution]
       #
       # @api public
       def define_resolution(resolution_name, options = {}, &block)
@@ -82,7 +82,7 @@ module LegacyFacter
       #
       # @param name [String]
       #
-      # @return [LegacyFacter::Util::Resolution, nil] The resolution if exists, nil if
+      # @return [Facter::Util::Resolution, nil] The resolution if exists, nil if
       #   it doesn't exist or name is nil
       def resolution(name)
         return nil if name.nil?
@@ -163,7 +163,11 @@ module LegacyFacter
 
       def find_first_real_value(resolutions)
         resolutions.each do |resolve|
-          value = resolve.value
+          begin
+            value = resolve.value
+          rescue Facter::ResolveCustomFactError
+            break
+          end
           @used_resolution_weight = resolve.weight
           return value unless value.nil?
         end
@@ -173,7 +177,7 @@ module LegacyFacter
       def announce_when_no_suitable_resolution(resolutions)
         return unless resolutions.empty?
 
-        LegacyFacter.debug format('Found no suitable resolves of %<resolver_lengths for %<name>s',
+        LegacyFacter.debug format('Found no suitable resolves of %<resolver_length> for %<name>s',
                                   resolver_length: @resolves.length, name: @name)
       end
 
@@ -192,7 +196,7 @@ module LegacyFacter
         else
           case resolution_type
           when :simple
-            resolve = LegacyFacter::Util::Resolution.new(resolution_name, self)
+            resolve = Facter::Util::Resolution.new(resolution_name, self)
           when :aggregate
             resolve = LegacyFacter::Core::Aggregate.new(resolution_name, self)
           else

data/lib/custom_facts/util/resolution.rb

@@ -9,7 +9,7 @@
 # satisfied for a fact to be considered _suitable_.
 #
 # @api public
-module LegacyFacter
+module Facter
   module Util
     class Resolution
       # @api private

data/lib/facter.rb

@@ -8,6 +8,8 @@ require "#{ROOT_DIR}/lib/framework/core/file_loader"
 require "#{ROOT_DIR}/lib/framework/core/options/options_validator"
 
 module Facter
+  class ResolveCustomFactError < StandardError; end
+
   @options = Options.instance
 
   def self.[](name)
@@ -44,7 +46,7 @@ module Facter
   end
 
   def self.debugging(debug_bool)
-    @options.priority_options = { debug: true }
+    @options.priority_options = { debug: debug_bool }
     @options.refresh
 
     debug_bool
@@ -108,7 +110,7 @@ module Facter
   end
 
   def self.to_user_output(cli_options, *args)
-    @options.priority_options = cli_options
+    @options.priority_options = { is_cli: true }.merge!(cli_options.map { |(k, v)| [k.to_sym, v] }.to_h)
     @options.refresh(args)
 
     resolved_facts = Facter::FactManager.instance.resolve_facts(@options, args)

data/lib/facts/solaris/zfs_featurenumbers.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facter
+  module Solaris
+    class ZFSFeatureNumbers
+      FACT_NAME = 'zfs_featurenumbers'
+
+      def call_the_resolver
+        fact_value = Resolvers::Solaris::ZFS.resolve(:zfs_featurenumbers)
+        ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/solaris/zfs_version.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facter
+  module Solaris
+    class ZFSVersion
+      FACT_NAME = 'zfs_version'
+
+      def call_the_resolver
+        fact_value = Resolvers::Solaris::ZFS.resolve(:zfs_version)
+        ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/solaris/zpool_featurenumbers.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facter
+  module Solaris
+    class ZPoolFeatureNumbers
+      FACT_NAME = 'zpool_featurenumbers'
+
+      def call_the_resolver
+        fact_value = Resolvers::Solaris::ZPool.resolve(:zpool_featurenumbers)
+        ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/solaris/zpool_version.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facter
+  module Solaris
+    class ZPoolVersion
+      FACT_NAME = 'zpool_version'
+
+      def call_the_resolver
+        fact_value = Resolvers::Solaris::ZPool.resolve(:zpool_version)
+        ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/framework/config/config_reader.rb

@@ -18,7 +18,6 @@ module Facter
     end
 
     def global
-      # puts @conf['global']
       @conf['global']
     end
 

data/lib/framework/core/file_loader.rb

@@ -40,7 +40,6 @@ load_dir(['config'])
 
 load_lib_dirs('resolvers')
 load_lib_dirs('facts_utils')
-load_lib_dirs('utils')
 load_lib_dirs('framework', 'core')
 load_lib_dirs('models')
 load_lib_dirs('framework', 'core', 'fact_loaders')
@@ -53,8 +52,8 @@ os_hierarchy.each { |operating_system| load_lib_dirs('facts', operating_system.d
 os_hierarchy.each { |operating_system| load_lib_dirs('resolvers', operating_system.downcase, '**') }
 
 require "#{ROOT_DIR}/lib/custom_facts/core/legacy_facter"
-require "#{ROOT_DIR}/lib/framework/utils/utils"
-require "#{ROOT_DIR}/lib/util/fact.rb"
+load_lib_dirs('framework', 'utils')
+load_lib_dirs('util')
 
 require "#{ROOT_DIR}/lib/framework/core/fact_augmenter"
 require "#{ROOT_DIR}/lib/framework/parsers/query_parser"

data/lib/framework/core/options.rb

@@ -6,6 +6,7 @@ module Facter
     include Facter::ConfigFileOptions
     include Facter::PriorityOptions
     include Facter::HelperOptions
+    include Facter::ValidateOptions
 
     include Singleton
 
@@ -58,10 +59,12 @@ module Facter
     private
 
     def initialize_options
+      @options = {}
       augment_with_defaults!
       augment_with_to_hash_defaults! if @priority_options[:to_hash]
       augment_with_config_file_options!(@priority_options[:config])
       augment_with_priority_options!(@priority_options)
+      validate_configs
       augment_with_helper_options!(@user_query)
     end
   end

data/lib/framework/core/options/config_file_options.rb

@@ -6,10 +6,12 @@ module Facter
       conf_reader = Facter::ConfigReader.new(config_path)
 
       augment_config_path(config_path)
-      augment_cli(conf_reader.cli)
+      if @priority_options[:is_cli]
+        augment_cli(conf_reader.cli)
+        augment_ruby(conf_reader.global)
+      end
       augment_custom(conf_reader.global)
       augment_external(conf_reader.global)
-      augment_ruby(conf_reader.global)
       augment_show_legacy(conf_reader.global)
       augment_facts(conf_reader.ttls)
     end
@@ -32,15 +34,19 @@ module Facter
     def augment_custom(file_global_conf)
       return unless file_global_conf
 
-      @options[:custom_facts] = !file_global_conf['no-custom-facts'] unless file_global_conf['no-custom-facts'].nil?
-      @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
+      if @priority_options[:is_cli]
+        @options[:custom_facts] = !file_global_conf['no-custom-facts'] unless file_global_conf['no-custom-facts'].nil?
+      end
+      @options[:custom_dir] = [file_global_conf['custom-dir']].flatten unless file_global_conf['custom-dir'].nil?
     end
 
     def augment_external(global_conf)
       return unless global_conf
 
-      @options[:external_facts] = !global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
-      @options[:external_dir] = global_conf['external-dir'] unless global_conf['external-dir'].nil?
+      if @priority_options[:is_cli]
+        @options[:external_facts] = !global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+      end
+      @options[:external_dir] = [global_conf['external-dir']].flatten unless global_conf['external-dir'].nil?
     end
 
     def augment_ruby(global_conf)

data/lib/framework/core/options/default_options.rb

@@ -7,6 +7,8 @@ module Facter
       global_defaults
     end
 
+    DEFAULT_LOG_LEVEL = :warn
+
     def augment_with_to_hash_defaults!
       @options[:show_legacy] = true
     end
@@ -17,7 +19,7 @@ module Facter
       @options[:debug] ||= false
       @options[:trace] ||= false
       @options[:verbose] ||= false
-      @options[:log_level] ||= :warn
+      @options[:log_level] ||= DEFAULT_LOG_LEVEL
       @options[:show_legacy] ||= false
     end
 

data/lib/framework/core/options/validate_options.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Facter
+  module ValidateOptions
+    def validate_configs
+      conflicting_configs.each do |op|
+        if op.values[0] && op.values[1]
+          raise_error("#{op.keys[0]} and #{op.keys[1]} options conflict: please specify only one")
+        end
+      end
+      validate_log_options
+    end
+
+    private
+
+    def conflicting_configs
+      no_ruby = !@options[:ruby]
+      no_custom_facts = !@options[:custom_facts]
+      puppet = @options[:puppet]
+      custom_dir = @options[:custom_dir].nil? ? false : @options[:custom_dir].any?
+      external_dir = @options[:external_dir].nil? ? false : @options[:external_dir].any?
+
+      [
+        { 'no-ruby' => no_ruby, 'custom-dir' => custom_dir },
+        { 'no-external-facts' => !@options[:external_facts], 'external-dir' => external_dir },
+        { 'no-custom-facts' => no_custom_facts, 'custom-fir' => custom_dir },
+        { 'no-ruby' => no_ruby, 'puppet' => puppet },
+        { 'no-custom-facts' => no_custom_facts, 'puppet' => puppet }
+      ]
+    end
+
+    def validate_log_options
+      return unless [@options[:debug],
+                     @options[:verbose],
+                     @options[:log_level] != Facter::DefaultOptions::DEFAULT_LOG_LEVEL]
+                    .count(true) > 1
+
+      raise_error('debug, verbose, and log-level options conflict: please specify only one.')
+    end
+
+    def raise_error(message)
+      log = Facter::Log.new(self)
+      log.error(message, true)
+      raise ArgumentError, message
+    end
+  end
+end

data/lib/framework/formatters/legacy_fact_formatter.rb

@@ -84,7 +84,7 @@ module Facter
 
     def remove_comma_and_quation(output)
       @log.debug('Remove unnecessary comma and quotation marks on root facts')
-      output.split("\n").map! { |line| line.match(/^[\s]+/) ? line : line.gsub(/,$|\"/, '') }.join("\n")
+      output.split("\n").map! { |line| line =~ /^[\s]+/ ? line : line.gsub(/,$|\"/, '') }.join("\n")
     end
   end
 end

data/lib/resolvers/aix/networking_resolver.rb

@@ -23,7 +23,7 @@ module Facter
           end
 
           def get_primary_interface_info(output)
-            primary_interface_info = output.select { |line| line =~ /=>/ }.first.split(' ')
+            primary_interface_info = output.find { |line| line =~ /=>/ }.split(' ')
             @fact_list[:primary] = primary_interface_info[5]
             @fact_list[:ip] = primary_interface_info[1]
           end

data/lib/resolvers/hostname_resolver.rb

@@ -32,9 +32,9 @@ module Facter
             domain = Regexp.last_match(1)
           elsif File.exist?('/etc/resolv.conf')
             file = File.read('/etc/resolv.conf')
-            if file.match(/^search\s+(\S+)/)
+            if file =~ /^search\s+(\S+)/
               domain = Regexp.last_match(1)
-            elsif file.match(/^domain\s+(\S+)/)
+            elsif file =~ /^domain\s+(\S+)/
               domain = Regexp.last_match(1)
             end
           end

data/lib/resolvers/macosx/system_profiler_resolver.rb

@@ -53,7 +53,7 @@ module Facter
 
         def normalize_factlist
           @fact_list = @fact_list.map do |k, v|
-            [k.downcase.gsub(' ', '_').delete("\(\)").to_sym, v]
+            [k.downcase.tr(' ', '_').delete("\(\)").to_sym, v]
           end.to_h
         end
       end

data/lib/resolvers/selinux_resolver.rb

@@ -22,7 +22,7 @@ module Facter
           @fact_list[:enabled] = false
 
           output.each_line do |line|
-            next unless line.match(/selinuxfs/)
+            next unless line =~ /selinuxfs/
 
             @fact_list[:enabled] = true
             @fact_list[:mountpoint] = line

data/lib/resolvers/solaris/zfs_resolver.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class ZFS < BaseResolver
+        @log = Facter::Log.new(self)
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { zfs_fact(fact_name) }
+          end
+
+          def zfs_fact(fact_name)
+            build_zfs_facts
+            @fact_list[fact_name]
+          end
+
+          def build_zfs_facts
+            output, _status = Open3.capture2('zfs upgrade -v')
+            features_list = output.scan(/^\s+(\d+)/).flatten
+
+            return if features_list.empty?
+
+            @fact_list[:zfs_featurenumbers] = features_list.join(',')
+            @fact_list[:zfs_version] = features_list.last
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/solaris/zpool_resolver.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class ZPool < BaseResolver
+        @log = Facter::Log.new(self)
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { zpool_fact(fact_name) }
+          end
+
+          def zpool_fact(fact_name)
+            build_zpool_facts
+            @fact_list[fact_name]
+          end
+
+          def build_zpool_facts
+            output, _status = Open3.capture2('zpool upgrade -v')
+            features_list = output.scan(/^\s+(\d+)/).flatten
+
+            return if features_list.empty?
+
+            @fact_list[:zpool_featurenumbers] = features_list.join(',')
+            @fact_list[:zpool_version] = features_list.last
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/windows/ffi/ffi.rb

@@ -23,13 +23,10 @@ ERROR_MORE_DATA = 234
 MAX_PATH = 32_767
 
 module FFI
-  WIN32_FALSE = 0
+  WIN32FALSE = 0
   END_OF_WCHAR_STRING = "\0\0".encode('UTF-16LE')
 
   class Pointer
-    alias write_dword write_uint32
-    alias read_dword read_uint32
-
     def read_wide_string_with_length(char_length)
       # char_length is number of wide chars (typically excluding NULLs), *not* bytes
       str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
@@ -39,27 +36,27 @@ module FFI
     def read_wide_string_without_length
       wide_character = get_bytes(0, 2)
       i = 2
-      str = String.new
+      str = []
 
       while wide_character.encode('UTF-16LE') != END_OF_WCHAR_STRING
-        str += wide_character
+        str << wide_character
         wide_character = get_bytes(i, 2)
         i += 2
       end
-      str.force_encoding('UTF-16LE').encode('UTF-8')
+      str.join.force_encoding('UTF-16LE').encode('UTF-8')
     end
 
     def read_win32_bool
       # BOOL is always a 32-bit integer in Win32
       # some Win32 APIs return 1 for true, while others are non-0
-      read_int32 != FFI::WIN32_FALSE
+      read_int32 != WIN32FALSE
     end
   end
 
   class Struct
     def self.read_list(first_address)
       instance = new(first_address)
-      while instance.to_ptr != FFI::Pointer::NULL
+      while instance.to_ptr != Pointer::NULL
         yield(instance)
         instance = new(instance[:Next])
       end

data/lib/resolvers/windows/ffi/network_utils.rb

@@ -47,7 +47,7 @@ class NetworkUtils
 
     def get_scope(sockaddr)
       require 'socket'
-      scope6 = String.new
+      scope6 = []
       addrinfo = Addrinfo.new(['AF_INET6', 0, nil, sockaddr], :INET6)
 
       scope6 << 'compat,' if addrinfo.ipv6_v4compat?
@@ -59,6 +59,7 @@ class NetworkUtils
                   'host'
                 else 'global'
                 end
+      scope6.join
     end
   end
 end

data/lib/resolvers/windows/identity_resolver.rb

@@ -26,7 +26,7 @@ module Facter
           end
 
           name_ptr = FFI::MemoryPointer.new(:wchar, size_ptr.read_uint32)
-          if IdentityFFI::GetUserNameExW(NAME_SAM_COMPATIBLE, name_ptr, size_ptr) == FFI::WIN32_FALSE
+          if IdentityFFI::GetUserNameExW(NAME_SAM_COMPATIBLE, name_ptr, size_ptr) == FFI::WIN32FALSE
             @log.debug "failure resolving identity facts: #{FFI.errno}"
             return
           end
@@ -36,7 +36,7 @@ module Facter
 
         def privileged?
           result = IdentityFFI::IsUserAnAdmin()
-          result && result != FFI::WIN32_FALSE
+          result && result != FFI::WIN32FALSE
         end
 
         def retrieve_facts(fact_name)

data/lib/resolvers/windows/memory_resolver.rb

@@ -17,7 +17,7 @@ module Facter
           require "#{ROOT_DIR}/lib/resolvers/windows/ffi/memory_ffi"
 
           state_ptr = FFI::MemoryPointer.new(PerformanceInformation.size)
-          if MemoryFFI::GetPerformanceInfo(state_ptr, state_ptr.size) == FFI::WIN32_FALSE
+          if MemoryFFI::GetPerformanceInfo(state_ptr, state_ptr.size) == FFI::WIN32FALSE
             @log.debug 'Resolving memory facts failed'
             return
           end

data/lib/resolvers/windows/netkvm_resolver.rb

@@ -23,7 +23,9 @@ module Facter
         end
 
         def build_fact_list(reg)
+          # rubocop:disable Performance/InefficientHashSearch
           @fact_list[:kvm] = reg.keys.include?('netkvm')
+          # rubocop:enable Performance/InefficientHashSearch
         end
       end
     end

data/lib/resolvers/windows/system32_resolver.rb

@@ -24,7 +24,7 @@ module Facter
           end
 
           bool_ptr = FFI::MemoryPointer.new(:win32_bool, 1)
-          if System32FFI::IsWow64Process(System32FFI::GetCurrentProcess(), bool_ptr) == FFI::WIN32_FALSE
+          if System32FFI::IsWow64Process(System32FFI::GetCurrentProcess(), bool_ptr) == FFI::WIN32FALSE
             @log.debug 'IsWow64Process failed'
             return
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.7.pre
+  version: 4.0.8.pre
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.74.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: rubycritic
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +182,7 @@ files:
 - ".jrubyrc"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".rubycritic.yml"
 - ".travis.yml"
 - CODEOWNERS
@@ -457,6 +486,10 @@ files:
 - lib/facts/solaris/ruby/version.rb
 - lib/facts/solaris/solaris_zones/current.rb
 - lib/facts/solaris/solaris_zones/zone.rb
+- lib/facts/solaris/zfs_featurenumbers.rb
+- lib/facts/solaris/zfs_version.rb
+- lib/facts/solaris/zpool_featurenumbers.rb
+- lib/facts/solaris/zpool_version.rb
 - lib/facts/windows/dhcp_servers.rb
 - lib/facts/windows/dmi/manufacturer.rb
 - lib/facts/windows/dmi/product/name.rb
@@ -558,6 +591,7 @@ files:
 - lib/framework/core/options/helper_options.rb
 - lib/framework/core/options/options_validator.rb
 - lib/framework/core/options/priority_options.rb
+- lib/framework/core/options/validate_options.rb
 - lib/framework/detector/os_detector.rb
 - lib/framework/formatters/formatter_factory.rb
 - lib/framework/formatters/formatter_helper.rb
@@ -617,7 +651,9 @@ files:
 - lib/resolvers/solaris/ipaddress_resolver.rb
 - lib/resolvers/solaris/solaris_os_release_resolver.rb
 - lib/resolvers/solaris/solaris_zone_name.rb
+- lib/resolvers/solaris/zfs_resolver.rb
 - lib/resolvers/solaris/zone_resolver.rb
+- lib/resolvers/solaris/zpool_resolver.rb
 - lib/resolvers/ssh_resolver.rb
 - lib/resolvers/suse_release_resolver.rb
 - lib/resolvers/sw_vers_resolver.rb