linux_stat 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 349ddabe649c7cdec58e01537c6c28ab47f9d30b413208baf5fae4c0c7a26804
-  data.tar.gz: e66ba391b2264c53f6d2619ee64d8907e5435079b29bcc76bf2d54516ea82949
+  metadata.gz: 1c68e104d55d755cd1cef1e8901a7dd67b1a901b132d9a7786fabfd75b41cf5a
+  data.tar.gz: 94d102c6244b8da52b5f7aa7b1ea903546b5ef6e615c6317233b510005b6ded7
 SHA512:
-  metadata.gz: 1f7274982f6330ed5023b6e7adf33f325163e382c9fdc81be8181c65ad182ba1e77433af792e1167d603673af147ff7e0601a42975f25ac2393206db755a27f5
-  data.tar.gz: 61d48ba5bcf4598d8df63173bfbecfe4fd6a91552f32195a540e344961ee4e2ebcb9decf492d092b41ca034908b82948b9e6d727e678e3b41f434c5771794070
+  metadata.gz: b94d6afea3d307c845f316ce21f66e93944e1b33ad9576ecd8d55e299d6d520732677f99ea8fba3dcb3f6f5c6c8aae98526cc21b2c0218d7a8d49bdd7896cdec
+  data.tar.gz: cecbaee79f9844c5a6ad83720071a7977697edeb958d2336a68fa9f3b19ccb28074641c9620c88574dd0b5074ba6069a3457543a2cad86c11d9c5562d6e83da6

data/README.md

@@ -13,12 +13,12 @@ It only works for Linux, and detecting the OS is upto the user of this gem.
 + You need to have the C compile to be able to compile the C extension.
 On Arch Linux:
 ```
-# pacman -S gcc
+# pacman -S gcc make
 ```
 
 On Debian based systems:
 ```
-# apt install gcc
+# apt install gcc build-essential
 ```
 
 + You might also require ruby-dev in Debian based systems which provides support for ruby.h header file:
@@ -103,7 +103,7 @@ LinuxStat::CPU.count
 => 4
 
 LinuxStat::CPU.cur_freq
-=> [1999998, 2000003, 2000015, 2000009]
+=> [2000050, 2000024, 1998134, 1975870]
 
 LinuxStat::CPU.max_freq
 => [2000000, 2000000, 2000000, 2000000]
@@ -112,38 +112,38 @@ LinuxStat::CPU.model
 => "Intel(R) Core(TM) i3-6006U CPU @ 2.00GHz"
 
 LinuxStat::CPU.stat
-=> {0=>14.29, 1=>25.0, 2=>0.0, 3=>25.0, 4=>14.29}
+=> {0=>3.57, 1=>0.0, 2=>0.0, 3=>0.0, 4=>0.0}
 
 LinuxStat::CPU.total_usage
-=> 18.75
+=> 3.45
 
 LinuxStat::CPU.usage
-=> 14.29
+=> 9.68
 
 LinuxStat::CPU.usages
-=> {0=>16.67, 1=>14.29, 2=>28.57, 3=>0.0, 4=>25.0}
+=> {0=>6.67, 1=>0.0, 2=>25.0, 3=>12.5, 4=>14.29}
 
 ```
 
 ### LinuxStat::Filesystem
 ```
 LinuxStat::Filesystem.available
-=> 42144575488
+=> 36234563584
 
 LinuxStat::Filesystem.free
-=> 42144575488
+=> 36234563584
 
 LinuxStat::Filesystem.stat
-=> {:total=>119981191168, :free=>42144575488, :used=>77836615680}
+=> {:total=>119981191168, :free=>36234563584, :used=>83746627584}
 
 LinuxStat::Filesystem.stat_raw
-=> {:block_size=>4096, :fragment_size=>4096, :blocks=>29292283, :block_free=>10289203, :block_avail_unpriv=>10289203, :inodes=>58612160, :free_inodes=>56716465, :filesystem_id=>2050, :mount_flags=>1024, :max_filename_length=>255}
+=> {:block_size=>4096, :fragment_size=>4096, :blocks=>29292283, :block_free=>8846329, :block_avail_unpriv=>8846329, :inodes=>58612160, :free_inodes=>56635312, :filesystem_id=>2050, :mount_flags=>1024, :max_filename_length=>255}
 
 LinuxStat::Filesystem.total
 => 119981191168
 
 LinuxStat::Filesystem.used
-=> 77836615680
+=> 83746627584
 
 ```
 
@@ -184,22 +184,22 @@ LinuxStat::Kernel.version
 ### LinuxStat::Memory
 ```
 LinuxStat::Memory.available
-=> 606548
+=> 602148
 
 LinuxStat::Memory.percent_available
