facter 4.0.29 → 4.0.30

data/lib/facter/facts/solaris/networking/network.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Networking
+      class Network
+        FACT_NAME = 'networking.network'
+        ALIASES = 'network'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Networking.resolve(:network)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/networking/network6.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Networking
+      class Network6
+        FACT_NAME = 'networking.network6'
+        ALIASES = 'network6'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Networking.resolve(:network6)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/networking/primary.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Networking
+      class Primary
+        FACT_NAME = 'networking.primary'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Networking.resolve(:primary_interface)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/{framework → facter/framework}/cli/cli.rb

@@ -116,7 +116,7 @@ module Facter
     desc '--version, -v', 'Print the version', hide: true
     map ['--version', '-v'] => :version
     def version
-      puts FACTER_VERSION.to_s
+      puts Facter::VERSION
     end
 
     desc '--list-block-groups', 'List block groups'

data/lib/{framework → facter/framework}/cli/cli_launcher.rb

@@ -2,10 +2,10 @@
 # frozen_string_literal: true
 
 require 'thor'
-require "#{ROOT_DIR}/lib/framework/logging/logger.rb"
+require 'facter/framework/logging/logger.rb'
 Facter::Log.output(STDERR)
-require "#{ROOT_DIR}/lib/facter"
-require "#{ROOT_DIR}/lib/framework/cli/cli"
+require 'facter'
+require 'facter/framework/cli/cli'
 
 class CliLauncher
   def initialize(args)

data/lib/{framework → facter/framework}/config/fact_groups.rb

@@ -9,7 +9,8 @@ module Facter
     STRING_TO_SECONDS = { 'seconds' => 1, 'minutes' => 60, 'hours' => 3600, 'days' => 3600 * 24 }.freeze
 
     def initialize(group_list_path = nil)
-      @groups_file_path = group_list_path || File.join(ROOT_DIR, 'fact_groups.conf')
+      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) : {}
       load_groups
     end

data/lib/{framework → facter/framework}/core/fact/internal/internal_fact_manager.rb

@@ -40,7 +40,7 @@ module Facter
             fact = CoreFact.new(searched_fact)
             fact.create
           rescue StandardError => e
-            @@log.error(e.backtrace.join("\n"))
+            @@log.error(e.message + ' ' + e.backtrace.join("\n"))
             nil
           end
         end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'json'
+require 'yaml'
+require 'hocon'
+require 'hocon/config_value_factory'
+require 'singleton'
+require 'logger'
+
+@lib_path = File.join(File.dirname(__FILE__), '../../')
+
+def load_dir(*dirs)
+  folder_path = File.join(@lib_path, dirs)
+  return unless Dir.exist?(folder_path.tr('*', ''))
+
+  files_to_require = Dir.glob(File.join(folder_path, '*.rb')).reject { |file| file =~ %r{/ffi/} }
+  files_to_require.each(&method(:require))
+end
+
+load_dir(%w[framework core options])
+require 'facter/framework/core/options'
+require 'facter/framework/logging/logger_helper'
+require 'facter/framework/logging/logger'
+
+require 'facter/util/file_helper'
+
+require 'facter/resolvers/base_resolver'
+require 'facter/framework/detector/os_hierarchy'
+require 'facter/framework/detector/os_detector'
+
+require 'facter/framework/config/config_reader'
+require 'facter/framework/config/fact_groups'
+
+load_dir(['config'])
+
+load_dir(%w[resolvers utils])
+load_dir(['resolvers'])
+load_dir(['facts_utils'])
+load_dir(%w[framework core])
+load_dir(['models'])
+load_dir(%w[framework core fact_loaders])
+load_dir(%w[framework core fact internal])
+load_dir(%w[framework core fact external])
+load_dir(%w[framework formatters])
+
+os_hierarchy = OsDetector.instance.hierarchy
+os_hierarchy.each { |operating_system| load_dir(['facts', operating_system.downcase, '**']) }
+os_hierarchy.each { |operating_system| load_dir(['resolvers', operating_system.downcase, '**']) }
+
+require 'facter/custom_facts/core/legacy_facter'
+load_dir(%w[framework utils])
+load_dir(['util'])
+
+require 'facter/framework/core/fact_augmenter'
+require 'facter/framework/parsers/query_parser'

data/lib/{framework → facter/framework}/detector/os_hierarchy.rb

@@ -4,8 +4,8 @@ module Facter
   class OsHierarchy
     def initialize
       @log = Log.new(self)
-      json_file = Util::FileHelper.safe_read(File.join(ROOT_DIR, 'os_hierarchy.json'))
-
+      json_file_path = File.join(File.dirname(__FILE__), '../../os_hierarchy.json')
+      json_file = Util::FileHelper.safe_read(json_file_path)
       begin
         @json_os_hierarchy = JSON.parse(json_file)
       rescue JSON::ParserError => _e