facter 4.0.8.pre → 4.0.9.pre

data/lib/facts/windows/ruby/platform.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class RubyPlatform
-      FACT_NAME = 'ruby.platform'
-      ALIASES = 'rubyplatform'
+    module Ruby
+      class Platform
+        FACT_NAME = 'ruby.platform'
+        ALIASES = 'rubyplatform'
 
-      def call_the_resolver
-        fact_value = Resolvers::Ruby.resolve(:platform)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Ruby.resolve(:platform)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
       end
     end
   end

data/lib/facts/windows/ruby/sitedir.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class RubySitedir
-      FACT_NAME = 'ruby.sitedir'
-      ALIASES = 'rubysitedir'
+    module Ruby
+      class Sitedir
+        FACT_NAME = 'ruby.sitedir'
+        ALIASES = 'rubysitedir'
 
-      def call_the_resolver
-        fact_value = Resolvers::Ruby.resolve(:sitedir)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Ruby.resolve(:sitedir)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
       end
     end
   end

data/lib/facts/windows/ruby/version.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class RubyVersion
-      FACT_NAME = 'ruby.version'
-      ALIASES = 'rubyversion'
+    module Ruby
+      class Version
+        FACT_NAME = 'ruby.version'
+        ALIASES = 'rubyversion'
 
-      def call_the_resolver
-        fact_value = Resolvers::Ruby.resolve(:version)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Ruby.resolve(:version)
 
-        [ResolvedFact.new(FACT_NAME, fact_value), ResolvedFact.new(ALIASES, fact_value, :legacy)]
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
       end
     end
   end

data/lib/facts/windows/scope6_interfaces.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
     class Scope6Interfaces
       FACT_NAME = 'scope6_.*'
@@ -8,10 +8,10 @@ module Facter
       def call_the_resolver
         arr = []
         result = {}
-        interfaces = Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
         interfaces&.each { |interface_name, info| result["scope6_#{interface_name}"] = info[:scope6] if info[:scope6] }
 
-        result.each { |fact, value| arr << ResolvedFact.new(fact, value, :legacy) }
+        result.each { |fact, value| arr << Facter::ResolvedFact.new(fact, value, :legacy) }
         arr
       end
     end

data/lib/facts/windows/system_uptime/days.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module SystemUptime
+      class Days
+        FACT_NAME = 'system_uptime.days'
+        ALIASES = 'uptime_days'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Windows::Uptime.resolve(:days)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/windows/system_uptime/hours.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module SystemUptime
+      class Hours
+        FACT_NAME = 'system_uptime.hours'
+        ALIASES = 'uptime_hours'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Windows::Uptime.resolve(:hours)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/windows/system_uptime/seconds.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module SystemUptime
+      class Seconds
+        FACT_NAME = 'system_uptime.seconds'
+        ALIASES = 'uptime_seconds'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Windows::Uptime.resolve(:seconds)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/windows/system_uptime/uptime.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module SystemUptime
+      class Uptime
+        FACT_NAME = 'system_uptime.uptime'
+        ALIASES = 'uptime'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Windows::Uptime.resolve(:uptime)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/windows/timezone.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
     class Timezone
       FACT_NAME = 'timezone'
 
       def call_the_resolver
-        fact_value = Resolvers::Timezone.resolve(:timezone)
+        fact_value = Facter::Resolvers::Timezone.resolve(:timezone)
 
-        ResolvedFact.new(FACT_NAME, fact_value)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end
     end
   end

data/lib/facts/windows/virtualization/is_virtual.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class IsVirtual
-      FACT_NAME = 'is_virtual'
+    module Virtualization
+      class IsVirtual
+        FACT_NAME = 'is_virtual'
 
-      def call_the_resolver
-        fact_value = Resolvers::Virtualization.resolve(:is_virtual)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Virtualization.resolve(:is_virtual)
 
-        ResolvedFact.new(FACT_NAME, fact_value)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
       end
     end
   end

data/lib/facts/windows/virtualization/virtual.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-module Facter
+module Facts
   module Windows
-    class Virtual
-      FACT_NAME = 'virtual'
+    module Virtualization
+      class Virtual
+        FACT_NAME = 'virtual'
 
-      def call_the_resolver
-        fact_value = Resolvers::Virtualization.resolve(:virtual)
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Virtualization.resolve(:virtual)
 
-        ResolvedFact.new(FACT_NAME, fact_value)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
       end
     end
   end

data/lib/framework/cli/cli_launcher.rb

@@ -2,6 +2,9 @@
 # frozen_string_literal: true
 
 require 'thor'
+require "#{ROOT_DIR}/lib/framework/logging/multilogger.rb"
+require "#{ROOT_DIR}/lib/framework/logging/logger.rb"
+Facter::Log.add_legacy_logger(STDERR)
 require "#{ROOT_DIR}/lib/facter"
 require "#{ROOT_DIR}/lib/framework/cli/cli"
 

data/lib/framework/config/block_list.rb

@@ -4,7 +4,7 @@ module Facter
   class BlockList
     include Singleton
 
-    attr_reader :block_groups
+    attr_reader :block_groups, :block_list
 
     def initialize(block_list_path = nil)
       @block_groups_file_path = block_list_path || File.join(ROOT_DIR, 'block_groups.conf')

data/lib/framework/core/fact_filter.rb

@@ -8,7 +8,6 @@ module Facter
     def filter_facts!(searched_facts)
       filter_legacy_facts!(searched_facts)
       searched_facts.each do |fact|
-        fact.value = symbolize_all_keys(fact.value) if fact.value.is_a?(Hash)
         fact.value = if fact.filter_tokens.any? && fact.value.respond_to?(:dig)
                        fact.value.dig(*fact.filter_tokens)
                      else
