linux_stat 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9155ed8b1f6161a8bafcb9fbd9f1a1d9f70b018ca62aabf49ad1c7439030ee2
-  data.tar.gz: 22e52732cd8c8a2fca1f34ca9ece06178373c800ddbc200c42d1a61d49c29995
+  metadata.gz: 75ee9aa13037e326a0c04626cd28e0903b06372ce24344ffa38870f98dd6f0dd
+  data.tar.gz: d275807c8a9572fa9faaa1c562102302697f52b6a1cb36907fa71b2576c533b0
 SHA512:
-  metadata.gz: d1f781908039e1946676f8a1502321b530538aef6d303976b07930c6d8933e7a45ca671e1aa3438fc774caa68c1b939f1ee12f47a5a6399523700b46cfb0c9f5
-  data.tar.gz: cd51272b3c145c9a57a5b3ae444c21119430106436e29c843420269cbad47044fdc4e3836bf86e61404c6df20f462164dc673ec5e6d76b4acacfcc37effc61c8
+  metadata.gz: 3bd3330e9135cffee27a82fc661462a9c94e421ee5eebe24fb322ad9241e5498bdfd84914fd58dab93481366969f414bf2aa93e9507bb967ca18a462c91fc007
+  data.tar.gz: 686e7f1935fea8cde6ae24624522ef642f41e21304fdae7e758f3249f3b026ea6261a77fca76bbc2f5153d1d8426f9112a1b66f124e7c3d03106c0992ca731aa

data/lib/linux_stat/cpu.rb

@@ -344,7 +344,7 @@ module LinuxStat
 				physical_cores = []
 				hyperthreaded = {}
 
-				return [] unless File.readable?('/sys/devices/system/cpu/'.freeze)
+				return [] unless File.executable?('/sys/devices/system/cpu/'.freeze)
 				entries = Dir.entries('/sys/devices/system/cpu/'.freeze)
 				entries.delete(?..freeze)
 				entries.delete('..'.freeze)
@@ -384,7 +384,7 @@ module LinuxStat
 			def hyperthreaded_core_list
 				hyperthreaded = {}
 
-				return [] unless File.readable?('/sys/devices/system/cpu/'.freeze)
+				return [] unless File.executable?('/sys/devices/system/cpu/'.freeze)
 				entries = Dir.entries('/sys/devices/system/cpu/'.freeze)
 				entries.delete(?..freeze)
 				entries.delete('..'.freeze)

data/lib/linux_stat/pci.rb

@@ -128,7 +128,7 @@ module LinuxStat
 			# Also note that if there's no info available or no PCI enabled devices, it will return an empty
 			# Hash.
 			def devices_stat(hwdata: true)
