termclock 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098660e91498baced640456738b0e3d4ec38f00fd386c50f97e4ae24327b8ac1'
-  data.tar.gz: c120438c0609d8a725f58ff32105300f79f531dfebea552726069fe2ceb0f36d
+  metadata.gz: 3fcea2cc01afe31bc00a62ed5438657612e909bb4db2510b56a2371a5fa4ecd1
+  data.tar.gz: 662d05beb745b1e3fc046f6ddfc2b53f3781dd8dc06efd74228321390bdc5d1f
 SHA512:
-  metadata.gz: 42707afa6c2cdd329b0f14d174b94ce74d52dbcf8aeea6423d71d7b7848c398661d5b6f1367d9dc649eda5a561c9dc85cee3414152993adc40c617ebb5a75a0d
-  data.tar.gz: 1ad86795402c131050e1513376d014378efc632cb7c45da2d4e8dafab11fed43e81bb7adb9cf2133a13f3bcfca646bd461fe6fe810207f5614963a66344dc59b
+  metadata.gz: d57447038d164806c56090fd13716100612bc04d946fd5be2cdefc7ee32d683ff06171af1ef33df73541d207b9244c6e47e93a4b674b82b40165b78d2ca114e0
+  data.tar.gz: e9044dd6e002d119c260119ac2e74d2ed770371448eca3100d88f147f7c0246b6f8cdd075736058f72dc843ae5ca78d7d10b64f834c86ba5e56d313b447aac9f

data/lib/termclock/system_info.rb

@@ -1,8 +1,10 @@
 module Termclock
-	FILESYSTEM = if LS::FS.stat('/')[:blocks].to_i == 0
-		?.
+	FILESYSTEM, FILESYSTEM_LABEL = if LS::FS.stat('/')[:blocks].to_i == 0
+		_pwd =  Dir.pwd
+		pwd = _pwd.length > 8 ? _pwd[0..5] + '...' : _pwd
+		[?..freeze, pwd]
 	else
-		?/
+		[?/.freeze, ?/.freeze]
 	end.freeze
 
 	@@cpu_usage = 0
@@ -16,9 +18,7 @@ module Termclock
 			unless @@cpu_usage_t.alive?
 				@@cpu_usage_t = Thread.new {
 					_cpu_usage = LS::CPU.usage(0.25)
-					_cpu_usage_i = _cpu_usage.to_i
-
-					@@cpu_usage = "%0.2f" % _cpu_usage
+					@@cpu_usage = _cpu_usage ? "%0.2f".freeze % _cpu_usage : nil
 				}
 			end
 
@@ -26,14 +26,25 @@ module Termclock
 				@@current_net_usage_t = Thread.new do
 					_m = LS::Net.current_usage(0.25)
 
-					_dl = LS::PrettifyBytes.convert_short_decimal(_m[:received])
-					_ul = LS::PrettifyBytes.convert_short_decimal(_m[:transmitted])
+					_dl = _m[:received]
+					_ul = _m[:transmitted]
+
+					@@current_net_usage = if _dl && _ul
+						dl = LS::PrettifyBytes.convert_short_decimal(_dl)
+						ul = LS::PrettifyBytes.convert_short_decimal(_ul)
 
-					@@current_net_usage = "\u{1F4CA} Curr. DL/UL: #{"%-9s" % _dl} | #{ "%9s" % _ul}"
+						"\u{1F4CA} Curr. DL/UL: #{"%-9s" % dl} | #{ "%9s" % ul}"
+					else
+						EMPTY
+					end
 				end
 			end
 
-			cpu = "\u{1F9E0} CPU: #{"%6s" % @@cpu_usage}% (#{LS::CPU.count_online}/#{LS::CPU.count})"
+			cpu = if @@cpu_usage
+				 "\u{1F9E0} CPU: #{"%6s" % @@cpu_usage}% (#{LS::CPU.count_online}/#{LS::CPU.count})"
+			else
+				EMPTY
+			end
 
 			battery = if LS::Battery.present?
 				stat = LS::Battery.stat
@@ -58,8 +69,17 @@ module Termclock
 			_m = LS::Net.total_bytes
 			ip = "\u{1F30F} IP Addr: #{LS::Net.ipv4_private}"
 
-			net_usage = "\u{1F4C8} Totl. DL/UL: #{"%-9s" % LS::PrettifyBytes.convert_short_decimal(_m[:received])}"\
-			" | #{"%9s" % LS::PrettifyBytes.convert_short_decimal(_m[:transmitted])}"
+			_received = _m[:received]
+			_transmitted = _m[:transmitted]
+
+			tot_received = _received ? "\u{1F4C8} Totl. DL/UL: #{'%-9s'.freeze % LS::PrettifyBytes.convert_short_decimal(_m[:received])}" : nil
+			tot_transmitted = _transmitted ? " | #{'%9s'.freeze % LS::PrettifyBytes.convert_short_decimal(_transmitted)}" : nil
+
+			net_usage = if tot_received && tot_transmitted
+				tot_received + tot_transmitted
+			else
+				EMPTY
+			end
 
 			_m = LS::Memory.stat
 			_m.default = 0
@@ -78,7 +98,7 @@ module Termclock
 			_m = LS::Filesystem.stat(FILESYSTEM)
 			_m.default = 0
 
-			fs = "\u{1F4BD} FS: #{LS::PrettifyBytes.convert_short_decimal(_m[:used])}"\
+			fs = "\u{1F4BD} FS (#{FILESYSTEM_LABEL}): #{LS::PrettifyBytes.convert_short_decimal(_m[:used])}"\
 			" / #{LS::PrettifyBytes.convert_short_decimal(_m[:total])}"\
 			" (#{"%.2f" % _m[:used].*(100).fdiv(_m[:total]).round(2)}%)"
 
@@ -101,7 +121,20 @@ module Termclock
 
 			@@os ||= "\u{1F427} Distrib: #{LS::OS.distribution} #{LS::OS.machine}#{@@os_v}"
 
-			_uptime = LS::OS.uptime
+			_temp_uptime = LS::OS.uptime
+
+			_uptime = unless _temp_uptime.empty?
+				_temp_uptime
+			else
+				_u = LS::OS.uptime_i
+				{
+					hour: _u / 3600,
+					minute: _u % 3600 / 60,
+					second: _u % 3600 % 60,
+					jiffy: 0
+				}
+			end
+
 			_second = _uptime[:second]
 			_second_i = _second.to_i
 

data/lib/termclock/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Termclock
-	VERSION = "0.5.3"
+	VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
 description: A clock for Linux VTE
 email:
 - souravgoswami@protonmail.com
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.13
 signing_key:
 specification_version: 4
 summary: A clock for Linux VTE