termclock 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e17d6410f4890cf9e070491f01c722e08b3678dca7e0cf4af4edfa3e4a6c020
-  data.tar.gz: a00abd3c09b311a4fa62acd03c5147033a7c758417877db2d132e1b3d5e954b2
+  metadata.gz: a889b38c921c98e808156b9feeee5dccb8ad10952a17f2b591ed14b6297f2075
+  data.tar.gz: 2676b0ba7b8ad4d2b604282845d2fe4d7101eb5a0c39d076833195e6ada67bfd
 SHA512:
-  metadata.gz: 40822adf435db689057290c054ea2f42a9afff94cd49053aed5d5ddf3b0dcbb168e7ce23fe3e130afbcb43c58f128bd689d1243bca52015ac245b44b05e24440
-  data.tar.gz: 9aa729c8ee4fb0b299da55f666a942ef21cccfc66ff94a5b54969594d8dc80aec38361c9c779cf813a312d89089589fb3e9c8010c31d05181a0435549fcfeac1
+  metadata.gz: 04e505fe18c33d49dcc050e3bf06a2ef2484c38b4b0b6b3d5f00ccb47a5551973641621411304342e3314b8255893db00aef62b775fecac001726347e80f5045
+  data.tar.gz: b7c740f14ee7df1ed1c4c4774f0696eb20c84850eec4b402a8fde75f6864bf6a068465a114680095dd5453fb00bcf33a08c4607a46efefa535dcb033cda8e556

data/exe/termclock

@@ -1,7 +1,58 @@
 #!/usr/bin/env ruby
 require 'termclock'
+$-v = nil
 
