More WIP.

lib/console/output/default.rb

@@ -9,11 +9,13 @@
 module Console
 	module Output
 		module Default
-			def self.new(output, io: $stderr, **options)
-				if io.tty?
-					Terminal.new(io: io, **options)
+			def self.new(output, **options)
+				output ||= $stderr
+
+				if output.tty?
+					Terminal.new(output, **options)
 				else
-					Serialized.new(io: io, **options)
+					Serialized.new(output, **options)
 				end
 			end
 		end

lib/console/output/null.rb

@@ -3,11 +3,9 @@
 # Released under the MIT License.
 # Copyright, 2023, by Samuel Williams.
 
-require_relative 'generic'
-
 module Console
 	module Output
-		class Null < Generic
+		class Null
 			def initialize(...)
 			end
 

lib/console/output/sensitive.rb

@@ -3,11 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2021-2022, by Samuel Williams.
 
-require_relative 'generic'
+require_relative 'wrapper'
 
 module Console
 	module Output
-		class Sensitive < Generic
+		class Sensitive < Wrapper
 			REDACT = /
 				  phone
 				| email

lib/console/output/serialized.rb

@@ -10,8 +10,8 @@
 module Console
 	module Output
 		class Serialized
-			def initialize(io: $stderr, format: Format.default, **options)
-				@io = io
+			def initialize(output, format: Format.default, **options)
+				@io = output
 				@format = format
 			end
 
@@ -66,5 +66,7 @@ def call(subject = nil, *arguments, severity: UNKNOWN, **options, &block)
 				@io.puts(self.dump(record))
 			end
 		end
+
+		JSON = Serialized
 	end
 end

lib/console/output/terminal.rb

@@ -51,11 +51,11 @@ def self.start_at!(environment = ENV)
 				return start_at
 			end
 
-			def initialize(io: $stderr, verbose: nil, start_at: Terminal.start_at!, format: nil, **options)
-				@io = io
+			def initialize(output, verbose: nil, start_at: Terminal.start_at!, format: nil, **options)
+				@io = output
 				@start_at = start_at
 
-				@terminal = format.nil? ? Console::Terminal.for(io) : format.new(io)
+				@terminal = format.nil? ? Console::Terminal.for(@io) : format.new(@io)
 
 				if verbose.nil?
 					@verbose = !@terminal.colors?
@@ -226,13 +226,13 @@ def build_prefix(name)
 
 		module Text
 			def self.new(output, **options)
-				Terminal.new(format: Console::Terminal::Text, **options)
+				Terminal.new(output, format: Console::Terminal::Text, **options)
 			end
 		end
 
 		module XTerm
 			def self.new(output, **options)
-				Terminal.new(format: Console::Terminal::XTerm, **options)
+				Terminal.new(output, format: Console::Terminal::XTerm, **options)
 			end
 		end
 	end

lib/console/output/generic.rb → lib/console/output/wrapper.rb

@@ -5,7 +5,7 @@
 
 module Console
 	module Output
-		class Generic
+		class Wrapper
 			def initialize(delegate, **options)
 				@delegate = delegate
 			end

test/console/compatible/logger.rb

@@ -8,7 +8,7 @@
 
 describe Console::Compatible::Logger do
 	let(:io) {StringIO.new}
-	let(:output) {Console::Output::Terminal.new(io: io)}
+	let(:output) {Console::Output::Terminal.new(io)}
 	let(:logger) {Console::Compatible::Logger.new("Test", output)}
 
 	it "should log messages" do

test/console/output.rb

@@ -33,7 +33,7 @@
 
 		with env: {'CONSOLE_OUTPUT' => 'JSON'} do
 			it 'can set output to Serialized and format to JSON' do
-				expect(output).to be_a Console::Serialized::Logger
+				expect(output).to be_a Console::Output::Serialized
 				expect(output.format).to be_a(Console::Format::Safe)
 			end
 		end
@@ -53,15 +53,15 @@
 		with env: {'CONSOLE_OUTPUT' => 'XTerm'} do
 			it 'can force format to XTerm for non tty output by ENV' do
 				expect(Console::Terminal).not.to receive(:for)
-				expect(output).to be_a Console::Terminal::Logger
+				expect(output).to be_a Console::Output::Terminal
 				expect(output.terminal).to be_a Console::Terminal::XTerm
 			end
 		end
 
 		with env: {'CONSOLE_OUTPUT' => 'Text'} do
 			it 'can force format to text for tty output by ENV using Text' do
 				expect(Console::Terminal).not.to receive(:for)
-				expect(output).to be_a Console::Terminal::Logger
+				expect(output).to be_a Console::Output::Terminal
 				expect(output.terminal).to be_a Console::Terminal::Text
 			end
 		end

test/console/output/default.rb

@@ -7,7 +7,7 @@
 require 'console/capture'
 
 describe Console::Output::Default do
-	let(:output) {Console::Capture.new}
+	let(:output) {nil}
 	let(:logger) {subject.new(output)}
 
 	def final_output(output)
@@ -18,11 +18,7 @@ def final_output(output)
 		end
 	end
 
-	with 'unspecified output' do
-		let(:output) {nil}
-
-		it 'should output to $stderr by default' do
-			expect(final_output(logger).io).to be == $stderr
-		end
+	it 'should output to $stderr by default' do
+		expect(final_output(logger).io).to be == $stderr
 	end
 end

test/console/output/serialized.rb

@@ -9,7 +9,7 @@
 
 describe Console::Output::Serialized do
 	let(:io) {StringIO.new}
-	let(:logger) {subject.new(io: io)}
+	let(:logger) {subject.new(io)}
 
 	let(:message) {"Hello World"}
 

test/console/output/terminal.rb

@@ -7,7 +7,7 @@
 
 describe Console::Output::Terminal do
 	let(:io) {StringIO.new}
-	let(:logger) {subject.new(io: io, verbose: true)}
+	let(:logger) {subject.new(io, verbose: true)}
 
 	let(:message) {"Hello World"}