linux_stat 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 918383341aa375e1414e08c13b38829373caa174c64769541955180ce9d6e09c
-  data.tar.gz: b821c81eee9bf5c9061057ab653e336adbbeaacf51d9b4141e6a1d72073058b6
+  metadata.gz: a392f3c04781b05bb96636a882b6e69143bef15befb094f980c7b542923e0649
+  data.tar.gz: 4ef67fa10ab4210090790b368852cac7deee99965560b201f136f0cd093e9a87
 SHA512:
-  metadata.gz: 580b5af4a00f4b2078e2d7cf9e249ba9648a5ab5965fe26c15f73c0cb843eeae6470e00d28fb096100f7b5445e47fcdce354c713c3aff4139fcb8a53221d68f0
-  data.tar.gz: 6ebaa17fd1aaf45910a297df8b992e495e3f8c594c2b69181bdd1c9536bb2be40a8ad4fb569f4be076aac1eaf70fc0d86d7930eedde79615db6ffcfcb498dc50
+  metadata.gz: 816e423f9a22797022d87a347dbcde20277d0b1d6fa8cc90001367cbdf2012e625400c2a659bbbd308fcf58363c19f2af88ec39d5bcc1fa04ccd4f61d77371b7
+  data.tar.gz: dfae97ea5bd4ef7c0daa4c784d7d951b915121753d8b61363624aaaa12e9559968e623638004accb8438a77b820913e726856e166bd437f1073047b936a83ba1

data/README.md

@@ -1,5 +1,5 @@
 # LinuxStat
-![logo](https://raw.githubusercontent.com/Souravgoswami/linux_stat/master/logo/logo.jpg)
+![logo](https://raw.githubusercontent.com/Souravgoswami/linux_stat/master/images/logo.jpg)
 
 For reading the HTML version, visit [linux_stat](https://souravgoswami.github.io/linux_stat/).
 
@@ -312,18 +312,23 @@ If some error is *raised* it should be reported as a bug.
 1. Just add `gem linux_stat`:
 
 ```
-bundle add linux_stat
+$ bundle add linux_stat
 ```
 
 You can use LinuxStat directly in rails.
 
-![RailsApp](https://raw.githubusercontent.com/Souravgoswami/linux_stat/master/logo/rails.gif)
+![RailsApp](https://raw.githubusercontent.com/Souravgoswami/linux_stat/master/images/rails.gif)
 
-Don't need to worry about versions if you are using anything > 0.2.1.
 
-Newer versions will have bug fixes, performance improvements and new features but the return types of old methods will always be the same across upgrades > 0.2.1.
+## Android
 
-Even if we remove something, there will be always a deprecation warning for some months or for even a year before we actually remove it.
+LinuxStat does support Android OS. But it's not rigorously tested on all device like android apps.
+
+But in Termux you can just run LinuxStat without facing issues.
+
+![termux](https://raw.githubusercontent.com/Souravgoswami/linux_stat/master/images/termux.webp)
+
+Issues regarding running LinuxStat on termux are also welcomed.
 
 ## Development
 

data/ext/fs_stat/fs_stat.c

@@ -1,5 +1,7 @@
 #include <sys/statvfs.h>
 #include "ruby.h"
+#pragma GCC optimize ("O3")
+#pragma clang optimize on
 
 static VALUE statfs(VALUE obj, VALUE dir) {
 	struct statvfs buf ;
@@ -8,16 +10,16 @@ static VALUE statfs(VALUE obj, VALUE dir) {
 
 	if(statvfs(d, &buf) < 0) return hash ;
 
-	rb_hash_aset(hash, ID2SYM(rb_intern("block_size")), INT2NUM(buf.f_bsize)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("fragment_size")), INT2NUM(buf.f_frsize)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("blocks")), INT2NUM(buf.f_blocks)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("block_free")), INT2NUM(buf.f_bfree)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("block_avail_unpriv")), INT2NUM(buf.f_bavail)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("inodes")), INT2NUM(buf.f_files)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("free_inodes")), INT2NUM(buf.f_ffree)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("filesystem_id")), INT2NUM(buf.f_fsid)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("mount_flags")), INT2NUM(buf.f_flag)) ;
-	rb_hash_aset(hash, ID2SYM(rb_intern("max_filename_length")), INT2NUM(buf.f_namemax)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("block_size")), INT2FIX(buf.f_bsize)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("fragment_size")), INT2FIX(buf.f_frsize)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("blocks")), INT2FIX(buf.f_blocks)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("block_free")), INT2FIX(buf.f_bfree)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("block_avail_unpriv")), INT2FIX(buf.f_bavail)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("inodes")), INT2FIX(buf.f_files)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("free_inodes")), INT2FIX(buf.f_ffree)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("filesystem_id")), INT2FIX(buf.f_fsid)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("mount_flags")), INT2FIX(buf.f_flag)) ;
+	rb_hash_aset(hash, ID2SYM(rb_intern("max_filename_length")), INT2FIX(buf.f_namemax)) ;
 
 	return hash ;
 }

