console 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f9ed13eedb54202ce2111a451e6e7d744f97db971a6b619ba3decb5aa6c963
-  data.tar.gz: 8c77221c0e50be91b7c1857fde7b596ec7e48eebd67a43287bd01aa3f95e70b4
+  metadata.gz: 5928a2a5d4c07c44e8ad937edbab2b8fa326ff13553ffb4bf89c0854184f1bd8
+  data.tar.gz: e0495d1933a3a0991b23193aae3988fb679389f02514d57c9a15ce7ccbf73497
 SHA512:
-  metadata.gz: 021e0bd5c98d7019af39186b6fa06e49aed619cb5228051a85725bd43f3f05d8015b6d9bc84baf3a49f51a9b13ac62ed65cb20051f9561939d0fb72c791b8475
-  data.tar.gz: '029abdaded5a4d383e7e4b666c99e2b06c0aaabed87c1da9740c6925ca5e9308eb41b52d61835e0b6a3223efff9b25a98aac555fe43c2ca441ef48f5f27e6f3f'
+  metadata.gz: e69af353f0397d3620654d9108b2cb7fffe4d601e4a4f9feea7cdf09a7cd40aa3f310faded79abfc8de5735c257b59713bb9d5a91d5320a1dca15d0df4a92804
+  data.tar.gz: c46ec0e33e56260345710facc882d89edb4782179ccdb7ec97ed70c3d83087465b4758ceecdaa7f8ac4e2508dc18f46968974bee19a694c62c5314157a8402fe

data/lib/console.rb

@@ -20,83 +20,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'console/version'
 require_relative 'console/logger'
-require_relative 'console/resolver'
-require_relative 'console/terminal/logger'
 
 module Console
-	class << self
-		attr_accessor :logger
-		
-		# Set the default log level based on `$DEBUG` and `$VERBOSE`.
-		# You can also specify CONSOLE_LEVEL=debug or CONSOLE_LEVEL=info in environment.
-		# https://mislav.net/2011/06/ruby-verbose-mode/ has more details about how it all fits together.
-		def default_log_level(env = ENV)
-			if level = (env['CONSOLE_LEVEL'] || env['CONSOLE_LOG_LEVEL'])
-				Logger::LEVELS[level.to_sym] || Logger.warn
-			elsif $DEBUG
-				Logger::DEBUG
-			elsif $VERBOSE.nil?
-				Logger::WARN
-			else
-				Logger::INFO
-			end
-		end
-		
-		# You can change the log level for different classes using CONSOLE_<LEVEL> env vars.
-		#
-		# e.g. `CONSOLE_WARN=Acorn,Banana CONSOLE_DEBUG=Cat` will set the log level for Acorn and Banana to warn and Cat to
-		# debug. This overrides the default log level.
-		#
-		# @param logger [Logger] A logger instance to set the logging levels on.
-		# @param env [Hash] Environment to read levels from.
-		#
-		# @return [nil] if there were no custom logging levels specified in the environment.
-		# @return [Resolver] if there were custom logging levels, then the created resolver is returned.
-		def default_resolver(logger, env = ENV)
-			# find all CONSOLE_<LEVEL> variables from environment
-			levels = Logger::LEVELS
-			.map { |label, level| [level, env["CONSOLE_#{label.to_s.upcase}"]&.split(',')] }
-			.to_h
-			.compact
-
-			# if we have any levels, then create a class resolver, and each time a class is resolved, set the log level for
-			# that class to the specified level
-			if levels.any?
-				resolver = Resolver.new
-				levels.each do |level, names|
-					resolver.bind(names) do |klass|
-						logger.enable(klass, level)
-					end
-				end
-				return resolver
-			end
-		end
-		
-		# Controls verbose output using `$VERBOSE`.
-		def verbose?
-			!$VERBOSE.nil?
-		end
-		
-		def build(output, verbose: self.verbose?, level: self.default_log_level)
-			terminal = Terminal::Logger.new(output, verbose: verbose)
-			
-			logger = Logger.new(terminal, verbose: verbose, level: level)
-			
-			return logger
-		end
+	def self.logger
+		Logger.instance
 	end
 	
-	# Create the logger instance:
-	@logger = self.build($stderr)
-	@resolver = self.default_resolver(@logger)
+	def self.logger= instance
+		Logger.instance= instance
+	end
 	
 	def logger= logger
 		@logger = logger
 	end
 	
 	def logger
-		@logger || Console.logger
+		@logger || Logger.instance
 	end
 	
 	def self.extended(klass)

data/lib/console/capture.rb

@@ -21,15 +21,20 @@
 require_relative 'filter'
 
 module Console
+	# A general sink which captures all events into a buffer.
 	class Capture
 		def initialize
-			@events = []
+			@buffer = []
 		end
 		
-		attr :events
+		attr :buffer
 		
 		def last
-			@events.last
+			@buffer.last
+		end
+		
+		def clear
+			@buffer.clear
 		end
 		
 		def verbose!(value = true)
@@ -37,7 +42,7 @@ module Console
 		
 		def call(subject = nil, *arguments, severity: UNKNOWN, **options, &block)
 			message = {
-				time: Time.now.iso8601,
+				time: ::Time.now.iso8601,
 				severity: severity,
 				**options,
 			}
@@ -60,7 +65,7 @@ module Console
 				end
 			end
 			
-			@events << message
+			@buffer << message
 		end
 	end
 end

data/lib/console/clock.rb

@@ -0,0 +1,50 @@
+# Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Console
+	module Clock
+		def self.formatted_duration(duration)
+			if duration < 60.0
+				return "#{duration.round(2)}s"
+			end
+			
+			duration /= 60.0
+			
+			if duration < 60.0
+				return "#{duration.round}m"
+			end
+			
+			duration /= 60.0
+			
+			if duration < 60.0
+				return "#{duration.round(1)}h"
+			end
+			
+			duration /= 24.0
+			
+			return "#{duration.round(1)}d"
+		end
+		
+		# Get the current elapsed monotonic time.
+		def self.now
+			::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+		end
+	end
+end

data/lib/console/event.rb

@@ -20,4 +20,5 @@
 
 require_relative 'event/spawn'
 require_relative 'event/failure'
+require_relative 'event/metric'
 require_relative 'event/progress'

data/lib/console/event/failure.rb

@@ -47,6 +47,12 @@ module Console
 				terminal[:exception_title] ||= terminal.style(:red, nil, :bold)
 				terminal[:exception_detail] ||= terminal.style(:yellow)
 				terminal[:exception_backtrace] ||= terminal.style(:red)
+				terminal[:exception_backtrace_other] ||= terminal.style(:red, nil, :faint)
+				terminal[:exception_message] ||= terminal.style(:default)
+			end
+			
+			def to_h
+				{exception: @exception, root: @root}
 			end
 			
 			def format(output, terminal, verbose)
@@ -62,13 +68,18 @@ module Console
 					output.puts "  #{terminal[:exception_detail]}#{line}#{terminal.reset}"
 				end
 				
+				root_pattern = /^#{@root}\// if @root
+				
 				exception.backtrace&.each_with_index do |line, index|
 					path, offset, message = line.split(":")
+					style = :exception_backtrace
 					
 					# Make the path a bit more readable
