linux_stat 1.2.0 → 1.3.1

data/exe/linuxstat.rb

@@ -113,10 +113,20 @@ execute.sort.each do |c|
 
 	meths.each do |meth|
 		arg = nil
-		params = e.method(meth).parameters
 
-		param = ''
+		arity = e.method(meth).arity
+		if arity > 0 || arity == -2
+			if c == :PrettifyBytes
+				arg = rand(10 ** 15)
+			elsif c == :FS
+				arg = '/'
+			else
+				next
+			end
+		end
 
+		params = e.method(meth).parameters
+		param = ''
 		params.each do |p|
 			case p[0]
 				when :opt
@@ -124,24 +134,14 @@ execute.sort.each do |c|
 				when :key
 					param << "#{p[1]}:, "
 				when :req
-					param << "#{p[1] || 'arg'}, "
+					_arg = arg ? " = #{arg.inspect}" : ''.freeze
+					param << "#{p[1] || 'arg'}#{_arg}, "
 			end
 		end
-
 		param.delete_suffix!(", ")
 
-		if e.method(meth).arity > 0
-			if c == :PrettifyBytes
-				arg = rand(10 ** 15)
-			elsif c == :FS
-				arg = '/'
-			else
-				next
-			end
-		end
-
 		disp_meth = "#{meth}"
-		disp_meth.concat(arg ? "(#{param} = #{arg.inspect})" : "(#{param})")
+		disp_meth.concat(arg ? "(#{param})" : "(#{param})")
 
 		time = Time.now
 		ret = arg ? e.send(meth, arg) : e.send(meth)

data/lib/linux_stat.rb

@@ -28,6 +28,7 @@ require "linux_stat/net"
 require "linux_stat/pci"
 require "linux_stat/process"
 require "linux_stat/swap"
+require "linux_stat/thermal"
 require "linux_stat/usb"
 
 # Dependent Modules

data/lib/linux_stat/battery.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various battery related information of the current system.
+
 	module Battery
 		PATH = "/sys/class/power_supply/BAT0".freeze
 

data/lib/linux_stat/bios.rb

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

data/lib/linux_stat/cpu.rb

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

data/lib/linux_stat/filesystem.rb

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

data/lib/linux_stat/kernel.rb

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

data/lib/linux_stat/memory.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Memory related information of the current system.
+
 	module Memory
 		class << self
 			##
@@ -11,7 +13,7 @@ module LinuxStat
 			def stat
 				return {} unless meminfo?
 
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 
 				total = memory[0].split[1].to_i
 				available = memory[2].split[1].to_i
@@ -39,7 +41,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil.
 			def total
 				return nil unless meminfo?
-				IO.foreach('/proc/meminfo').first.split[1].to_i
+				IO.foreach('/proc/meminfo'.freeze).first.split[1].to_i
 			end
 
 			##
@@ -49,7 +51,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil
 			def available
 				return nil unless meminfo?
-				IO.foreach('/proc/meminfo').first(3)[-1].split[1].to_i
+				IO.foreach('/proc/meminfo'.freeze).first(3)[-1].split[1].to_i
 			end
 
 			##
@@ -59,7 +61,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil.
 			def used
 				return nil unless meminfo?
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 				memory[0].split[1].to_i - memory[2].split[1].to_i
 			end
 
@@ -69,7 +71,7 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available, it will return nil
 			def percent_used
 				return nil unless meminfo?
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 				total = memory[0].split[1].to_i
 				total.-(memory[2].split[1].to_i).*(100).fdiv(total).round(2)
 			end
@@ -80,13 +82,13 @@ module LinuxStat
 			# It retuns an Integer but if the info is not available,  it will return nil
 			def percent_available
 				return nil unless meminfo?
-				memory = IO.foreach('/proc/meminfo').first(3)
+				memory = IO.foreach('/proc/meminfo'.freeze).first(3)
 				memory[2].split[1].to_i.*(100).fdiv(memory[0].split[1].to_i).round(2)
 			end
 
 			private
 			def meminfo?
-				@@readable ||= File.readable?('/proc/meminfo')
+				@@readable ||= File.readable?('/proc/meminfo'.freeze)
 			end
 		end
 	end

data/lib/linux_stat/mounts.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Mounted device related information of the current system.
+
 	module Mounts
 		class << self
 			##
@@ -209,17 +211,17 @@ module LinuxStat
 
 			private
 			def mount_readable?