data/ext/utsname/extconf.rb

@@ -0,0 +1,7 @@
+require 'mkmf'
+
+unless (have_header('sys/utsname.h') && have_header('ruby.h'))
+	abort('Missing header')
+end
+
+create_makefile 'linux_stat/utsname'

data/ext/utsname/utsname.c

@@ -0,0 +1,29 @@
+#include <sys/utsname.h>
+#include "ruby.h"
+#pragma GCC optimize ("O3")
+#pragma clang optimize on
+
+static struct utsname buf ;
+static short status ;
+
+void init_buf() {
+	status = uname(&buf) ;
+}
+
+static VALUE getMachine(VALUE obj) {
+	VALUE machine = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.machine) ;
+	return machine ;
+}
+
+static VALUE getNodename(VALUE obj) {
+	VALUE nodename = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.nodename) ;
+	return nodename ;
+}
+
+void Init_utsname() {
+	init_buf() ;
+
+	VALUE _uname = rb_define_module("Uname") ;
+	rb_define_module_function(_uname, "machine", getMachine, 0) ;
+	rb_define_module_function(_uname, "nodename", getNodename, 0) ;
+}

data/lib/linux_stat/filesystem.rb

@@ -1,8 +1,6 @@
-# require 'linux_stat/fs_stat'
-
 module LinuxStat
 	module Filesystem
-		extend FS
+		prepend FS
 
 		class << self
 			# stat(fs = '/')
@@ -29,7 +27,7 @@ module LinuxStat
 				}
 			end
 
-			# stat(fs = '/')
+			# total(fs = '/')
 			# Where fs is the directory of the file system (like / or /tmp/ or /run/media/thumbdrive).
 			# It returns the total size of a given disk in bytes.
 			#
@@ -41,7 +39,7 @@ module LinuxStat
 				s[:block_size] * s[:blocks]
 			end
 
-			# stat(fs = '/')
+			# free(fs = '/')
 			# Where fs is the directory of the file system (like / or /tmp/ or /run/media/thumbdrive).
 			# It returns the total free space in a disk in bytes.
 			# It is to be noted that free is not same as available.
@@ -55,7 +53,7 @@ module LinuxStat
 				s[:block_size] * s[:block_free]
 			end
 
-			# stat(fs = '/')
+			# used(fs = '/')
 			# Where fs is the directory of the file system (like / or /tmp/ or /run/media/thumbdrive).
 			# It returns the used space of a given disk in bytes.
 			#
@@ -67,7 +65,7 @@ module LinuxStat
 				s[:blocks].-(s[:block_free]) * s[:block_size]
 			end
 
-			# stat(fs = '/')
+			# available(fs = '/')
 			# Where fs is the directory of the file system (like / or /tmp/ or /run/media/thumbdrive).
 			# It returns the total free space in a disk in bytes.
 			# It is to be noted that free is not same as available.
