console 1.29.3 → 1.30.0

data/lib/console/output/wrapper.rb

@@ -5,21 +5,32 @@
 
 module Console
 	module Output
+		# A generic wrapper for output handling.
 		class Wrapper
+			# Create a new wrapper output.
+			#
+			# @parameter delegate [Console::Output] The output to delegate to.
+			# @parameter options [Hash] Additional options to customize the output.
 			def initialize(delegate, **options)
 				@delegate = delegate
 			end
 			
+			# @attribute [Console::Output] The output to delegate to.
 			attr :delegate
 			
+			# The last output is the last output of the delegate.
 			def last_output
 				@delegate.last_output
 			end
 			
+			# Set the verbose flag for the delegate.
+			#
+			# @parameter value [Boolean] The new value.
 			def verbose!(value = true)
 				@delegate.verbose!(value)
 			end
 			
+			# Invoke the delegate.
 			def call(...)
 				@delegate.call(...)
 			end

data/lib/console/output.rb

@@ -9,7 +9,18 @@ require_relative "output/terminal"
 require_relative "output/null"
 
 module Console
+	# Output handling.
 	module Output
+		# Create a new output based on the environment.
+		#
+		# The environment variable `CONSOLE_OUTPUT` can be used to specify a list of output classes to wrap around the output. If not specified the {Default} output is used.
+		#
+		# The output argument is deliberately unders-specified but can be an IO object or an instance of {Output}.
+		#
+		# @parameter output [Console::Output] The output to wrap OR an IO object.
+		# @parameter env [Hash] The environment to read configuration from.
+		# @parameter options [Hash] Additional options to customize the output.
+		# @returns [Console::Output] The output instance.
 		def self.new(output = nil, env = ENV, **options)
 			if names = env["CONSOLE_OUTPUT"]
 				names = names.split(",").reverse

data/lib/console/progress.rb

@@ -7,16 +7,24 @@
 require_relative "clock"
 
 module Console
+	# A simple progress indicator
 	class Progress
+		# @deprecated Use {Clock.now} instead.
 		def self.now
-			Process.clock_gettime(Process::CLOCK_MONOTONIC)
+			Clock.now
 		end
 		
+		# Create a new progress indicator.
+		#
+		# @parameter subject [Object] The subject of the progress indicator.
+		# @parameter total [Integer] The total number of steps.
+		# @parameter minimum_output_duration [Numeric] The minimum duration between outputs.
+		# @parameter options [Hash] Additional options to customize the output.
 		def initialize(subject, total = 0, minimum_output_duration: 0.1, **options)
 			@subject = subject
 			@options = options
 			
-			@start_time = Progress.now
+			@start_time = Clock.now
 			
 			@last_output_time = nil
 			@minimum_output_duration = minimum_output_duration
@@ -25,34 +33,53 @@ module Console
 			@total = total
 		end
 		
+		# @attribute [Object] The subject of the progress indicator.
 		attr :subject
+		
+		# @attribute [Numeric] The minimum duration between outputs.
+		attr :minimum_output_duration
+		
+		# @attribute [Time] The time the progress indicator was started.
+		attr :start_time
+		
+		# @attribute [Numeric] The current number of steps completed.
 		attr :current
+		
+		# @attribute [Numeric] The total number of steps.
 		attr :total
 		
+		# @returns [Numeric] The duration since the progress indicator was started.
 		def duration
-			Progress.now - @start_time
+			Clock.now - @start_time
 		end
 		
+		# @returns [Rational] The ratio of steps completed to total steps.
 		def ratio
 			Rational(@current.to_f, @total.to_f)
 		end
 		
+		# @returns [Numeric] The number of steps remaining.
 		def remaining
 			@total - @current
 		end
 		
+		# @returns [Numeric | Nil] The average duration per step, or `nil` if no steps have been completed.
 		def average_duration
 			if @current > 0
 				duration / @current
 			end
 		end
 		
+		# @returns [Numeric | Nil] The estimated remaining time, or `nil` if no steps have been completed.
 		def estimated_remaining_time
 			if average_duration = self.average_duration
 				average_duration * remaining
 			end
 		end
 		
+		# Generate an appropriate event for the progress indicator.
+		#
+		# @returns [Hash] The progress indicator as a hash.
 		def to_hash
 			Hash.new.tap do |hash|
 				hash[:type] = :progress
@@ -64,30 +91,44 @@ module Console
 			end
 		end
 		
