facter 4.0.36 → 4.0.41

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

@@ -5,7 +5,6 @@ module Facter
     module Macosx
       class Mountpoints < BaseResolver
         include Facter::FilesystemHelper
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -16,6 +15,7 @@ module Facter
 
           def read_mounts
             mounts = {}
+
             FilesystemHelper.read_mountpoints.each do |fs|
               device = fs.name
               filesystem = fs.mount_type
@@ -36,8 +36,8 @@ module Facter
             begin
               stats = FilesystemHelper.read_mountpoint_stats(path)
               size_bytes = stats.bytes_total
-              used_bytes = stats.bytes_used
-              available_bytes = size_bytes - used_bytes
+              available_bytes = stats.bytes_available
+              used_bytes = size_bytes - available_bytes
             rescue Sys::Filesystem::Error
               size_bytes = used_bytes = available_bytes = 0
             end

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class Processors < BaseResolver
-        @semaphore = Mutex.new
         @fact_list = {}
         ITEMS = { logical_count: 'hw.logicalcpu_max',
                   physical_count: 'hw.physicalcpu_max',

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class SwapMemory < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class SystemMemory < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -15,7 +15,6 @@ module Facter
         SP_ETHERNET_DATA_TYPE = %i[type bus vendor_id device_id subsystem_vendor_id
                                    subsystem_id revision_id bsd_name kext_name location version].freeze
 
-        @semaphore = Mutex.new
         @fact_list = {}
 
         class << self

data/lib/facter/resolvers/memory_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Memory < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @log = Facter::Log.new(self)
         class << self
@@ -48,7 +47,12 @@ module Facter
           def reclaimable_memory(output)
             buffers = kilobytes_to_bytes(output.match(/Buffers:\s+(\d+)\s/)[1])
             cached = kilobytes_to_bytes(output.match(/Cached:\s+(\d+)\s/)[1])
-            s_reclaimable = kilobytes_to_bytes(output.match(/SReclaimable:\s+(\d+)\s/)[1])
+            s_reclaimable = output.match(/SReclaimable:\s+(\d+)\s/)
+            s_reclaimable = if s_reclaimable
+                              kilobytes_to_bytes(s_reclaimable[1])
+                            else
+                              0
+                            end
             @fact_list[:memfree] + buffers + cached + s_reclaimable
           end
 

data/lib/facter/resolvers/mountpoints_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Mountpoints < BaseResolver
       include Facter::FilesystemHelper
-      @semaphore = Mutex.new
       @fact_list ||= {}
       @log = Facter::Log.new(self)
       class << self

data/lib/facter/resolvers/networking_linux_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class NetworkingLinux < BaseResolver
-      @semaphore = Mutex.new
       @fact_list = {}
       DIRS = ['/var/lib/dhclient/', '/var/lib/dhcp/', '/var/lib/dhcp3/', '/var/lib/NetworkManager/', '/var/db/'].freeze
 
@@ -11,7 +10,6 @@ module Facter
         private
 
         def post_resolve(fact_name)
-          log.debug('in networking_linux_resolver')
           @fact_list.fetch(fact_name) { retrieve_network_info(fact_name) }
 
           @fact_list[fact_name]

data/lib/facter/resolvers/networking_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Networking < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/open_vz.rb

@@ -5,7 +5,6 @@ module Facter
     class OpenVz < BaseResolver
       # build
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/os_release_resolver.rb

@@ -14,7 +14,6 @@ module Facter
       # :support_url
       # :bug_report_url
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/partitions.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Partitions < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       BLOCK_PATH = '/sys/block'
       BLOCK_SIZE = 512
@@ -66,10 +65,18 @@ module Facter
           info_hash = { size_bytes: size_bytes,
                         size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes),
                         backing_file: backing_file }
-          info_hash.merge!(populate_from_blkid(partition_name))
+          info_hash.merge!(populate_from_syscalls(partition_name))
           @fact_list[:partitions][partition_name] = info_hash.reject { |_key, value| value.nil? }
         end
 
+        def populate_from_syscalls(partition_name)
+          part_info = populate_from_blkid(partition_name)
+
+          return pupulate_from_lsblk(partition_name) if part_info.empty?
+
+          part_info
+        end
+
         def populate_from_blkid(partition_name)
           return {} unless blkid_command?
 
@@ -92,6 +99,34 @@ module Facter
           @blkid_exists = !output.empty?
         end
 
+        def pupulate_from_lsblk(partition_name)
+          return {} unless lsblk_command?
+
+          @lsblk_content ||= Facter::Core::Execution.execute('lsblk -fp', logger: log)
+
+          part_info = @lsblk_content.match(/#{partition_name}.*/).to_s.split(' ')
+          return {} if part_info.empty?
+
+          result = { filesystem: part_info[1] }
+
+          if part_info.count.eql?(5)
+            result[:label] = part_info[2]
+            result[:uuid] = part_info[3]
+          else
+            result[:uuid] = part_info[2]
+          end
+
+          result
+        end
+
+        def lsblk_command?
+          return @lsblk_exists unless @lsblk_exists.nil?
+
+          output = Facter::Core::Execution.execute('which lsblk', logger: log)
+
+          @lsblk_exists = !output.empty?
+        end
+
         def execute_and_extract_blkid_info
           stdout = Facter::Core::Execution.execute('blkid', logger: log)
           output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]

data/lib/facter/resolvers/path_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Path < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/processors_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         MHZ_TO_HZ = 1_000_000
         class << self

data/lib/facter/resolvers/puppet_version_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     class PuppetVersionResolver < BaseResolver
       # :puppetversion
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/redhat_release_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :version
       # :codename
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/ruby_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Ruby < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/selinux_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class SELinux < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Disks < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Dmi < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class DmiSparc < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Filesystem < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Ipaddress < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -14,7 +14,6 @@ module Facter
         # :role_service
         # :role_impl
 
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         VIRTINFO_MAPPING = {

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

@@ -7,7 +7,6 @@ module Facter
         BLOCKSIZE = 512
         # :system
         # :swap
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -8,7 +8,6 @@ module Facter
     module Solaris
       class Networking < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @interfaces = {}
 

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class OsRelease < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @os_version_regex_patterns = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
                                       'Solaris (\d+)[.](\d+)', 'Solaris (\d+)']

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Processors < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Zone < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class ZoneName < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/ssh_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class SshResolver < BaseResolver
       @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
       @fact_list ||= {}
       @file_names = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub]
       @file_paths = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh]

data/lib/facter/resolvers/suse_release_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :version
       # :codename
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/sw_vers_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :productversion
       # :buildversion
       #
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/timezone_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Timezone < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/uname_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Uname < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/uptime_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Uptime < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/utils/filesystem_helper.rb

@@ -7,7 +7,9 @@ module Facter
                     size_bytes used used_bytes capacity].freeze
     class << self
       def read_mountpoints
-        require 'sys/filesystem'
+        # TODO: this require must be replaced with "require 'sys/filesystem'" when a new release of
+        # djberg96/sys-filesystem gem is available
+        require_relative '../../patches/sysfilesystem/sys/statvfs.rb'
         force_utf(Sys::Filesystem.mounts)
       end
 

data/lib/facter/resolvers/virt_what.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class VirtWhat < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/vmware.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Vmware < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/windows/aio_agent_version.rb

@@ -5,7 +5,6 @@ module Facter
     module Windows
       class AioAgentVersion < BaseResolver
         REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self