(FACT-2562) Correctly load custom and external fact directories

lib/facter.rb

@@ -131,6 +131,8 @@ def fact(user_query)
     # @api public
     def reset
       LegacyFacter.reset
+      Options[:custom_dir] = []
+      Options[:external_dir] = []
       LegacyFacter.search(*Options.custom_dir)
       LegacyFacter.search_external(Options.external_dir)
       nil
@@ -145,6 +147,7 @@ def reset
     #
     # @api public
     def search(*dirs)
+      Options[:custom_dir] += dirs
       LegacyFacter.search(*dirs)
     end
 
@@ -156,6 +159,7 @@ def search(*dirs)
     #
     # @api public
     def search_external(dirs)
+      Options[:external_dir] += dirs
       LegacyFacter.search_external(dirs)
     end
 
@@ -165,7 +169,7 @@ def search_external(dirs)
     #
     # @api public
     def search_external_path
-      LegacyFacter.search_external_path
+      Options.external_dir
     end
 
     # Returns the registered search directories for custom facts.
@@ -174,7 +178,7 @@ def search_external_path
     #
     # @api public
     def search_path
-      LegacyFacter.search_path
+      Options.custom_dir
     end
 
     # Gets a hash mapping fact names to their values
@@ -186,7 +190,6 @@ def search_path
     def to_hash
       log_blocked_facts
 
-      reset
       resolved_facts = Facter::FactManager.instance.resolve_facts
       Facter::SessionCache.invalidate_all_caches
       Facter::FactCollection.new.build_fact_collection!(resolved_facts)

lib/framework/core/fact_loaders/external_fact_loader.rb

@@ -19,6 +19,7 @@ def all_facts
     # The search paths must be set before creating the fact collection.
     # If we set them after, they will not be visible.
     def load_search_paths
+      LegacyFacter.reset_search_path!
       LegacyFacter.search(*Options.custom_dir) if Options.custom_dir?
       LegacyFacter.search_external(Options.external_dir) if Options.external_dir?
     end

spec/facter/facter_spec.rb

@@ -285,8 +285,8 @@
   end
 
   describe '#search_path' do
-    it 'sends call to LegacyFacter' do
-      expect(LegacyFacter).to receive(:search_path).once
+    it 'sends call to Facter::Options' do
+      expect(Facter::Options).to receive(:custom_dir).once
       Facter.search_path
     end
   end
@@ -301,8 +301,8 @@
   end
 
   describe '#search_external_path' do
-    it 'sends call to LegacyFacter' do
-      expect(LegacyFacter).to receive(:search_external_path).once
+    it 'sends call to Facter::Options' do
+      expect(Facter::Options).to receive(:external_dir).once
       Facter.search_external_path
     end
   end