termclock 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 746cefa7bb14ad6ea4c2886b3631047a1d28eaf65a23709f69dd53a1af139929
-  data.tar.gz: 5f71dfabd6b0608b41f7707d89d09521b2d1121d8206f5279d67be242fd49850
+  metadata.gz: b642d436f341a05ce85e4203af397fe5b3bc37ffa0c562584c4239d986528949
+  data.tar.gz: 3352cdd08951821375f5fe6b177c3be8e68bab5af267bfdfead6448a30a8b293
 SHA512:
-  metadata.gz: ac18271d58739a9061f6c582d031f2bcd8e329259069681e8abb253a14af60307fb3253ff8468509afdc01057e2f802cbe1c32ba7d08a91c5df2ab944b65adc3
-  data.tar.gz: 83e4ebc5a42e09cc880bd11468730266d8807b8aee72a873b04e8acf1867bcc9ae6500e13909ed421a37b6888c6bcaea9e8764ab5b0d6c7f6f0c0e02374af75c
+  metadata.gz: '038ed7235df48c8770a3b3dd87e60ec15400b71b8ec25757e186f1ff2bd3ba6c028da1c21144a8295f3eda575ef6872d050594a1f4e49f3e7afae43967ac53a1'
+  data.tar.gz: 283724a271297ef9af4bd07efa055112f537a91827f4a662f4420754243b383d33981daab6c2ec524409bfff288fbc96e939d6598d3af4c56fad48215830fd9a

data/exe/termclock

@@ -1,7 +1,25 @@
 #!/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!
+
+		Arguments:
+			--help|-h\t\t\tShows this help section
+			--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 # ]
+			--no-date|-nd\t\t\tShows no date
+			--no-message|-nm\t\tShows no messages
+			--no-sysinfo|-ni\t\tShows no system info
+			--text-colour|-tc\t\tSpecify text colour (2 colours)
+	EOF
+
+	exit 0
+end
 
 begin
 	print "\e[?25l"
@@ -24,16 +42,34 @@ 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
 
 	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)
+	bold = ARGV.any? { |x| x[/\A\-\-bold\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.start(
+		*colours,
+		*text_colours,
+		sleep: refresh_time,
+		bold: bold,
+		print_info: !no_print_info,
+		print_message: !no_print_message,
+		print_date: !no_print_date
+	)
 rescue Interrupt, SignalException
 	print "\e[H\e[2J\e[3J"
 ensure

data/lib/termclock.rb

@@ -2,6 +2,7 @@ require 'linux_stat'
 require 'io/console'
 require_relative "termclock/string"
 require_relative "termclock/parse_characters"
+require_relative "termclock/system_info"
 require_relative "termclock/main"
 require_relative "termclock/hex2rgb"
 require_relative "termclock/version"

data/lib/termclock/main.rb

@@ -2,7 +2,12 @@ module Termclock
 	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)
+	def self.start(colour1, colour2, colour3, colour4, textcolour1 = nil,
+		textcolour2 = nil, sleep: 0.1, bold: false,
+		print_info: true, print_message: true,
+		print_date: true
+	)
+
 		newline = ?\n.freeze
 		space = ?\s.freeze
 
@@ -59,10 +64,14 @@ module Termclock
 		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
@@ -80,27 +89,10 @@ module Termclock
 			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
@@ -109,81 +101,45 @@ module Termclock
 				_caret = ''
 			end
 
-			time = time_now.strftime("%H %M %S %2N").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])
-				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"
+			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
 
-			unless cpu_usage_t.alive?
-				cpu_usage_t = Thread.new { cpu_usage = LS::CPU.usage(0.25) }
+				message_final = message.rjust(message_align).+(_caret).gradient(tc1, tc2, exclude_spaces: true, bold: bold)
 			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
+			if print_info
+				info = system_info(width, tc1, tc2, bold)
 			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
+			if print_date
+				date = time_now.strftime('%a, %d %B %Y').center(width)
+					.gradient(tc1, tc2, bold: bold)
 			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)}%)"
