facter 4.0.39 → 4.0.44

data/lib/facter/framework/cli/cli_launcher.rb

@@ -1,59 +1,55 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'thor'
 require 'facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
 require 'facter'
 require 'facter/framework/cli/cli'
 
 class CliLauncher
-  def initialize(args)
-    @args = args
-  end
-
-  def validate_options
-    Facter::OptionsValidator.validate(@args)
-  end
+  class << self
+    def prepare_arguments(args, task = Facter::Cli.default_task)
+      args.unshift(task) unless
+        check_if_arguments_is_known(Facter::Cli.all_tasks, args) ||
+        check_if_arguments_is_known(Facter::Cli.instance_variable_get(:@map), args) ||
+        !task
+
+      reorder_program_arguments(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)
+    def start(args)
+      # stop parsing arguments if we don't recognize them
+      Thor.check_unknown_options!
+      Facter::Cli.start(args, debug: true)
+    rescue Thor::UnknownArgumentError => e
+      Facter::OptionsValidator.write_error_and_exit("unrecognised option '#{e.unknown.first}'")
+    end
 
-    @args = reorder_program_arguments(@args)
-  end
+    private
 
-  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
 
-  def check_if_arguments_is_known(known_arguments, program_arguments)
-    program_arguments.each do |argument|
-      return true if known_arguments.key?(argument)
+      false
     end
 
-    false
-  end
-
-  def reorder_program_arguments(program_arguments)
-    priority_arguments = Facter::Cli.instance_variable_get(:@map)
+    def reorder_program_arguments(program_arguments)
+      priority_arguments = Facter::Cli.instance_variable_get(:@map)
 
-    priority_args = []
-    normal_args = []
+      priority_args = []
+      normal_args = []
 
-    program_arguments.each do |argument|
-      if priority_arguments.include?(argument)
-        priority_args << argument
-      else
-        normal_args << argument
+      program_arguments.each do |argument|
+        if priority_arguments.include?(argument)
+          priority_args << argument
+        else
+          normal_args << argument
+        end
       end
-    end
 
-    priority_args.concat(normal_args)
+      priority_args.concat(normal_args)
+    end
   end
 end

data/lib/facter/framework/config/fact_groups.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
+require 'facter/config'
+
 module Facter
   class FactGroups
-    attr_reader :groups, :block_list
+    attr_reader :groups, :block_list, :facts_ttls
 
     @groups_ttls = []
 
     STRING_TO_SECONDS = { 'seconds' => 1, 'minutes' => 60, 'hours' => 3600, 'days' => 3600 * 24 }.freeze
 
-    def initialize(group_list_path = nil)
-      default_path = File.join(File.dirname(__FILE__), '../../fact_groups.conf')
-      @groups_file_path = group_list_path || default_path
-      @groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
+    def initialize
+      @groups = Facter::Config::FACT_GROUPS.dup
       load_groups
       load_groups_from_options
+      load_facts_ttls
+
+      # Reverse sort facts so that children have precedence when caching. eg: os.macosx vs os
+      @facts_ttls = @facts_ttls.sort.reverse.to_h
     end
 
     # Breakes down blocked groups in blocked facts
@@ -31,6 +35,9 @@ module Facter
 
     # Get the group name a fact is part of
     def get_fact_group(fact_name)
