facter 4.0.49 → 4.0.50

data/lib/facter/resolvers/freebsd/virtual.rb

@@ -19,7 +19,7 @@ module Facter
 
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end
 

data/lib/facter/resolvers/gce.rb

@@ -11,7 +11,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           log.debug('reading Gce metadata')
           @fact_list.fetch(fact_name) { read_facts(fact_name) }
         end

data/lib/facter/resolvers/hostname.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_info(fact_name) }
         end
 

data/lib/facter/resolvers/identity.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_identity(fact_name) }
         end
 

data/lib/facter/resolvers/linux/docker_uptime.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { detect_uptime(fact_name) }
           end
 

data/lib/facter/resolvers/linux/load_averages.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_load_averages_file(fact_name) }
           end
 

data/lib/facter/resolvers/load_averages.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_load_averages(fact_name) }
         end
 

data/lib/facter/resolvers/lpar.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_lpar(fact_name) }
         end
 

data/lib/facter/resolvers/lsb_release.rb

@@ -14,7 +14,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_facts(fact_name) }
         end
 

data/lib/facter/resolvers/lspci.rb

@@ -13,7 +13,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { lspci_command(fact_name) }
         end
 

data/lib/facter/resolvers/macosx/dmi.rb

@@ -11,7 +11,7 @@ module Facter
 
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts }
           end
 

data/lib/facter/resolvers/macosx/filesystems.rb

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_filesystems(fact_name) }
           end
 

data/lib/facter/resolvers/macosx/load_averages.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_load_averages_file(fact_name) }
           end
 

data/lib/facter/resolvers/macosx/mountpoints.rb

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_mounts }
           end
 

data/lib/facter/resolvers/macosx/processor.rb

@@ -18,7 +18,7 @@ module Facter
 
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_processor_data(fact_name) }
           end
 

data/lib/facter/resolvers/macosx/swap_memory.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
           end
 

data/lib/facter/resolvers/macosx/system_memory.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { calculate_system_memory(fact_name) }
           end
 

data/lib/facter/resolvers/macosx/system_profiler.rb

@@ -20,7 +20,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { retrieve_system_profiler(fact_name) }
           end
 

data/lib/facter/resolvers/memory.rb

@@ -11,7 +11,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_meminfo_file(fact_name) }
           end
 

data/lib/facter/resolvers/mountpoints.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_mounts(fact_name) }
         end
 

data/lib/facter/resolvers/networking.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_facts(fact_name) }
         end
 

data/lib/facter/resolvers/networking_linux.rb

@@ -19,7 +19,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_network_info(fact_name) }
 
           @fact_list[fact_name]

data/lib/facter/resolvers/open_vz.rb

@@ -10,7 +10,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { check_proc_vz(fact_name) }
         end
 

data/lib/facter/resolvers/os_release.rb

@@ -19,7 +19,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_os_release_file(fact_name) }
         end
 

data/lib/facter/resolvers/partitions.rb

@@ -11,7 +11,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_partitions(fact_name) }
         end
 

data/lib/facter/resolvers/path.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_path_from_env }
         end
 

data/lib/facter/resolvers/processors.rb

@@ -18,7 +18,7 @@ module Facter
 
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_cpuinfo(fact_name) }
           end
 

data/lib/facter/resolvers/redhat_release.rb

@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_redhat_release(fact_name) }
         end
 

data/lib/facter/resolvers/release_from_first_line.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class ReleaseFromFirstLine < BaseResolver
+      # :release
+
+      init_resolver
+
+      class << self
+        private
+
+        def post_resolve(fact_name, options)
+          @fact_list.fetch(fact_name) { read_release_file(fact_name, options) }
+        end
+
+        def read_release_file(fact_name, options)
+          release_file = options[:release_file]
+          return unless release_file
+
+          output = Facter::Util::FileHelper.safe_read(release_file, nil)
+          return @fact_list[fact_name] = nil if output.nil?
+
+          @fact_list[:release] = retrieve_version(output)
+
+          @fact_list[fact_name]
+        end
+
+        def retrieve_version(output)
+          if output[/(Rawhide)$/]
+            'Rawhide'
+          elsif output['release']
+            output.strip =~ /release (\d[\d.]*)/ ? Regexp.last_match(1) : nil
+          else
+            output.strip =~ /Amazon Linux (\d+)/ ? Regexp.last_match(1) : nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/ruby.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_ruby_information(fact_name) }
         end
 

data/lib/facter/resolvers/selinux.rb

@@ -8,7 +8,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_facts(fact_name) }
         end
 

data/lib/facter/resolvers/solaris/disks.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_disks_info(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/dmi.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/dmi_sparc.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/filesystems.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_sysdef_file(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/ipaddress.rb

@@ -9,7 +9,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_ipaddress(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/ldom.rb

@@ -31,7 +31,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { call_virtinfo(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/memory.rb

@@ -12,7 +12,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { calculate_memory(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -10,7 +10,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_mounts(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/networking.rb

@@ -11,7 +11,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_facts(fact_name) }
           end
 

data/lib/facter/resolvers/solaris/os_release.rb

@@ -12,7 +12,7 @@ module Facter
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { build_release_facts(fact_name) }
           end