-					path.gsub!(/^#{@root}\//, "./") if @root
+					if root_pattern and path.sub!(root_pattern, "").nil?
+						style = :exception_backtrace_other
+					end
 					
-					output.puts "  #{index == 0 ? "→" : " "} #{terminal[:exception_backtrace]}#{path}:#{offset}#{terminal.reset} #{message}"
+					output.puts "  #{index == 0 ? "→" : " "} #{terminal[style]}#{path}:#{offset}#{terminal[:exception_message]} #{message}#{terminal.reset}"
 				end
 				
 				if exception.cause

data/lib/console/event/generic.rb

@@ -24,6 +24,13 @@ module Console
 			def self.register(terminal)
 			end
 			
+			def to_h
+			end
+			
+			def as_json
+				to_h
+			end
+			
 			def format(buffer, terminal)
 			end
 		end

data/lib/console/event/measure.rb

@@ -0,0 +1,42 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'metric'
+require_relative '../clock'
+
+module Console
+	module Event
+		class Enter < Generic
+			def initialize(name)
+				@name = name
+			end
+			
+			def format(output, terminal, verbose)
+				output.puts "→ #{@name}"
+			end
+		end
+		
+		class Exit < Metric
+			def value_string
+				"← #{@name} took #{Clock.formatted_duration(@value)}"
+			end
+		end
+	end
+end

data/lib/console/event/metric.rb

@@ -0,0 +1,58 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'generic'
+require_relative '../clock'
+
+module Console
+	module Event
+		class Metric < Generic
+			def self.[](**parameters)
+				parameters.map(&self.method(:new))
+			end
+			
+			def initialize(name, value, **tags)
+				@name = name
+				@value = value
+				@tags = tags
+			end
+			
+			attr :name
+			attr :value
+			attr :tags
+			
+			def to_h
+				{name: @name, value: @value, tags: @tags}
+			end
+			
+			def value_string
+				"#{@name}: #{@value}"
+			end
+			
+			def format(output, terminal, verbose)
+				if @tags&.any?
+					output.puts "#{value_string} #{@tags.inspect}"
+				else
+					output.puts value_string
+				end
+			end
+		end
+	end
+end

data/lib/console/event/progress.rb

@@ -63,7 +63,7 @@ module Console
 				terminal[:progress_bar] ||= terminal.style(:blue, :white)
 			end
 			
-			def as_json
+			def to_h
 				{current: @current, total: @total}
 			end
 			

data/lib/console/event/spawn.rb

@@ -24,6 +24,7 @@ module Console
 	module Event
 		class Spawn < Generic
 			def self.for(*arguments, **options)
+				# Extract out the command environment:
 				if arguments.first.is_a?(Hash)
 					self.new(*arguments, **options)
 				else
@@ -51,6 +52,10 @@ module Console
 				terminal[:shell_command] ||= terminal.style(:blue, nil, :bold)
 			end
 			
+			def to_h
+				{environment: @environment, arguments: @arguments, options: @options}
+			end
+			
 			def format(output, terminal, verbose)
 				arguments = @arguments.flatten.collect(&:to_s)
 				

data/lib/console/filter.rb

@@ -46,7 +46,7 @@ module Console
 					end
 					
 					define_method("#{name}?") do
-						@level >= level
+						@level <= level
 					end
 				end
 			end

data/lib/console/logger.rb

@@ -20,17 +20,72 @@
 
 require_relative 'filter'
 require_relative 'measure'
+require_relative 'progress'
+
+require_relative 'resolver'
+require_relative 'terminal/logger'
+
+require 'fiber/local'
 
 module Console
 	class Logger < Filter[debug: 0, info: 1, warn: 2, error: 3, fatal: 4]
+		extend Fiber::Local
+		
+		# Set the default log level based on `$DEBUG` and `$VERBOSE`.
+		# You can also specify CONSOLE_LEVEL=debug or CONSOLE_LEVEL=info in environment.
+		# https://mislav.net/2011/06/ruby-verbose-mode/ has more details about how it all fits together.
+		def self.default_log_level(env = ENV)
+			if level = (env['CONSOLE_LEVEL'] || env['CONSOLE_LOG_LEVEL'])
+				LEVELS[level.to_sym] || level.to_i
+			elsif $DEBUG
+				DEBUG
+			elsif $VERBOSE.nil?
+				WARN
+			else
+				INFO
+			end
+		end
+		
+		# Controls verbose output using `$VERBOSE`.
+		def self.verbose?(env = ENV)
+			!$VERBOSE.nil? || env['CONSOLE_VERBOSE']
+		end
+		
+		def self.default_logger(output, verbose: self.verbose?, level: self.default_log_level)
+			terminal = Terminal::Logger.new(output, verbose: verbose)
+			
+			logger = self.new(terminal, verbose: verbose, level: level)
+			Resolver.default_resolver(logger)
+			
+			return logger
+		end
+		
+		def self.local
+			self.default_logger($stderr)
+		end
+		
 		DEFAULT_LEVEL = 1
 		
 		def initialize(output, **options)
 			super(output, **options)
 		end
 		
-		def measure(subject, total)
-			Measure.new(self, subject, total)
+		def progress(subject, total, **options)
+			Progress.new(self, subject, total, **options)
+		end
+		
+		def measure(subject, name = "block", **options, &block)
+			measure = Measure.new(self, subject)
+			
+			if block_given?
+				measure.duration(name, **options, &block)
+			end
+			
+			return measure
+		end
+		
+		def failure(subject, exception, *arguments, &block)
+			fatal(subject, *arguments, Event::Failure.new(exception), &block)
 		end
 	end
 end

data/lib/console/measure.rb

@@ -1,4 +1,4 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,98 +18,29 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'event/measure'
+require_relative 'clock'
+
 module Console
 	class Measure
-		def initialize(output, subject, total = 0)
+		def initialize(output, subject)
 			@output = output
 			@subject = subject
-			
-			@start_time = Time.now
-			
-			@current = 0
-			@total = total
-		end
-		
-		attr :subject
-		
-		attr :current
-		
-		attr :total
-		
-		def duration
-			Time.now - @start_time
-		end
-		
-		def progress
-			@current.to_f / @total.to_f
-		end
-		
-		def remaining
-			@total - @current
-		end
-		
-		def average_duration
-			if @current > 0
-				duration / @current
-			end
-		end
-		
-		def estimated_remaining_time
-			if average_duration = self.average_duration
-				average_duration * remaining
-			end
-		end
-		
-		def increment(amount = 1)
-			@current += amount
-			
-			@output.info(@subject, self) {Event::Progress.new(@current, @total)}
-			
-			return self
 		end
 		
-		def resize(total)
-			@total = total
-			
-			@output.info(@subject, self) {Event::Progress.new(@current, @total)}
-			
-			return self
-		end
-		
-		def mark(*arguments)
-			@output.info(@subject, *arguments)
-		end
-		
-		def to_s
-			if estimated_remaining_time = self.estimated_remaining_time
-				"#{@current}/#{@total} completed in #{self.formatted_duration self.duration}, #{self.formatted_duration estimated_remaining_time} remaining."
-			else
-				"#{@current}/#{@total} completed, waiting for estimate..."
-			end
-		end
-		
-		private
-		
-		def formatted_duration(duration)
-			if duration < 60.0
-				return "#{duration.round(2)}s"
-			end
-			
-			duration /= 60.0
+		# Measure the execution of a block of code.
+		def duration(name, **tags, &block)
+			@output.info(@subject) {Event::Enter.new(name)}
 			
-			if duration < 60.0
-				return "#{duration.round}m"
-			end
+			start_time = Clock.now
 			
-			duration /= 60.0
+			yield
 			
-			if duration < 60.0
-				return "#{duration.round(1)}h"
-			end
+			duration = Clock.now - start_time
 			
-			duration /= 24.0
+			@output.info(@subject) {Event::Exit.new(name, duration, **tags)}
 			
-			return "#{duration.round(1)}d"
+			return duration
 		end
 	end
 end

data/lib/console/progress.rb

@@ -0,0 +1,142 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'event/progress'
+
+module Console
+	class Progress
+		def self.now
+			Process.clock_gettime(Process::CLOCK_MONOTONIC)
+		end
+		
+		def initialize(output, subject, total = 0, minimum_output_duration: 1.0)
+			@output = output
+			@subject = subject
+			
+			@start_time = Progress.now
+			
+			@last_output_time = nil
+			@minimum_output_duration = 0.1
+			
+			@current = 0
+			@total = total
+		end
+		
+		attr :subject
+		attr :current
+		attr :total
+		
+		def duration
+			Progress.now - @start_time
+		end
+		
+		def progress
+			@current.to_f / @total.to_f
+		end
+		
+		def remaining
+			@total - @current
+		end
+		
+		def average_duration
+			if @current > 0
+				duration / @current
+			end
+		end
+		
+		def estimated_remaining_time
+			if average_duration = self.average_duration
+				average_duration * remaining
+			end
+		end
+		
+		def increment(amount = 1)
+			@current += amount
+			
+			if output?
+				@output.info(@subject, self) {Event::Progress.new(@current, @total)}
+				@last_output_time = Progress.now
+			end
+			
+			return self
+		end
+		
+		def resize(total)
+			@total = total
+			
+			@output.info(@subject, self) {Event::Progress.new(@current, @total)}
+			@last_output_time = Progress.now
+			
+			return self
+		end
+		
+		def mark(*arguments)
+			@output.info(@subject, *arguments)
+		end
+		
+		def to_s
+			if estimated_remaining_time = self.estimated_remaining_time
+				"#{@current}/#{@total} completed in #{formatted_duration(self.duration)}, #{formatted_duration(estimated_remaining_time)} remaining."
+			else
+				"#{@current}/#{@total} completed, waiting for estimate..."
+			end
+		end
+		
+		private
+		
+		def duration_since_last_output
+			if @last_output_time
+				Progress.now - @last_output_time
+			end
+		end
+		
+		def output?
+			if remaining.zero?
+				return true
+			elsif duration = duration_since_last_output
+				return duration > @minimum_output_duration
+			else
+				return true
+			end
+		end
+		
+		def formatted_duration(duration)
+			if duration < 60.0
+				return "#{duration.round(2)}s"
+			end
+			
+			duration /= 60.0
+			
+			if duration < 60.0
+				return "#{duration.round}m"
+			end
+			
+			duration /= 60.0
+			
+			if duration < 60.0
+				return "#{duration.round(1)}h"
+			end
+			
+			duration /= 24.0
+			
+			return "#{duration.round(1)}d"
+		end
+	end
+end

data/lib/console/resolver.rb

@@ -22,6 +22,36 @@ require_relative 'filter'
 
 module Console
 	class Resolver
+		# You can change the log level for different classes using CONSOLE_<LEVEL> env vars.
+		#
+		# e.g. `CONSOLE_WARN=Acorn,Banana CONSOLE_DEBUG=Cat` will set the log level for the classes Acorn and Banana to `warn` and Cat to `debug`. This overrides the default log level.
+		#
+		# @parameter logger [Logger] A logger instance to set the logging levels on.
+		# @parameter env [Hash] The environment to read levels from.
+		#
+		# @returns [Nil] If there were no custom logging levels specified in the environment.
+		# @returns [Resolver] If there were custom logging levels, then the created resolver is returned.
+		def self.default_resolver(logger, env = ENV)
+			# Find all CONSOLE_<LEVEL> variables from environment:
+			levels = Logger::LEVELS
+				.map{|label, level| [level, env["CONSOLE_#{label.upcase}"]&.split(',')]}
+				.to_h
+				.compact
+			
+			# If we have any levels, then create a class resolver, and each time a class is resolved, set the log level for that class to the specified level:
+			if levels.any?
+				resolver = Resolver.new
+				
+				levels.each do |level, names|
+					resolver.bind(names) do |klass|
+						logger.enable(klass, level)
+					end
+				end
+				
+				return resolver
+			end
+		end
+		
 		def initialize
 			@names = {}
 			

data/lib/console/terminal/logger.rb

@@ -24,6 +24,9 @@ require_relative '../event'
 require_relative 'text'
 require_relative 'xterm'
 
+require 'json'
+require 'fiber'
+
 module Console
 	module Terminal
 		# This, and all related methods, is considered private.
@@ -64,7 +67,6 @@ module Console
 					@verbose = verbose
 				end
 				
-				@terminal[:logger_prefix] ||= @terminal.style(nil, nil, nil)
 				@terminal[:logger_suffix] ||= @terminal.style(:white, nil, :faint)
 				@terminal[:subject] ||= @terminal.style(nil, nil, :bold)
 				@terminal[:debug] = @terminal.style(:cyan)
@@ -77,7 +79,9 @@ module Console
 			end
 			
 			attr :io
+			
 			attr_accessor :verbose
+			
 			attr :start
 			attr :terminal
 			
@@ -94,7 +98,7 @@ module Console
 			
 			UNKNOWN = 'unknown'
 			
-			def call(subject = nil, *arguments, name: nil, severity: UNKNOWN, &block)
+			def call(subject = nil, *arguments, name: nil, severity: UNKNOWN, **options, &block)
 				prefix = build_prefix(name || severity.to_s)
 				indent = " " * prefix.size
 				
@@ -104,6 +108,10 @@ module Console
 					format_subject(severity, prefix, subject, buffer)
 				end
 				
+				if options&.any?
+					format_options(options, buffer)
+				end
+				
 				arguments.each do |argument|
 					format_argument(argument, buffer)
 				end
@@ -121,10 +129,14 @@ module Console
 			
 			protected
 			
+			def format_options(options, output)
+				format_value(options.to_json, output)
+			end
+			
 			def format_argument(argument, output)
 				case argument
 				when Exception
-					Event::Failure.new(argument).format(output, @terminal, @verbose)
+					Event::Failure.for(argument).format(output, @terminal, @verbose)
 				when Event::Generic
 					argument.format(output, @terminal, @verbose)
 				else
@@ -142,11 +154,21 @@ module Console
 				end
 			end
 			
+			def default_suffix(object = nil)
+				buffer = +" #{@terminal[:logger_suffix]}"
+				
+				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}"
+			end
+			
 			def format_object_subject(severity, prefix, subject, output)
 				prefix_style = @terminal[severity]
 				
 				if @verbose
-					suffix = " #{@terminal[:logger_suffix]}[oid=0x#{subject.object_id.to_s(16)}] [pid=#{Process.pid}] [#{Time.now}]#{@terminal.reset}"
+					suffix = default_suffix(subject)
 				end
 				
 				prefix = "#{prefix_style}#{prefix}:#{@terminal.reset} "
@@ -158,7 +180,7 @@ module Console
 				prefix_style = @terminal[severity]
 				
 				if @verbose
-					suffix = " #{@terminal[:logger_suffix]}[pid=#{Process.pid}] [#{Time.now}]#{@terminal.reset}"
+					suffix = default_suffix
 				end
 				
 				prefix = "#{prefix_style}#{prefix}:#{@terminal.reset} "
@@ -175,15 +197,7 @@ module Console
 			end
 			
 			def time_offset_prefix
-				offset = Time.now - @start_at
-				minutes = (offset/60).floor
-				seconds = (offset - (minutes*60))
-				
-				if minutes > 0
-					"#{minutes}m#{seconds.floor}s"
-				else
-					"#{seconds.round(2)}s"
-				end.rjust(6)
+				Clock.formatted_duration(Time.now - @start_at).rjust(6)
 			end
 			
 			def build_prefix(name)

data/lib/console/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Console
-	VERSION = "1.9.0"
+	VERSION = "1.11.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fiber-local
+  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
@@ -90,14 +104,18 @@ files:
 - lib/console.rb
 - lib/console/buffer.rb
 - lib/console/capture.rb
+- lib/console/clock.rb
 - lib/console/event.rb
 - lib/console/event/failure.rb
 - lib/console/event/generic.rb
+- lib/console/event/measure.rb
+- lib/console/event/metric.rb
 - lib/console/event/progress.rb
 - lib/console/event/spawn.rb
 - lib/console/filter.rb
 - lib/console/logger.rb
 - lib/console/measure.rb
+- lib/console/progress.rb
 - lib/console/resolver.rb
 - lib/console/serialized/logger.rb
 - lib/console/split.rb
@@ -125,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Beautiful logging for Ruby.