linux_stat 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98045c378f59845c66b01f0e311faed27a4def546bea99354bfd04a4883a5d38
-  data.tar.gz: fe4413395bca5cae357413deba7bd3f1316c845d4652289688fe8c15ee38cc13
+  metadata.gz: 05ad75bfd711c7ac7960645e2609416e868f2b425cbac94b503198db8b011aa4
+  data.tar.gz: f6291a5aaa6903839d7915c8e8494d88cf165dd6e82143ff0fc71dcea19628d8
 SHA512:
-  metadata.gz: fef16c595ecac5b2c5ad86851cd6dd8fe27211e7905f315c68ce5cb451e3ee75bf0feff1913ae9b1b66e1fdc4a935d456b4f62b758ee19f592e378c8aa2f78d1
-  data.tar.gz: 84cc82dbd7fe6a080f1ddd1b5c7ea4aa613ea58816893ae681187e859676c111d0cdb988fb26a8f15fd607cd37ec951f30c0492ed722e0b46bfa56449ff69eb8
+  metadata.gz: f4406f12e2035652f26f9eb518bb4386e644622938d506880cc3f2899937e060b594d6067a8b4a4b66c85db24f068b13a70e59cbac4f9770cc937569e506da26
+  data.tar.gz: b0bbb6cd4570228bafaa2fe89d2bc6a75e67803334e907bcf6e3c3a3fb70f1333ac98da133484b37d8fe279d991ffd18cad617fa931f77c9c7150798cc2d580a

data/README.md

@@ -103,7 +103,7 @@ LinuxStat::CPU.count
 => 4
 
 LinuxStat::CPU.cur_freq
-=> [1863999, 1934584, 1996927, 1978102]
+=> [2000063, 2000108, 2000332, 2000028]
 
 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=>20.0, 1=>50.0, 2=>0.0, 3=>0.0, 4=>0.0}
+=> {0=>0.0, 1=>0.0, 2=>0.0, 3=>0.0, 4=>0.0}
 
 LinuxStat::CPU.total_usage
 => 0.0
 
 LinuxStat::CPU.usage
-=> 25.0
+=> 20.0
 
 LinuxStat::CPU.usages
-=> {0=>0.0, 1=>0.0, 2=>0.0, 3=>0.0, 4=>0.0}
+=> {0=>20.0, 1=>0.0, 2=>0.0, 3=>50.0, 4=>100.0}
 
 ```
 
 ### LinuxStat::Filesystem
 ```
 LinuxStat::Filesystem.available
-=> 34612666368
+=> 33120964608
 
 LinuxStat::Filesystem.free
-=> 34612666368
+=> 33120964608
 
 LinuxStat::Filesystem.stat
-=> {:total=>119981191168, :free=>34612666368, :used=>85368524800}
+=> {:total=>119981191168, :free=>33120964608, :used=>86860226560}
 
 LinuxStat::Filesystem.stat_raw
-=> {:block_size=>4096, :fragment_size=>4096, :blocks=>29292283, :block_free=>8450358, :block_avail_unpriv=>8450358, :inodes=>58612160, :free_inodes=>56582049, :filesystem_id=>2050, :mount_flags=>1024, :max_filename_length=>255}
+=> {:block_size=>4096, :fragment_size=>4096, :blocks=>29292283, :block_free=>8086173, :block_avail_unpriv=>8086173, :inodes=>58612160, :free_inodes=>56567338, :filesystem_id=>2050, :mount_flags=>1024, :max_filename_length=>255}
 
 LinuxStat::Filesystem.total
 => 119981191168
 
 LinuxStat::Filesystem.used
-=> 85368524800
+=> 86860226560
 
 ```
 
@@ -184,35 +184,35 @@ LinuxStat::Kernel.version
 ### LinuxStat::Memory
 ```
 LinuxStat::Memory.available
-=> 185060
+=> 579264
 
 LinuxStat::Memory.percent_available
-=> 4.82
+=> 15.1
 
 LinuxStat::Memory.percent_used
-=> 95.18
+=> 84.9
 
 LinuxStat::Memory.stat
-=> {:total=>3836228, :used=>3651168, :available=>185060, :percent_used=>95.18, :percent_available=>4.82}
+=> {:total=>3836236, :used=>3256972, :available=>579264, :percent_used=>84.9, :percent_available=>15.1}
 
 LinuxStat::Memory.total
-=> 3836228
+=> 3836236
 
 LinuxStat::Memory.used
-=> 3651168
+=> 3256972
 
 ```
 
 ### LinuxStat::Mounts
 ```
 LinuxStat::Mounts.device_stat