+		# Increment the progress indicator by the given amount.
+		#
+		# @parameter amount [Numeric] The amount to increment by.
+		# @returns [Progress] The progress indicator itself.
 		def increment(amount = 1)
 			@current += amount
 			
 			if output?
 				Console.call(@subject, self.to_s, event: self.to_hash, **@options)
-				@last_output_time = Progress.now
+				@last_output_time = Clock.now
 			end
 			
 			return self
 		end
 		
+		# Resize the progress indicator to the given total.
+		#
+		# @parameter total [Numeric] The new total number of steps.
+		# @returns [Progress] The progress indicator itself.
 		def resize(total)
 			@total = total
 			
 			Console.call(@subject, self.to_s, event: self.to_hash, **@options)
-			@last_output_time = Progress.now
+			@last_output_time = Clock.now
 			
 			return self
 		end
 		
-		def mark(*arguments, **options)
-			Console.call(@subject, *arguments, **options, **@options)
+		# Augment the progress indicator with additional information.
+		#
+		# @parameter *arguments [Array] The arguments to log.
+		# @parameter **options [Hash] Additional options to log.
+		# @parameter &block [Proc] An optional block used to generate the log message.
+		def mark(*arguments, **options, &block)
+			Console.call(@subject, *arguments, **options, **@options, &block)
 		end
 		
+		# @returns [String] A human-readable representation of the progress indicator.
 		def to_s
 			if estimated_remaining_time = self.estimated_remaining_time
 				"#{@current}/#{@total} completed in #{Clock.formatted_duration(self.duration)}, #{Clock.formatted_duration(estimated_remaining_time)} remaining."
@@ -98,12 +139,18 @@ module Console
 		
 		private
 		
+		# Compute a time delta since the last output, used for rate limiting the output.
+		#
+		# @returns [Numeric | Nil] The duration since the last output.
 		def duration_since_last_output
 			if @last_output_time
-				Progress.now - @last_output_time
+				Clock.now - @last_output_time
 			end
 		end
 		
+		# Whether an output should be generated at this time, taking into account the remaining steps, and the duration since the last output.
+		#
+		# @returns [Boolean] Whether an output should be generated.
 		def output?
 			if remaining.zero?
 				return true

data/lib/console/resolver.rb

@@ -7,6 +7,7 @@
 require_relative "filter"
 
 module Console
+	# Represents a class resolver that can be used to set log levels for different classes as they become available.
 	class Resolver
 		# You can change the log level for different classes using CONSOLE_$LEVEL env vars.
 		#
@@ -16,7 +17,6 @@ module Console
 		#
 		# @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)
@@ -59,12 +59,21 @@ module Console
 			return resolver
 		end
 		
+		# Create a new class resolver.
 		def initialize
 			@names = {}
 			
 			@trace_point = TracePoint.new(:class, &self.method(:resolve))
 		end
 		
+		# Bind the given class names to the given block. When the class name is resolved into an actual class, the block will be called with the class as an argument.
+		#
+		# If the class is already defined, the block will be called immediately.
+		#
+		# If the class is not defined, the block will be called when the class is defined, using a trace point.
+		#
+		# @parameter names [Array(String)] The class names to bind.
+		# @parameter block [Proc] The block to call when the class is resolved.
 		def bind(names, &block)
 			names.each do |name|
 				if klass = Object.const_get(name) rescue nil
@@ -81,10 +90,18 @@ module Console
 			end
 		end
 		
+		# @returns [Boolean] True if the resolver is waiting for classes to be defined.
 		def waiting?
 			@trace_point.enabled?
 		end
 		
+		# Invoked by the trace point when a class is defined.
+		#
+		# This will call the block associated with the class name, if any, and remove it from the list of names to resolve.
+		#
+		# If the list of names is empty, the trace point will be disabled.
+		#
+		# @parameter trace_point [TracePoint] The trace point that triggered the event.
 		def resolve(trace_point)
 			if block = @names.delete(trace_point.self.to_s)
 				block.call(trace_point.self)

data/lib/console/terminal/formatter/failure.rb

@@ -6,9 +6,14 @@
 module Console
 	module Terminal
 		module Formatter
+			# Format a failure event, including the exception message and backtrace.
 			class Failure
+				# The key used to identify this formatter.
 				KEY = :failure
 				