+      fact = get_fact(fact_name)
+      return fact[:group] if fact
+
       @groups.detect { |k, v| break k if Array(v).find { |f| fact_name =~ /^#{f}.*/ } }
     end
 
@@ -41,6 +48,15 @@ module Facter
       ttls_to_seconds(ttls[group_name])
     end
 
+    def get_fact(fact_name)
+      return @facts_ttls[fact_name] if @facts_ttls[fact_name]
+
+      result = @facts_ttls.select { |name, fact| break fact if fact_name =~ /^#{name}\..*/ }
+      return nil if result == {}
+
+      result
+    end
+
     private
 
     def load_groups_from_options
@@ -55,10 +71,28 @@ module Facter
       end
     end
 
+    def load_facts_ttls
+      @facts_ttls ||= {}
+      return if @groups_ttls == []
+
+      @groups_ttls.reduce(:merge).each do |group, ttls|
+        ttls = ttls_to_seconds(ttls)
+        if @groups[group]
+          @groups[group].each do |fact|
+            if (@facts_ttls[fact] && @facts_ttls[fact][:ttls] < ttls) || @facts_ttls[fact].nil?
+              @facts_ttls[fact] = { ttls: ttls, group: group }
+            end
+          end
+        else
+          @facts_ttls[group] = { ttls: ttls, group: group }
+        end
+      end
+    end
+
     def load_groups
       config = ConfigReader.init(Options[:config])
-      @block_list = config.block_list || {}
-      @groups_ttls = config.ttls || {}
+      @block_list = config.block_list || []
+      @groups_ttls = config.ttls || []
       @groups.merge!(config.fact_groups) if config.fact_groups
     end
 

data/lib/facter/framework/core/cache_manager.rb

@@ -40,31 +40,47 @@ module Facter
       end
     end
 
-    def group_cached?(group_name)
-      cached = @fact_groups.get_group_ttls(group_name) ? true : false
-      delete_cache(group_name) unless cached
+    def fact_cache_enabled?(fact_name)
+      fact = @fact_groups.get_fact(fact_name)
+      cached = if fact
+                 !fact[:ttls].nil?
+               else
+                 false
+               end
+
+      fact_group = @fact_groups.get_fact_group(fact_name)
+      delete_cache(fact_group) if fact_group && !cached
       cached
     end
 
     private
 
     def resolve_fact(searched_fact)
-      group_name =  if searched_fact.file
-                      searched_fact.name
-                    else
-                      @fact_groups.get_fact_group(searched_fact.name)
-                    end
+      fact_name = if searched_fact.file
+                    File.basename(searched_fact.file)
+                  else
+                    searched_fact.name
+                  end
 
-      return unless group_name
+      return unless fact_cache_enabled?(fact_name)
 
-      return unless group_cached?(group_name)
+      fact = @fact_groups.get_fact(fact_name)
 
-      return unless check_ttls?(group_name)
+      return unless fact
 
-      data = read_group_json(group_name)
+      return unless check_ttls?(fact[:group], fact[:ttls])
+
+      read_fact(searched_fact, fact[:group])
+    end
+
+    def read_fact(searched_fact, fact_group)
+      data = nil
+      Facter::Framework::Benchmarking::Timer.measure(searched_fact.name, 'cached') do
+        data = read_group_json(fact_group)
+      end
       return unless data
 
-      @log.debug("loading cached values for #{group_name} facts")
+      @log.debug("loading cached values for #{searched_fact.name} facts")
 
       create_facts(searched_fact, data)
     end
@@ -86,14 +102,17 @@ module Facter
     end
 
     def cache_fact(fact)
-      group_name = if fact.file
-                     File.basename(fact.file)
-                   else
-                     @fact_groups.get_fact_group(fact.name)
-                   end
+      fact_name = if fact.file
+                    File.basename(fact.file)
+                  else
+                    fact.name
+                  end
+
+      group_name = @fact_groups.get_fact_group(fact_name)
+
       return if !group_name || fact.value.nil?
 
-      return unless group_cached?(group_name)
+      return unless fact_cache_enabled?(fact_name)
 
       @groups[group_name] ||= {}
       @groups[group_name][fact.name] = fact.value
@@ -106,10 +125,12 @@ module Facter
       end
 
       @groups.each do |group_name, data|
-        next unless check_ttls?(group_name)
+        next unless check_ttls?(group_name, @fact_groups.get_group_ttls(group_name))
 
-        @log.debug("caching values for #{group_name} facts")
         cache_file_name = File.join(@cache_dir, group_name)
+        next if File.readable?(cache_file_name)
+
+        @log.debug("caching values for #{group_name} facts")
         File.write(cache_file_name, JSON.pretty_generate(data))
       end
     end
@@ -128,8 +149,7 @@ module Facter
       @groups[group_name] = data
     end
 
-    def check_ttls?(group_name)
-      ttls = @fact_groups.get_group_ttls(group_name)
+    def check_ttls?(group_name, ttls)
       return false unless ttls
 
       cache_file_name = File.join(@cache_dir, group_name)

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -20,45 +20,48 @@ module Facter
 
       @facts = []
       @external_facts = []
-      load_internal_facts(options)
-      load_external_facts(options)
 
-      @facts
+      @internal_facts = load_internal_facts(options)
+      @external_facts = load_external_facts(options)
+
+      @facts = @internal_facts + @external_facts
     end
 
     private
 
     def load_internal_facts(options)
       @log.debug('Loading internal facts')
+      internal_facts = []
 
       if options[:user_query] || options[:show_legacy]
         # if we have a user query, then we must search in core facts and legacy facts
         @log.debug('Loading all internal facts')
-        @internal_facts = @internal_loader.facts
+        internal_facts = @internal_loader.facts
       else
         @log.debug('Load only core facts')
-        @internal_facts = @internal_loader.core_facts
+        internal_facts = @internal_loader.core_facts
       end
 
-      @internal_facts = block_facts(@internal_facts, options)
-      @facts.concat(@internal_facts)
+      block_facts(internal_facts, options)
     end
 
     def load_external_facts(options)
       @log.debug('Loading external facts')
+      external_facts = []
+
       if options[:custom_facts]
         @log.debug('Loading custom facts')
-        @external_facts.concat(@external_fact_loader.custom_facts)
+        external_facts += @external_fact_loader.custom_facts
       end
 
-      @external_facts = block_facts(@external_facts, options)
+      external_facts = block_facts(external_facts, options)
 
       if options[:external_facts]
         @log.debug('Loading external facts')
-        @external_facts.concat(@external_fact_loader.external_facts)
+        external_facts += @external_fact_loader.external_facts
       end
 
-      @facts.concat(@external_facts)
+      external_facts
     end
 
     def block_facts(facts, options)

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

@@ -46,7 +46,9 @@ module Facter
         return unless file_global_conf
 
         if Options.cli?
-          @options[:custom_facts] = !file_global_conf['no-custom-facts'] unless file_global_conf['no-custom-facts'].nil?
+          unless file_global_conf['no-custom-facts'].nil?
+            @options[:no_custom_facts] = file_global_conf['no-custom-facts']
+          end
         end
 
         @options[:custom_dir] = file_global_conf['custom-dir'] unless file_global_conf['custom-dir'].nil?
@@ -57,7 +59,7 @@ module Facter
         return unless global_conf
 
         if Options.cli?
-          @options[:external_facts] = !global_conf['no-external-facts'] unless global_conf['no-external-facts'].nil?
+          @options[:no_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?
@@ -67,7 +69,7 @@ module Facter
       def augment_ruby(global_conf)
         return unless global_conf
 
-        @options[:ruby] = global_conf['no-ruby'].nil? ? true : !global_conf['no-ruby']
+        @options[:no_ruby] = global_conf['no-ruby'].nil? ? false : global_conf['no-ruby']
       end
 
       def augment_show_legacy(global_conf)

data/lib/facter/framework/core/options/option_store.rb

@@ -8,28 +8,36 @@ module Facter
     # TODO: constant is not yet available when running puppet facts
     @log_level = :warn
     @show_legacy = true
+    @custom_facts = true
+    @blocked_facts = []
+    @ruby = true
+    @external_facts = true
+    @config = nil
+    @user_query = []
+    @strict = false
+    @json = false
+    @cache = true
+    @yaml = false
+    @puppet = false
+    @ttls = []
     @block = true
-    @custom_dir = []
+    @cli = nil
     @config_file_custom_dir = []
-    @custom_facts = true
-    @external_dir = []
     @config_file_external_dir = []
     @default_external_dir = []
-    @external_facts = true
-    @ruby = true
-    @cache = true
-    @blocked_facts = []
-    @user_query = []
-    @block_list = {}
     @fact_groups = {}
-    @color = false
+    @block_list = []
+    @color = true
+    @trace = false
     @timing = false
+    @external_dir = []
+    @custom_dir = []
 
     class << self
-      attr_reader :debug, :verbose, :log_level, :show_legacy, :ruby,
-                  :custom_facts, :blocked_facts
+      attr_reader :debug, :verbose, :log_level, :show_legacy,
+                  :custom_facts, :blocked_facts, :ruby, :external_facts
 
-      attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
+      attr_accessor :config, :user_query, :strict, :json,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
                     :block_list, :color, :trace, :timing
@@ -45,16 +53,28 @@ module Facter
         options
       end
 
-      def ruby=(bool)
-        if bool == true
-          @ruby = true
-        else
+      def no_ruby=(bool)
+        if bool
           @ruby = false
           @custom_facts = false
           @blocked_facts << 'ruby'
+        else
+          @ruby = true
         end
       end
 
+      def no_block=(bool)
+        @block = !bool
+      end
+
+      def no_cache=(bool)
+        @cache = !bool
+      end
+
+      def no_color=(bool)
+        @color = !bool
+      end
+
       def external_dir
         return fallback_external_dir if @external_dir.empty? && @external_facts
 
@@ -99,8 +119,8 @@ module Facter
         end
       end
 
-      def custom_facts=(bool)
-        if bool == true
+      def no_custom_facts=(bool)
+        if bool == false
           @custom_facts = true
           @ruby = true
         else
@@ -108,6 +128,10 @@ module Facter
         end
       end
 
+      def no_external_facts=(bool)
+        @external_facts = !bool
+      end
+
       def log_level=(level)
         level = level.to_sym
         case level
@@ -142,25 +166,34 @@ module Facter
         # TODO: constant is not yet available when running puppet facts
         @log_level = :warn
         @show_legacy = true
-        @block = true
         @ruby = true
         @user_query = []
-        @cli = nil
+        @json = false
         @cache = true
-        @trace = false
+        @yaml = false
+        @puppet = false
+        @ttls = []
+        @block = true
+        @cli = nil
         reset_config
       end
 
       def reset_config
-        @custom_dir = []
         @custom_facts = true
-        @external_dir = []
-        @default_external_dir = []
-        @external_facts = true
         @blocked_facts = []
+        @external_facts = true
+        @config = nil
+        @strict = false
+        @config_file_custom_dir = []
+        @config_file_external_dir = []
+        @default_external_dir = []
         @fact_groups = {}
-        @block_list = {}
+        @block_list = []
+        @color = true
+        @trace = false
         @timing = false
+        @external_dir = []
+        @custom_dir = []
       end
 
       def fallback_external_dir