termclock 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97954b7ee94050e29c1d43619a147275d89a731d8e317e84af0afa59e6958961
-  data.tar.gz: f5b29cef16329eb7db1442a0073b32cdaef8563fa21abc9dca4d36de28925441
+  metadata.gz: 3fcea2cc01afe31bc00a62ed5438657612e909bb4db2510b56a2371a5fa4ecd1
+  data.tar.gz: 662d05beb745b1e3fc046f6ddfc2b53f3781dd8dc06efd74228321390bdc5d1f
 SHA512:
-  metadata.gz: e707c28bb571a7f6fe4655d0b9f24217361b64ff2489ee0f23d1475ecda543d85186bd6b8b476ae7247d088428baa2f424b4d0fafa507d1057bced4f626e708d
-  data.tar.gz: bdb1086fbb90979c98084f0fdcd8c4a0cbdf4ff689dd623d39c61079166a29525e2c07881b080838c3b0535a1c98c8db966f987253a6e9e14837f0700120c274
+  metadata.gz: d57447038d164806c56090fd13716100612bc04d946fd5be2cdefc7ee32d683ff06171af1ef33df73541d207b9244c6e47e93a4b674b82b40165b78d2ca114e0
+  data.tar.gz: e9044dd6e002d119c260119ac2e74d2ed770371448eca3100d88f147f7c0246b6f8cdd075736058f72dc843ae5ca78d7d10b64f834c86ba5e56d313b447aac9f

data/exe/termclock

@@ -14,11 +14,12 @@ def version(logo_colour)
 		_v[vl_2..-1].gradient(logo_colour[1], logo_colour[2], underline: true, bold: true)
 end
 
-logo_colour = [
-	%w(ff0  f55 55f),
-	%w(fa0  f5a 55f),
-	%w(3eb  55f 55f),
-].sample.map(&Termclock.method(:hex2rgb))
+unless STDOUT.tty?
+	IO.undef_method(:winsize)
+	IO.define_method(:winsize) { [100, 100] }
+end
+
+LOGO_COLOUR = %w(ff0  f55 55f).map(&Termclock.method(:hex2rgb))
 
 if ARGV.any? { |x| x[/\A\-(\-help|h)\z/] }
 	puts <<~EOF
@@ -36,36 +37,42 @@ if ARGV.any? { |x| x[/\A\-(\-help|h)\z/] }
 			--character=|char=\t\tDraws specified character
 			--clean\t\t\t\tJust run the clean bare clock
 			--colour=|-c=\t\t\tSpecify hex colour (4 colours)
