facter 4.0.19 → 4.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d0b6c2e99da8558c39308375676c59ef7f6f1d7ce0859dc449118ce0206be3d
-  data.tar.gz: ee96b051c6644a7de2978efbcf48c911497950341a119430061808bb9838267c
+  metadata.gz: baceb04e072102e0f18534a903fc7e0ead2f76d2d4f81dd49a64e325a22a0f7d
+  data.tar.gz: b63826bac2fef312e1745b2b2591e77a3d8a1e4b7fd019d3f77019660161d48c
 SHA512:
-  metadata.gz: 6df1544a2c552dd38ee5013d9391aedfd539306f772ee7a020779370bcb9769a0c55a4cc376e65a970352e5fc7930df5252a49b4e4e5246d6bca42937b19cf16
-  data.tar.gz: 66681be65dc00cb5c58ae3c8f5275ee42e6065ef28acef9ded42476d1f1ab35db754e8d8738f86f838352f14ff4b365349ccd22bef5531061a67107553cb271e
+  metadata.gz: 205b507dab7c7253b8d58f8e76ba664ac10545bfb3fca3b5d7649248546edf5f31fccd52c654d2d38691b48f8a30bf70b7731008b747260ba0a258775fdf231a
+  data.tar.gz: 5ca2bf79afe491abe2b8ace592ab269eedb9ff97e041cd39ea145c7d4da055863076432acb0eecd64a367b326c1d06621aab6545d9109093f99783c409e06945

data/.rubocop_todo.yml

@@ -6,7 +6,7 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 80
+# Offense count: 81
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
   Exclude:
@@ -37,6 +37,7 @@ RSpec/FilePath:
     - 'spec/facter/resolvers/aix/architecture_resolver_spec.rb'
     - 'spec/facter/resolvers/aix/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/aix/hardware_resolver_spec.rb'
+    - 'spec/facter/resolvers/bsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/disk_resolver_spec.rb'
     - 'spec/facter/resolvers/dmi_resolver_spec.rb'
     - 'spec/facter/resolvers/filesystems_resolver_spec.rb'
@@ -191,7 +192,7 @@ RSpec/SubjectStub:
     - 'spec/custom_facts/util/fact_spec.rb'
     - 'spec/custom_facts/util/resolution_spec.rb'
 
-# Offense count: 169
+# Offense count: 180
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
@@ -227,6 +228,7 @@ RSpec/VerifiedDoubles:
     - 'spec/facter/resolvers/aix/architecture_resolver_spec.rb'
     - 'spec/facter/resolvers/aix/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/aix/hardware_resolver_spec.rb'
+    - 'spec/facter/resolvers/bsd/ffi_helper_spec.rb'
     - 'spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/mountpoints_resolver_spec.rb'
     - 'spec/facter/resolvers/solaris/current_zone_resolver_spec.rb'

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 
 
