console 1.16.2 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0538bbfb859ce8e59ced95ef6da6d5bf2b311baa936403b08bd6c70b615117b1'
-  data.tar.gz: adb22e27bcd5844f916359ba8a972e0f92dad295de72285bdcb8b68cc5410eb7
+  metadata.gz: 5a1588810973b2d219accb3bbb33005311b4c214c052c877a601ed8c9cbeaff8
+  data.tar.gz: b2cb63cd0c9fa5e136455f5367fd3b8c47896ae04b0f73aa2fe72604af725e2f
 SHA512:
-  metadata.gz: b595d1dc0175f426cbcb08e62d9ed4d1fe9043b31b88287666e219676e0f512cc2dc2e4fda117fc50caa75cc577eb080ea342a7db9920ce632b485cffc1d2914
-  data.tar.gz: 4fe8e5cf7edd75e49e233dba3856d50d5ff6a98aef67a6cd422ad28fa1d48ee77bd0d28426c2d20d2f9a60ce0dc46e5e3f4bbcf68eec83ca61f929b30ca0584f
+  metadata.gz: 964c9e0a5362a89d6bbf103d8a16a7f0c29eb5a032fc24d92d5339909bdd76970404640de776d097bd5d1f9b633270d4da67baa3bd2cc69f0cb59ab0564e8217
+  data.tar.gz: 4e3cb21047824f715dbc13e98707c6aebc641ebf304c5e11e22c72cf4786102ffeb0690693d23194b45933991bf8de6fc38559f89a0da5a55a10afc2c5df665c

data/lib/console/filter.rb

@@ -17,7 +17,7 @@ module Console
 			min_level, max_level = levels.values.minmax
 			
 			klass.instance_exec do
-				const_set(:LEVELS, levels)
+				const_set(:LEVELS, levels.freeze)
 				const_set(:MINIMUM_LEVEL, min_level)
 				const_set(:MAXIMUM_LEVEL, max_level)
 				

data/lib/console/serialized/logger.rb

@@ -9,6 +9,8 @@ require_relative '../filter'
 require 'time'
 require 'json'
 
+require 'fiber/annotation'
+
 module Console
 	module Serialized
 		class Logger
@@ -44,6 +46,10 @@ module Console
 					record[:subject] = subject
 				end
 				
+				if annotation = Fiber.current.annotation
+					record[:annotation] = annotation
+				end
+				
 				message = arguments
 				
 				if block_given?

data/lib/console/terminal/logger.rb

@@ -6,12 +6,14 @@
 
 require_relative '../buffer'
 require_relative '../event'
+require_relative '../clock'
 
 require_relative 'text'
 require_relative 'xterm'
 
 require 'json'
 require 'fiber'
+require 'fiber/annotation'
 
 module Console
 	module Terminal
@@ -61,6 +63,9 @@ module Console
 				@terminal[:error] = @terminal.style(:red)
 				@terminal[:fatal] = @terminal[:error]
 				
+				@terminal[:annotation] = @terminal.style(:blue)
+				@terminal[:value] = @terminal.style(:blue)
+				
 				self.register_defaults(@terminal)
 			end
 			
@@ -90,18 +95,16 @@ module Console
 				
 				buffer = Buffer.new("#{indent}| ")
 				
-				if subject
-					format_subject(severity, prefix, subject, buffer)
+				format_subject(severity, prefix, subject, buffer)
+				
+				arguments.each do |argument|
+					format_argument(argument, buffer)
 				end
 				
 				if options&.any?
 					format_options(options, buffer)
 				end
 				
-				arguments.each do |argument|
-					format_argument(argument, buffer)
-				end
-				
 				if block_given?
 					if block.arity.zero?
 						format_argument(yield, buffer)
@@ -126,7 +129,9 @@ module Console
 				when Event::Generic
 					argument.format(output, @terminal, @verbose)
 				else
-					format_value(argument, output)
+					argument.to_s.each_line do |line|
+						output.puts line
+					end
 				end
 			end
 			
@@ -141,13 +146,23 @@ module Console
 			end
 			
 			def default_suffix(object = nil)
-				buffer = +" #{@terminal[:logger_suffix]}"
+				buffer = +" "
+				
+				if @verbose
+					if annotation = Fiber.current.annotation and annotation.size > 0
+						buffer << "(#{@terminal[:annotation]}#{annotation})#{@terminal.reset} "
+					end
+				end
+				
+				buffer << @terminal[:logger_suffix].to_s
 				
 				if object
 					buffer << "[oid=0x#{object.object_id.to_s(16)}] "
 				end
 				
 				buffer << "[ec=0x#{Fiber.current.object_id.to_s(16)}] [pid=#{Process.pid}] [#{::Time.now}]#{@terminal.reset}"
+				
+				return buffer
 			end
 			
 			def format_object_subject(severity, prefix, subject, output)
@@ -178,7 +193,7 @@ module Console
 				string = value.to_s
 				
 				string.each_line do |line|
-					output.puts "#{line}"
+					output.puts "#{@terminal[:value]}#{line}#{@terminal.reset}"
 				end
 			end
 			

data/lib/console/terminal/xterm.rb

@@ -21,7 +21,7 @@ module Console
 				cyan: 6,
 				white: 7,
 				default: 9,
-			}
+			}.freeze
 			
 			ATTRIBUTES = {
 				normal: 0,
@@ -33,7 +33,7 @@ module Console
 				blink: 5,
 				reverse: 7,
 				hidden: 8,
-			}
+			}.freeze
 			
 			def colors?
 				true

data/lib/console/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2019-2022, by Samuel Williams.
 
 module Console
-	VERSION = "1.16.2"
+	VERSION = "1.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -43,7 +43,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiber-local
@@ -59,6 +59,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fiber-annotation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bake
   requirement: !ruby/object:Gem::Requirement
@@ -192,14 +206,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Beautiful logging for Ruby.