facter 4.0.11 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc756f457596cb1e7c5dc236119090baa3bdc669e4cd35e9820144cf8d1b585
-  data.tar.gz: 78f30898f661ecd030dd0857f4f68e38ac55f1c8efe551f24e8a4f5c97ab8c77
+  metadata.gz: 9a35e635fbb713ca5ee0179eb5d82d156682164d849f1d144d8b575d504d6cce
+  data.tar.gz: e8ec1444f543d735972a7d246d87f0f1bece3153f9cedd9b7f253c3d53c48c51
 SHA512:
-  metadata.gz: 0a62ed7d388386b6515c685cbeaefad0385914c4715ee8c117dc2057ed7042ca8053c05a2abb748fcd69028733975fb8458e276eb50bd8215d480c9deebbbc3b
-  data.tar.gz: 4057a5d3ebd48e8e5296542a5ebfa052e55cbfbc726e9bb7b931145941894a31b1b89daa69251a816935bbfe83814d41818046d2e0a23826ecd619b6588b2e13
+  metadata.gz: fbe14240f8e0b735e67258583d0122459d4c58e98316aa2790eee2e29aa6621f60665c405798789b94f6a59dd6e5b680498c41a09c5d86d0b04522b28ac12408
+  data.tar.gz: 9c8c1b6b02de006a8b6188cc178402ceba4deda9600e9dec9cc2666a44a72e25dcb8361681e714b6ca808fe4078863db3a442b490fc80ec938cc63a1d5c7f65a

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 1000`
-# on 2020-03-17 13:36:57 +0200 using RuboCop version 0.74.0.
+# on 2020-03-19 13:55:15 +0200 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -54,13 +54,12 @@ RSpec/ContextWording:
     - 'spec/framework/core/options_spec.rb'
     - 'spec/framework/formatters/legacy_fact_formatter_spec.rb'
 
-# Offense count: 31
+# Offense count: 29
 RSpec/ExpectInHook:
   Exclude:
     - 'spec/custom_facts/core/execution/fact_manager_spec.rb'
     - 'spec/facter/facts/aix/load_averages_spec.rb'
     - 'spec/facter/facts/macosx/filesystems_spec.rb'
-    - 'spec/facter/facts/macosx/identity/privileged_spec.rb'
     - 'spec/facter/resolvers/aix/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/lpar_resolver_spec.rb'
     - 'spec/facter/resolvers/solaris/current_zone_resolver_spec.rb'
@@ -179,7 +178,7 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/utils/windows/network_utils_spec.rb'
 
-# Offense count: 326
+# Offense count: 322
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -206,8 +205,6 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/aix/networking/hostname_spec.rb'
     - 'spec/facter/facts/aix/networking/ip_spec.rb'
     - 'spec/facter/facts/aix/networking/primary_spec.rb'
-    - 'spec/facter/facts/aix/os/architecture_spec.rb'
-    - 'spec/facter/facts/aix/os/family_spec.rb'
     - 'spec/facter/facts/aix/os/name_spec.rb'
     - 'spec/facter/facts/aix/os/release_spec.rb'
     - 'spec/facter/facts/aix/ruby/version_spec.rb'
@@ -226,7 +223,6 @@ RSpec/MessageSpies:
     - 'spec/facter/facts/el/networking/ip_spec.rb'
     - 'spec/facter/facts/el/networking/primary_spec.rb'
     - 'spec/facter/facts/macosx/filesystems_spec.rb'
-    - 'spec/facter/facts/macosx/identity/privileged_spec.rb'
     - 'spec/facter/facts/macosx/is_virtual_spec.rb'
     - 'spec/facter/facts/macosx/memory/swap/used_spec.rb'
     - 'spec/facter/facts/macosx/memory/system/used_spec.rb'
@@ -354,7 +350,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 246
+# Offense count: 242
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -371,10 +367,7 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/facts/aix/kernelrelease_spec.rb'
     - 'spec/facter/facts/aix/kernelversion_spec.rb'
     - 'spec/facter/facts/aix/load_averages_spec.rb'
-    - 'spec/facter/facts/aix/os/hardware_spec.rb'
     - 'spec/facter/facts/aix/path_spec.rb'
-    - 'spec/facter/facts/aix/ruby/platform_spec.rb'
-    - 'spec/facter/facts/aix/ruby/sitedir_spec.rb'
     - 'spec/facter/facts/aix/ssh_spec.rb'
     - 'spec/facter/facts/debian/facterversion_spec.rb'
     - 'spec/facter/facts/debian/kernel_spec.rb'
@@ -390,7 +383,6 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/facts/el/path_spec.rb'
     - 'spec/facter/facts/macosx/facterversion_spec.rb'
     - 'spec/facter/facts/macosx/filesystems_spec.rb'
-    - 'spec/facter/facts/macosx/identity/privileged_spec.rb'
     - 'spec/facter/facts/macosx/kernel_spec.rb'
     - 'spec/facter/facts/macosx/kernelmajversion_spec.rb'
     - 'spec/facter/facts/macosx/kernelrelease_spec.rb'

data/VERSION

@@ -1 +1 @@
-4.0.11
+4.0.12

data/lib/custom_facts/util/collection.rb

@@ -11,6 +11,7 @@ module LegacyFacter
         @facts = {}
         @internal_loader = internal_loader
         @external_loader = external_loader
+        @loaded = false
       end
 
       # Return a fact object by name.
@@ -98,12 +99,24 @@ module LegacyFacter
         @external_facts = Facter::Utils.deep_copy(external_facts.keys)
       end
 
+      def invalidate_custom_facts
+        @valid_custom_facts = false
+      end
+
+      def reload_custom_facts
+        @loaded = false
+      end
+
       # Builds a hash of custom facts
       def custom_facts
-        return @custom_facts unless @custom_facts.nil?
+        return @custom_facts if @valid_custom_facts
 
-        internal_loader.load_all
-        custom_facts = @facts.select { |_k, v| v.options[:fact_type] }
+        @valid_custom_facts = true
+
+        internal_loader.load_all unless @loaded
+        @loaded = true
+
+        custom_facts = @facts.select { |_k, v| v.options[:fact_type] == :custom }
         @custom_facts = Facter::Utils.deep_copy(custom_facts.keys)
       end
 

data/lib/facter.rb

@@ -45,6 +45,7 @@ module Facter
     def add(name, options = {}, &block)
       options[:fact_type] = :custom
       LegacyFacter.add(name, options, &block)
+      LegacyFacter.collection.invalidate_custom_facts
     end
 
     # Clears all cached values and removes all facts from memory.
@@ -55,6 +56,8 @@ module Facter
     def clear
       @already_searched = {}
       LegacyFacter.clear
+      LegacyFacter.collection.invalidate_custom_facts
+      LegacyFacter.collection.reload_custom_facts
     end
 
     def core_value(user_query)

data/lib/facts/aix/os/hardware.rb

@@ -5,11 +5,12 @@ module Facts
     module Os
       class Hardware
         FACT_NAME = 'os.hardware'
+        ALIASES = 'hardwaremodel'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Hardware.resolve(:hardware)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

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

@@ -5,10 +5,11 @@ module Facts
     module Ruby
       class Platform
         FACT_NAME = 'ruby.platform'
+        ALIASES = 'rubyplatform'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Ruby.resolve(:platform)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

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

@@ -5,10 +5,11 @@ module Facts
     module Ruby
       class Sitedir
         FACT_NAME = 'ruby.sitedir'
+        ALIASES = 'rubysitedir'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Ruby.resolve(:sitedir)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

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

@@ -5,10 +5,11 @@ module Facts
     module SystemUptime
       class Days
         FACT_NAME = 'system_uptime.days'
+        ALIASES = 'uptime_days'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:days)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

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

@@ -5,10 +5,11 @@ module Facts
     module SystemUptime
       class Hours
         FACT_NAME = 'system_uptime.hours'
+        ALIASES = 'uptime_hours'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:hours)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

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

@@ -5,10 +5,11 @@ module Facts
     module SystemUptime
       class Seconds
         FACT_NAME = 'system_uptime.seconds'
+        ALIASES = 'uptime_seconds'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:seconds)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

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

@@ -5,10 +5,11 @@ module Facts
     module SystemUptime
       class Uptime
         FACT_NAME = 'system_uptime.uptime'
+        ALIASES = 'uptime'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uptime.resolve(:uptime)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.0.12
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler