termclock 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c5e863a8c650bfda4aaa58bc010d8526692f47853f2ddae298cec606f4b410
-  data.tar.gz: 3f3fef454b216911b4a7aaf860f5376e6c2b00b9aef1b72331afa9defba36b59
+  metadata.gz: ec9759a77ce797b7110a4d5427cf56ca1e7c7188558a84220d233b873d2db1b6
+  data.tar.gz: 6262c03faf908cdf536aa461181ed8564408e838f2df4a016da5f90817d25135
 SHA512:
-  metadata.gz: b23b1136a704adc42a90d9cdae7f8de046bc63a19688cfb7bfb7b1b230c2b6f4a59a0088e8817707a6b9ba02d95f72b7764519965c429068a3e9e9981710406b
-  data.tar.gz: 79c42cb8d83e1077073fcc94c29e19faec8ce67923095d32f6c0adcd8e8687a54c931911621b9ffb4d6a56f7eb7c28037af2ca879cee030ce5ed350c71ce207c
+  metadata.gz: be6ba479d498ea9155a16e950e8c5f6a240ec3556f3a5a0bccb7120ab48142f9084ea01c0c17c81c229172c9cbd2ac61fd8234063fe9c537d36e1e20ee23e524
+  data.tar.gz: 4d17f5be9b2d8b8c61800173c4fc7fb09294d10f17c2d69e35b78d24d1b1ffd758484525594a91bbf627052cfefe6bb0f96d02c9d304f0f94d7429a803abebd8

data/exe/termclock

@@ -2,17 +2,32 @@
 require 'termclock'
 $-v = nil
 
+def version
+	emoji = ?🕐.ord.-(1).chr('utf-8')
+	Time.now.strftime('%I').to_i.times { emoji.next! }
+
+	_v = "#{emoji} This is Termclock v#{Termclock::VERSION}"
+	vl_2 = _v.length / 2
+
+	v_col1 = Termclock.hex2rgb('ff0')
+	v_col2 = Termclock.hex2rgb('f55')
+	v_col3 = Termclock.hex2rgb('55f')
+
+	_v[0...vl_2].gradient(v_col1, v_col2, underline: true, bold: true) <<
+		_v[vl_2..-1].gradient(v_col2, v_col3, underline: true, bold: true)
+end
+
 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