-				@@sys_pci_readable ||= File.readable?('/sys/bus/pci/devices/')
+				@@sys_pci_readable ||= File.executable?('/sys/bus/pci/devices/')
 				return devices_info(hwdata: hwdata) unless @@sys_pci_readable
 
 				Dir['/sys/bus/pci/devices/*/'.freeze].sort!.map! { |x|
@@ -215,7 +215,7 @@ module LinuxStat
 			# But if the information isn't available, it will return nil.
 			def count
 				@@proc_pci_readable ||= File.readable?('/proc/bus/pci/devices')
-				@@sys_pci_readable ||= File.readable?('/sys/bus/pci/devices/')
+				@@sys_pci_readable ||= File.executable?('/sys/bus/pci/devices/')
 
 				if @@proc_pci_readable
 					IO.readlines('/proc/bus/pci/devices'.freeze).length

data/lib/linux_stat/thermal.rb

@@ -64,7 +64,7 @@ module LinuxStat
 
 			private
 			def hwmon_readable?
-				@@hwmon_readable ||= File.readable?("/sys/class/hwmon/")
+				@@hwmon_readable ||= File.executable?("/sys/class/hwmon/")
 			end
 
 			def query_hwmon(mon, key, div = false)
@@ -78,20 +78,46 @@ module LinuxStat
 
 				while x = files[i += 1]
 					splitted = File.split(x)
-					path = File.join(splitted[0..-2])
-
-					n = splitted[-1][/.*_/]
+					n = splitted.pop[/.*_/]
+					path = File.join(splitted)
 
 					label_f = "#{path}/#{n}label"
-					label = File.readable?(label_f) ? IO.read(label_f, encoding: 'ASCII-8BIT'.freeze).strip : nil
+
+					# Some of the files may have no content
+					# They can also raise Errno::EIO, Errno::ENODATA as well.
+					label = if File.readable?(label_f)
+						begin
+							IO.read(label_f, encoding: 'ASCII-8BIT'.freeze).strip
+						rescue Errno::EIO, Errno::ENODEV, Errno::ENODATA
+							nil
+						end
+					end
 
 					temp_crit_f = "#{path}/#{n}crit"
-					temp_crit = File.readable?(temp_crit_f) ? IO.read(temp_crit_f, encoding: 'ASCII-8BIT'.freeze).to_i : nil
+					temp_crit = if File.readable?(temp_crit_f)
+						begin
+							IO.read(temp_crit_f, encoding: 'ASCII-8BIT'.freeze).to_i
+						rescue Errno::EIO, Errno::ENODEV, Errno::ENODATA
+							nil
+						end
+					end
 
 					temp_max_f = "#{path}/#{n}max"
-					temp_max = File.readable?(temp_max_f) ? IO.read(temp_max_f, encoding: 'ASCII-8BIT'.freeze).to_i : nil
+					temp_max = if File.readable?(temp_max_f)
+						begin
+							IO.read(temp_max_f, encoding: 'ASCII-8BIT'.freeze).to_i
+						rescue Errno::EIO, Errno::ENODEV, Errno::ENODATA
+							nil
+						end
+					end
 
-					value = File.readable?(x) ? IO.read(x).to_i : nil
+					value = if File.readable?(x)
+						begin
+							IO.read(x).to_i
+						rescue Errno::EIO, Errno::ENODEV, Errno::ENODATA
+							nil
+						end
+					end
 
 					if dir != path
 						dir = path
@@ -100,17 +126,17 @@ module LinuxStat
 					end
 
 					if div
-						value /= 1000.0
+						value /= 1000.0 if value
 						temp_max /= 1000.0 if temp_max
 						temp_crit /= 1000.0 if temp_crit
 					end
 
 					h = {path: path, name: name}
 
-					h.store(:label, label) if label
+					h.store(:label, label)
 					h.store(key, value)
-					h.store(:temp_crit, temp_crit) if temp_crit
-					h.store(:temp_crit, temp_max) if temp_max
+					h.store(:temp_crit, temp_crit)
+					h.store(:temp_crit, temp_max)
 
 					ret.push(h)
 				end

data/lib/linux_stat/usb.rb

@@ -47,7 +47,7 @@ module LinuxStat
 			# Also note that if there's no info available or no USB devices, it will return an empty
 			# Hash.
 			def devices_stat(hwdata: true)
-				@@sys_usb_readable ||= File.readable?('/sys/bus/usb/devices/')
+				@@sys_usb_readable ||= File.executable?('/sys/bus/usb/devices/')
 				return [] unless @@sys_usb_readable
 
 				Dir['/sys/bus/usb/devices/*/'.freeze].sort!.map! { |x|
@@ -137,7 +137,7 @@ module LinuxStat
 			#
 			# But if the information isn't available, it will return nil.
 			def count
-				@@sys_usb_readable ||= File.readable?('/sys/bus/usb/devices/')
+				@@sys_usb_readable ||= File.executable?('/sys/bus/usb/devices/')
 				return nil unless @@sys_usb_readable
 
 				Dir['/sys/bus/usb/devices/*/'.freeze].count { |x|

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "2.5.2"
+	VERSION = "2.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: Efficient linux system reporting gem