linux_stat 1.2.2 → 1.5.1

data/lib/linux_stat/swap.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Swap devices related information of the current system.
+
 	module Swap
 		class << self
 			##
@@ -8,7 +10,7 @@ module LinuxStat
 			def list
 				return {} unless swaps_readable?
 
-				file = IO.readlines('/proc/swaps').drop(1)
+				file = IO.readlines('/proc/swaps'.freeze).drop(1)
 				file.reduce({}) do |h, x|
 					name, *stats = x.strip.split
 					h.merge!(name => stats.map! { |v| v.to_i.to_s == v ? v.to_i : v.to_sym })
@@ -20,7 +22,7 @@ module LinuxStat
 			#
 			# If the info isn't available, it will return an empty Hash.
 			def any?
-				!!IO.foreach('/proc/swaps').drop(1).first
+				!!IO.foreach('/proc/swaps'.freeze).first(2)[1]
 			end
 
 			# Show aggregated used and available swap.
@@ -55,8 +57,19 @@ module LinuxStat
 			#
 			# The return type is a Integer but if the info isn't available, it will return nil.
 			def total
-				return nil unless swaps_readable?
-				read_usage[0].sum
+				v = LinuxStat::Sysinfo.totalswap
+				v ? v.fdiv(1024).to_i : nil
+			end
+
+			##
+			# Shows free swap.
+			#
+			# The value is in kilobytes.
+			#
+			# The return type is a Integer but if the info isn't available, it will return nil.
+			def free
+				v = LinuxStat::Sysinfo.freeswap
+				v ? v.fdiv(1024).to_i : nil
 			end
 
 			##
@@ -114,7 +127,7 @@ module LinuxStat
 			def read_usage
 				return [[], []] unless swaps_readable?
 