-=> 15.81
+=> 15.7
 
 LinuxStat::Memory.percent_used
-=> 84.19
+=> 84.3
 
 LinuxStat::Memory.stat
-=> {:total=>3836256, :used=>3229708, :available=>606548, :percent_used=>84.19, :percent_available=>15.81}
+=> {:total=>3836256, :used=>3234108, :available=>602148, :percent_used=>84.3, :percent_available=>15.7}
 
 LinuxStat::Memory.total
 => 3836256
 
 LinuxStat::Memory.used
-=> 3229708
+=> 3234108
 
 ```
 
@@ -225,7 +225,7 @@ LinuxStat::Mounts.tmpfs
 ### LinuxStat::Net
 ```
 LinuxStat::Net.ipv4_private
-=> "192.168.0.101"
+=> "192.168.43.107"
 
 ```
 
@@ -253,29 +253,29 @@ LinuxStat::OS.os_release
 => {:NAME=>"Arch Linux", :PRETTY_NAME=>"Arch Linux", :ID=>"arch", :BUILD_ID=>"rolling", :ANSI_COLOR=>"38;2;23;147;209", :HOME_URL=>"https://www.archlinux.org/", :DOCUMENTATION_URL=>"https://wiki.archlinux.org/", :SUPPORT_URL=>"https://bbs.archlinux.org/"...
 
 LinuxStat::OS.uptime
-=> {:hour=>9, :minute=>10, :second=>19.41}
+=> {:hour=>15, :minute=>19, :second=>34.72}
 
 ```
 
 ### LinuxStat::Process
 ```
 LinuxStat::Process.count
-=> 221
+=> 228
 
 LinuxStat::Process.idle
-=> [3, 4, 6, 9, 12, 23, 30, 37, 39, 49, 102, 103, 104, 106, 107, 108, 109, 110, 117, 118, 120, 122, 131, 134, 140, 152, 153, 168, 170, 173, 174, 182, 183, 184, 185, 186, 187, 214, 224, 268, 308, 313, 314, 330, 2357, 2358, 2359, 2360, 2361, 2362, 25094, 2...
+=> [3, 4, 6, 9, 12, 23, 30, 37, 39, 49, 102, 103, 104, 106, 107, 108, 109, 110, 117, 118, 119, 121, 131, 134, 140, 152, 153, 174, 176, 178, 182, 183, 187, 188, 189, 190, 191, 192, 225, 231, 280, 327, 329, 335, 5823, 5824, 5825, 5826, 5827, 5828, 43047, 4...
 
 LinuxStat::Process.list
-=> [1, 2, 3, 4, 6, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, 28, 30, 31, 32, 33, 34, 35, 37, 38, 39, 40, 41, 42, 46, 47, 48, 49, 50, 51, 52, 102, 103, 104, 106, 107, 108, 109, 110, 112, 114, 115, 117, 118, 120, 122, 131, 134,...
+=> [1, 2, 3, 4, 6, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, 28, 30, 31, 32, 33, 34, 35, 37, 38, 39, 40, 41, 42, 46, 47, 48, 49, 50, 51, 52, 102, 103, 104, 106, 107, 108, 109, 110, 112, 114, 115, 117, 118, 119, 121, 131, 134,...
 
 LinuxStat::Process.names
 => {1=>"systemd", 2=>"kthreadd", 3=>"rcu_gp", 4=>"rcu_par_gp", 6=>"kworker/0:0H-kblockd", 9=>"mm_percpu_wq", 10=>"ksoftirqd/0", 11=>"rcuc/0", 12=>"rcu_preempt", 13=>"rcub/0", 14=>"migration/0", 15=>"idle_inject/0", 16=>"cpuhp/0", 17=>"cpuhp/1", 18=>"idle...
 
 LinuxStat::Process.running
-=> [30804]
+=> [49287]
 
 LinuxStat::Process.sleeping
-=> [1, 2, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 24, 25, 26, 27, 28, 31, 32, 33, 34, 35, 38, 40, 41, 42, 46, 47, 48, 50, 51, 52, 112, 114, 115, 167, 169, 188, 215, 228, 307, 309, 311, 316, 317, 319, 320, 354, 355, 356, 357, 364, 368, 370, 384, 397,...
+=> [1, 2, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 24, 25, 26, 27, 28, 31, 32, 33, 34, 35, 38, 40, 41, 42, 46, 47, 48, 50, 51, 52, 112, 114, 115, 173, 175, 193, 219, 235, 301, 312, 313, 315, 326, 328, 340, 363, 364, 365, 366, 373, 376, 378, 381, 395,...
 
 LinuxStat::Process.types
 => {1=>:sleeping, 2=>:sleeping, 3=>:idle, 4=>:idle, 6=>:idle, 9=>:idle, 10=>:sleeping, 11=>:sleeping, 12=>:idle, 13=>:sleeping, 14=>:sleeping, 15=>:sleeping, 16=>:sleeping, 17=>:sleeping, 18=>:sleeping, 19=>:sleeping, 20=>:sleeping, 21=>:sleeping, 23=>:i...
@@ -288,37 +288,37 @@ LinuxStat::Process.zombie
 ### LinuxStat::ProcessInfo
 ```
 LinuxStat::ProcessInfo.cmdline