+				# Create a new failure formatter.
+				#
+				# @param terminal [Terminal::Text] The terminal to use for formatting.
 				def initialize(terminal)
 					@terminal = terminal
 					
@@ -19,7 +24,14 @@ module Console
 					@terminal[:exception_message] ||= @terminal.style(:default)
 				end
 				
-				def format(event, output, prefix: nil, verbose: false, width: 80)
+				# Format the given event.
+				#
+				# @parameter event [Hash] The event to format.
+				# @parameter stream [IO] The stream to write the formatted event to.
+				# @parameter prefix [String] The prefix to use before the title.
+				# @parameter verbose [Boolean] Whether to include additional information.
+				# @parameter options [Hash] Additional options.
+				def format(event, stream, prefix: nil, verbose: false, **options)
 					title = event[:class]
 					message = event[:message]
 					backtrace = event[:backtrace]
@@ -27,10 +39,10 @@ module Console
 					
 					lines = message.lines.map(&:chomp)
 					
-					output.puts "  #{prefix}#{@terminal[:exception_title]}#{title}#{@terminal.reset}: #{lines.shift}"
+					stream.puts "  #{prefix}#{@terminal[:exception_title]}#{title}#{@terminal.reset}: #{lines.shift}"
 					
 					lines.each do |line|
-						output.puts "  #{@terminal[:exception_detail]}#{line}#{@terminal.reset}"
+						stream.puts "  #{@terminal[:exception_detail]}#{line}#{@terminal.reset}"
 					end
 					
 					root_pattern = /^#{root}\// if root
@@ -44,11 +56,11 @@ module Console
 							style = :exception_backtrace_other
 						end
 						
-						output.puts "  #{index == 0 ? "→" : " "} #{@terminal[style]}#{path}:#{offset}#{@terminal[:exception_message]} #{message}#{@terminal.reset}"
+						stream.puts "  #{index == 0 ? "→" : " "} #{@terminal[style]}#{path}:#{offset}#{@terminal[:exception_message]} #{message}#{@terminal.reset}"
 					end
 					
 					if cause = event[:cause]
-						format(cause, output, prefix: "Caused by ", verbose: verbose, width: width)
+						format(cause, stream, prefix: "Caused by ", verbose: verbose, **options)
 					end
 				end
 			end

data/lib/console/terminal/formatter/progress.rb

@@ -6,9 +6,12 @@
 module Console
 	module Terminal
 		module Formatter
+			# Format a progress event, including the current progress and total.
 			class Progress
+				# The key used to identify this formatter.
 				KEY = :progress
 				
+				# The block characters used to render the progress bar.
 				BLOCK = [
 					" ",
 					"▏",
@@ -21,12 +24,21 @@ module Console
 					"█",
 				]
 				
+				# Create a new progress formatter.
+				#
+				# @param terminal [Terminal::Text] The terminal to use for formatting.
 				def initialize(terminal)
 					@terminal = terminal
 					@terminal[:progress_bar] ||= terminal.style(:blue, :white)
 				end
 				
-				def format(event, output, verbose: false, width: 80)
+				# Format the given event.
+				#
+				# @parameter event [Hash] The event to format.
+				# @parameter stream [IO] The stream to write the formatted event to.
+				# @parameter verbose [Boolean] Whether to include additional information.
+				# @parameter width [Integer] The width of the progress bar.
+				def format(event, stream, verbose: false, width: 80)
 					current = event[:current].to_f
 					total = event[:total].to_f
 					value = current / total
@@ -36,11 +48,12 @@ module Console
 						value = 1.0
 					end
 					
-					output.puts "#{@terminal[:progress_bar]}#{self.bar(value, width-10)}#{@terminal.reset} #{sprintf('%6.2f', value * 100)}%"
+					stream.puts "#{@terminal[:progress_bar]}#{self.bar(value, width-10)}#{@terminal.reset} #{sprintf('%6.2f', value * 100)}%"
 				end
 				
 				private
 				
+				# Render a progress bar with the given value and width.
 				def bar(value, width)
 					blocks = width * value
 					full_blocks = blocks.floor

data/lib/console/terminal/formatter/spawn.rb

@@ -6,31 +6,42 @@
 module Console
 	module Terminal
 		module Formatter
-			# Format spawn events.
+			# Format a spawn event, including the command and arguments.
 			class Spawn
+				# The key used to identify this formatter.
 				KEY = :spawn
 				