-				val = IO.readlines('/proc/swaps').drop(1)
+				val = IO.readlines('/proc/swaps'.freeze).drop(1)
 				return [[], []] if val.empty?
 
 				val.map! { |x|
@@ -123,7 +136,7 @@ module LinuxStat
 			end
 
 			def swaps_readable?
-				@@swaps_readable ||= File.readable?('/proc/swaps')
+				@@swaps_readable ||= File.readable?('/proc/swaps'.freeze)
 			end
 		end
 	end

data/lib/linux_stat/thermal.rb

@@ -0,0 +1,122 @@
+module LinuxStat
+	# Sensors are available to /sys/class/hwmon
+	# This module just reads the files inside them to get the sensor information.
+	#
+	# https://www.kernel.org/doc/Documentation/thermal/sysfs-api.txt
+
+	module Thermal
+		class << self
+			##
+			# Get temperatures from all sensors.
+			#
+			# The return value is an Array of Hashes.
+			#
+			# It opens various files from /sys/, and it should be
+			# considered very slow.
+			#
+			# Each hash may contain information including:
+			#
+			# path, name, label
+			# temperature, temp_crit, temp_max
+			#
+			# But if the info isn't available, it will return an empty Array.
+			def temperatures
+				query_hwmon('temp'.freeze, :temperature, true)
+			end
+
+			##
+			# Get RPM from all fans.
+			#
+			# The return value is an Array of Hashes.
+			#
+			# It opens various files from /sys/, and it should be
+			# considered very slow.
+			#
+			# Each hash may contain information including:
+			#
+			# path, name, label
+			# rpm, temp_crit, temp_max
+			#
+			# But if the info isn't available, it will return an empty Array.
+			def fans
+				query_hwmon('fan'.freeze, :rpm)
+			end
+
+			##
+			# Counts the number of sensors (fans are not counted)
+			#
+			# The return type is an Integer.
+			def count_sensors
+				return 0 unless hwmon_readable?
+
+				Dir["/sys/class/hwmon/hwmon[0-9]*/temp[0-9]*_input".freeze].size
+			end
+
+			##
+			# Counts the number of fans (sensors are not counted)
+			#
+			# The return type is an Integer.
+			def count_fans
+				return 0 unless hwmon_readable?
+
+				Dir["/sys/class/hwmon/hwmon[0-9]*/fan[0-9]*_input".freeze].size
+			end
+
+			private
+			def hwmon_readable?
+				@@hwmon_readable ||= File.readable?("/sys/class/hwmon/")
+			end
+
+			def query_hwmon(mon, key, div = false)
+				return [] unless hwmon_readable?
+
+				name = dir = ''.freeze
+
+				files = Dir["/sys/class/hwmon/hwmon[0-9]*/#{mon}[0-9]*_input".freeze]
+				i = -1
+				ret = []
+
+				while x = files[i += 1]
+					splitted = File.split(x)
+					path = File.join(splitted[0..-2])
+
+					n = splitted[-1][/.*_/]
+
+					label_f = "#{path}/#{n}label"
+					label = File.readable?(label_f) ? IO.read(label_f, encoding: 'ASCII-8BIT'.freeze).strip : nil
+
+					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_max_f = "#{path}/#{n}max"
+					temp_max = File.readable?(temp_max_f) ? IO.read(temp_max_f, encoding: 'ASCII-8BIT'.freeze).to_i : nil
+
+					value = File.readable?(x) ? IO.read(x).to_i : nil
+
+					if dir != path
+						dir = path
+						name_f = "#{path}/name"
+						name = File.readable?(name_f) ? IO.read(name_f, encoding: 'ASCII-8BIT'.freeze).tap(&:strip!) : ''.freeze
+					end
+
+					if div
+						value /= 1000.0
+						temp_max /= 1000.0 if temp_max
+						temp_crit /= 1000.0 if temp_crit
+					end
+
+					h = {path: path, name: name}
+
+					h.merge!(label: label) if label
+					h.merge!(key => value)
+					h.merge!(temp_crit: temp_crit) if temp_crit
+					h.merge!(temp_crit: temp_max) if temp_max
+
+					ret.push(h)
+				end
+
+				ret
+			end
+		end
+	end
+end

data/lib/linux_stat/usb.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various USB device related information of the current system.
+
 	module USB
 		class << self
 			##

data/lib/linux_stat/user.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various User related information of the current system.
+
 	module User
 		class << self
 			##
@@ -55,6 +57,7 @@ module LinuxStat
 			# But if the status isn't available it will return an empty Hash.
 			def gids
 				return {} unless passwd_readable?
+
 				passwd_splitted.reduce({}) { |h, x|
 					h.merge!(x[0].to_sym => x[3].to_i)
 				}
@@ -103,7 +106,7 @@ module LinuxStat
 
 				uid, gid = LinuxStat::Sysconf.get_uid, LinuxStat::Sysconf.get_gid
 
-				username = ''
+				username = ''.freeze
 				passwd.each { |x|
 					splitted = x.split(?:).freeze
 					if splitted[2].to_i == uid && splitted[3].to_i == gid
@@ -187,7 +190,7 @@ module LinuxStat
 			def username_by_gid(gid = get_gid)
 				return ''.freeze unless passwd_readable?
 
-				username = ''
+				username = ''.freeze
 				passwd.each do |x|
 					splitted = x.split(?:.freeze)
 					if splitted[2].to_i == gid
@@ -314,7 +317,7 @@ module LinuxStat
 			def home_by_gid(id = get_gid)
 				return ''.freeze unless passwd_readable?
 
-				home = ''
+				home = ''.freeze
 				passwd.each do |x|
 					splitted = x.split(?:.freeze)
 

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION ||= "1.2.2"
+	VERSION ||= "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.5.1
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem
@@ -20,6 +20,7 @@ extensions:
 - ext/fs_stat/extconf.rb
 - ext/nproc/extconf.rb
 - ext/sysconf/extconf.rb
+- ext/sysinfo/extconf.rb
 - ext/utsname/extconf.rb
 extra_rdoc_files:
 - README.md
@@ -35,6 +36,8 @@ files:
 - ext/nproc/nproc.c
 - ext/sysconf/extconf.rb
 - ext/sysconf/sysconf.c
+- ext/sysinfo/extconf.rb
+- ext/sysinfo/sysinfo.c
 - ext/utsname/extconf.rb
 - ext/utsname/utsname.c
 - lib/linux_stat.rb
@@ -52,6 +55,7 @@ files:
 - lib/linux_stat/process.rb
 - lib/linux_stat/process_info.rb
 - lib/linux_stat/swap.rb
+- lib/linux_stat/thermal.rb
 - lib/linux_stat/usb.rb
 - lib/linux_stat/user.rb
 - lib/linux_stat/version.rb