-				@@mount_readable ||= File.readable?('/proc/mounts')
+				@@mount_readable ||= File.readable?('/proc/mounts'.freeze)
 			end
 
 			def mounts
 				return [] unless mount_readable?
-				IO.readlines('/proc/mounts').each(&:strip!)
+				IO.readlines('/proc/mounts'.freeze).each(&:strip!)
 			end
 
 			def find_root
 				return [] unless mount_readable?
-				@@root ||= IO.foreach('/proc/mounts').find { |x| x.split[1] == '/'.freeze }.split
+				@@root ||= IO.foreach('/proc/mounts'.freeze).find { |x| x.split[1] == '/'.freeze }.split
 			end
 
 			def fs_info(dev)

data/lib/linux_stat/net.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various Net related information of the current system.
+
 	module Net
 		class << self
 			DEV = '/proc/net/dev'.freeze
@@ -86,13 +88,13 @@ module LinuxStat
 
 				data = IO.readlines(DEV).drop(2)
 				indices = find_index_of_bytes
-				data.reject! { |x| x.strip.start_with?('lo:') }
+				data.reject! { |x| x.strip.start_with?('lo:'.freeze) }
 				r, t = data.map { |x| x.split.values_at(*indices).map(&:to_i) }.transpose.map(&:sum)
 
 				sleep(interval)
 
 				data2 = IO.readlines(DEV).drop(2)
-				data2.reject! { |x| x.strip.start_with?('lo:') }
+				data2.reject! { |x| x.strip.start_with?('lo:'.freeze) }
 				r2, t2 = data2.map { |x| x.split.values_at(*indices).map(&:to_i) }.transpose.map(&:sum)
 
 				# Measure the difference
@@ -118,8 +120,8 @@ module LinuxStat
 
 					r.each_with_index { |x, i|
 						downcased = x.downcase
-						h.merge!(:r => i) if downcased.start_with?('receive')
-						h.merge!(:t => i) if downcased.start_with?('transmit')
+						h.merge!(:r => i) if downcased.start_with?('receive'.freeze)
+						h.merge!(:t => i) if downcased.start_with?('transmit'.freeze)
 					}
 
 					data_0 = data.next.gsub(?|.freeze, ' %'.freeze)

data/lib/linux_stat/os.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various OS related information of the current system.
+
 	module OS
 		class << self
 			##
@@ -52,7 +54,7 @@ module LinuxStat
 					elsif v.key?(:DISTRIB_ID)
 						v[:DISTRIB_ID]
 					elsif File.readable?('/etc/issue'.freeze)
-						IO.read('/etc/issue'.freeze, encoding: 'ASCII-8bit').strip
+						IO.read('/etc/issue'.freeze, encoding: 'ASCII-8bit'.freeze).strip
 					else
 						'Unknown'.freeze
 					end

data/lib/linux_stat/pci.rb

@@ -1,4 +1,6 @@
 module LinuxStat
+	# Shows various PCI device related information of the current system.
+
 	module PCI
 		class << self
 			##