@@ -19,14 +18,6 @@ module Facter
 
     private
 
-    def symbolize_all_keys(hash)
-      symbolized_hash = {}
-      hash.each do |k, v|
-        symbolized_hash[k.to_sym] = v.is_a?(Hash) ? symbolize_all_keys(v) : v
-      end
-      symbolized_hash
-    end
-
     def filter_legacy_facts!(resolved_facts)
       return if Options[:show_legacy]
 

data/lib/framework/core/fact_loaders/class_discoverer.rb

@@ -9,13 +9,24 @@ module Facter
     end
 
     def discover_classes(operating_system)
-      os_module_name = Module.const_get("Facter::#{operating_system}")
+      os_module_name = Module.const_get("Facts::#{operating_system}")
 
       # select only classes
-      os_module_name.constants.select { |c| os_module_name.const_get(c).is_a? Class }
+      find_nested_classes(os_module_name, discovered_classes = [])
+      discovered_classes
     rescue NameError
       @log.error("There is no module named #{operating_system}")
       []
     end
+
+    def find_nested_classes(mod, discovered_classes)
+      mod.constants.each do |constant_name|
+        if mod.const_get(constant_name).instance_of? Class
+          discovered_classes << mod.const_get(constant_name)
+        elsif mod.const_get(constant_name).instance_of? Module
+          find_nested_classes(Module.const_get("#{mod.name}::#{constant_name}"), discovered_classes)
+        end
+      end
+    end
   end
 end

data/lib/framework/core/fact_loaders/internal_fact_loader.rb

@@ -32,16 +32,13 @@ module Facter
       classes = ClassDiscoverer.instance.discover_classes(operating_system)
 
       classes.each do |class_name|
-        klass = klass(operating_system, class_name)
-        fact_name = klass::FACT_NAME
+        fact_name = class_name::FACT_NAME
 
-        load_fact(fact_name, klass)
-        [*klass::ALIASES].each { |fact_alias| load_fact(fact_alias, klass) } if klass.const_defined?('ALIASES')
-      end
-    end
+        load_fact(fact_name, class_name)
+        next unless class_name.const_defined?('ALIASES')
 
-    def klass(operating_system, class_name)
-      Class.const_get("Facter::#{operating_system}::" + class_name.to_s)
+        [*class_name::ALIASES].each { |fact_alias| load_fact(fact_alias, class_name) }
+      end
     end
 
     def load_fact(fact_name, klass)

data/lib/framework/core/fact_manager.rb

@@ -11,9 +11,7 @@ module Facter
       @log = Log.new(self)
     end
 
-    def resolve_facts(options = {}, user_query = [])
-      Log.level = options.get[:log_level]
-
+    def resolve_facts(user_query = [])
       loaded_facts = @fact_loader.load(Options.get)
       searched_facts = QueryParser.parse(user_query, loaded_facts)
 

data/lib/framework/core/file_loader.rb

@@ -22,7 +22,6 @@ end
 
 load_lib_dirs('framework', 'core', 'options')
 require "#{ROOT_DIR}/lib/framework/core/options"
-require "#{ROOT_DIR}/lib/framework/logging/legacy_logger"
 require "#{ROOT_DIR}/lib/framework/logging/multilogger"
 require "#{ROOT_DIR}/lib/framework/logging/logger"
 
@@ -31,7 +30,6 @@ require "#{ROOT_DIR}/lib/framework/detector/os_detector"
 
 require "#{ROOT_DIR}/lib/framework/config/config_reader"
 require "#{ROOT_DIR}/lib/framework/config/block_list"
-require "#{ROOT_DIR}/lib/facter"
 require "#{ROOT_DIR}/lib/resolvers/utils/fingerprint.rb"
 require "#{ROOT_DIR}/lib/resolvers/utils/ssh.rb"
 require "#{ROOT_DIR}/lib/resolvers/utils/filesystem_helper.rb"

data/lib/framework/core/options.rb

@@ -59,10 +59,10 @@ module Facter
     private
 
     def initialize_options
-      @options = {}
+      @options = { config: @priority_options[:config] }
       augment_with_defaults!
       augment_with_to_hash_defaults! if @priority_options[:to_hash]
-      augment_with_config_file_options!(@priority_options[:config])
+      augment_with_config_file_options!(@options[:config])
       augment_with_priority_options!(@priority_options)
       validate_configs
       augment_with_helper_options!(@user_query)

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

@@ -24,6 +24,7 @@ module Facter
     end
 
     def global_defaults
+      @options[:block] ||= true
       @options[:custom_facts] ||= true
       @options[:custom_dir] ||= []
       @options[:external_facts] ||= true

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

@@ -5,23 +5,35 @@ module Facter
     def augment_with_helper_options!(user_query)
       @options[:user_query] = true if user_query.any?
 
-      if @options[:ruby] == false
-        @options[:custom_facts] = false
-        @options[:blocked_facts] = ['ruby'].concat(@options[:blocked_facts] || [])
-      end
+      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]
+      @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]
       LegacyFacter.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
-      :debug if @options[:debug] || @options[:log_level] == :trace
+      if @options[:debug] || @options[:log_level] == :trace
+        :debug
+      elsif @options[:verbose]
+        :info
+      end
     end
 
     def validate_log_level

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

@@ -33,6 +33,7 @@ module Facter
     end
 
     def self.write_error_and_exit(message)
+      Options.augment_with_priority_options!(is_cli: true)
       log = Facter::Log.new(self)
       log.error(message, true)
       Cli.start(['--help'])

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

@@ -4,9 +4,10 @@ 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
+        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
@@ -39,6 +40,7 @@ module Facter
     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