-
-			process = "\u{1F9EE} Process: #{LS::Process.count}"
-			message_final = message.rjust(message_align).+(_caret).gradient(tc1, tc2, exclude_spaces: true)
+			time = time_now.strftime('%H %M %S %2N').split.join(splitter)
+			art = Termclock::ParseCharacters.display(time).lines
 
-			max_l = [hostname, process, ip, battery, current_net_usage, net_usage].map(&:length).max + 4
+			art_aligned = art.each_with_index do |x, i|
+				chomped = x.chomp(''.freeze).+(newline)
+				gr = chomped.gradient(*colours[i], bold: bold)
+				x.replace(space.*(width./(2.0).-(chomped.length / 2.0).abs.to_i + 1) + gr)
+			end.join
 
-			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
+			vertical_gap = "\e[#{height./(2.0).-(art.length / 2.0).to_i + 1}H"
 
-			print "#{CLEAR}#{info}#{vertical_gap}#{art_aligned}\n#{message_final}"
+			print "#{CLEAR}#{info}#{vertical_gap}#{art_aligned}\n#{date}\n\n#{message_final}"
 
 			if gc_compact && time_now.to_i > gc_compacted
 				GC.compact

data/lib/termclock/parse_characters.rb

@@ -3,74 +3,74 @@ module Termclock
 		NEWLINE = ?\n.freeze
 		CHARACTERS = <<~EOF.freeze
 		# 0
-		```````
-		``   ``
-		``   ``
-		``   ``
-		```````
+		````````
+		``    ``
+		``    ``
+		``    ``
+		````````
 
 		# 1
 		   ``
-		 ````
+		`````
 		   ``
 		   ``
-		```````
+		````````
 
 		# 2
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
 		``
-		```````
+		````````
 
 		# 3
-		```````
-		     ``
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
+		      ``
+		````````
 
 		# 4
-		``   ``
-		``   ``
-		```````
-		     ``
-		     ``
+		``    ``
+		``    ``
+		````````
+		      ``
+		      ``
 
 		# 5
-		```````
+		````````
 		``
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
 
 		# 6
-		```````
+		````````
 		``
-		```````
-		``   ``
-		```````
+		````````
+		``    ``
+		````````
 
 		# 7
-		```````
-		     ``
-		     ``
-		     ``
-		     ``
+		````````
+		      ``
+		      ``
+		      ``
+		      ``
 
 		# 8
-		```````
-		``   ``
-		```````
-		``   ``
-		```````
+		````````
+		``    ``
+		````````
+		``    ``
+		````````
 
 		# 9
-		```````
-		``   ``
-		```````
-		     ``
-		```````
+		````````
+		``    ``
+		````````
+		      ``
+		````````
 
 		# :
 		\u2B29\u2B29
@@ -86,88 +86,88 @@ module Termclock
 		\s\s
 		\s\s
 		# A
-		```````
-		``   ``
-		```````
-		``   ``
-		``   ``
+		````````
+		``    ``
+		````````
+		``    ``
+		``    ``
 
 		# B
-		``````
-		``   ``
-		``````
-		``   ``
-		``````
+		````````
+		``     ``
+		````````
+		``     ``
+		````````
 
 		# C
-		```````
+		````````
 		``
 		``
 		``
-		```````
+		````````
 
 		# D
-		`````
-		``   ``
-		``    ``
-		``   ``
-		`````
+		````````
+		``     ``
+		``      ``
+		``     ``
+		````````
 
 		# E
-		```````
+		````````
 		``
-		```````
+		````````
 		``
-		```````
+		````````
 
 		# F
-		```````
+		````````
 		``
-		```````
+		````````
 		``
 		``
 
 		# G
-		```````
+		````````
 		``
 		``
-		``   ```
+		``  ````
 		````````
 
 		# H
-		``   ``
-		``   ``
-		```````
-		``   ``
-		``   ``
+		``    ``
+		``    ``
+		````````
+		``    ``
+		``    ``
 
 		# I
-		```````
+		````````
 		   `
 		   `
 		   `