+				# Create a new spawn formatter.
+				#
+				# @param terminal [Terminal::Text] The terminal to use for formatting.
 				def initialize(terminal)
 					@terminal = terminal
 					@terminal[:spawn_command] ||= @terminal.style(:blue, nil, :bold)
 				end
 				
-				def format(event, output, verbose: false, width: 80)
+				# Format the given event.
+				#
+				# @parameter event [Hash] The event to format.
+				# @parameter stream [IO] The stream to write the formatted event to.
+				# @parameter verbose [Boolean] Whether to include additional information.
+				# @parameter width [Integer] The width of the progress bar.
+				def format(event, stream, verbose: false, width: 80)
 					environment, arguments, options = event.values_at(:environment, :arguments, :options)
 					
 					arguments = arguments.flatten.collect(&:to_s)
 					
-					output.puts "#{@terminal[:spawn_command]}#{arguments.join(' ')}#{@terminal.reset}#{chdir_string(options)}"
+					stream.puts "#{@terminal[:spawn_command]}#{arguments.join(' ')}#{@terminal.reset}#{chdir_string(options)}"
 					
 					if verbose and environment
 						environment.each do |key, value|
-							output.puts "export #{key}=#{value}"
+							stream.puts "export #{key}=#{value}"
 						end
 					end
 				end
 				
 				private
 				
+				# Generate a string to represent the working directory.
 				def chdir_string(options)
 					if options and chdir = options[:chdir]
 						" in #{chdir}"

data/lib/console/terminal/formatter.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2025, by Samuel Williams.
+
+require_relative "formatter/progress"
+require_relative "formatter/failure"
+require_relative "formatter/spawn"
+
+module Console
+	module Terminal
+		# Formatters for various types of events.
+		module Formatter
+		end
+	end
+end

data/lib/console/terminal/text.rb

@@ -8,75 +8,116 @@ require "io/console"
 module Console
 	# Styled terminal output.
 	module Terminal
+		# A simple text-based terminal output.
 		class Text
-			def initialize(output)
-				@output = output
+			# Create a new text terminal output.
+			#
+			# @parameter stream [IO] The stream to write to.
+			def initialize(stream)
+				@stream = stream
 				@styles = {reset: self.reset}
 			end
 			
+			# @attribute [IO] The stream to write to.
+			attr :stream
+			
+			# Get the style associated with the given key.
+			#
+			# @parameter key [Symbol] The key to look up.
+			# @returns [String] The style associated with the key.
 			def [] key
 				@styles[key]
 			end
 			
+			# Set the style associated with the given key.
+			#
+			# @parameter key [Symbol] The key to associate the style with.
+			# @parameter value [String] The style to associate with the key.
 			def []= key, value
 				@styles[key] = value
 			end
 			
+			# @returns [Boolean] Whether the terminal supports colors.
 			def colors?
 				false
 			end
 			
+			# @returns [Tuple(Integer, Integer)] The size of the terminal, or a default value of [24, 80].
+			def size
+				[24, 80]
+			end
+			
+			# @returns [Integer] The width of the terminal.
 			def width
-				80
+				self.size.last
 			end
 			
+			# Generate a style string for the given foreground, background, and attributes.
+			#
+			# @returns [String | Nil] The style string if colors are supported, otherwise nil.
 			def style(foreground, background = nil, *attributes)
 			end
 			
+			# Generate a reset sequence.
+			#
+			# @returns [String | Nil] The reset sequence if colors are supported, otherwise nil.
 			def reset
 			end
 			
+			# Write the given arguments to the output stream using the given style. The reset sequence is automatically appended.
+			#
+			# @parameter arguments [Array] The arguments to write.
+			# @parameter style [Symbol] The style to apply.
 			def write(*arguments, style: nil)
 				if style and prefix = self[style]
-					@output.write(prefix)
-					@output.write(*arguments)
-					@output.write(self.reset)
+					@stream.write(prefix)
+					@stream.write(*arguments)
+					@stream.write(self.reset)
 				else
-					@output.write(*arguments)
+					@stream.write(*arguments)
 				end
 			end
 			
+			# Write the given arguments to the output stream using the given style. The reset sequence is automatically appended.
+			#
+			# @parameter arguments [Array] The arguments to write, each on a new line.
+			# @parameter style [Symbol] The style to apply.
 			def puts(*arguments, style: nil)
 				if style and prefix = self[style]