+		\e[1m1. Help and Version:\e[0m
 			--help|-h\t\t\tShows this help section
 			--version|-v\t\t\tShows termclock version
 
-		2. Style:\e[0m
+		\e[1m2. Style:\e[0m
 			--bold|-b\t\t\tMake texts bold
 			--italic|-i\t\t\tMake texts italic
 			--character=|char=\t\tDraws specified character
@@ -20,22 +35,26 @@ if ARGV.any? { |x| x[/\A\-(\-help|h)\z/] }
 			--colour=|-c=\t\t\tSpecify hex colour (4 colours)
 			\t\t\t\t[ with or without # ]
 
-		3. Information:\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
 			--text-colour|-tc\t\tSpecify text colour (2 colours)
+			--no-logo|-nl\t\t\tDon't show the logo at the bottom
 
-		4. Formats:\e[0m
+		\e[1m4. 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 ]
+
+			Usually the format looks like this:
+			%H:%M:%S:%2N or %d %B, %Y
+
+			\e[3mRun `date --help` to know more formats\e[0m
 
 		Supported characters are 0 - 9, a - z, /, \\, !, %, and |.
 
-		This is Termclock v#{Termclock::VERSION}
+		#{version}
 	EOF
 
 	exit 0
@@ -50,7 +69,7 @@ if ARGV.any? { |x| x[/\A\-(-version|v)\z/] }
 	].sample
 
 	colour.reverse! if rand < 0.5
-	puts "This is Termclock v#{Termclock::VERSION}".gradient(*colour)
+	puts version
 	exit 0
 end
 
@@ -93,13 +112,21 @@ begin
 	italic = ARGV.any? { |x| x[/\A\-(\-italic|i)\z/] }
 
 	no_print_info = ARGV.any? { |x| x[/\A\-(\-no\-sysinfo|ni)\z/] }
+	no_logo = ARGV.any? { |x| x[/\A\-(\-no\-logo|nl)\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
+		no_print_info = no_print_message = no_print_date = no_logo = true
+	end
+
+	begin
+		Time.now.strftime(time_format)
+		Time.now.strftime(date_format)
+	rescue
+		abort "Date / Time format is invalid\n#{$!.to_s}"
 	end
 
 	Termclock.start(
@@ -111,6 +138,7 @@ begin
 		print_info: !no_print_info,
 		print_message: !no_print_message,
 		print_date: !no_print_date,
+		no_logo: no_logo,
 		time_format: time_format,
 		date_format: date_format
 	)

data/lib/termclock.rb

@@ -1,9 +1,9 @@
 require 'linux_stat'
 require 'io/console'
+require_relative "termclock/version"
 
 module Termclock
-	COLOURTERM = ENV.key?('COLORTERM')
-	CLEAR = COLOURTERM ? "\e[H\e[2J\e[3J" : "\e[H"
+	CLEAR = "\e[H\e[2J\e[3J".freeze
 	NEWLINE = ?\n.freeze
 	SPACE = ?\s.freeze
 	TAB = ?\t.freeze
@@ -14,4 +14,3 @@ require_relative "termclock/parse_characters"
 require_relative "termclock/system_info"
 require_relative "termclock/start"
 require_relative "termclock/hex2rgb"
-require_relative "termclock/version"

data/lib/termclock/start.rb

@@ -7,7 +7,8 @@ module Termclock
 		print_info: true, print_message: true,
 		print_date: true,
 		time_format: "%H %M %S %2N",
-		date_format: '%a, %d %B %Y'
+		date_format: '%a, %d %B %Y',
+		no_logo: false
 		)
 
 		generate = proc do |start, stop, n = 5|
@@ -30,7 +31,7 @@ module Termclock
 		end
 
 		gc_compact, gc_compacted = GC.respond_to?(:compact), Time.now.to_i + 7200
-		print "\e[H\e[2J\e[3J" unless COLOURTERM
+		print CLEAR
 
 		r1, g1, b1 = *colour1
 		r2, g2, b2 = *colour2
@@ -66,53 +67,100 @@ module Termclock
 		message_counter = -1
 		message = ''
 		message_final = ''
+		message_align = 0
 		message_temp = ''
+		point_five_tick = 0
 
 		date, info = '', ''
 
+		clock_emoji = ?\u{1F550}.ord.-(1).chr('utf-8')
+		clock_emoji = 12.times.map { clock_emoji.next!.dup }
+
+		braille = %W(\u2821 \u2811 \u2812 \u280A \u280C)
+
 		get_message = proc {
+			braille.rotate!
+			braille_0 = braille[0]
+
 			case Time.now.hour
 			when 5...12
-				"\u{1F304} Good Morning..."
+				"\u{1F304} #{braille_0} Good Morning #{braille_0} \u{1F304}"
 			when 12...16
-				"\u26C5 Good Afternoon..."
+				"\u26C5 #{braille_0} Good Afternoon #{braille_0} \u26C5"
 			when 16...18
-				"\u{1F307} Good Evening..."
+				"\u{1F307} #{braille_0} Good Evening #{braille_0} \u{1F307}"
 			when 18...20
-				"\u{1F31F} Good Evening..."
+				"\u{1F31F} #{braille_0} Good Evening #{braille_0} \u{1F31F}"
 			when 20...24
-				"\u{1F303} Good Night..."
+				"\u{1F303} #{braille_0} Good Night #{braille_0} \u{1F303}"
 			else
-				"\u{2728} Good Night..."
+				"\u{2728} #{braille_0} Good Night #{braille_0} \u{2728}"
 			end
 		}
 
+		version = "Termclock v#{Termclock::VERSION}"
+
+		v_col1 = hex2rgb('ff0')
+		v_col2 = hex2rgb('f55')
+		v_col3 = hex2rgb('f55')
+		v_col4 = hex2rgb('55f')
+
+		vl_2 = version.length / 2
+		_term_clock_v = version[0...vl_2].gradient(v_col1, v_col2, underline: true, bold: bold, italic: italic) <<
+			version[vl_2..-1].gradient(v_col3, v_col4, underline: true, bold: bold, italic: italic)
+
+		term_clock_v = ''
+
+		chop_message = 0
+
 		while true
 			time_now = Time.now
 			height, width = *STDOUT.winsize
 
 			if time_now.to_f./(0.5).to_i.even?
-				splitter = ?:.freeze
+				unless point_five_tick == 1
+					point_five_tick = 1
+					splitter = ?:.freeze
+					clock_emoji.rotate!
+				end
 			else
-				splitter = ?$.freeze
+				unless point_five_tick == 0
+					point_five_tick = 0
+					splitter = ?$.freeze
+				end
+			end
+
+			unless no_logo
+				term_clock_v = "\e[#{height}H #{clock_emoji[0]} #{_term_clock_v} \e[0m"
 			end
 
 			if print_message
+				message_temp = get_message.call
 				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
+				message_length = message.length
+
+				if (width - message_counter % width < 8)
+					unless chop_message == message_temp.length
+						chop_message += 1
+						message_counter -= 1
+						message_align -= 1
+						message.replace(message_temp[chop_message..-1])
+					end
 				else
+					chop_message = 0 unless chop_message == 0
 					message.clear if width - message_counter % width == width
-					message_temp = get_message.call
+					message_align = width - message_counter % width + message_length - 4
 
 					if message_temp != message
-						message << message_temp[message.length..message.length  + 1]
+						if message_length < message_temp.length
+							message.replace(message_temp[0..message_length])
+						else
+							message.replace(message_temp)
+						end
 					end
 				end
 
-				message_final = message.rjust(message_align).gradient(
+				message_final = (message).rjust(message_align).gradient(
 					tc1, tc2, exclude_spaces: true, bold: bold, italic: italic
 				)
 			end
@@ -139,7 +187,7 @@ module Termclock
 
 			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}"
+			print "#{CLEAR}#{info}#{vertical_gap}#{art_aligned}\n#{date}\n\n#{message_final}#{term_clock_v}"
 
 			if gc_compact && time_now.to_i > gc_compacted
 				GC.compact

data/lib/termclock/string.rb

@@ -6,7 +6,7 @@ class String
 	def gradient(*all_rgbs,
 		bg: false,
 		exclude_spaces: false,
-		bold: false, italic: false, blink: false
+		bold: false, italic: false, underline: false
 		)
 
 		temp = ''
@@ -18,10 +18,11 @@ class String
 		init = bg ? 48 : 38
 
 		style = nil
-		if bold || italic
+		if bold || italic || underline
 			style = "\e["
 			style << '1;'.freeze if bold
 			style << '3;'.freeze if italic
+			style << '4;'.freeze if underline
 			style.chop!
 			style << 'm'.freeze
 		end

data/lib/termclock/system_info.rb

@@ -55,7 +55,7 @@ module Termclock
 			_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)}%)"
+			" (#{_m[:used].to_i.*(100).fdiv(_m[:total].to_i).round(2)}%)"
 
 			pt = LS::Process.types.values
 
@@ -64,7 +64,14 @@ module Termclock
 			"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})"
+			_os_v = LS::OS.version
+			os_v = unless _os_v.empty?
+				" (#{_os_v})"
+			else
+				''.freeze
+			end
+
+			os = "\u{1F427} Distrib: #{LS::OS.distribution} #{LS::OS.machine}#{os_v}"
 
 			max_l = [hostname, process, ip, battery, @@current_net_usage, net_usage].map(&:length).max + 4
 

data/lib/termclock/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termclock
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sourav Goswami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linux_stat