@@ -130,70 +132,73 @@ module LinuxStat
 				return devices_info(hwdata: hwdata) unless @@sys_pci_readable
 
 				Dir['/sys/bus/pci/devices/*/'.freeze].sort!.map! { |x|
-					_vendor_file = File.join(x, 'vendor'.freeze)
-					next unless File.readable?(_vendor_file)
-					vendor = IO.read(_vendor_file).to_i(16).to_s(16)
-					prepend_0(vendor)
-
-					_device_file = File.join(x, 'device'.freeze)
-					next unless File.readable?(_device_file)
-					device = IO.read(_device_file).to_i(16).to_s(16)
-					prepend_0(device)
-
-					_sub_vendor_file = File.join(x, 'subsystem_vendor'.freeze)
-					sub_vendor = File.readable?(_sub_vendor_file) ? IO.read(_sub_vendor_file).to_i(16).to_s(16) : nil
-					prepend_0(sub_vendor) if sub_vendor
-
-					_sub_device_file = File.join(x, 'subsystem_device'.freeze)
-					sub_device = File.readable?(_sub_device_file) ? IO.read(_sub_device_file).to_i(16).to_s(16) : nil
-					prepend_0(sub_device) if sub_device
-
-					_uevent = File.join(x, 'uevent'.freeze)
-					uevent = File.readable?(_uevent) ? IO.foreach(_uevent) : nil
-
-					kernel_driver = if uevent
-						uevent.find { |_x|
-							_x.split(?=.freeze)[0].to_s.tap(&:strip!) == 'DRIVER'.freeze
-						} &.split(?=) &.[](1) &.tap(&:strip!)
-					else
-						nil
-					end
+					begin
+						_vendor_file = File.join(x, 'vendor'.freeze)
+						next unless File.readable?(_vendor_file)
+						vendor = IO.read(_vendor_file).to_i(16).to_s(16)
+						prepend_0(vendor)
+
+						_device_file = File.join(x, 'device'.freeze)
+						next unless File.readable?(_device_file)
+						device = IO.read(_device_file).to_i(16).to_s(16)
+						prepend_0(device)
+
+						_sub_vendor_file = File.join(x, 'subsystem_vendor'.freeze)
+						sub_vendor = File.readable?(_sub_vendor_file) ? IO.read(_sub_vendor_file).to_i(16).to_s(16) : nil
+						prepend_0(sub_vendor) if sub_vendor
+
+						_sub_device_file = File.join(x, 'subsystem_device'.freeze)
+						sub_device = File.readable?(_sub_device_file) ? IO.read(_sub_device_file).to_i(16).to_s(16) : nil
+						prepend_0(sub_device) if sub_device
+
+						_uevent = File.join(x, 'uevent'.freeze)
+						uevent = File.readable?(_uevent) ? IO.foreach(_uevent) : nil
+
+						kernel_driver = if uevent
+							uevent.find { |_x|
+								_x.split(?=.freeze)[0].to_s.tap(&:strip!) == 'DRIVER'.freeze
+							} &.split(?=) &.[](1) &.tap(&:strip!)
+						else
+							nil
+						end
 
-					_revision_file = File.join(x, 'revision'.freeze)
-					revision = File.readable?(_revision_file) ? IO.read(_revision_file).tap(&:strip!) : ''.freeze
+						_revision_file = File.join(x, 'revision'.freeze)
+						revision = File.readable?(_revision_file) ? IO.read(_revision_file).tap(&:strip!) : ''.freeze
 
-					_irq_file = File.join(x, 'irq'.freeze)
-					irq = File.readable?(_irq_file) ? IO.read(_irq_file).to_i : nil
+						_irq_file = File.join(x, 'irq'.freeze)
+						irq = File.readable?(_irq_file) ? IO.read(_irq_file).to_i : nil
 
-					_enable_file = File.join(x, 'enable'.freeze)
-					enable = File.readable?(_enable_file) ? IO.read(_enable_file).to_i  == 1 : nil
+						_enable_file = File.join(x, 'enable'.freeze)
+						enable = File.readable?(_enable_file) ? IO.read(_enable_file).to_i  == 1 : nil
 
-					query = if hwdata && sub_vendor && sub_device
-						query_hwdata(vendor, device, sub_vendor, sub_device)
-					elsif hwdata && sub_vendor
-						query_hwdata(vendor, device, sub_vendor)
-					elsif hwdata
-						query_hwdata(vendor, device)
-					else
-						{}
-					end
+						query = if hwdata && sub_vendor && sub_device
+							query_hwdata(vendor, device, sub_vendor, sub_device)
+						elsif hwdata && sub_vendor
+							query_hwdata(vendor, device, sub_vendor)
+						elsif hwdata
+							query_hwdata(vendor, device)
+						else
+							{}
+						end
 
-					ret = {
-						path: x, id: "#{vendor}:#{device}",
-						vendor: vendor, device: device
-					}
+						ret = {
+							path: x, id: "#{vendor}:#{device}",
+							vendor: vendor, device: device
+						}
 
-					ret.merge!(sub_vendor: sub_vendor) if sub_vendor
-					ret.merge!(sub_device: sub_device) if sub_device
+						ret.merge!(sub_vendor: sub_vendor) if sub_vendor
+						ret.merge!(sub_device: sub_device) if sub_device
 
-					ret.merge!(kernel_driver: kernel_driver) if kernel_driver
-					ret.merge!(revision: revision) unless revision.empty?
-					ret.merge!(irq: irq) if irq
-					ret.merge!(enable: enable) unless enable.nil?
-					ret.merge!(hwdata: query) unless query.empty?
+						ret.merge!(kernel_driver: kernel_driver) if kernel_driver
+						ret.merge!(revision: revision) unless revision.empty?
+						ret.merge!(irq: irq) if irq
+						ret.merge!(enable: enable) unless enable.nil?
+						ret.merge!(hwdata: query) unless query.empty?
 
-					ret
-				}
+						ret
+					rescue StandardError
+					end
+				}.tap(&:compact!)
 			end
 
 			##

