termclock 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0916f4a4beb06eae575611343e1235e5fa9a0585116fd9694622d1a5e9867938'
-  data.tar.gz: 53f9236790df604fe8eb5f0c1a4d0cb5ed0179c6aed3c04da4ae8b26398269ee
+  metadata.gz: a889b38c921c98e808156b9feeee5dccb8ad10952a17f2b591ed14b6297f2075
+  data.tar.gz: 2676b0ba7b8ad4d2b604282845d2fe4d7101eb5a0c39d076833195e6ada67bfd
 SHA512:
-  metadata.gz: f85098f0082eca3776b0349b65a34323491c8372cf2b426c91bedde2d5031be210da5fe49d36f773a95afdc9fc6907bbcc9b7e1e3d5e863624106d8e4112ac8f
-  data.tar.gz: a116f54e530fdfcecfc7f415812aa107bddd7e98409090acbd2f039aefccf0db937f47a8f441d5fa35b1fbe75974ff8795745d3a63da28187c85f275090fb24e
+  metadata.gz: 04e505fe18c33d49dcc050e3bf06a2ef2484c38b4b0b6b3d5f00ccb47a5551973641621411304342e3314b8255893db00aef62b775fecac001726347e80f5045
+  data.tar.gz: b7c740f14ee7df1ed1c4c4774f0696eb20c84850eec4b402a8fde75f6864bf6a068465a114680095dd5453fb00bcf33a08c4607a46efefa535dcb033cda8e556

data/exe/termclock

@@ -6,23 +6,54 @@ if ARGV.any? { |x| x[/\A\-(\-help|h)\z/] }
 	puts <<~EOF
 		TermClock: A clock that runs on the LinuxTerminal!
 
-		Arguments:
+		\e[1;4mArguments:\e[0m
+
+		1. Help and Version:\e[0m
 			--help|-h\t\t\tShows this help section
-			--bold\t\t\t\tMake texts bold
+			--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"
 
@@ -49,10 +80,18 @@ begin
 	_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\z/] }
+	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/] }
@@ -68,9 +107,12 @@ begin
 		*text_colours,
 		sleep: refresh_time,
 		bold: bold,
+		italic: italic,
 		print_info: !no_print_info,
 		print_message: !no_print_message,
-		print_date: !no_print_date
+		print_date: !no_print_date,
+		time_format: time_format,
+		date_format: date_format
 	)
 rescue Interrupt, SignalException
 	print "\e[H\e[2J\e[3J"

data/lib/termclock.rb

@@ -12,6 +12,6 @@ end
 require_relative "termclock/string"
 require_relative "termclock/parse_characters"
 require_relative "termclock/system_info"
-require_relative "termclock/main"
+require_relative "termclock/start"
 require_relative "termclock/hex2rgb"
 require_relative "termclock/version"

data/lib/termclock/parse_characters.rb

@@ -142,9 +142,9 @@ module Termclock
 
 		# I
 		````````
-		   `
-		   `
-		   `
+		\s\s\s``
+		\s\s\s``
+		\s\s\s``
 		````````
 
 		# J
@@ -235,8 +235,8 @@ module Termclock
 		``    ``
 		``    ``
 		``    ``
-		 `` ``
-		   `
+		\s``  ``\s
+		\s\s\s``
 
 		# W
 		``    ``
@@ -246,11 +246,11 @@ module Termclock
 		````````
 
 		# X
-		`      `
-		  `  `
-		    `
-		  `   `
-		`       `
+		``    ``
+		\s``  ``
+		\s\s\s``
+		\s``  ``
+		``    ``
 
 		# Y
 		``    ``
@@ -265,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

data/lib/termclock/{main.rb → start.rb}

@@ -3,8 +3,11 @@ module Termclock
 		textcolour1 = nil, textcolour2 = nil,
 		sleep: 0.1,
 		bold: false,
+		italic: false,
 		print_info: true, print_message: true,
-		print_date: true
+		print_date: true,
+		time_format: "%H %M %S %2N",
+		date_format: '%a, %d %B %Y'
 		)
 
 		generate = proc do |start, stop, n = 5|
@@ -112,24 +115,28 @@ module Termclock
 					end
 				end
 
-				message_final = message.rjust(message_align).+(_caret).gradient(tc1, tc2, exclude_spaces: true, bold: bold)
+				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, tc1, tc2, bold)
+				info = system_info(width).gradient(
+					tc1, tc2, bold: bold, italic: italic
+				)
 			end
 
 			if print_date
-				date = time_now.strftime('%a, %d %B %Y').center(width)
-					.gradient(tc1, tc2, bold: bold)
+				date = time_now.strftime(date_format).center(width)
+					.gradient(tc1, tc2, bold: bold, italic: italic)
 			end
 
-			time = time_now.strftime('%H %M %S %2N').split.join(splitter)
+			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)
+				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
 

data/lib/termclock/string.rb

@@ -3,7 +3,12 @@ class String
 	SPACE = ?\s.freeze
 	TAB = ?\t.freeze
 
-	def gradient(*all_rgbs, bg: false, exclude_spaces: false, bold: false)
+	def gradient(*all_rgbs,
+		bg: false,
+		exclude_spaces: false,
+		bold: false, italic: false, blink: false
+		)
+
 		temp = ''
 
 		r, g, b = all_rgbs[0]
@@ -12,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,8 +65,6 @@ 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

@@ -2,11 +2,11 @@ module Termclock
 	@@cpu_usage = 0
 	@@cpu_usage_t = Thread.new { }.join
 
-	@@current_net_usage = ''
+	@@current_net_usage = "\u{1F4CA} Curr. DL/UL:"
 	@@current_net_usage_t = Thread.new { }.join
 
 	class << self
-		def system_info(width, tc1, tc2, bold)
+		def system_info(width)
 			unless @@cpu_usage_t.alive?
 				@@cpu_usage_t = Thread.new { @@cpu_usage = LS::CPU.usage(0.25) }
 			end
@@ -57,17 +57,25 @@ module Termclock
 			" / #{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}"
+			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
 
-			<<~EOF.gradient(tc1, tc2, exclude_spaces: true, bold: bold)
+			<<~STR
 				\s#{user}#{SPACE.*(width.-(user.length + max_l).abs)}#{hostname}
-				\s#{cpu}#{SPACE.*(width.-(cpu.length + max_l).abs)}#{battery}
-				\s#{memory}#{SPACE.*(width.-(memory.length + max_l).abs)}#{ip}
-				\s#{swap}#{SPACE.*(width.-(swap.length + max_l).abs)}#{@@current_net_usage}
-				\s#{fs}#{SPACE.*(width.-(fs.length + max_l).abs)}#{net_usage}
-			EOF
+				\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.6"
+	VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat
@@ -35,8 +35,8 @@ 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