+## [4.0.20](https://github.com/puppetlabs/facter-ng/tree/4.0.20) (2020-05-06)
+
+[Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.19...4.0.20)
+
+### Added
+
+- Add \*BSD kernelversion and kernelmajversion facts [\#462](https://github.com/puppetlabs/facter-ng/pull/462) ([smortex](https://github.com/smortex))
+- Fix os.family fact on \*BSD [\#461](https://github.com/puppetlabs/facter-ng/pull/461) ([smortex](https://github.com/smortex))
+- Add support for \*BSD load averages [\#460](https://github.com/puppetlabs/facter-ng/pull/460) ([smortex](https://github.com/smortex))
+
+### Fixed
+
+- \(FACT-2590\) No facts are displayed on Redhat 5 and Centos6 [\#484](https://github.com/puppetlabs/facter-ng/pull/484) ([IrimieBogdan](https://github.com/IrimieBogdan))
+- \(FACT-2530\) Fix for tests/facts/os\_processors\_and\_kernel.rb [\#449](https://github.com/puppetlabs/facter-ng/pull/449) ([oanatmaria](https://github.com/oanatmaria))
+
+
+
 ## [4.0.19](https://github.com/puppetlabs/facter-ng/tree/4.0.19) (2020-04-29)
 
 [Full Changelog](https://github.com/puppetlabs/facter-ng/compare/4.0.18...4.0.19)

data/Rakefile

@@ -9,7 +9,7 @@ Dir.glob(File.join('tasks/**/*.rake')).each { |file| load file }
 task default: :spec
 
 def retrieve_from_keyboard
-  return unless ARGV =~ /changelog/
+  return unless ARGV.include?('changelog')
 
   puts "Please provide the next release tag:\n"
   next_version = $stdin.gets.chomp

data/VERSION

@@ -1 +1 @@
-4.0.19
+4.0.20

data/lib/facts/bsd/kernelmajversion.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Bsd
+    class Kernelmajversion
+      FACT_NAME = 'kernelmajversion'
+
+      def call_the_resolver
+        full_version = Facter::Resolvers::Uname.resolve(:kernelrelease)
+        versions_split = full_version.split('.')
+        major_version = versions_split[0]
+        Facter::ResolvedFact.new(FACT_NAME, major_version)
+      end
+    end
+  end
+end

data/lib/facts/bsd/kernelversion.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Bsd
+    class Kernelversion
+      FACT_NAME = 'kernelversion'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Uname.resolve(:kernelrelease).sub(/\A(\d+(\.\d+)*).*/, '\1')
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/bsd/load_averages.rb

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

data/lib/facts/bsd/os/family.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Bsd
+    module Os
+      class Family
+        FACT_NAME = 'os.family'
+        ALIASES = 'osfamily'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uname.resolve(:kernelname)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/debian/os/distro/release.rb

@@ -10,14 +10,7 @@ module Facts
           def call_the_resolver
             fact_value = determine_release_for_os
 
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
-
-            versions = fact_value.split('.')
-            release = {}
-            release['full'] = fact_value
-            release['major'] = versions[0]
-            release['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
-            Facter::ResolvedFact.new(FACT_NAME, release)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
 
           private
@@ -26,9 +19,23 @@ module Facts
             os_name = Facter::Resolvers::OsRelease.resolve(:name)
 
             if os_name =~ /Debian|Raspbian/
-              Facter::Resolvers::DebianVersion.resolve(:version)
+              release = Facter::Resolvers::DebianVersion.resolve(:version)
+              return unless release
+
+              versions = release.split('.')
+              fact_value = {}
+              fact_value['full'] = release
+              fact_value['major'] = versions[0]
+              fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
+              fact_value
             else
-              Facter::Resolvers::OsRelease.resolve(:version_id)
+              release = Facter::Resolvers::OsRelease.resolve(:version_id)
+              return unless release
+
+              {
+                'full' => release,
+                'major' => release
+              }
             end
           end
         end

data/lib/facts/debian/os/release.rb

@@ -10,17 +10,11 @@ module Facts
         def call_the_resolver
           fact_value = determine_release_for_os
 
-          return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
+          return Facter::ResolvedFact.new(FACT_NAME, fact_value) unless fact_value
 
-          versions = fact_value.split('.')
-          release = {}
-          release['full'] = fact_value
-          release['major'] = versions[0]
-          release['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
-
-          [Facter::ResolvedFact.new(FACT_NAME, release),
-           Facter::ResolvedFact.new(ALIASES.first, versions[0], :legacy),
-           Facter::ResolvedFact.new(ALIASES.last, fact_value, :legacy)]
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new(ALIASES.first, fact_value['major'], :legacy),
+           Facter::ResolvedFact.new(ALIASES.last, fact_value['full'], :legacy)]
         end
 
         private
@@ -29,9 +23,23 @@ module Facts
           os_name = Facter::Resolvers::OsRelease.resolve(:name)
 
           if os_name =~ /Debian|Raspbian/
-            Facter::Resolvers::DebianVersion.resolve(:version)
+            release = Facter::Resolvers::DebianVersion.resolve(:version)
+            return unless release
+
+            versions = release.split('.')
+            fact_value = {}
+            fact_value['full'] = release
+            fact_value['major'] = versions[0]
+            fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
+            fact_value
           else
-            Facter::Resolvers::OsRelease.resolve(:version_id)
+            release = Facter::Resolvers::OsRelease.resolve(:version_id)
+            return unless release
+
+            {
+              'full' => release,
+              'major' => release
+            }
           end
         end
       end

data/lib/framework/detector/os_detector.rb

@@ -8,6 +8,7 @@ class OsDetector
   attr_reader :identifier, :version, :hierarchy
 
   def initialize(*_args)
+    @log = Facter::Log.new(self)
     @os_hierarchy = Facter::OsHierarchy.new
     @identifier = detect
   end
@@ -39,8 +40,15 @@ class OsDetector
 
   def detect_hierarchy(identifier)
     hierarchy = @os_hierarchy.construct_hierarchy(identifier)
-    hierarchy = @os_hierarchy.construct_hierarchy(detect_family) if hierarchy.empty?
-    hierarchy = @os_hierarchy.construct_hierarchy(:linux) if hierarchy.empty?
+    if hierarchy.empty?
+      @log.debug("Could not detect hierarchy using os identifier: #{identifier} , trying with family")
+      hierarchy = @os_hierarchy.construct_hierarchy(detect_family)
+    end
+
+    if hierarchy.empty?
+      @log.debug("Could not detect hierarchy using family #{detect_family}, falling back to Linux")
+      hierarchy = @os_hierarchy.construct_hierarchy(:linux)
+    end
 
     hierarchy
   end

data/lib/resolvers/bsd/ffi/ffi_helper.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'ffi'
+
+module Facter
+  module Bsd
+    module FfiHelper
+      module Libc
+        extend FFI::Library
+
+        ffi_lib 'c'
+        attach_function :getloadavg, %i[pointer int], :int
+      end
+
+      def self.read_load_averages
+        raw_loadavg = FFI::MemoryPointer.new(:double, 3)
+
+        res = Libc.getloadavg(raw_loadavg, 3)
+        return unless res == 3
+
+        raw_loadavg.read_array_of_double(res)
+      end
+    end
+  end
+end

data/lib/resolvers/bsd/load_averages_resolver.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Bsd
+      class LoadAverages < BaseResolver
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_load_averages(fact_name) }
+          end
+
+          def read_load_averages(fact_name)
+            require_relative 'ffi/ffi_helper'
+            @fact_list[:load_averages] = %w[1m 5m 15m].zip(Facter::Bsd::FfiHelper.read_load_averages).to_h
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/os_release_resolver.rb

@@ -36,6 +36,7 @@ module Facter
 
           fill_fact_list(pairs)
           process_name
+          pad_version_id
 
           @fact_list[fact_name]
         end
@@ -47,6 +48,10 @@ module Facter
           @fact_list[:identifier] = @fact_list[:id]
         end
 
+        def pad_version_id
+          @fact_list[:version_id] = "#{@fact_list[:version_id]}.0" unless @fact_list[:version_id] =~ /\./
+        end
+
         def process_name
           return unless @fact_list[:name]
 

data/os_hierarchy.json

@@ -12,7 +12,8 @@
         "El": [
           "Fedora",
           "Amzn",
-          "Centos"
+          "Centos",
+          "Rhel"
         ]
       },
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.19
+  version: 4.0.20
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,6 +287,10 @@ files:
 - lib/facts/aix/system_uptime/uptime.rb
 - lib/facts/aix/timezone.rb
 - lib/facts/bsd/bsd_example_fact.rb
+- lib/facts/bsd/kernelmajversion.rb
+- lib/facts/bsd/kernelversion.rb
+- lib/facts/bsd/load_averages.rb
+- lib/facts/bsd/os/family.rb
 - lib/facts/debian/augeas/version.rb
 - lib/facts/debian/disks.rb
 - lib/facts/debian/dmi/bios/release_date.rb
@@ -803,6 +807,8 @@ files:
 - lib/resolvers/aix/utils/odm_query.rb
 - lib/resolvers/augeas_resolver.rb
 - lib/resolvers/base_resolver.rb
+- lib/resolvers/bsd/ffi/ffi_helper.rb
+- lib/resolvers/bsd/load_averages_resolver.rb
 - lib/resolvers/debian_version.rb
 - lib/resolvers/disk_resolver.rb
 - lib/resolvers/dmi_resolver.rb