data/lib/linux_stat/prettify_bytes.rb

@@ -1,4 +1,11 @@
 module LinuxStat
+	# Helps you convert bytes to a unit like:
+	#
+	# 1. kilobyte, megabyte, gigabyte, terabyte, petabyte, exabyte, zettabyte, yottabyte
+	# 2. kibibyte, mebibyte, gibibyte, tebibyte, pebibyte, exbibyte, zebibyte, yobibyte
+	# 3. kB, MB, GB, TB, PB, EB, ZB, YB
+	# 4. kiB, MiB, GiB, TiB, PiB, EiB, ZiB, YiB
+
 	module PrettifyBytes
 		class << self
 			##
@@ -16,13 +23,13 @@ module LinuxStat
 			# LinuxStat::PrettifyBytes.convert_decimal(1024 ** 3)
 			#
 			# => "1.07 gigabytes"
-			def convert_decimal(n)
+			def convert_decimal(n, precision: 2)
 				@@d_units ||= %W(#{''} kilo mega giga tera peta exa zetta)
 					.map.with_index { |x, i| [x, 1000.**(i + 1)] }
 				unit = @@d_units.find { |x| n < x[1] } || ['yotta'.freeze, 10 ** 27]
 
 				converted = n.fdiv(unit[1] / 1000).round(2)
-				"#{pad_left(converted)} #{unit[0]}byte#{?s.freeze if converted != 1}"
+				"#{pad_left(converted, precision)} #{unit[0]}byte#{?s.freeze if converted != 1}"
 			end
 
 			# Converts a number to binary byte units and outputs with the IEC prefix
@@ -39,13 +46,13 @@ module LinuxStat
 			# LinuxStat::PrettifyBytes.convert_binary(1024 ** 3)
 			#
 			# => "1.0 gibibyte"
-			def convert_binary(n)
+			def convert_binary(n, precision: 2)
 				@@b_units ||= %W(#{''} kibi mebi gibi tebi pebi exbi zebi)
 					.map.with_index { |x, i| [x, 1024.**(i + 1)] }
 				unit = @@b_units.find { |x| n < x[1] } || ['yobi'.freeze, 10 ** 27]
 
 				converted = n.fdiv(unit[1] / 1024).round(2)
-				"#{pad_left(converted)} #{unit[0]}byte#{?s.freeze if converted != 1}"
+				"#{pad_left(converted, precision)} #{unit[0]}byte#{?s.freeze if converted != 1}"
 			end
 
 			# Converts a number to decimal byte units
@@ -62,13 +69,13 @@ module LinuxStat
 			# LinuxStat::PrettifyBytes.convert_short_decimal(1024 ** 3)
 			#
 			# => "1.07 GB"
-			def convert_short_decimal(n)
+			def convert_short_decimal(n, precision: 2)
 				@@sd_units ||= %W(#{''} k M G T P E Z)
 					.map.with_index { |x, i| [x, 1000.**(i + 1)] }
 				unit = @@sd_units.find { |x| n < x[1] } || [?Y.freeze, 10 ** 27]
 
 				converted = n.fdiv(unit[1] / 1000).round(2)
-				"#{pad_left(converted)} #{unit[0]}B"
+				"#{pad_left(converted, precision)} #{unit[0]}B"
 			end
 
 			##
@@ -87,15 +94,15 @@ module LinuxStat
 			# LinuxStat::PrettifyBytes.convert_short_binary(1024 ** 3)
 			#
 			# => "1.0 GiB"
-			def convert_short_binary(n)
-				return "#{n} B" if n < 1024
+			def convert_short_binary(n, precision: 2)
+				return "#{pad_left(n, precision)} B" if n < 1024
 
 				@@sb_units ||= %W(#{''} K M G T P E Z)
 					.map.with_index { |x, i| [x, 1024.**(i + 1)] }
 				unit = @@sb_units.find { |x| n < x[1] } || [?Y.freeze, 1024 ** 9]
 
 				converted = n.fdiv(unit[1] / 1024).round(2)
-				"#{pad_left(converted)} #{unit[0]}iB"
+				"#{pad_left(converted, precision)} #{unit[0]}iB"
 			end
 
 			private