-			\t\t\t\t[ with or without # ]
-			--text-colour|-tc\t\tSpecify text colour (2 colours)
-			\t\t\t\t[ with or without # ]
+			--text-colour=|-tc=\t\tSpecify text colour (2 colours)
+
+			\u2B22 \e[3mColours has to be hex, 3 or 6 characters with or
+			without the leading # in front\e[0m
 
 		\e[1m3. Information:\e[0m
 			--no-date|-nd\t\t\tShows no date
 			--no-message|-nm\t\tShows no messages
 			--no-sysinfo|-ni\t\tShows no system info
-			--refresh|r\t\t\tSpecify delay or refresh time
+			--refresh=|r=\t\t\tSpecify delay or refresh time
 			--no-logo|-nl\t\t\tDon't show the logo at the bottom
 
-		\e[1m4. Formats:\e[0m
+		\e[1m4. Antiflicker:\e[0m
+			--antiflicker|-af\t\tDon't flicker terminal
+
+			\u2B22 \e[3mIf refresh time is low or terminal is slow, use this option\e[0m
+
+		\e[1m5. Formats:\e[0m
 			--date-format=|-df=\t\tSpecify the date format
 			--time-format=|-tf=\t\tSpecify the time format
 
 			Usually the format looks like this:
 			%H:%M:%S:%2N or %d %B, %Y
 
-			\e[3mRun `date --help` to know more formats\e[0m
+			\u2B22 \e[3mRun `date --help` to know more formats\e[0m
 
 		Supported characters are 0 - 9, a - z, /, \\, !, %, and |.
 
-		#{version(logo_colour)}
+		#{version(LOGO_COLOUR)}
 	EOF
 
 	exit 0
 end
 
 if ARGV.any? { |x| x[/\A\-(-version|v)\z/] }
-	puts version(logo_colour)
+	puts version(LOGO_COLOUR)
 	exit 0
 end
 
@@ -106,6 +113,7 @@ begin
 
 	bold = ARGV.any? { |x| x[/\A\-(\-bold|b)\z/] }
 	italic = ARGV.any? { |x| x[/\A\-(\-italic|i)\z/] }
+	anti_flicker = ARGV.any? { |x| x[/\A\-(\-antiflicker|af)\z/] }
 
 	no_print_info = ARGV.any? { |x| x[/\A\-(\-no\-sysinfo|ni)\z/] }
 	no_logo = ARGV.any? { |x| x[/\A\-(\-no\-logo|nl)\z/] }
@@ -137,10 +145,13 @@ begin
 		no_logo: no_logo,
 		time_format: time_format,
 		date_format: date_format,
-		logo_colour: logo_colour
+		logo_colour: LOGO_COLOUR,
+		anti_flicker: anti_flicker
 	)
 rescue Interrupt, SignalException
 	print "\e[H\e[2J\e[3J"
+# rescue Errno::ENOTTY
+	# abort "This should be run on a TTY! Also please don't pipe or redirect the output!"
 ensure
 	print "\e[?25h"
 end

data/lib/termclock.rb

@@ -3,7 +3,9 @@ require 'io/console'
 require_relative "termclock/version"
 
 module Termclock
+	GC_COMPACT_TIME = 7200
 	CLEAR = "\e[H\e[2J\e[3J".freeze
+	ANTIFLICKER = "\e[J\e[1;1H".freeze
 	NEWLINE = ?\n.freeze
 	SPACE = ?\s.freeze
 	TAB = ?\t.freeze

data/lib/termclock/start.rb

@@ -9,9 +9,12 @@ module Termclock
 		time_format: "%H %M %S %2N",
 		date_format: '%a, %d %B %Y',
 		no_logo: false,
+		anti_flicker: false,
 		logo_colour: [Termclock.hex2rgb('ff0'), Termclock.hex2rgb('f55'), Termclock.hex2rgb('55f')]
 		)
 
+		clear_character = anti_flicker ? ANTIFLICKER : CLEAR
+
 		generate = proc do |start, stop, n = 5|
 			r_op = r_val = nil
 			ary = []
@@ -31,8 +34,7 @@ module Termclock
 			ary
 		end
 
-		gc_compact, gc_compacted = GC.respond_to?(:compact), Time.now.to_i + 7200
-		print CLEAR
+		gc_compact, gc_compacted = GC.respond_to?(:compact), Time.now.to_i + GC_COMPACT_TIME
 
 		r1, g1, b1 = *colour1
 		r2, g2, b2 = *colour2
@@ -58,19 +60,11 @@ module Termclock
 		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_counter = -1
 		message = ''
 		message_final = ''
 		message_align = 0
 		message_temp = ''
-		point_five_tick = 0
 
 		date, info = '', ''
 
@@ -114,22 +108,25 @@ module Termclock
 		chop_message = 0
 		deviation = 0
 
+		time_seperators = [?:, ?$]
+		time_seperator = time_seperators[0]
+		point_five_tick = -0.5
+
+		height, width = *STDOUT.winsize
+		height2, width2 = *STDOUT.winsize
+
+		print CLEAR
+
 		while true
 			monotonic_time_1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 			time_now = Time.now
 			height, width = *STDOUT.winsize
 
-			if time_now.to_f./(0.5).to_i.even?
-				unless point_five_tick == 1
-					point_five_tick = 1
-					splitter = ?:.freeze
-					clock_emoji.rotate!
-				end
-			else
-				unless point_five_tick == 0
-					point_five_tick = 0
-					splitter = ?$.freeze
-				end
+			if time_now.to_f > point_five_tick
+				point_five_tick = time_now.to_f + 0.5
+				time_seperators.rotate!
+				clock_emoji.rotate!
+				time_seperator = time_seperators[0]
 			end
 
 			unless no_logo
@@ -167,18 +164,14 @@ module Termclock
 				)
 			end
 
-			if print_info
-				info = system_info(width).gradient(
-					tc1, tc2, bold: bold, italic: italic
-				)
-			end
+			info = system_info(width, tc1, tc2, bold, italic) if print_info
 
 			if print_date
 				date = time_now.strftime(date_format).center(width)
 					.gradient(tc1, tc2, bold: bold, italic: italic, exclude_spaces: true)
 			end
 
-			time = time_now.strftime(time_format).split.join(splitter)
+			time = time_now.strftime(time_format).split.join(time_seperator)
 			art = Termclock::ParseCharacters.display(time).lines
 
 			art_aligned = art.each_with_index do |x, i|
@@ -192,21 +185,27 @@ module Termclock
 			end.join
 
 			vertical_gap = "\e[#{height./(2.0).-(art.length / 2.0).to_i + 1}H"
+			final_output = "#{info}#{vertical_gap}#{art_aligned}\n#{date}\n\n\e[K#{message_final}#{term_clock_v}"
+
+			if anti_flicker && (height != height2 || width != width2)
+				height2, width2 = *STDOUT.winsize
+				print CLEAR
+			end
 
-			print "#{CLEAR}#{info}#{vertical_gap}#{art_aligned}\n#{date}\n\n#{message_final}#{term_clock_v}"
+			print "#{clear_character}#{final_output}"
 
 			if gc_compact && time_now.to_i > gc_compacted
 				GC.compact
-				gc_compacted = time_now.to_i + 7200
+				gc_compacted = time_now.to_i + GC_COMPACT_TIME
 			end
 
 			monotonic_time_2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 			time_diff = monotonic_time_2 - monotonic_time_1
-			sleep_time = refresh.-(time_diff + EPSILON + deviation)
+			sleep_time = refresh.-(time_diff + deviation)
 			sleep_time = 0 if sleep_time < 0
 
-			deviation = Process.clock_gettime(Process::CLOCK_MONOTONIC) - monotonic_time_2
 			sleep(sleep_time)
+			deviation = Process.clock_gettime(Process::CLOCK_MONOTONIC).-(monotonic_time_2 + sleep_time + EPSILON)
 		end
 	end
 end

data/lib/termclock/system_info.rb

@@ -1,4 +1,12 @@
 module Termclock
+	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
 	@@cpu_usage_t = Thread.new { }.join
 
@@ -6,13 +14,11 @@ module Termclock
 	@@current_net_usage_t = Thread.new { }.join
 
 	class << self
-		def system_info(width)
+		def system_info(width, tc1, tc2, bold, italic)
 			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
 
@@ -20,24 +26,39 @@ module Termclock
 				@@current_net_usage_t = Thread.new do
 					_m = LS::Net.current_usage(0.25)
 
-					_dl = LS::PrettifyBytes.convert_short_decimal(_m[:received], precision: 1)
-					_ul = LS::PrettifyBytes.convert_short_decimal(_m[:transmitted], precision: 1)
+					_dl = _m[:received]
+					_ul = _m[:transmitted]
 
-					@@current_net_usage = "\u{1F4CA} Curr. DL/UL: #{sprintf "%-8s", _dl} | #{sprintf "%8s", _ul}"
+					@@current_net_usage = if _dl && _ul
+						dl = LS::PrettifyBytes.convert_short_decimal(_dl)
+						ul = LS::PrettifyBytes.convert_short_decimal(_ul)
+
+						"\u{1F4CA} Curr. DL/UL: #{"%-9s" % dl} | #{ "%9s" % ul}"
+					else
+						EMPTY
+					end
 				end
 			end
 
-			cpu = "\u{1F9E0} CPU: #{sprintf "%5s", @@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
+				charge = stat[:charge].to_i
+
 				emoji, plug = "\u{1F50B}".freeze, EMPTY
 
 				if LS::Battery.charging?
 					emoji, plug = "\u{1F4A1}".freeze, "\u{1F50C} ".freeze
 				end
 
-				"#{emoji} Battery: #{stat[:charge].to_i}% (#{plug}#{stat[:status]})"
+				lives = "\u2665 ".freeze.*(charge.fdiv(20).ceil).chop
+
+				"#{emoji} Battery: #{charge}% #{lives} (#{plug}#{stat[:status]})"
 			else
 				EMPTY
 			end
@@ -48,79 +69,131 @@ module Termclock
 			_m = LS::Net.total_bytes
 			ip = "\u{1F30F} IP Addr: #{LS::Net.ipv4_private}"
 
-			net_usage = "\u{1F4C8} Totl. DL/UL: #{sprintf "%-8s", LS::PrettifyBytes.convert_short_decimal(_m[:received], precision: 1)}"\
-			" | #{sprintf "%8s", LS::PrettifyBytes.convert_short_decimal(_m[:transmitted], precision: 1)}"
+			_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
 
 			memory = "\u{1F3B0} Mem: #{LS::PrettifyBytes.convert_short_decimal(_m[:used] * 1000)}"\
 			" / #{LS::PrettifyBytes.convert_short_decimal(_m[:total] * 1000)}"\
-			" (#{_m[:percent_used]}%)"
+			" (#{"%.2f" % _m[:percent_used]}%)"
 
 			_m = LS::Swap.stat
 			_m.default = 0
 
 			swap = "\u{1F300} Swap: #{LS::PrettifyBytes.convert_short_decimal(_m[:used] * 1000)}"\
 			" / #{LS::PrettifyBytes.convert_short_decimal(_m[:total] * 1000)}"\
-			" (#{_m[:percent_used]}%)"
+			" (#{"%.2f" % _m[:percent_used]}%)"
 
-			_m = LS::Filesystem.stat('/')
+			_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])}"\
-			" (#{_m[:used].*(100).fdiv(_m[:total]).round(2)}%)"
+			" (#{"%.2f" % _m[:used].*(100).fdiv(_m[:total]).round(2)}%)"
 
 			pt = LS::Process.types.values
 
-			process = "\u{1F9EE} Process: T:#{sprintf "%4s", LS::Process.count}|"\
-			"R:#{sprintf "%3s", pt.count(:running)}|"\
-			"S:#{sprintf "%3s", pt.count(:sleeping)}|"\
-			"I:#{sprintf "%3s", pt.count(:idle)}"
+			process = if pt.length > 0
+				"\u{1F3ED} Process: T:#{"%4s" % pt.length}|"\
+				"R:#{"%3s" % pt.count(:running)}|"\
+				"S:#{"%3s" % pt.count(:sleeping)}|"\
+				"I:#{"%3s" % pt.count(:idle)}"
+			else
+				EMPTY
+			end
 
-			_os_v = LS::OS.version
-			os_v = unless _os_v.empty?
-				" (#{_os_v})"
+			@@os_v ||= unless LS::OS.version.empty?
+				" (#{LS::OS.version})"
 			else
 				EMPTY
 			end
 
-			os = "\u{1F427} Distrib: #{LS::OS.distribution} #{LS::OS.machine}#{os_v}"
+			@@os ||= "\u{1F427} Distrib: #{LS::OS.distribution} #{LS::OS.machine}#{@@os_v}"
+
+			_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
 
-			_uptime = LS::OS.uptime
 			_second = _uptime[:second]
 			_second_i = _second.to_i
 
 			hour = "%02d" % _uptime[:hour]
 			minute = "%02d" % _uptime[:minute]
-			second = "%02d" % _second_i
-			ms = "%02d" % _second.-(_second_i).*(100)
+			second = "%02d" % _uptime[:second]
+			jiffy = "%02d" % _uptime[:jiffy]
+
+			uptime = "\u{1F3A1} Uptime: #{hour}:#{minute}:#{second}:#{jiffy} (#{LS::OS.uptime_i}s)"
 
-			uptime = "\u{1F3A1} Uptime: #{hour}:#{minute}:#{second}:#{ms} (#{LS::OS.uptime_i}s)"
+			_loadavg = LS::Sysinfo.loads.map! { |x| "%.2f" % x }
+			loadavg = "\u{1F525} LoadAvg: 1m #{_loadavg[0]}|5m #{_loadavg[1]}|15m #{_loadavg[2]}"
 
-			_loadavg = LS::Sysinfo.loads.map! { |x| sprintf("%.2f", x) }
-			loadavg = "\u{1F9FA} LoadAvg: 1m #{_loadavg[0]}|5m #{_loadavg[1]}|15m #{_loadavg[2]}"
+			all_info = []
+			max_l = 0
+			i = -1
 
-			all_info = [
+			[
 				user, hostname,
-				os, battery,
+				@@os, battery,
 				cpu, ip,
 				memory, @@current_net_usage,
 				swap, net_usage,
 				fs, process,
 				uptime, loadavg
-			].map(&:to_s).reject(&:empty?)
-			max_l = 0
-
-			all_info.each_with_index { |x, i|
-				max_l = x.length if i.odd? && x.length > max_l
+			].each { |x|
+				unless x.empty?
+					all_info << x
+					i += 1
+
+					if i.odd?
+						_x_len = x.length
+						max_l = _x_len if max_l < _x_len
+					end
+				end
 			}
 
 			max_l += 4
 
 			all_info.each_slice(2).map { |x, y|
-				"\s#{x}#{SPACE.*(width.-(x.length + max_l).abs)}#{y}"
+				_diff = width.-(x.length + max_l)
+				_diff = 0 if _diff < 1
+				y_to_s = y.to_s
+
+				padding = "#{SPACE * _diff}"
+				str = SPACE + x + padding + y_to_s
+
+				grads = SPACE + x.gradient(tc1, tc2, bold: bold, italic: italic) +
+					padding +
+					y_to_s.gradient(tc1, tc2, bold: bold, italic: italic)
+
+				len = str.chars.map { |x|
+					_x = x.bytesize./(2)
+					_x == 0 ? 1 : _x
+				}.sum
+
+				w = width - 2
+
+				len < w ? grads.+(SPACE.*(w - len)) : grads
 			}.join(NEWLINE)
 		end
 	end

data/lib/termclock/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-24 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: 1.5.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        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.1.4
+rubygems_version: 3.2.13
 signing_key:
 specification_version: 4
 summary: A clock for Linux VTE