termclock 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e17d6410f4890cf9e070491f01c722e08b3678dca7e0cf4af4edfa3e4a6c020
-  data.tar.gz: a00abd3c09b311a4fa62acd03c5147033a7c758417877db2d132e1b3d5e954b2
+  metadata.gz: 746cefa7bb14ad6ea4c2886b3631047a1d28eaf65a23709f69dd53a1af139929
+  data.tar.gz: 5f71dfabd6b0608b41f7707d89d09521b2d1121d8206f5279d67be242fd49850
 SHA512:
-  metadata.gz: 40822adf435db689057290c054ea2f42a9afff94cd49053aed5d5ddf3b0dcbb168e7ce23fe3e130afbcb43c58f128bd689d1243bca52015ac245b44b05e24440
-  data.tar.gz: 9aa729c8ee4fb0b299da55f666a942ef21cccfc66ff94a5b54969594d8dc80aec38361c9c779cf813a312d89089589fb3e9c8010c31d05181a0435549fcfeac1
+  metadata.gz: ac18271d58739a9061f6c582d031f2bcd8e329259069681e8abb253a14af60307fb3253ff8468509afdc01057e2f802cbe1c32ba7d08a91c5df2ab944b65adc3
+  data.tar.gz: 83e4ebc5a42e09cc880bd11468730266d8807b8aee72a873b04e8acf1867bcc9ae6500e13909ed421a37b6888c6bcaea9e8764ab5b0d6c7f6f0c0e02374af75c

data/exe/termclock

@@ -26,7 +26,14 @@ begin
 	chars = ARGV.find { |x| x[/\A\-(\-character|char)=.*\z/] } &.split(?=) &.at(1)
 	Termclock::ParseCharacters.transform_characters!(chars[0]) if chars
 
-	Termclock.main(*colours)
+	_refresh_time = ARGV.find { |x| x[/\A\-(\-refresh|r)=.*\z/] } &.split(?=) &.at(1)
+	refresh_time = _refresh_time ? _refresh_time.to_f : 0.1
+
+	text_colours = ARGV.find { |x| x[/\A\-(\-text\-colour|tc)=.*\z/] } &.split(?=) &.at(1) &.split(?,)
+
+	abort("Text colours need 2 colours. Example: -tc=55f,3ce3b5") if text_colours && text_colours.length != 2
+
+	Termclock.start(*colours, *text_colours, sleep: refresh_time)
 rescue Interrupt, SignalException
 	print "\e[H\e[2J\e[3J"
 ensure

data/lib/termclock.rb

@@ -1,8 +1,3 @@
-# frozen_string_literal: true
-COLOURTERM = ENV.key?('COLORTERM')
-CLEAR = COLOURTERM ? "\e[H\e[2J\e[3J" : "\e[H"
-$-n, $-s = ?\n, ?\s
-
 require 'linux_stat'
 require 'io/console'
 require_relative "termclock/string"

data/lib/termclock/main.rb

@@ -1,5 +1,8 @@
 module Termclock
-	def self.main(colour1, colour2, colour3, colour4, sleep = 0.1)
+	COLOURTERM = ENV.key?('COLORTERM')
+	CLEAR = COLOURTERM ? "\e[H\e[2J\e[3J" : "\e[H"
+
+	def self.start(colour1, colour2, colour3, colour4, textcolour1 = nil, textcolour2 = nil, sleep: 0.1)
 		newline = ?\n.freeze
 		space = ?\s.freeze
 
@@ -44,8 +47,17 @@ module Termclock
 		colours = [rs1, gs1, bs1].transpose.zip([rs2, gs2, bs2].transpose)
 		colours.unshift(colours[0])
 		colours.push(colours[-1])
+
+		# Text colours
+		tc1 = textcolour1 ? hex2rgb(textcolour1) : hex2rgb('5555ff')
+		tc2 = textcolour2 ? hex2rgb(textcolour2) : hex2rgb('3ce3b5')
+
 		cpu_usage = 0
 		cpu_usage_t = Thread.new { }
+
+		current_net_usage = ''
+		current_net_usage_t = Thread.new { }
+
 		message_time = Time.now.to_i - 5
 		message = ''
 		message_temp = ''
@@ -69,7 +81,6 @@ module Termclock
 		}
 
 		i = -1
-
 		while true
 			i += 1
 			time_now = Time.now
@@ -99,34 +110,50 @@ module Termclock
 			end
 
 			time = time_now.strftime("%H %M %S %2N").split.join(splitter)
-			art = Termclock::ParseCharacters.display(time)
+			art = Termclock::ParseCharacters.display(time).lines
 
-			art_aligned = art.lines.each_with_index do |x, i|
+			art_aligned = art.each_with_index do |x, i|
 				chomped = x.chomp(''.freeze).+(newline)
 				gr = chomped.gradient(*colours[i])
 				x.replace(space.*(width./(2.0).-(chomped.length / 2.0).abs.to_i + 1) + gr)
 			end.join
 
-			horizontal_gap = "\e[#{height./(2.0).-(art.lines.length / 2.0).to_i + 1}H"
+			vertical_gap = "\e[#{height./(2.0).-(art.length / 2.0).to_i + 1}H"
 
 			unless cpu_usage_t.alive?
 				cpu_usage_t = Thread.new { cpu_usage = LS::CPU.usage(0.25) }
 			end
 