-=> "ruby exe/linuxstat.rb -md"
+=> "/usr/bin/ruby /home/sourav/.gem/ruby/2.7.0/bin/linuxstat.rb --html -md"
 
 LinuxStat::ProcessInfo.command_name
 => "ruby"
 
 LinuxStat::ProcessInfo.cpu_stat
-=> {:cpu_usage=>0.0, :threads=>1, :last_executed_cpu=>2}
+=> {:cpu_usage=>0.0, :threads=>1, :last_executed_cpu=>3}
 
 LinuxStat::ProcessInfo.cpu_usage
 => 0.0
 
 LinuxStat::ProcessInfo.last_executed_cpu
-=> 2
+=> 3
 
 LinuxStat::ProcessInfo.mem_stat
-=> {:memory=>9644, :virtual_memory=>79568, :resident_memory=>15764}
+=> {:memory=>11748, :virtual_memory=>81680, :resident_memory=>17928}
 
 LinuxStat::ProcessInfo.memory
-=> 9644
+=> 11748
 
 LinuxStat::ProcessInfo.resident_memory
-=> 15764
+=> 17928
 
 LinuxStat::ProcessInfo.threads
 => 1
 
 LinuxStat::ProcessInfo.total_io
-=> {:read_bytes=>0, :write_bytes=>0}
+=> {:read_bytes=>3932160, :write_bytes=>0}
 
 LinuxStat::ProcessInfo.virtual_memory
-=> 79568
+=> 81680
 
 ```
 
@@ -328,25 +328,25 @@ LinuxStat::Swap.any?
 => true
 
 LinuxStat::Swap.available
-=> 2256212
+=> 3358184
 
 LinuxStat::Swap.list
-=> {"/dev/zram0"=>[:partition, 4194300, 1938088, -2]}
+=> {"/dev/zram0"=>[:partition, 4194300, 836116, -2]}
 
 LinuxStat::Swap.percent_available
-=> 53.79
+=> 80.07
 
 LinuxStat::Swap.percent_used
-=> 46.21
+=> 19.93
 
 LinuxStat::Swap.stat
-=> {:total=>4194300, :used=>1938088, :available=>2256212, :percent_used=>46.21, :percent_available=>53.79}
+=> {:total=>4194300, :used=>836116, :available=>3358184, :percent_used=>19.93, :percent_available=>80.07}
 
 LinuxStat::Swap.total
 => 4194300
 
 LinuxStat::Swap.used
-=> 1938088
+=> 836116
 
 ```
 
@@ -355,6 +355,21 @@ LinuxStat::Swap.used
 LinuxStat::Sysconf.child_max
 => 2000000
 
+LinuxStat::Sysconf.get_euid
+=> 1000
+
+LinuxStat::Sysconf.get_gid
+=> 1000
+
+LinuxStat::Sysconf.get_login
+=> "sourav"
+
+LinuxStat::Sysconf.get_uid
+=> 1000
+
+LinuxStat::Sysconf.get_user
+=> "sourav"
+
 LinuxStat::Sysconf.hostname_max
 => 64
 
@@ -362,7 +377,7 @@ LinuxStat::Sysconf.login_name_max
 => 256
 
 LinuxStat::Sysconf.open_max
-=> 8192
+=> 1024
 
 LinuxStat::Sysconf.page_size_max
 => 4096