-					@output.write(prefix)
-					@output.puts(*arguments)
-					@output.write(self.reset)
+					@stream.write(prefix)
+					@stream.puts(*arguments)
+					@stream.write(self.reset)
 				else
-					@output.puts(*arguments)
+					@stream.puts(*arguments)
 				end
 			end
 			
-			# Print out the given arguments.
-			# When the argument is a symbol, look up the style and inject it into the output stream.
-			# When the argument is a proc/lambda, call it with self as the argument.
-			# When the argument is anything else, write it directly to the output.
+			# Print rich text to the output stream.
+			#
+			# - When the argument is a symbol, look up the style and inject it into the output stream.
+			# - When the argument is a proc/lambda, call it with self as the argument.
+			# - When the argument is anything else, write it directly to the output.
+			#
+			# @parameter arguments [Array] The arguments to print.
 			def print(*arguments)
 				arguments.each do |argument|
 					case argument
 					when Symbol
-						@output.write(self[argument])
+						@stream.write(self[argument])
 					when Proc
 						argument.call(self)
 					else
-						@output.write(argument)
+						@stream.write(argument)
 					end
 				end
 			end
 			
-			# Print out the arguments as per {#print}, followed by the reset sequence and a newline.
+			# Print rich text to the output stream, followed by the reset sequence and a newline.
+			#
+			# @parameter arguments [Array] The arguments to print.
 			def print_line(*arguments)
 				print(*arguments)
-				@output.puts(self.reset)
+				@stream.puts(self.reset)
 			end
 		end
 	end

data/lib/console/terminal/xterm.rb

@@ -10,7 +10,9 @@ require_relative "text"
 module Console
 	# Styled terminal output.
 	module Terminal
+		# XTerm style terminal output.
 		class XTerm < Text
+			# XTerm color codes.
 			COLORS = {
 				black: 0,
 				red: 1,
@@ -23,6 +25,7 @@ module Console
 				default: 9,
 			}.freeze
 			
+			# XTerm attribute codes.
 			ATTRIBUTES = {
 				normal: 0,
 				bold: 1,
@@ -35,21 +38,30 @@ module Console
 				hidden: 8,
 			}.freeze
 			
+			# Whether the terminal supports colors.
 			def colors?
 				true
 			end
 			
+			# The size of the terminal.
 			def size
-				@output.winsize
+				@stream.winsize
 			rescue Errno::ENOTTY
 				# Fake it...
 				[24, 80]
 			end
 			
+			# The width of the terminal.
 			def width
 				size.last
 			end
 			
+			# Apply the given style to the output.
+			#
+			# @parameter foreground [Symbol] The foreground color.
+			# @parameter background [Symbol] The background color.
+			# @parameter attributes [Array(Symbol)] The attributes to apply.
+			# @returns [String] The style code.
 			def style(foreground, background = nil, *attributes)
 				tokens = []
 				
@@ -68,6 +80,9 @@ module Console
 				return "\e[#{tokens.join(';')}m"
 			end
 			
+			# Reset the style.
+			#
+			# @returns [String] The reset code.
 			def reset
 				"\e[0m"
 			end

data/lib/console/terminal.rb

@@ -5,18 +5,16 @@
 
 require_relative "terminal/text"
 require_relative "terminal/xterm"
-
-require_relative "terminal/formatter/progress"
-require_relative "terminal/formatter/failure"
-require_relative "terminal/formatter/spawn"
+require_relative "terminal/formatter"
 
 module Console
 	module Terminal
-		def self.for(io)
-			if io.tty?
-				XTerm.new(io)
+		# Create a new terminal output for the given stream.
+		def self.for(stream)
+			if stream.tty?
+				XTerm.new(stream)
 			else
-				Text.new(io)
+				Text.new(stream)
 			end
 		end
 	end

data/lib/console/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2019-2024, by Samuel Williams.
 
 module Console
-	VERSION = "1.29.3"
+	VERSION = "1.30.0"
 end

data/lib/console/warn.rb

@@ -22,7 +22,7 @@ module Console
 				fiber.console_warn = true
 				message.chomp!
 				
-				Console::Logger.instance.warn(message, **options)
+				Console::Interface.instance.warn(message, **options)
 			ensure
 				fiber.console_warn = false
 			end

data/lib/console.rb

@@ -9,6 +9,7 @@
 require_relative "console/version"
 require_relative "console/interface"
 
+# @namespace
 module Console
 	Console.extend(Interface)
 end