facter 4.0.36 → 4.0.37

data/lib/facter/resolvers/dmi_decode.rb

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

data/lib/facter/resolvers/dmi_resolver.rb

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

data/lib/facter/resolvers/ec2.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       EC2_METADATA_ROOT_URL = 'http://169.254.169.254/latest/meta-data/'
       EC2_USERDATA_ROOT_URL = 'http://169.254.169.254/latest/user-data/'

data/lib/facter/resolvers/eos_release_resolver.rb

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

data/lib/facter/resolvers/facterversion_resolver.rb

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

data/lib/facter/resolvers/filesystems_resolver.rb

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

data/lib/facter/resolvers/fips_enabled_resolver.rb

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

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

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

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

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

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

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

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

@@ -7,7 +7,6 @@ module Facter
     module Freebsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

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

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

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

data/lib/facter/resolvers/gce.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Gce < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       METADATA_URL = 'http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json'
       HEADERS = { "Metadata-Flavor": 'Google', "Accept": 'application/json' }.freeze

data/lib/facter/resolvers/hostname_resolver.rb

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

data/lib/facter/resolvers/identity_resolver.rb

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

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

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

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

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

data/lib/facter/resolvers/load_averages.rb

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

data/lib/facter/resolvers/lpar_resolver.rb

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

data/lib/facter/resolvers/lsb_release_resolver.rb

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

data/lib/facter/resolvers/lspci.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Lspci < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       REGEX_VALUES = { 'VirtualBox' => 'virtualbox', 'XenSource' => 'xenhvm',

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

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

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

@@ -5,7 +5,6 @@ module Facter
     module Macosx
       class Filesystems < BaseResolver
         # :macosx_filesystems
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self
@@ -17,11 +16,7 @@ module Facter
 
           def read_filesystems(fact_name)
             output = Facter::Core::Execution.execute('mount', logger: log)
-            filesystems = []
-            output.each_line do |line|
-              filesystem = line.match(/\(([a-z]+)\,*/).to_s
-              filesystems << filesystem[1..-2]
-            end
+            filesystems = output.scan(/\(([a-z]+)\,*/).flatten
             @fact_list[:macosx_filesystems] = filesystems.uniq.sort.join(',')
             @fact_list[fact_name]
           end

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

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

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
 

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_level_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     class OsLevel < 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