-=> {:mountpoint=>"/", :total=>119981191168, :free=>34098106368, :available=>34098106368, :used=>85883084800, :percent_used=>71.58, :percent_free=>28.42, :percent_available=>28.42}
+=> {:mountpoint=>"/", :total=>119981191168, :free=>33120964608, :available=>33120964608, :used=>86860226560, :percent_used=>72.39, :percent_free=>27.61, :percent_available=>27.61}
 
 LinuxStat::Mounts.devices_stat
 => {"proc"=>{:mountpoint=>"/proc", :total=>0, :free=>0, :available=>0, :used=>0, :percent_used=>NaN, :percent_free=>NaN, :percent_available=>NaN}, "sys"=>{:mountpoint=>"/sys", :total=>0, :free=>0, :available=>0, :used=>0, :percent_used=>NaN, :percent_fre...
 
 LinuxStat::Mounts.list
-=> ["proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0", "sys /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0", "dev /dev devtmpfs rw,nosuid,relatime,size=1892904k,nr_inodes=473226,mode=755 0 0", "run /run tmpfs rw,nosuid,nodev,relatime,mode=755 0 0", "...
+=> ["proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0", "sys /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0", "dev /dev devtmpfs rw,nosuid,relatime,size=1892908k,nr_inodes=473227,mode=755 0 0", "run /run tmpfs rw,nosuid,nodev,relatime,mode=755 0 0", "...
 
 LinuxStat::Mounts.list_devices
 => ["proc", "sys", "dev", "run", "/dev/sda2", "securityfs", "tmpfs", "devpts", "tmpfs", "cgroup2", "cgroup", "pstore", "none", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "cgroup", "systemd-1", "deb...
@@ -239,9 +239,24 @@ LinuxStat::Mounts.tmpfs
 
 ### LinuxStat::Net
 ```
+LinuxStat::Net.current_usage
+=> {:received=>2183400.0, :transmitted=>114860.0}
+
 LinuxStat::Net.ipv4_private
 => "192.168.0.102"
 
+LinuxStat::Net.total_bytes
+=> {:received=>294316415, :transmitted=>45313147}
+
+LinuxStat::Net.total_bytes_received
+=> 294317913
+
+LinuxStat::Net.total_bytes_transmitted
+=> 45313147
+
+LinuxStat::Net.usage
+=> {:received=>1643690.0, :transmitted=>146030.0}
+
 ```
 
 ### LinuxStat::OS
@@ -268,29 +283,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=>21, :second=>17.73}
+=> {:hour=>7, :minute=>44, :second=>29.92}
 
 ```
 
 ### LinuxStat::Process
 ```
 LinuxStat::Process.count
-=> 214
+=> 205
 
 LinuxStat::Process.idle
-=> [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, 178, 180, 183, 184, 188, 192, 193, 194, 195, 196, 197, 199, 241, 287, 337, 341, 349, 3799, 3800, 3801, 3802, 3803, 3804, 17865, 2...
+=> [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, 166, 168, 172, 174, 176, 178, 182, 183, 184, 185, 186, 188, 230, 271, 324, 328, 337, 14228, 14757, 14998, 14999, 15000, 15001, 15...
 
 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, 119, 121, 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, 111, 114, 115, 117, 118, 120, 122, 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...
+=> {1=>"systemd", 2=>"kthreadd", 3=>"rcu_gp", 4=>"rcu_par_gp", 6=>"kworker/0:0H", 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_inject/...
 
 LinuxStat::Process.running
-=> [24893]
+=> [21158]
 
 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, 177, 179, 198, 228, 246, 310, 316, 323, 324, 325, 336, 338, 370, 371, 372, 373, 380, 384, 388, 399, 410,...
+=> [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, 111, 114, 115, 165, 167, 189, 217, 231, 302, 307, 308, 309, 310, 320, 321, 322, 323, 325, 326, 350, 353, 356, 374, 394,...
 
 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...
@@ -309,7 +324,7 @@ 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=>1}
 
 LinuxStat::ProcessInfo.cpu_usage
 => 0.0
@@ -318,19 +333,19 @@ LinuxStat::ProcessInfo.gid
 => {:real=>1000, :effective=>1000, :saved_set=>1000, :filesystem_uid=>1000}
 
 LinuxStat::ProcessInfo.last_executed_cpu
-=> 2
+=> 1
 
 LinuxStat::ProcessInfo.mem_stat
-=> {:memory=>9752, :virtual_memory=>79824, :resident_memory=>15564}
+=> {:memory=>10051.584, :virtual_memory=>81801.216, :resident_memory=>15986.688}
 
 LinuxStat::ProcessInfo.memory
-=> 9752
+=> 10051.584
 
 LinuxStat::ProcessInfo.owner
 => "sourav"
 
 LinuxStat::ProcessInfo.resident_memory
-=> 15564
+=> 15986.688
 
 LinuxStat::ProcessInfo.threads
 => 1
@@ -342,7 +357,7 @@ LinuxStat::ProcessInfo.uid
 => {:real=>1000, :effective=>1000, :saved_set=>1000, :filesystem_uid=>1000}
 
 LinuxStat::ProcessInfo.virtual_memory
-=> 79824
+=> 81801.216
 
 ```
 
@@ -352,25 +367,25 @@ LinuxStat::Swap.any?
 => true
 
 LinuxStat::Swap.available
-=> 1929788
+=> 3383720
 
 LinuxStat::Swap.list
-=> {"/dev/zram0"=>[:partition, 4194300, 2264512, -2]}
+=> {"/dev/zram0"=>[:partition, 4194300, 810580, -2]}
 
 LinuxStat::Swap.percent_available
-=> 46.01
+=> 80.67
 
 LinuxStat::Swap.percent_used
-=> 53.99
+=> 19.33
 
 LinuxStat::Swap.stat
-=> {:total=>4194300, :used=>2264512, :available=>1929788, :percent_used=>53.99, :percent_available=>46.01}
+=> {:total=>4194300, :used=>810580, :available=>3383720, :percent_used=>19.33, :percent_available=>80.67}
 
 LinuxStat::Swap.total
 => 4194300
 
 LinuxStat::Swap.used
-=> 2264512
+=> 810580
 
 ```
 
@@ -403,7 +418,7 @@ LinuxStat::Sysconf.login_name_max
 LinuxStat::Sysconf.open_max
 => 1024
 
-LinuxStat::Sysconf.page_size_max
+LinuxStat::Sysconf.pagesize
 => 4096
 
 LinuxStat::Sysconf.posix_version
@@ -521,7 +536,7 @@ $ irb
 irb(main):001:0> require 'linux_stat'
 => true
 
-irb(main):002:0> LinuxStat::Mounts.list.find { |x| x.include?('/run/media/sourav') }.split[1]
+irb(main):002:0> LinuxStat::Mounts.mount_point('/dev/sdb1')
 => "/run/media/sourav/5c2b7af7-d4c3-4ab4-a035-06d18ffc8e6f"
 
 irb(main):003:0> thumbdrive = _

data/exe/linuxstat.rb

@@ -2,7 +2,7 @@
 $-v = true
 
 begin
-	require 'linux_stat'
+	require 'linux_stat' unless defined?(LinuxStat)
 rescue LoadError
 	abort "The Gem needs to be installed before this test can be run!"
 end

data/lib/linux_stat.rb

@@ -1,8 +1,26 @@
-# Independed and LinuxStat specific unrelated modules
+# ----------------------------------------------------------------------------------------------------- #
+# Don't edit this file unless you know what you are doing.                                               #
+#                                                                                                                                  #
+#  A file can have reverse dependency.                                                                         #
+# For example, linux_stat/utsname is required before                                                    #
+# linux_stat/os, which means utsname can be used by LinuxStat::OS and the files below.  #
+#                                                                                                                                  #
+# Once wrongly edited, you need to go through each method to know what                     #
+# file is required by the module functions. Which can be very time consuming.                 #
+#                                                                                                                                   #
+# If you are writng an independent module, just add them under "Independent" section   #
+# If you are writing a dependent module, just append that to the end of the file.             #
+# If you are writing something that is miscellaneous, just add it to miscellaneous section #
+# ------------------------------------------------------------------------------------------------------ #
+
+# Miscellaneous Modules
+# Independed and LinuxStat's miscellaneous modules
 require "linux_stat/version"
 require 'linux_stat/prettify_bytes'
 
-# Independed and LinuxStat related modules
+# Independed Modules
+# Modules that doesn't have any dependency on its own
+# But might be required by other module functions in "Dependent Modules" section
 require "linux_stat/battery"
 require "linux_stat/bios"
 require "linux_stat/cpu"
@@ -11,6 +29,9 @@ require "linux_stat/net"
 require "linux_stat/process"
 require "linux_stat/swap"
 
+# Dependent Modules
+# Modules that can have reverse dependency
+
 # LinuxStat::Uname dependent modules
 require 'linux_stat/utsname'
 require "linux_stat/os"

data/lib/linux_stat/net.rb

@@ -1,13 +1,119 @@
 module LinuxStat
 	module Net
 		class << self
+			DEV = '/proc/net/dev'.freeze
 			# Returns the local IP address of the system as a String.
 			# If the information isn't available, it will a frozen empty string.
 			def ipv4_private
-				require 'socket'
+				require 'socket' unless defined?(Socket)
 				ip = Socket.ip_address_list.find(&:ipv4_private?)
 				ip ? ip.ip? ? ip.ip_unpack[0].freeze : ''.freeze : ''.freeze
 			end
+
+			# Returns the total bytes received and transmitted as Hash.
+			# For example:
+			#    {:received=>56602867, :transmitted=>6940922}
+			#
+			# But if the status isn't available it will return an empty Hash.
+			def total_bytes
+				return {} unless File.readable?(DEV)
+
+				data = IO.readlines(DEV).drop(2)
+				indices = find_index_of_bytes
+				data.reject! { |x| x.strip.start_with?('lo:') }
+				r, t = data.map { |x| x.split.values_at(*indices).map(&:to_i) }.transpose.map(&:sum)
+
+				{
+					received: r,
+					transmitted: t
+				}
+			end
+
+			# Returns the total bytes received as Integer.
+			#
+			# But if the status isn't available it will return nil.
+			def total_bytes_received
+				return nil unless File.readable?(DEV)
+
+				data = IO.readlines(DEV).drop(2)
+				index = find_index_of_bytes[0]
+				data.reject! { |x| x.strip.start_with?('lo:') }
+				data.map { |x| x.split[index].to_i }.sum
+			end
+
+			# Returns the total bytes transmitted as Integer.
+			#
+			# But if the status isn't available it will return nil.
+			def total_bytes_transmitted
+				return nil unless File.readable?(DEV)
+
+				data = IO.readlines(DEV).drop(2)
+				index = find_index_of_bytes[-1]
+				data.reject! { |x| x.strip.start_with?('lo:') }
+				data.map { |x| x.split[index].to_i }.sum
+			end
+
+			# usage(interval = 0.1)
+			# Where interval is the time between polling in seconds. The default is 0.1 seconds.
+			#
+			# The return type is a Hash, containg the current internet usage (received, transmit) in B/s.
+			#
+			# For example:
+			#    {:received=>436060.0, :transmitted=>50350.0}
+			#
+			# If the system transmits 100 kb in the interval,
+			# this method will return 1000 kb/s. That is, it estimates
+			# the data it will transmit in one second. Thus, a good and reliable interval is 1 second
+			# It will return an empty Hash if the info (/proc/net/dev) isn't available.
+			def usage(interval = 0.1)
+				return {} unless File.readable?(DEV)
+
+				data = IO.readlines(DEV).drop(2)
+				indices = find_index_of_bytes
+				data.reject! { |x| x.strip.start_with?('lo:') }
+				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:') }
+				r2, t2 = data2.map { |x| x.split.values_at(*indices).map(&:to_i) }.transpose.map(&:sum)
+
+				# Measure the difference
+				dr, dt = r2.-(r).fdiv(interval), t2.-(t).fdiv(interval)
+
+				{
+					received: dr,
+					transmitted: dt
+				}
+			end
+
+			alias current_usage usage
+
+			private
+			# Returns the index containing the received and transmitted bytes
+			def find_index_of_bytes
+				@@index_of_bytes ||= nil
+
+				unless @@index_of_bytes
+					data = IO.foreach(DEV)
+
+					r, h = data.next.split, {}
+
+					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')
+					}
+
+					data_0 = data.next.gsub(?|.freeze, ' %'.freeze)
+					@@index_of_bytes = []
+					data_0.split.each_with_index { |x, i| @@index_of_bytes << i if x == '%bytes'.freeze }
+					h[:r] > h[:t] ? @@index_of_bytes.reverse : @@index_of_bytes
+				else
+					@@index_of_bytes
+				end
+			end
 		end
 	end
 end

data/lib/linux_stat/process_info.rb

@@ -86,12 +86,9 @@ module LinuxStat
 			# If the info isn't available it will return an empty Hash.
 			def mem_stat(pid = $$)
 				statm = "/proc/#{pid}/statm".freeze
+				return {} unless File.readable?(statm)
 
-				data = if File.readable?(statm)
-					IO.read(statm).split
-				else
-					return {}
-				end
+				data = IO.read(statm).split
 
 				_rss_anon = (data[1] && data[2]) ? data[1].to_i.-(data[2].to_i).*(pagesize).fdiv(1000) : nil
 				_virtual_memory = data[0] ? data[0].to_i*(pagesize).fdiv(1000) : nil

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "0.6.2"
+	VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Sourav Goswami