facter 4.0.15 → 4.0.16

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.15
+  version: 4.0.16
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -273,6 +273,7 @@ files:
 - lib/facts/aix/os/hardware.rb
 - lib/facts/aix/os/name.rb
 - lib/facts/aix/os/release.rb
+- lib/facts/aix/partitions.rb
 - lib/facts/aix/path.rb
 - lib/facts/aix/puppet_version.rb
 - lib/facts/aix/ruby/platform.rb
@@ -734,6 +735,7 @@ files:
 - lib/facts/windows/ruby/sitedir.rb
 - lib/facts/windows/ruby/version.rb
 - lib/facts/windows/scope6_interfaces.rb
+- lib/facts/windows/ssh.rb
 - lib/facts/windows/system_uptime/days.rb
 - lib/facts/windows/system_uptime/hours.rb
 - lib/facts/windows/system_uptime/seconds.rb
@@ -762,11 +764,8 @@ files:
 - lib/framework/core/file_loader.rb
 - lib/framework/core/options.rb
 - lib/framework/core/options/config_file_options.rb
-- lib/framework/core/options/default_options.rb
-- lib/framework/core/options/helper_options.rb
+- lib/framework/core/options/option_store.rb
 - lib/framework/core/options/options_validator.rb
-- lib/framework/core/options/priority_options.rb
-- lib/framework/core/options/validate_options.rb
 - lib/framework/core/session_cache.rb
 - lib/framework/detector/os_detector.rb
 - lib/framework/formatters/formatter_factory.rb
@@ -792,6 +791,7 @@ files:
 - lib/resolvers/aix/mountpoints.rb
 - lib/resolvers/aix/networking_resolver.rb
 - lib/resolvers/aix/os_level_resolver.rb
+- lib/resolvers/aix/partitions.rb
 - lib/resolvers/aix/utils/odm_query.rb
 - lib/resolvers/augeas_resolver.rb
 - lib/resolvers/base_resolver.rb
@@ -844,6 +844,7 @@ files:
 - lib/resolvers/utils/filesystem_helper.rb
 - lib/resolvers/utils/fingerprint.rb
 - lib/resolvers/utils/ssh.rb
+- lib/resolvers/utils/ssh_helper.rb
 - lib/resolvers/windows/dmi_bios_resolver.rb
 - lib/resolvers/windows/dmi_computersystem_resolver.rb
 - lib/resolvers/windows/ffi/ffi.rb
@@ -867,6 +868,7 @@ files:
 - lib/resolvers/windows/networking_resolver.rb
 - lib/resolvers/windows/processors_resolver.rb
 - lib/resolvers/windows/product_release_resolver.rb
+- lib/resolvers/windows/ssh.rb
 - lib/resolvers/windows/system32_resolver.rb
 - lib/resolvers/windows/uptime_resolver.rb
 - lib/resolvers/windows/utils/win32ole.rb
@@ -874,6 +876,7 @@ files:
 - lib/resolvers/windows/win_os_description_resolver.rb
 - lib/resolvers/wpar_resolver.rb
 - lib/util/api_debugger.rb
+- lib/util/file_helper.rb
 - tasks/create_fact.rake
 - tasks/fact_generator/fact.erb
 - tasks/fact_generator/fact_creator.rb

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

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module DefaultOptions
-    def augment_with_defaults!
-      cli_defaults
-      global_defaults
-    end
-
-    DEFAULT_LOG_LEVEL = :warn
-
-    def augment_with_to_hash_defaults!
-      @options[:show_legacy] = true
-    end
-
-    private
-
-    def cli_defaults
-      @options[:debug] ||= false
-      @options[:trace] ||= false
-      @options[:verbose] ||= false
-      @options[:log_level] ||= DEFAULT_LOG_LEVEL
-      @options[:show_legacy] ||= false
-    end
-
-    def global_defaults
-      @options[:block] ||= true
-      @options[:custom_facts] ||= true
-      @options[:custom_dir] ||= []
-      @options[:external_facts] ||= true
-      @options[:external_dir] ||= []
-      @options[:ruby] ||= true
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module HelperOptions
-    def augment_with_helper_options!(user_query)
-      @options[:user_query] = true if user_query.any?
-
-      no_ruby
-
-      # convert array or string to array
-      @options[:external_dir] = [*@options[:external_dir]] unless @options[:external_dir].nil?
-
-      @options[:log_level] = log_level || @options[:log_level].to_sym
-      @options[:debug] = true if @options[:log_level] == :debug
-
-      validate_log_level
-
-      Log.level = @options[:log_level]
-      Facter.trace(@options[:trace])
-    end
-
-    private
-
-    def no_ruby
-      return if @options[:ruby]
-
-      @options[:custom_facts] = false
-      @options[:blocked_facts] = ['ruby'].concat(@options[:blocked_facts] || [])
-    end
-
-    def log_level
-      if @options[:debug] || @options[:log_level] == :trace
-        :debug
-      elsif @options[:verbose]
-        :info
-      end
-    end
-
-    def validate_log_level
-      if @options[:log_level].empty?
-        OptionsValidator.write_error_and_exit('the required argument for option'\
-                                                            " '--log-level' is missing")
-      end
-      unless OptionsValidator::LOG_LEVEL.include?(
-        @options[:log_level].to_sym
-      )
-        OptionsValidator.write_error_and_exit("invalid log level #{@options[:log_level]}  : expected none, trace,"\
-                                                                                ' debug, info, warn, error, or fatal.')
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module PriorityOptions
-    def augment_with_priority_options!(priority_options)
-      priority_options.each do |key, val|
-        @options[key.to_sym] = val
-        @options[key.to_sym] = '' if key == 'log_level' && val == 'log_level'
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module ValidateOptions
-    def validate_configs
-      conflicting_configs.each do |op|
-        next unless op.values[0] && op.values[1]
-
-        message = "#{op.keys[0]} and #{op.keys[1]} options conflict: please specify only one"
-        raise_error(message)
-      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)
-      OptionsValidator.write_error_and_exit(message) if @options[:is_cli]
-      log = Facter::Log.new(self)
-      log.error(message, true)
-      raise ArgumentError, message
-    end
-  end
-end