@@ -81,7 +79,7 @@ module LinuxStat
 				s[:block_size] * s[:block_avail_unpriv]
 			end
 
-			# stat(fs = '/')
+			# stat_raw(fs = '/')
 			# Where fs is the directory of the file system (like / or /tmp/ or /run/media/thumbdrive).
 			#
 			# It returns a Hash with the following data (for example):

data/lib/linux_stat/kernel.rb

@@ -133,6 +133,8 @@ module LinuxStat
 				end
 			end
 
+			alias release version
+
 			# Reads maximum 1024 bytes from /proc/version and returns the string.
 			# The output is also cached ; as changing the value in runtime is unexpected.
 			def string

data/lib/linux_stat/os.rb

@@ -1,5 +1,7 @@
 module LinuxStat
 	module OS
+		prepend Uname
+
 		class << self
 			# Reads /etc/os-release and returns a Hash. For example:
 			# {: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/", :BUG_REPORT_URL=>"https://bugs.archlinux.org/", :LOGO=>"archlinux"}
@@ -51,6 +53,18 @@ module LinuxStat
 				end
 			end
 
+			# Uses utsname.h to determine the machine
+			# It returns a String but if the info isn't available, it will return an empty String
+			def machine
+				@@machine ||= Uname.machine
+			end
+
+			# Uses utsname.h to determine the system nodename
+			# It returns String but if the info isn't available, it will return an empty String
+			def nodename
+				@@nodename ||= Uname.nodename
+			end
+
 			# Reads /etc/hostname and returns the hostname.
 			# The return type is String.
 			# If the info info isn't available, it will return 'localhost'.
@@ -62,10 +76,13 @@ module LinuxStat
 				end
 			end
 
-			# Reads ruby configuration and tries to guess if the system is 32 bit or 64 bit.
-			# The return type is Integer.
+			# Reads ruby configuration and tries to guess if the system is 64 bit.
+			# If it fails then it runs utsname.h to guess the machine.
+			# It the machine is 64 bits, it will return 64, else it returns 32.
+			#
+			# The return type is strictly Integer and doesn't fail.
 			def bits
-				@@bits ||= if RbConfig::CONFIG['host_cpu'].end_with?('64') || RUBY_PLATFORM[/x86_64/]
+				@@bits ||= if RbConfig::CONFIG['host_cpu'].end_with?('64') || RUBY_PLATFORM.end_with?('64') || machine.end_with?('64')
 					64
 				else
 					32

data/lib/linux_stat/version.rb

@@ -1,3 +1,3 @@
 module LinuxStat
-	VERSION = "0.3.1"
+	VERSION = "0.3.3"
 end

data/lib/linux_stat.rb

@@ -5,9 +5,13 @@ require "linux_stat/cpu"
 require "linux_stat/kernel"
 require "linux_stat/memory"
 require "linux_stat/net"
+
+require 'linux_stat/utsname'
 require "linux_stat/os"
+
 require "linux_stat/process"
 require "linux_stat/swap"
 require "linux_stat/mounts"
+
 require "linux_stat/fs_stat"
 require "linux_stat/filesystem"

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: linux_stat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies: []
 description: Efficient linux system reporting gem. Linux Only | Efficient | Reliable
 email:
 - souravgoswami@protonmail.com
 executables: []
 extensions:
+- ext/utsname/extconf.rb
 - ext/fs_stat/extconf.rb
 extra_rdoc_files:
 - README.md
@@ -25,6 +26,8 @@ files:
 - bin/setup
 - ext/fs_stat/extconf.rb
 - ext/fs_stat/fs_stat.c
+- ext/utsname/extconf.rb
+- ext/utsname/utsname.c
 - lib/linux_stat.rb
 - lib/linux_stat/battery.rb
 - lib/linux_stat/bios.rb