-			cpu = "\u{1F9E0} CPU: #{cpu_usage}% (#{LS::CPU.count_online} / #{LS::CPU.count})"
+			unless current_net_usage_t.alive?
+				current_net_usage_t = Thread.new do
+					_m = LS::Net.current_usage(0.25)
+
+					_dl = LS::PrettifyBytes.convert_short_binary(_m[:received], precision: 0)
+					_ul = LS::PrettifyBytes.convert_short_binary(_m[:transmitted], precision: 0)
+
+					current_net_usage = "\u{1F4CA} Curr. DL/UL: #{sprintf "%-7s", _dl} | #{sprintf "%7s", _ul}"
+				end
+			end
+
+			cpu = "\u{1F9E0} CPU: #{sprintf "%5s", cpu_usage}% (#{LS::CPU.count_online} / #{LS::CPU.count})"
 
 			battery = if LS::Battery.present?
 				stat = LS::Battery.stat
 				emoji = LS::Battery.charging? ? "\u{1F4A1}" : "\u{1F50B}"
-				"#{emoji} Battery: #{stat[:charge].to_i}% (#{stat[:status]})"
+				plug = LS::Battery.charging? ? "\u{1F50C} " : ''.freeze
+				"#{emoji} Battery: #{stat[:charge].to_i}% (#{plug}#{stat[:status]})"
 			else
 				''.freeze
 			end
 
+			user = "\u{1F481} User: #{LS::User.get_current_user.capitalize}"
+			hostname = "\u{1F4BB} Hostname: #{LS::OS.hostname}"
+
 			_m = LS::Net.total_bytes
-			ip = "\u{1F30F} IP: #{LS::Net.ipv4_private}"
-			net_usage = "\u{1F4C8} D/L | U/L: #{LS::PrettifyBytes.convert_short_binary(_m[:received].to_i)}"\
-			" | #{LS::PrettifyBytes.convert_short_binary(_m[:transmitted].to_i)}"
+			ip = "\u{1F30F} IP Addr: #{LS::Net.ipv4_private}"
+
+			net_usage = "\u{1F4C8} Totl. DL/UL: #{sprintf "%-7s", LS::PrettifyBytes.convert_short_binary(_m[:received], precision: 0)}"\
+			" | #{sprintf "%7s", LS::PrettifyBytes.convert_short_binary(_m[:transmitted], precision: 0)}"
 
 			_m = LS::Memory.stat
 			memory = "\u{1F3B0} Mem: #{LS::PrettifyBytes.convert_short_binary(_m[:used].to_i * 1024)}"\
@@ -144,18 +171,19 @@ module Termclock
 			" (#{_m[:used].to_i*(100).fdiv(_m[:total].to_i).round(2)}%)"
 
 			process = "\u{1F9EE} Process: #{LS::Process.count}"
+			message_final = message.rjust(message_align).+(_caret).gradient(tc1, tc2, exclude_spaces: true)
 
-			max_l = [process, ip, battery, net_usage].map(&:length).max
+			max_l = [hostname, process, ip, battery, current_net_usage, net_usage].map(&:length).max + 4
 
-			info = <<~EOF.gradient(*colours[2], exclude_spaces: true)
-				\s#{cpu}#{?\s.*(width.-(cpu.length + max_l + 4).abs)}#{battery}
-				\s#{memory}#{?\s.*(width.-(memory.length + max_l + 4).abs)}#{ip}
-				\s#{swap}#{?\s.*(width.-(swap.length + max_l + 4).abs)}#{net_usage}
-				\s#{fs}#{?\s.*(width.-(fs.length + max_l + 4).abs)}#{process}
+			info = <<~EOF.gradient(tc1, tc2, exclude_spaces: true)
+				\s#{user}#{?\s.*(width.-(user.length + max_l).abs)}#{hostname}
+				\s#{cpu}#{?\s.*(width.-(cpu.length + max_l).abs)}#{battery}
+				\s#{memory}#{?\s.*(width.-(memory.length + max_l).abs)}#{ip}
+				\s#{swap}#{?\s.*(width.-(swap.length + max_l).abs)}#{current_net_usage}
+				\s#{fs}#{?\s.*(width.-(fs.length + max_l).abs)}#{net_usage}
 			EOF
 
-			print "#{CLEAR}#{info}#{horizontal_gap}#{art_aligned}\n"\
-			"#{message.rjust(message_align).+(_caret).gradient(*colours[1], exclude_spaces: true)}"
+			print "#{CLEAR}#{info}#{vertical_gap}#{art_aligned}\n#{message_final}"
 
 			if gc_compact && time_now.to_i > gc_compacted
 				GC.compact

data/lib/termclock/parse_characters.rb

@@ -73,11 +73,11 @@ module Termclock
 		```````
 
 		# :
-		⬩⬩
-		⬩⬩
+		\u2B29\u2B29
+		\u2B29\u2B29
 
-		⬩⬩
-		⬩⬩
+		\u2B29\u2B29
+		\u2B29\u2B29
 
 		# $
 		\s\s
@@ -290,17 +290,17 @@ module Termclock
 			end
 
 			def display(c)
-				j = ['', '']
+				j = []
 
-				c.upcase.chars.map! { |x|
-					@@characters.fetch(x, x).split(?\n.freeze)
+				c.upcase.each_char { |x|
+					@@characters.fetch(x, x).split(NEWLINE)
 					.each_with_index { |z, i|
 						_j = j[i]
 						_j && _j << z || j[i] = z
 					}
 				}
 
-				j.join(?\n.freeze)
+				j.join(NEWLINE)
 			end
 		end
 	end

data/lib/termclock/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 description: A clock for Linux VTE
 email:
 - souravgoswami@protonmail.com