-		```````
+		````````
 
 		# J
-		```````
-		     ``
-		     ``
-		 ``  ``
-		 ``````
+		````````
+		      ``
+		      ``
+		 ``   ``
+		 ```````
 
 		# K
-		``   ``
-		`` ``
-		````
-		`` ``
-		``   ``
+		``    ``
+		``  ``
+		`````
+		``  ``
+		``    ``
 
 		# L
 		``
 		``
 		``
 		``
-		``````
+		````````
 
 		# M
 		```  ```
@@ -177,11 +177,11 @@ module Termclock
 		``    ``
 
 		# N
-		````    ``
-		``  `   ``
-		``   `  ``
-		``    ` ``
-		``     ```
+		````  ``
+		`` `` ``
+		`` `` ``
+		`` `` ``
+		``  ````
 
 		# O
 		````````
@@ -198,25 +198,25 @@ module Termclock
 		``
 
 		# Q
-		```````
-		``   ``
-		```````
-		     ``
-		     ``
+		````````
+		``    ``
+		````````
+		      ``
+		      ``
 
 		# R
-		```````
+		````````
+		``    ``
+		````````
+		`````
 		``   ``
-		```````
-		````
-		``  ``
 
 		# S
-		```````
+		````````
 		``
-		```````
-		     ``
-		```````
+		````````
+		      ``
+		````````
 
 		# T
 		````````
@@ -226,32 +226,32 @@ module Termclock
 		   ``
 
 		# U
-		``   ``
-		``   ``
-		``   ``
-		``   ``
-		```````
+		``    ``
+		``    ``
+		``    ``
+		``    ``
+		````````
 
 		# V
-		``   ``
-		``   ``
-		``   ``
+		``    ``
+		``    ``
+		``    ``
 		 `` ``
 		   `
 
 		# W
-		``     ``
-		``     ``
-		``     ``
-		``  `  ``
-		`````````
+		``    ``
+		``    ``
+		``    ``
+		`` `  ``
+		````````
 
 		# X
-		``      ``
-		  ``  ``
-		    ``
-		  ``  ``
-		``      ``
+		`      `
+		  `  `
+		    `
+		  `   `
+		`       `
 
 		# Y
 		``    ``
@@ -283,9 +283,23 @@ 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 == ?\n
+							next(y) if y != stripped
+							chars.rotate!(1)[0]
+						}.join
+
+						x.replace(replace_with)
+					end
 				}
 			end
 

data/lib/termclock/string.rb

@@ -1,5 +1,5 @@
 class String
-	def gradient(*all_rgbs, bg: false, exclude_spaces: false)
+	def gradient(*all_rgbs, bg: false, exclude_spaces: false, bold: false)
 		temp = ''
 
 		r, g, b = all_rgbs[0]
@@ -45,6 +45,8 @@ class String
 			_g = _g.send(g_op, g_val * -1) if g_op
 			_b = _b.send(b_op, b_val * -1) if b_op
 
+			temp << "\e[1m" if bold
+
 			i = -1
 			while (i += 1) < len
 				_c = c[i]

data/lib/termclock/system_info.rb

@@ -0,0 +1,73 @@
+module Termclock
+	@@cpu_usage = 0
+	@@cpu_usage_t = Thread.new { }
+
+	@@current_net_usage = ''
+	@@current_net_usage_t = Thread.new { }
+
+	class << self
+		def system_info(width, tc1, tc2, bold)
+			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)}%)"
+
+			process = "\u{1F9EE} Process: #{LS::Process.count}"
+
+			max_l = [hostname, process, ip, battery, @@current_net_usage, net_usage].map(&:length).max + 4
+
+			<<~EOF.gradient(tc1, tc2, exclude_spaces: true, bold: bold)
+				\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
+		end
+	end
+end

data/lib/termclock/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sourav Goswami
@@ -38,6 +38,7 @@ files:
 - lib/termclock/main.rb
 - lib/termclock/parse_characters.rb
 - lib/termclock/string.rb
+- lib/termclock/system_info.rb
 - lib/termclock/version.rb
 homepage: https://github.com/souravgoswami/termclock
 licenses: