console 1.29.3 → 1.30.1

data/lib/console/filter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2019-2025, by Samuel Williams.
 # Copyright, 2019, by Bryan Powell.
 # Copyright, 2020, by Michael Adams.
 # Copyright, 2021, by Robert Schulze.
@@ -9,18 +9,28 @@
 module Console
 	UNKNOWN = :unknown
 	
+	# A log filter which can be used to filter log messages based on severity, subject, and other criteria.
 	class Filter
 		if Object.const_defined?(:Ractor) and RUBY_VERSION >= "3.1"
+			# Define a method which can be shared between ractors.
 			def self.define_immutable_method(name, &block)
 				block = Ractor.make_shareable(block)
 				self.define_method(name, &block)
 			end
 		else
+			# Define a method.
 			def self.define_immutable_method(name, &block)
 				define_method(name, &block)
 			end
 		end
 		
+		# Create a new log filter with specific log levels.
+		#
+		# ```ruby
+		# class MyLogger < Console::Filter[debug: 0, okay: 1, bad: 2, terrible: 3]
+		# ```
+		#
+		# @parameter levels [Hash(Symbol, Integer)] A hash of log levels.
 		def self.[] **levels
 			klass = Class.new(self)
 			minimum_level, maximum_level = levels.values.minmax
@@ -54,6 +64,12 @@ module Console
 			return klass
 		end
 		
+		# Create a new log filter.
+		#
+		# @parameter output [Console::Output] The output destination.
+		# @parameter verbose [Boolean] Enable verbose output.
+		# @parameter level [Integer] The log level.
+		# @parameter options [Hash] Additional options.
 		def initialize(output, verbose: true, level: self.class::DEFAULT_LEVEL, **options)
 			@output = output
 			@verbose = verbose
@@ -64,6 +80,12 @@ module Console
 			@options = options
 		end
 		
+		# Create a new log filter with the given options, from an existing log filter.
+		#
+		# @parameter level [Integer] The log level.
+		# @parameter verbose [Boolean] Enable verbose output.
+		# @parameter options [Hash] Additional options.
+		# @returns [Console::Filter] The new log filter.
 		def with(level: @level, verbose: @verbose, **options)
 			dup.tap do |logger|
 				logger.level = level
@@ -72,14 +94,24 @@ module Console
 			end
 		end
 		
+		# @attribute [Console::Output] The output destination.
 		attr_accessor :output
+		
+		# @attribute [Boolean] Whether to enable verbose output.
 		attr :verbose
+		
+		# @attribute [Integer] The current log level.
 		attr :level
 		
+		# @attribute [Hash(Module, Integer)] The log levels for specific subject (classes).
 		attr :subjects
 		
+		# @attribute [Hash] Additional options.
 		attr_accessor :options
 		
+		# Set the log level.
+		#
+		# @parameter level [Integer | Symbol] The log level.
 		def level= level
 			if level.is_a? Symbol
 				@level = self.class::LEVELS[level]
@@ -88,19 +120,30 @@ module Console
 			end
 		end
 		
+		# Set verbose output (enable by default with no arguments).
+		#
+		# @parameter value [Boolean] Enable or disable verbose output.
 		def verbose!(value = true)
 			@verbose = value
 			@output.verbose!(value)
 		end
 		
+		# Disable all logging.
 		def off!
 			@level = self.class::MAXIMUM_LEVEL + 1
 		end
 		
+		# Enable all logging.
 		def all!
 			@level = self.class::MINIMUM_LEVEL - 1
 		end
 		
+		# Filter log messages based on the subject and log level.
+		#
+		# You must provide the subject's class, not an instance of the class.
+		#
+		# @parameter subject [Module] The subject to filter.
+		# @parameter level [Integer] The log level.
 		def filter(subject, level)
 			unless subject.is_a?(Module)
 				raise ArgumentError, "Expected a class, got #{subject.inspect}"
@@ -109,8 +152,13 @@ module Console
 			@subjects[subject] = level
 		end
 		
+		# Whether logging is enabled for the given subject and log level.
+		#
 		# You can enable and disable logging for classes. This function checks if logging for a given subject is enabled.
-		# @param subject [Object] the subject to check.
+		#
+		# @parameter subject [Module] The subject to check.
+		# @parameter level [Integer] The log level.
+		# @returns [Boolean] Whether logging is enabled.
 		def enabled?(subject, level = self.class::MINIMUM_LEVEL)
 			subject = subject.class unless subject.is_a?(Module)
 			
@@ -124,19 +172,24 @@ module Console
 		end
 		
 		# Enable specific log level for the given class.
+		#
 		# @parameter name [Module] The class to enable.
 		def enable(subject, level = self.class::MINIMUM_LEVEL)
 			# Set the filter level of logging for a given subject which passes all log messages:
 			filter(subject, level)
 		end
 		
+		# Disable logging for the given class.
+		#
+		# @parameter name [Module] The class to disable.
 		def disable(subject)
 			# Set the filter level of the logging for a given subject which filters all log messages:
 			filter(subject, self.class::MAXIMUM_LEVEL + 1)
 		end
 		
 		# Clear any specific filters for the given class.
-		# @parameter name [Module] The class to disable.
+		#
+		# @parameter subject [Module] The class to disable.
 		def clear(subject)
 			unless subject.is_a?(Module)
 				raise ArgumentError, "Expected a class, got #{subject.inspect}"
@@ -145,6 +198,13 @@ module Console
 			@subjects.delete(subject)
 		end
 		
+		# Log a message with the given severity.
+		#
+		# @parameter subject [Object] The subject of the log message.
+		# @parameter arguments [Array] The arguments to log.
+		# @parameter options [Hash] Additional options to pass to the output.
+		# @parameter block [Proc] A block passed to the output.
+		# @returns [Nil] Always returns nil.
 		def call(subject, *arguments, **options, &block)
 			severity = options[:severity] || UNKNOWN
 			level = self.class::LEVELS[severity]

data/lib/console/format/safe.rb

@@ -1,21 +1,32 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
 require "json"
 
 module Console
+	# @namespace
 	module Format
-		# This class is used to safely dump objects.
-		# It will attempt to dump the object using the given format, but if it fails, it will generate a safe version of the object.
+		# A safe format for converting objects to strings.
+		# 
+		# Handles issues like circular references and encoding errors.
 		class Safe
+			# Create a new safe format.
+			#
+			# @parameter format [JSON] The format to use for serialization.
+			# @parameter limit [Integer] The maximum depth to recurse into objects.
+			# @parameter encoding [Encoding] The encoding to use for strings.
 			def initialize(format: ::JSON, limit: 8, encoding: ::Encoding::UTF_8)
 				@format = format
 				@limit = limit
 				@encoding = encoding
 			end
 			
+			# Dump the given object to a string.
+			#
+			# @parameter object [Object] The object to dump.
+			# @returns [String] The dumped object.
 			def dump(object)
 				@format.dump(object, @limit)
 			rescue SystemStackError, StandardError => error
@@ -24,6 +35,10 @@ module Console
 			
 			private
 			
+			# Filter the backtrace to remove duplicate frames and reduce verbosity.
+			#
+			# @parameter error [Exception] The exception to filter.
+			# @returns [Array(String)] The filtered backtrace.
 			def filter_backtrace(error)
 				frames = error.backtrace
 				filtered = {}
@@ -61,6 +76,13 @@ module Console
 				return frames
 			end
 			
+			# Dump the given object to a string, replacing it with a safe representation if there is an error.
+			#
+			# This is a slow path so we try to avoid it.
+			#
+			# @parameter object [Object] The object to dump.
+			# @parameter error [Exception] The error that occurred while dumping the object.
+			# @returns [Hash] The dumped (truncated) object including error details.
 			def safe_dump(object, error)
 				object = safe_dump_recurse(object)
 				
@@ -74,6 +96,10 @@ module Console
 				return object
 			end
 			
+			# Replace the given object with a safe truncated representation.
+			#
+			# @parameter object [Object] The object to replace.
+			# @returns [String] The replacement string.
 			def replacement_for(object)
 				case object
 				when Array
@@ -85,15 +111,17 @@ module Console
 				end
 			end
 			
+			# Create a new hash with identity comparison.
 			def default_objects
 				Hash.new.compare_by_identity
 			end
 			
-			# This will recursively generate a safe version of the object.
-			# Nested hashes and arrays will be transformed recursively.
-			# Strings will be encoded with the given encoding.
-			# Primitive values will be returned as-is.
-			# Other values will be converted using `as_json` if available, otherwise `to_s`.
+			# This will recursively generate a safe version of the object. Nested hashes and arrays will be transformed recursively. Strings will be encoded with the given encoding. Primitive values will be returned as-is. Other values will be converted using `as_json` if available, otherwise `to_s`.
+			#
+			# @parameter object [Object] The object to dump.
+			# @parameter limit [Integer] The maximum depth to recurse into objects.
+			# @parameter objects [Hash] The objects that have already been visited.
+			# @returns [Object] The dumped object as a primitive representation.
 			def safe_dump_recurse(object, limit = @limit, objects = default_objects)
 				if limit <= 0 || objects[object]
 					return replacement_for(object)

data/lib/console/format.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
 require_relative "format/safe"
 
 module Console
 	module Format
+		# A safe format for converting objects to strings.
+		#
+		# @returns [Console::Format::Safe]
 		def self.default
 			Safe.new(format: ::JSON)
 		end

data/lib/console/interface.rb

@@ -3,51 +3,59 @@
 # Released under the MIT License.
 # Copyright, 2024-2025, by Samuel Williams.
 
-require_relative "logger"
+require "fiber/local"
+require_relative "config"
 
 module Console
 	# The public logger interface.
 	module Interface
+		extend Fiber::Local
+		
+		# Create a new (thread local) logger instance.
+		def self.local
+			Config::DEFAULT.make_logger
+		end
+		
 		# Get the current logger instance.
 		def logger
-			Logger.instance
+			Interface.instance
 		end
 		
 		# Set the current logger instance.
 		#
 		# The current logger instance is assigned per-fiber.
 		def logger= instance
-			Logger.instance= instance
+			Interface.instance= instance
 		end
 		
 		# Emit a debug log message.
 		def debug(...)
-			Logger.instance.debug(...)
+			Interface.instance.debug(...)
 		end
 		
 		# Emit an informational log message.
 		def info(...)
-			Logger.instance.info(...)
+			Interface.instance.info(...)
 		end
 		
 		# Emit a warning log message.
 		def warn(...)
-			Logger.instance.warn(...)
+			Interface.instance.warn(...)
 		end
 		
 		# Emit an error log message.
 		def error(...)
-			Logger.instance.error(...)
+			Interface.instance.error(...)
 		end
 		
 		# Emit a fatal log message.
 		def fatal(...)
-			Logger.instance.fatal(...)
+			Interface.instance.fatal(...)
 		end
 		
 		# Emit a log message with arbitrary arguments and options.
 		def call(...)
-			Logger.instance.call(...)
+			Interface.instance.call(...)
 		end
 	end
 end

data/lib/console/logger.rb

@@ -1,68 +1,47 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2019-2025, by Samuel Williams.
 # Copyright, 2021, by Bryan Powell.
 # Copyright, 2021, by Robert Schulze.
+# Copyright, 2025, by Shigeru Nakajima.
 
 require_relative "output"
 require_relative "output/failure"
 
-require_relative "filter"
-require_relative "event"
-require_relative "resolver"
 require_relative "progress"
 
-require "fiber/local"
-
 module Console
+	# The standard logger interface with support for log levels and verbosity.
+	#
+	# The log levels are: `debug`, `info`, `warn`, `error`, and `fatal`.
 	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)
+		#
+		# @parameter env [Hash] The environment to read the log level from.
+		# @parameter verbose [Boolean] The verbose flag.
+		# @parameter debug [Boolean] The debug flag.
+		# @returns [Integer] The default log level.
+		def self.default_log_level(env = ENV, verbose: $VERBOSE, debug: $DEBUG)
 			if level = env["CONSOLE_LEVEL"]
 				LEVELS[level.to_sym] || level.to_i
-			elsif $DEBUG
+			elsif debug
 				DEBUG
-			elsif $VERBOSE.nil?
+			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 = $stderr, env = ENV, **options)
-			if options[:verbose].nil?
-				options[:verbose] = self.verbose?(env)
-			end
-			
-			if options[:level].nil?
-				options[:level] = self.default_log_level(env)
-			end
-			
-			output = Output.new(output, env, **options)
-			
-			logger = self.new(output, **options)
-			
-			Resolver.default_resolver(logger)
-			
-			return logger
-		end
-		
-		def self.local
-			self.default_logger
-		end
-		
 		DEFAULT_LEVEL = 1
 		
+		# Create a new logger.
+		#
+		# @parameter output [Console::Output] The output destination.
+		# @parameter options [Hash] Additional options.
 		def initialize(output, **options)
 			# This is the expected default behaviour, but it may be nice to have a way to override it.
 			output = Output::Failure.new(output, **options)
@@ -70,6 +49,12 @@ module Console
 			super(output, **options)
 		end
 		
+		# Create a progress indicator for the given subject.
+		#
+		# @parameter subject [String] The subject of the progress indicator.
+		# @parameter total [Integer] The total number of items to process.
+		# @parameter options [Hash] Additional options passed to {Progress}.
+		# @returns [Progress] The progress indicator.
 		def progress(subject, total, **options)
 			options[:severity] ||= :info
 			

data/lib/console/output/default.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2024, by Samuel Williams.
+# Copyright, 2021-2025, by Samuel Williams.
 
 require_relative "terminal"
 require_relative "serialized"
@@ -9,14 +9,20 @@ require_relative "failure"
 
 module Console
 	module Output
+		# Default output format selection.
 		module Default
-			def self.new(output, **options)
-				output ||= $stderr
+			# Create a new output format based on the given stream.
+			#
+			# @parameter io [IO] The output stream.
+			# @parameter options [Hash] Additional options to customize the output.
+			# @returns [Console::Output::Terminal | Console::Output::Serialized] The output instance, depending on whether the `io` is a terminal or not.
+			def self.new(stream, **options)
+				stream ||= $stderr
 				
-				if output.tty?
-					output = Terminal.new(output, **options)
+				if stream.tty?
+					output = Terminal.new(stream, **options)
 				else
-					output = Serialized.new(output, **options)
+					output = Serialized.new(stream, **options)
 				end
 				
 				return output

data/lib/console/output/failure.rb

@@ -10,11 +10,18 @@ module Console
 	module Output
 		# A wrapper for outputting failure messages, which can include exceptions.
 		class Failure < Wrapper
+			# Create a new failure output wrapper.
 			def initialize(output, **options)
 				super(output, **options)
 			end
 			
 			# The exception must be either the last argument or passed as an option.
+			#
+			# @parameter subject [String] The subject of the message.
+			# @parameter arguments [Array] The arguments to output.
+			# @parameter exception [Exception] The exception to output.
+			# @parameter options [Hash] Additional options to pass to the output.
+			# @parameter block [Proc] An optional block to pass to the output.
 			def call(subject = nil, *arguments, exception: nil, **options, &block)
 				if exception.nil?
 					last = arguments.last
@@ -28,7 +35,7 @@ module Console
 					options[:exception] = exception
 				end
 				
-				super(subject, *arguments, **options)
+				super(subject, *arguments, **options, &block)
 			end
 		end
 	end

data/lib/console/output/null.rb

@@ -1,20 +1,23 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
 module Console
 	module Output
+		# A null output that does nothing.
 		class Null
+			# Create a new null output.
 			def initialize(...)
 			end
 			
+			# The last output is always self.
 			def last_output
 				self
 			end
 			
+			# Do nothing.
 			def call(...)
-				# Do nothing.
 			end
 		end
 	end

data/lib/console/output/sensitive.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2024, by Samuel Williams.
+# Copyright, 2021-2025, by Samuel Williams.
 
 require_relative "wrapper"
 
 module Console
 	module Output
+		# Redact sensitive information from output.
 		class Sensitive < Wrapper
+			# Default redaction pattern.
 			REDACT = /
 				phone
 				| email
@@ -34,28 +36,52 @@ module Console
 				| password
 			/xi
 			
+			# Create a new sensitive output wrapper.
+			#
+			# @parameter output [Console::Output] The output to wrap.
+			# @parameter redact [Regexp] The pattern to redact.
+			# @parameter options [Hash] Additional options to pass to the output.
 			def initialize(output, redact: REDACT, **options)
 				super(output, **options)
 				
 				@redact = redact
 			end
 			
+			# Check if the given text should be redacted.
+			#
+			# @parameter text [String] The text to check.
+			# @returns [Boolean] Whether the text should be redacted.
 			def redact?(text)
 				text.match?(@redact)
 			end
 			
+			# Redact sensitive information from a hash.
+			#
+			# @parameter arguments [Hash] The hash to redact.
+			# @parameter filter [Proc] An optional filter to apply to redacted text.
+			# @returns [Hash] The redacted hash.
 			def redact_hash(arguments, filter)
 				arguments.transform_values do |value|
 					redact(value, filter)
 				end
 			end
 			
+			# Redact sensitive information from an array.
+			#
+			# @parameter array [Array] The array to redact.
+			# @parameter filter [Proc] An optional filter to apply to redacted text.
+			# @returns [Array] The redacted array.
 			def redact_array(array, filter)
 				array.map do |value|
 					redact(value, filter)
 				end
 			end
 			
+			# Redact sensitive information from the given argument.
+			#
+			# @parameter argument [String | Array | Hash] The argument to redact.
+			# @parameter filter [Proc] An optional filter to apply to redacted text.
+			# @returns [String | Array | Hash] The redacted argument.
 			def redact(argument, filter)
 				case argument
 				when String
@@ -75,17 +101,32 @@ module Console
 				end
 			end
 			
+			# A simple filter for redacting sensitive information.
 			class Filter
+				# Create a new filter.
+				#
+				# @parameter substitutions [Hash] The substitutions to apply.
 				def initialize(substitutions)
 					@substitutions = substitutions
 					@pattern = Regexp.union(substitutions.keys)
 				end
 				
+				# Apply the filter to the given text. This will replace all occurrences of the pattern with the corresponding substitution.
+				#
+				# @parameter text [String] The text to filter.
+				# @returns [String] The filtered text.
 				def call(text)
 					text.gsub(@pattern, @substitutions)
 				end
 			end
 			
+			# Write a message to the output, filtering sensitive information if necessary.
+			#
+			# @parameter subject [String] The subject of the message.
+			# @parameter arguments [Array] The arguments to output.
+			# @parameter sensitive [Boolean | Filter | Hash] Whether to filter sensitive information.
+			# @parameter options [Hash] Additional options to pass to the output.
+			# @parameter block [Proc] An optional block to pass to the output.
 			def call(subject = nil, *arguments, sensitive: true, **options, &block)
 				if sensitive
 					if sensitive.respond_to?(:call)