-$-v = true
+if ARGV.any? { |x| x[/\A\-(\-help|h)\z/] }
+	puts <<~EOF
+		TermClock: A clock that runs on the LinuxTerminal!
+
+		\e[1;4mArguments:\e[0m
+
+		1. Help and Version:\e[0m
+			--help|-h\t\t\tShows this help section
+			--version|-v\t\t\tShows termclock version
+
+		2. Style:\e[0m
+			--bold|-b\t\t\tMake texts bold
+			--italic|-i\t\t\tMake texts italic
+			--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 # ]
+
+		3. 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
+			--text-colour|-tc\t\tSpecify text colour (2 colours)
+
+		4. Formats:\e[0m
+			--date-format=|-df=\t\tSpecify the date format
+			\t\t\t\t[ Run date --help for formats ]
+			--time-format=|-tf=\t\tSpecify the time format
+			\t\t\t\t[ Run date --help for formats ]
+
+		Supported characters are 0 - 9, a - z, /, \\, !, %, and |.
+
+		This is Termclock v#{Termclock::VERSION}
+	EOF
+
+	exit 0
+end
+
+if ARGV.any? { |x| x[/\A\-(-version|v)\z/] }
+	colour = [
+		[[255, 100, 100], [100, 100, 255]],
+		[[60, 230, 180], [100, 100, 255]],
+		[[255, 255, 0], [100, 100, 255]],
+		[[255, 80, 170], [255, 200, 0]],
+	].sample
+
+	colour.reverse! if rand < 0.5
+	puts "This is Termclock v#{Termclock::VERSION}".gradient(*colour)
+	exit 0
+end
 
 begin
 	print "\e[?25l"
@@ -24,9 +75,45 @@ begin
 	}
 
 	chars = ARGV.find { |x| x[/\A\-(\-character|char)=.*\z/] } &.split(?=) &.at(1)
-	Termclock::ParseCharacters.transform_characters!(chars[0]) if chars
+	Termclock::ParseCharacters.transform_characters!(*chars) if chars
+
+	_refresh_time = ARGV.find { |x| x[/\A\-(\-refresh|r)=.*\z/] } &.split(?=) &.at(1)
+	refresh_time = _refresh_time ? _refresh_time.to_f : 0.1
+
+	_time_format = ARGV.find { |x| x[/\A\-(\-time\-format|tf)=.*\z/] } &.split(?=) &.at(1)
+	time_format = _time_format ? _time_format : "%H %M %S %2N"
+
+	_date_format = ARGV.find { |x| x[/\A\-(\-date\-format|df)=.*\z/] } &.split(?=) &.at(1)
+	date_format = _date_format ? _date_format : "'%a, %d %B %Y'"
+
+	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
+
+	bold = ARGV.any? { |x| x[/\A\-(\-bold|b)\z/] }
+	italic = ARGV.any? { |x| x[/\A\-(\-italic|i)\z/] }
+
+	no_print_info = ARGV.any? { |x| x[/\A\-(\-no\-sysinfo|ni)\z/] }
+	no_print_message = ARGV.any? { |x| x[/\A\-(\-no\-message|nm)\z/] }
+	no_print_date = ARGV.any? { |x| x[/\A\-(\-no\-date|nd)\z/] }
+
+	clean = ARGV.any? { |x| x[/\A\-(\-clean)\z/] }
+
+	if clean
+		no_print_info = no_print_message = no_print_date = true
+	end
 
-	Termclock.main(*colours)
+	Termclock.start(
+		*colours,
+		*text_colours,
+		sleep: refresh_time,
+		bold: bold,
+		italic: italic,
+		print_info: !no_print_info,
+		print_message: !no_print_message,
+		print_date: !no_print_date,
+		time_format: time_format,
+		date_format: date_format
+	)
 rescue Interrupt, SignalException
 	print "\e[H\e[2J\e[3J"
 ensure

data/lib/termclock.rb

@@ -1,12 +1,17 @@
-# 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'
+
+module Termclock
+	COLOURTERM = ENV.key?('COLORTERM')
+	CLEAR = COLOURTERM ? "\e[H\e[2J\e[3J" : "\e[H"
+	NEWLINE = ?\n.freeze
+	SPACE = ?\s.freeze
+	TAB = ?\t.freeze
+end
+
 require_relative "termclock/string"
 require_relative "termclock/parse_characters"
-require_relative "termclock/main"
+require_relative "termclock/system_info"
+require_relative "termclock/start"
 require_relative "termclock/hex2rgb"
 require_relative "termclock/version"

data/lib/termclock/parse_characters.rb

@@ -1,83 +1,82 @@
 module Termclock
 	module ParseCharacters
-		NEWLINE = ?\n.freeze
 		CHARACTERS = <<~EOF.freeze
 		# 0
-		```````
-		``   ``
-		``   ``
-		``   ``
-		```````
+		````````
+		``    ``
+		``    ``
+		``    ``
+		````````
 
 		# 1
 		   ``
-		 ````
+		`````
 		   ``
 		   ``
-		```````
+		````````
 
 		# 2
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
 		``
-		```````
+		````````
 
 		# 3
-		```````
-		     ``
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
+		      ``
+		````````
 
 		# 4
-		``   ``
-		``   ``
-		```````
-		     ``
-		     ``
+		``    ``
+		``    ``
+		````````
+		      ``
+		      ``
 
 		# 5
-		```````
+		````````
 		``
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
 
 		# 6
-		```````
+		````````
 		``
-		```````
-		``   ``
-		```````
+		````````
+		``    ``
+		````````
 
 		# 7
-		```````
-		     ``
-		     ``
-		     ``
-		     ``
+		````````
+		      ``
+		      ``
+		      ``
+		      ``
 
 		# 8
-		```````
-		``   ``
-		```````
-		``   ``
-		```````
+		````````
+		``    ``
+		````````
+		``    ``
+		````````
 
 		# 9
-		```````
-		``   ``
-		```````
-		     ``
-		```````
+		````````
+		``    ``
+		````````
+		      ``
+		````````
 
 		# :
-		⬩⬩
-		⬩⬩
+		\u2B29\u2B29
+		\u2B29\u2B29
 
-		⬩⬩
-		⬩⬩
+		\u2B29\u2B29
+		\u2B29\u2B29
 
 		# $
 		\s\s
@@ -86,88 +85,88 @@ module Termclock
 		\s\s
 		\s\s
 		# A
-		```````
-		``   ``
-		```````
-		``   ``
-		``   ``
+		````````
+		``    ``
+		````````
+		``    ``
+		``    ``
 
 		# B
-		``````
-		``   ``
-		``````
-		``   ``
-		``````
+		````````
+		``     ``
+		````````
+		``     ``
+		````````
 
 		# C
-		```````
+		````````
 		``
 		``
 		``
-		```````
+		````````
 
 		# D
-		`````
-		``   ``
-		``    ``
-		``   ``
-		`````
+		````````
+		``     ``
+		``      ``
+		``     ``
+		````````
 
 		# E
-		```````
+		````````
 		``
-		```````
+		````````
 		``
-		```````
+		````````
 
 		# F
-		```````
+		````````
 		``
-		```````
+		````````
 		``
 		``
 
 		# G
-		```````
+		````````
 		``
 		``
-		``   ```
+		``  ````
 		````````
 
 		# H
-		``   ``
-		``   ``
-		```````
-		``   ``
-		``   ``
+		``    ``
+		``    ``
+		````````
+		``    ``
+		``    ``
 
 		# I
-		```````
-		   `
-		   `
-		   `
-		```````
+		````````
+		\s\s\s``
+		\s\s\s``
+		\s\s\s``
+		````````
 
 		# J
-		```````
-		     ``
-		     ``
-		 ``  ``
-		 ``````
+		````````
+		      ``
+		      ``
+		 ``   ``
+		 ```````
 
 		# K
-		``   ``
-		`` ``
-		````
-		`` ``
-		``   ``
+		``    ``
+		``  ``
+		`````
+		``  ``
+		``    ``
 
 		# L
 		``
 		``
 		``
 		``
-		``````
+		````````
 
 		# M
 		```  ```
@@ -177,11 +176,11 @@ module Termclock
 		``    ``
 
 		# N
-		````    ``
-		``  `   ``
-		``   `  ``
-		``    ` ``
-		``     ```
+		````  ``
+		`` `` ``
+		`` `` ``
+		`` `` ``
+		``  ````
 
 		# O
 		````````
@@ -198,25 +197,25 @@ module Termclock
 		``
 
 		# Q
-		```````
-		``   ``
-		```````
-		     ``
-		     ``
+		````````
+		``    ``
+		````````
+		      ``
+		      ``
 
 		# R
-		```````
+		````````
+		``    ``
+		````````
+		`````
 		``   ``
-		```````
-		````
-		``  ``
 
 		# S
-		```````
+		````````
 		``
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
 
 		# T
 		````````
@@ -226,32 +225,32 @@ module Termclock
 		   ``
 
 		# U
-		``   ``
-		``   ``
-		``   ``
-		``   ``
-		```````
+		``    ``
+		``    ``
+		``    ``
+		``    ``
+		````````
 
 		# V
-		``   ``
-		``   ``
-		``   ``
-		 `` ``
-		   `
+		``    ``
+		``    ``
+		``    ``
+		\s``  ``\s
+		\s\s\s``
 
 		# W
-		``     ``
-		``     ``
-		``     ``
-		``  `  ``
-		`````````
+		``    ``
+		``    ``
+		``    ``
+		`` `  ``
+		````````
 
 		# X
-		``      ``
-		  ``  ``
-		    ``
-		  ``  ``
-		``      ``
+		``    ``
+		\s``  ``
+		\s\s\s``
+		\s``  ``
+		``    ``
 
 		# Y
 		``    ``
@@ -266,6 +265,41 @@ module Termclock
 		   ``
 		 ``
 		````````
+
+		# /
+		\s\s\s\s\s``\s
+		\s\s\s\s``\s\s
+		\s\s\s``\s\s\s
+		\s\s``\s\s\s\s
+		\s``\s\s\s\s\s
+
+		# \\
+		\s``\s\s\s\s\s
+		\s\s``\s\s\s\s
+		\s\s\s``\s\s\s
+		\s\s\s\s``\s\s
+		\s\s\s\s\s``\s
+
+		# %
+		\s\s\s\s\s``\s
+		``\s\s``\s\s
+		\s\s\s``\s\s\s
+		\s\s``\s\s``
+		\s``\s\s\s\s\s
+
+		# |
+		\s\s\s``\s\s\s
+		\s\s\s``\s\s\s
+		\s\s\s``\s\s\s
+		\s\s\s``\s\s\s
+		\s\s\s``\s\s\s
+
+		# !
+		\s\s\s``\s\s\s
+		\s\s\s``\s\s\s
+		\s\s\s``\s\s\s
+		\s\s\s\s\s\s\s\s
+		\s\s\s``\s\s\s
 		EOF
 
 		class << self
@@ -283,24 +317,38 @@ module Termclock
 			end.freeze
 
 			def transform_characters!(arg)
+				@@transformed ||= nil
+				fail RuntimeError, 'Characters already transformed!' if @@transformed
+				@@transformed ||= true
+
 				@@characters.values.each { |x|
 					stripped = x.strip[0]
-					x.gsub!(stripped, arg) if stripped
+					chars = arg.chars.rotate(-1)
+
+					if stripped
+						replace_with = x.chars.map { |y|
+							chars = arg.chars.rotate(-1) if y == NEWLINE
+							next(y) if y != stripped
+							chars.rotate!(1)[0]
+						}.join
+
+						x.replace(replace_with)
+					end
 				}
 			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/start.rb

@@ -0,0 +1,155 @@
+module Termclock
+	def self.start(colour1, colour2, colour3, colour4,
+		textcolour1 = nil, textcolour2 = nil,
+		sleep: 0.1,
+		bold: false,
+		italic: false,
+		print_info: true, print_message: true,
+		print_date: true,
+		time_format: "%H %M %S %2N",
+		date_format: '%a, %d %B %Y'
+		)
+
+		generate = proc do |start, stop, n = 5|
+			r_op = r_val = nil
+			ary = []
+
+			if start > stop
+				r_op, r_val = :-, start.-(stop).fdiv(n - 1)
+			elsif start < stop
+				r_op, r_val = :+, stop.-(start).fdiv(n - 1)
+			end
+
+			_r = r_op ? start.send(r_op, r_val * -1) : start
+			n.times {
+				_r = _r.send(r_op, r_val) if r_op
+				ary << _r.clamp(0, 255).to_i
+			}
+
+			ary
+		end
+
+		gc_compact, gc_compacted = GC.respond_to?(:compact), Time.now.to_i + 7200
+		print "\e[H\e[2J\e[3J" unless COLOURTERM
+
+		r1, g1, b1 = *colour1
+		r2, g2, b2 = *colour2
+		r3, g3, b3 = *colour3
+		r4, g4, b4 = *colour4
+
+		# colour1 -> colour3
+		rs1 = generate.(r1, r3)
+		gs1 = generate.(g1, g3)
+		bs1 = generate.(b1, b3)
+
+		# colour2 -> colour4
+		rs2 = generate.(r2, r4)
+		gs2 = generate.(g2, g4)
+		bs2 = generate.(b2, b4)
+
+		# All Gradient Colours
+		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_counter = -1
+		message = ''
+		message_final = ''
+		message_temp = ''
+		caret = "\u2588"
+
+		date, info = '', ''
+
+		get_message = proc {
+			case Time.now.hour
+			when 5...12
+				"\u{1F304} Good Morning..."
+			when 12...16
+				"\u26C5 Good Afternoon..."
+			when 16...18
+				"\u{1F307} Good Evening..."
+			when 18...20
+				"\u{1F31F} Good Evening..."
+			when 20...24
+				"\u{1F303} Good Night..."
+			else
+				"\u{2728} Good Night..."
+			end
+		}
+
+		while true
+			time_now = Time.now
+			height, width = *STDOUT.winsize
+
+			if time_now.to_f./(0.5).to_i.even?
+				splitter = ?:.freeze
+				_caret = caret
+			else
+				splitter = ?$.freeze
+				_caret = ''
+			end
+
+			if print_message
+				message_counter += 1
+				message_align = width - message_counter % width + message.length / 2 - 4
+				if (width - message_counter % width <= message.length)
+					message.replace(message[1..-1])
+					message_align = width - message_counter % width + 4
+				else
+					message.clear if width - message_counter % width == width
+					message_temp = get_message.call
+
+					if message_temp != message
+						message << message_temp[message.length..message.length  + 1]
+					end
+				end
+
+				message_final = message.rjust(message_align).+(_caret).gradient(
+					tc1, tc2, exclude_spaces: true, bold: bold, italic: italic
+				)
+			end
+
+			if print_info
+				info = system_info(width).gradient(
+					tc1, tc2, bold: bold, italic: italic
+				)
+			end
+
+			if print_date
+				date = time_now.strftime(date_format).center(width)
+					.gradient(tc1, tc2, bold: bold, italic: italic)
+			end
+
+			time = time_now.strftime(time_format).split.join(splitter)
+			art = Termclock::ParseCharacters.display(time).lines
+
+			art_aligned = art.each_with_index do |x, i|
+				chomped = x.chomp(''.freeze).+(NEWLINE)
+				gr = chomped.gradient(*colours[i], bold: bold, italic: italic)
+				x.replace(SPACE.*(width./(2.0).-(chomped.length / 2.0).abs.to_i + 1) + gr)
+			end.join
+
+			vertical_gap = "\e[#{height./(2.0).-(art.length / 2.0).to_i + 1}H"
+
+			print "#{CLEAR}#{info}#{vertical_gap}#{art_aligned}\n#{date}\n\n#{message_final}"
+
+			if gc_compact && time_now.to_i > gc_compacted
+				GC.compact
+				gc_compacted = time_now.to_i + 7200
+			end
+
+			sleep(sleep)
+		end
+	end
+end

data/lib/termclock/string.rb

@@ -1,5 +1,14 @@
 class String
-	def gradient(*all_rgbs, bg: false, exclude_spaces: false)
+	NEWLINE = ?\n.freeze
+	SPACE = ?\s.freeze
+	TAB = ?\t.freeze
+
+	def gradient(*all_rgbs,
+		bg: false,
+		exclude_spaces: false,
+		bold: false, italic: false, blink: false
+		)
+
 		temp = ''
 
 		r, g, b = all_rgbs[0]
@@ -8,7 +17,18 @@ class String
 
 		init = bg ? 48 : 38
 
+		style = nil
+		if bold || italic
+			style = "\e["
+			style << '1;'.freeze if bold
+			style << '3;'.freeze if italic
+			style.chop!
+			style << 'm'.freeze
+		end
+
 		each_line do |c|
+			temp << style if style
+
 			_r, _g, _b = r, g, b
 			chomped = !!c.chomp!(''.freeze)
 
@@ -49,7 +69,7 @@ class String
 			while (i += 1) < len
 				_c = c[i]
 
-				if !exclude_spaces || (exclude_spaces && !(_c == ?\s.freeze || _c == ?\t.freeze))
+				if !exclude_spaces || (exclude_spaces && !(_c == SPACE || _c == TAB))
 					_r = _r.send(r_op, r_val) if r_op
 					_g = _g.send(g_op, g_val) if g_op
 					_b = _b.send(b_op, b_val) if b_op
@@ -70,7 +90,7 @@ class String
 			ret = if !c.empty?
 				chomped ? "\e[0m\n".freeze : "\e[0m".freeze
 			elsif chomped
-				?\n.freeze
+				NEWLINE
 			end
 
 			temp << ret

data/lib/termclock/system_info.rb

@@ -0,0 +1,81 @@
+module Termclock
+	@@cpu_usage = 0
+	@@cpu_usage_t = Thread.new { }.join
+
+	@@current_net_usage = "\u{1F4CA} Curr. DL/UL:"
+	@@current_net_usage_t = Thread.new { }.join
+
+	class << self
+		def system_info(width)
+			unless @@cpu_usage_t.alive?
+				@@cpu_usage_t = Thread.new { @@cpu_usage = LS::CPU.usage(0.25) }
+			end
+
+			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}"
+				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 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)}"\
+			" / #{LS::PrettifyBytes.convert_short_binary(_m[:total].to_i * 1024)}"\
+			" (#{_m[:percent_used].to_i}%)"
+
+			_m = LS::Swap.stat
+			swap = "\u{1F300} Swap: #{LS::PrettifyBytes.convert_short_binary(_m[:used].to_i * 1024)}"\
+			" / #{LS::PrettifyBytes.convert_short_binary(_m[:total].to_i * 1024)}"\
+			" (#{_m[:percent_used].to_i}%)"
+
+			_m = LS::Filesystem.stat
+			fs = "\u{1F4BD} FS: #{LS::PrettifyBytes.convert_short_binary(_m[:used].to_i)}"\
+			" / #{LS::PrettifyBytes.convert_short_binary(_m[:total].to_i)}"\
+			" (#{_m[:used].to_i*(100).fdiv(_m[:total].to_i).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)}"
+
+			os = "\u{1F427} Distrib: #{LS::OS.distribution} #{LS::OS.machine} (#{LS::OS.version})"
+
+			max_l = [hostname, process, ip, battery, @@current_net_usage, net_usage].map(&:length).max + 4
+
+			<<~STR
+				\s#{user}#{SPACE.*(width.-(user.length + max_l).abs)}#{hostname}
+				\s#{os}#{SPACE.*(width.-(os.length + max_l).abs)}#{battery}
+				\s#{cpu}#{SPACE.*(width.-(cpu.length + max_l).abs)}#{ip}
+				\s#{memory}#{SPACE.*(width.-(memory.length + max_l).abs)}#{@@current_net_usage}
+				\s#{swap}#{SPACE.*(width.-(swap.length + max_l).abs)}#{net_usage}
+				\s#{fs}#{SPACE.*(width.-(fs.length + max_l).abs)}#{process}
+			STR
+		end
+	end
+end

data/lib/termclock/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-19 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
@@ -35,9 +35,10 @@ files:
 - exe/termclock
 - lib/termclock.rb
 - lib/termclock/hex2rgb.rb
-- lib/termclock/main.rb
 - lib/termclock/parse_characters.rb
+- lib/termclock/start.rb
 - lib/termclock/string.rb
+- lib/termclock/system_info.rb
 - lib/termclock/version.rb
 homepage: https://github.com/souravgoswami/termclock
 licenses:

data/lib/termclock/main.rb

@@ -1,168 +0,0 @@
-module Termclock
-	def self.main(colour1, colour2, colour3, colour4, sleep = 0.1)
-		newline = ?\n.freeze
-		space = ?\s.freeze
-
-		generate = proc do |start, stop, n = 5|
-			r_op = r_val = nil
-			ary = []
-
-			if start > stop
-				r_op, r_val = :-, start.-(stop).fdiv(n - 1)
-			elsif start < stop
-				r_op, r_val = :+, stop.-(start).fdiv(n - 1)
-			end
-
-			_r = r_op ? start.send(r_op, r_val * -1) : start
-			n.times {
-				_r = _r.send(r_op, r_val) if r_op
-				ary << _r.clamp(0, 255).to_i
-			}
-
-			ary
-		end
-
-		gc_compact, gc_compacted = GC.respond_to?(:compact), Time.now.to_i + 7200
-		print "\e[H\e[2J\e[3J" unless COLOURTERM
-
-		r1, g1, b1 = *colour1
-		r2, g2, b2 = *colour2
-		r3, g3, b3 = *colour3
-		r4, g4, b4 = *colour4
-
-		# colour1 -> colour3
-		rs1 = generate.(r1, r3)
-		gs1 = generate.(g1, g3)
-		bs1 = generate.(b1, b3)
-
-		# colour2 -> colour4
-		rs2 = generate.(r2, r4)
-		gs2 = generate.(g2, g4)
-		bs2 = generate.(b2, b4)
-
-		# All Gradient Colours
-		colours = [rs1, gs1, bs1].transpose.zip([rs2, gs2, bs2].transpose)
-		colours.unshift(colours[0])
-		colours.push(colours[-1])
-		cpu_usage = 0
-		cpu_usage_t = Thread.new { }
-		message_time = Time.now.to_i - 5
-		message = ''
-		message_temp = ''
-		caret = "\u2588"
-
-		get_message = proc {
-			case Time.now.hour
-			when 5...12
-				"\u{1F304} Good Morning..."
-			when 12...16
-				"\u26C5 Good Afternoon..."
-			when 16...18
-				"\u{1F307} Good Evening..."
-			when 18...20
-				"\u{1F31F} Good Evening..."
-			when 20...24
-				"\u{1F303} Good Night..."
-			else
-				"\u{2728} Good Night..."
-			end
-		}
-
-		i = -1
-
-		while true
-			i += 1
-			time_now = Time.now
-			height, width = *STDOUT.winsize
-
-			message_align = width - i % width + message.length / 2 - 4
-
-			if (width - i % width <= message.length)
-				message.replace(message[1..-1])
-				message_align = width - i % width + 4
-			else
-				message.clear if width - i % width == width
-				message_temp = get_message.call
-
-				if message_temp != message
-					message << message_temp[message.length..message.length  + 1]
-
-				end
-			end
-
-			if time_now.to_f./(0.5).to_i.even?
-				splitter = ?:.freeze
-				_caret = caret
-			else
-				splitter = ?$.freeze
-				_caret = ''
-			end
-
-			time = time_now.strftime("%H %M %S %2N").split.join(splitter)
-			art = Termclock::ParseCharacters.display(time)
-
-			art_aligned = art.lines.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"
-
-			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})"
-
-			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]})"
-			else
-				''.freeze
-			end
-
-			_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)}"
-
-			_m = LS::Memory.stat
-			memory = "\u{1F3B0} Mem: #{LS::PrettifyBytes.convert_short_binary(_m[:used].to_i * 1024)}"\
-			" / #{LS::PrettifyBytes.convert_short_binary(_m[:total].to_i * 1024)}"\
-			" (#{_m[:percent_used].to_i}%)"
-
-			_m = LS::Swap.stat
-			swap = "\u{1F300} Swap: #{LS::PrettifyBytes.convert_short_binary(_m[:used].to_i * 1024)}"\
-			" / #{LS::PrettifyBytes.convert_short_binary(_m[:total].to_i * 1024)}"\
-			" (#{_m[:percent_used].to_i}%)"
-
-			_m = LS::Filesystem.stat
-			fs = "\u{1F4BD} FS: #{LS::PrettifyBytes.convert_short_binary(_m[:used].to_i)}"\
-			" / #{LS::PrettifyBytes.convert_short_binary(_m[:total].to_i)}"\
-			" (#{_m[:used].to_i*(100).fdiv(_m[:total].to_i).round(2)}%)"
-
-			process = "\u{1F9EE} Process: #{LS::Process.count}"
-
-			max_l = [process, ip, battery, net_usage].map(&:length).max
-
-			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}
-			EOF
-
-			print "#{CLEAR}#{info}#{horizontal_gap}#{art_aligned}\n"\
-			"#{message.rjust(message_align).+(_caret).gradient(*colours[1], exclude_spaces: true)}"
-
-			if gc_compact && time_now.to_i > gc_compacted
-				GC.compact
-				gc_compacted = time_now.to_i + 7200
-			end
-
-			sleep(sleep)
-		end
-	end
-end