@@ -564,7 +579,7 @@ irb(main):003:0> t = Time.now ; puts LinuxStat::FS.stat('/') ; Time.now - t
 => 5.0468e-05
 ```
 
-To learn more about them, just run ri and the method name. To see all available methods:
+To learn more about them, just run ri and the method name. To see all available methods.
 
 ## Note 4: User
 Most of the LinuxStat::User supports arguments.

data/lib/linux_stat/user.rb

@@ -17,11 +17,9 @@ module LinuxStat
 			# But if the status isn't available it will return an empty Hash.
 			def ids
 				return {} unless passwd_readable?
-				passwd.reduce({}) { |h, x|
-					splitted = x.split(?:)
-
-					h.merge!(splitted[0].to_sym => {
-						uid: splitted[2].to_i, gid: splitted[3].to_i
+				passwd_splitted.reduce({}) { |h, x|
+					h.merge!(x[0].to_sym => {
+						uid: x[2].to_i, gid: x[3].to_i
 					})
 				}
 			end
@@ -34,9 +32,8 @@ module LinuxStat
 			# But if the status isn't available it will return an empty Hash.
 			def uids
 				return {} unless passwd_readable?
-				passwd.reduce({}) { |h, x|
-					splitted = x.split(?:)
-					h.merge!(splitted[0].to_sym => splitted[2].to_i)
+				passwd_splitted.reduce({}) { |h, x|
+					h.merge!(x[0].to_sym => x[2].to_i)
 				}
 			end
 
@@ -48,9 +45,8 @@ module LinuxStat
 			# But if the status isn't available it will return an empty Hash.
 			def gids
 				return {} unless passwd_readable?
-				passwd.reduce({}) { |h, x|
-					splitted = x.split(?:)
-					h.merge!(splitted[0].to_sym => splitted[3].to_i)
+				passwd_splitted.reduce({}) { |h, x|
+					h.merge!(x[0].to_sym => x[3].to_i)
 				}
 			end
 
@@ -69,11 +65,35 @@ module LinuxStat
 			end
 
 			# Returns the user ID as integer
-			# It directly calls LinuxStat::Sysconf.get_user
+			# It directly calls LinuxStat::Sysconf.get_uid and LinuxStat::Sysconf.get_gid
+			# and then reads /etc/passwd and matches the values with UID and GID.
+			#
+			# It doesn't get affected with the assignment of USER environment variable
+			# If either /etc/passwd is readable or LinuxStat::Sysconf.get_login() is not empty.
 			#
-			# It doesn't get affected with the assignment of USER environment variable.
+			# But if /etc/passwd isn't readable (which is weird), it will fall back to sysconf.h's get_login()
+			# It that's not available, like in docker, falls back to ENV['USER].to_s
+			#
+			# Note that this is not cached or memoized so use this at your own processing expense.
+			# It should return the username under most robust circumstances.
+			# But if nothing is available for some reason, it will return an empty String.
 			def get_user
-				LinuxStat::Sysconf.get_user
+				unless passwd_readable?
+					_l = LinuxStat::Sysconf.get_login().freeze
+					return _l.empty? ? ENV['USER'.freeze].to_s : _l
+				end
+
+				uid, gid = LinuxStat::Sysconf.get_uid, LinuxStat::Sysconf.get_gid
+
+				username = ''
+				passwd.each { |x|
+					splitted = x.split(?:).freeze
+					if splitted[2].to_i == uid && splitted[3].to_i == gid
+						username = splitted[0]
+						break
+					end
+				}
+				username
 			end
 
 			# Returns the user ID as integer
@@ -94,6 +114,17 @@ module LinuxStat
 				LinuxStat::Sysconf.get_euid
 			end
 
+			# Calls LinuxStat::Sysconf.get_login()
+			# The username is returned as a String.
+			# It doesn't get affected by ENV['USER]
+			#
+			# But if the name isn't available (say inside a container), it will return an empty String.
+			# This is meant for speed but not for reliability.
+			# To get more reliable output, you might try LinuxStat::User.get_user()
+			def get_login
+				LinuxStat::Sysconf.get_login
+			end
+
 			# def usernames_by_uid(gid = get_uid)
 			# Where uid is the group id of the user. By default it's the uid of the current user.
 			#
@@ -108,10 +139,9 @@ module LinuxStat
 				return [] unless passwd_readable?
 
 				usernames = []
-				passwd.each do |x|
-					splitted = x.split(?:.freeze)
-					usernames << splitted[0] if splitted[2].to_i == uid
-				end
+				passwd_splitted.each { |x|
+					usernames << x[0] if x[2].to_i == uid
+				}
 				usernames
 			end
 
@@ -243,12 +273,22 @@ module LinuxStat
 				home
 			end
 
+			alias get_current_user get_user
+
 			private
 			def passwd
 				@@passwd_file ||= '/etc/passwd'.freeze
 				IO.readlines(@@passwd_file)
 			end
 
+			# Only use this method where we are sure that the whole array is going to be used.
+			# In cases like find() or a loop with `break` this is a lot of overhead.
+			# In cases like reduce({}) or select, this is not helpful.
+			def passwd_splitted
+				@@passwd_file ||= '/etc/passwd'.freeze
+				IO.readlines(@@passwd_file).map { |x| x.split(?:.freeze) }
+			end
+
 			def passwd_readable?
 				@@passwd_file ||= '/etc/passwd'.freeze
 				@@passwd_readable ||= File.readable?(@@passwd_file)

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "0.5.1"
+	VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies: []
 description: Linux only, efficient linux system utilization reporting and system monitoring
   gem