loggability 0.15.0.pre20190714094638 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207be54e5100e41c070a6b545448ea603ff0e8a7cf4754149a8c63ec0ed1afe7
-  data.tar.gz: e50d8153d2da1b21e27dbb919307c9812d6b786a7eb5b6f69a7e045d30c877d8
+  metadata.gz: 4dd5d6f5605a1a639a0143107b4079272e35bb7ffba9e2b76b150c1fab57e11f
+  data.tar.gz: aef9016eb5f208d0d168d8e4aac0b03047851b582f8afcb437b37bb9f9b5ad4d
 SHA512:
-  metadata.gz: 21ca3115d9fd4a16515e8b30bad3ba981f3b4c2f42076338aa8008e4037ea408b70e3e90e4821be7f74083022e66075f480f18e4ae4a554a5d9ab1a0f6996a92
-  data.tar.gz: 02cf4ec3ad18e2f39ea9c1642f527c8e33fdeec54ae8ea109c5cef481d3adb3ef919c4282a317875ee1274ed97558824c7fef283e83e0c022a369a76f869a1ee
+  metadata.gz: e14c6919279635835bd126a7c878ef69149811640cd4c632022e1677c18abfb3ebadc67fe8a12e9d35e35a94296e2c3ca32614c0c998ed9089b8e9b72d25ec56
+  data.tar.gz: d2481edb5e1a26dcc7f2a78420831d127b9951dd36e02e898bbd7fded829895083071627d9d78616fbad692937eb05edbdd39456efa0034aae4647cce597c484

data/ChangeLog

@@ -1,23 +1,6 @@
-2019-07-14  Michael Granger  <ged@FaerieMUD.org>
-
-@  	* .gems, Manifest.txt, Rakefile, lib/loggability/formatter.rb,
-|  	lib/loggability/formatter/default.rb,
-|  	lib/loggability/formatter/html.rb,
-|  	lib/loggability/formatter/structured.rb, lib/loggability/logger.rb,
-|  	loggability.gemspec, spec/helpers.rb,
-|  	spec/loggability/formatter/color_spec.rb,
-|  	spec/loggability/formatter/default_spec.rb,
-|  	spec/loggability/formatter/html_spec.rb,
-|  	spec/loggability/formatter/structured_spec.rb,
-|  	spec/loggability/formatter_spec.rb, spec/loggability/logger_spec.rb,
-|  	spec/loggability/override_spec.rb,
-|  	spec/loggability/spechelpers_spec.rb:
-|  	Add a structured log formatter.
-|  	[55ea9e745f4d] [tip]
-|
 2019-07-13  Michael Granger  <ged@FaerieMUD.org>
 
-o  	* .ruby-version, lib/loggability.rb, lib/loggability/constants.rb,
+@  	* .ruby-version, lib/loggability.rb, lib/loggability/constants.rb,
 |  	lib/loggability/formatter.rb, lib/loggability/formatter/color.rb,
 |  	lib/loggability/formatter/default.rb,
 |  	lib/loggability/formatter/html.rb, lib/loggability/logclient.rb,
@@ -29,7 +12,7 @@ o  	* .ruby-version, lib/loggability.rb, lib/loggability/constants.rb,
 |  	spec/loggability/loghost_spec.rb, spec/loggability/override_spec.rb,
 |  	spec/loggability/spechelpers_spec.rb, spec/loggability_spec.rb:
 |  	Make literal strings frozen by default
-|  	[0933e9ab9c01]
+|  	[0933e9ab9c01] [tip]
 |
 2018-10-10  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,26 @@
+= Release History for loggability
+
+---
+
+== v0.15.1 [2020-01-09] Michael Granger <ged@faeriemud.org>
+
+Bugfixes:
+
+- Change the spec to require Ruby 2.5 or greater. This was because
+  of the use methods that are only public in newer versions.
+
+
+== v0.15.0 [2020-01-08] Michael Granger <ged@faeriemud.org>
+
+(Yanked)
+
+Enhancements:
+
+- Make literal strings frozen by default
+- Add a structured log formatter.
+- Add fixes for Ruby 2.6 and 2.7
+
+
 == v0.14.0 [2017-01-30] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Manifest.txt

@@ -2,7 +2,7 @@
 ChangeLog
 History.rdoc
 Manifest.txt
-README.rdoc
+README.md
 Rakefile
 lib/loggability.rb
 lib/loggability/constants.rb

data/{README.rdoc → README.md}

@@ -1,12 +1,19 @@
-= loggability
+# loggability
 
-home   :: http://deveiate.org/projects/loggability
-code   :: http://bitbucket.org/ged/loggability
-docs   :: http://deveiate.org/code/loggability
-github :: http://github.com/ged/loggability
+home
+: https://hg.sr.ht/~ged/Loggability
 
+code
+: https://hg.sr.ht/~ged/Loggability/browse
 
-== Description
+docs
+: https://deveiate.org/code/loggability
+
+github
+: https://github.com/ged/loggability
+
+
+## Description
 
 A composable logging system built on the standard Logger library.
 
@@ -21,23 +28,23 @@ An example:
     require 'inversion'
     require 'treequel'
     require 'loggability'
-    
+
     # Set up our own library
     module MyProject
         extend Loggability
         log_as :my_project
-    
+
         class Server
             extend Loggability
             log_to :my_project
-    
+
             def initialize
                 self.log.debug "Listening."
             end
         end
-    
+
     end
-    
+
     # Now tell everything that's using Loggability to log to an HTML
     # log file at INFO level
     Loggability.write_to( '/usr/local/www/htdocs/log.html' )
@@ -45,30 +52,30 @@ An example:
     Loggability.level = :info
 
 
-== Prerequisites
+## Prerequisites
 
-* Ruby 1.9.3 or better, Rubinius 2.0 or better
+* Ruby 2.4+
 
 It will probably work under any other interpreter in which Logger works, but
 it's only tested in the above.
 
 
-== Installation
+## Installation
 
     $ gem install loggability
 
 
-== Usage
+## Usage
 
-Loggability is split up into two parts: {log hosts}[rdoc-ref:Loggability::LogHost]
-and {log clients}[rdoc-ref:Loggability::LogClient]. A <b>log
+Loggability is split up into two parts: [log hosts](rdoc-ref:Loggability::LogHost)
+and [log clients](rdoc-ref:Loggability::LogClient). A <b>log
 host</b> is an object that contains a Logger instance that will be used to
 log stuff. A <b>log client</b> is an object that will write logging messages to a
 particular <b>log host</b>'s Logger.
 
 Both parts require that you extend the object with Loggability.
 
-=== Setting Up A 'Log Host'
+### Setting Up A 'Log Host'
 
 To install a Logger into an object, you use the +log_as+ declaration with a
 Symbol that will be used as the key for the object's Logger:
@@ -116,10 +123,10 @@ or use a few new convenience methods for changing the logging level:
     log_messages = []
     MyProject.logger.output_to( log_messages )
 
-...{and more}[rdoc-ref:Loggability::Logger].
+...[and more](rdoc-ref:Loggability::Logger).
 
 
-=== Setting Up A 'Log Client'
+### Setting Up A 'Log Client'
 
 To add an object that will log to your log host, after you <tt>extend Loggability</tt>,
 use the +log_to+ declaration to hook up the object (and instances of the object if
@@ -153,7 +160,7 @@ You can also use the <b>log host</b> itself as the argument to +log_to+:
     end
 
 
-=== Aggregate Logging
+### Aggregate Logging
 
 If you have several <b>log hosts</b>, and you want to affect them all simultaneously,
 you can do that using the aggregate functions of Loggability. They're the same as the
@@ -161,15 +168,15 @@ methods on Loggability::Logger:
 
     # Set all logs to log at INFO level
     Loggability.level = :info
-    
+
     # Write HTML logs
     Loggability.format_with( :html )
-    
+
     # Log everything to the same logfile
     Loggability.output_to( "/tmp/my_project_log.html" )
 
 
-=== Temporarily Overriding Logging  Behavior
+### Temporarily Overriding Logging  Behavior
 
 Sometimes you want to log one particular chunk of code at a different
 level, or to a different destination, and then restore everything back
@@ -187,7 +194,7 @@ Loggability has a few ways of doing that:
     Loggability.outputting_to( logs ) do
         ...
     end
-    
+
     # Log using the HTML formatter
     Loggability.formatted_with( :html ) do
         ...
@@ -210,7 +217,7 @@ You can also make the override only apply to the loggers for a subset of log hos
       ACME.start_up
     end
 
-=== Configurability
+### Configurability
 
 Loggability has support for the Configurability[https://rubygems.org/gems/configurability]
 library, which does the same thing for configuration that Loggability does for
@@ -230,39 +237,41 @@ The format of the value of each logger is:
 
 where:
 
-[+SEVERITY+]
-  The log level; one of: +debug+, +info+, +warn+, +error+, or +fatal+
-[+TARGET+]
-  The destination for log messages. This can be the path to a log file, or
-  one of <tt>'STDOUT'</tt> or <tt>'STDERR'</tt>, which get mapped to the
-  equivalent filehandle. Optional.
-[+FORMAT+]
-  The name of one of the formatters. Loggability comes with +default+ (plaintext),
-  +color+ (ANSI colored text), and +html+ formatters. Optional.
++SEVERITY+
+:  The log level; one of: +debug+, +info+, +warn+, +error+, or +fatal+
 
-If the special key <tt>__default__</tt> is included, its config will be used to set
-global defaults before the individual configs are applied.
++TARGET+
+:  The destination for log messages. This can be the path to a log file, or
+   one of <tt>'STDOUT'</tt> or <tt>'STDERR'</tt>, which get mapped to the
+   equivalent filehandle. Optional.
 
-If either of the optional values is unspecified, it is left unchanged from what it
-was before configuration.
++FORMAT+
+:  The name of one of the formatters. Loggability comes with +default+
+   (plaintext), +color+ (ANSI colored text), and +html+ formatters. Optional.
 
+If the special key <tt>__default__</tt> is included, its config will be used to
+set global defaults before the individual configs are applied.
 
-=== RSpec Helpers
+If either of the optional values is unspecified, it is left unchanged from what
+it was before configuration.
 
-Loggability includes a couple of helper functions for RSpec that allow you to control
-log levels for particular specs.
 
-To use it, require <tt>loggability/spechelpers</tt> in your specs (we put it in the 
-spec helpers file) and then include the helpers from your RSpec config:
+### RSpec Helpers
 
-  require 'loggability/spechelpers'
-  RSpec.configure do |c|
-    # ...
-    c.include( Loggability::SpecHelpers )
-  end
+Loggability includes a couple of helper functions for RSpec that allow you to
+control log levels for particular specs.
+
+To use it, require <tt>loggability/spechelpers</tt> in your specs (we put it in
+the spec helpers file) and then include the helpers from your RSpec config:
 
-This will install a before and after `:all` hook to set the logging levels before each
-example group and then reset it before moving on to the next group.
+    require 'loggability/spechelpers'
+    RSpec.configure do |c|
+      # ...
+      c.include( Loggability::SpecHelpers )
+    end
+
+This will install a before and after `:all` hook to set the logging levels
+before each example group and then reset it before moving on to the next group.
 
 You can also access the bodies of those hooks manually:
 
@@ -270,31 +279,31 @@ You can also access the bodies of those hooks manually:
   reset_logging()
 
 The helpers also allow you to set logging levels for a whole example group, for
-particular contexts, or even for individual examples using RSpec's metadata hash
-syntax:
+particular contexts, or even for individual examples using RSpec's metadata
+hash syntax:
 
   # Set logging to 'error' level for each example in this group
   describe MyClass, logging: :error do
-  
+
     # ...but for examples in this context, set it to 'fatal'
     context 'created with a target', log: :fatal do
-    
+
       # ...except for this one, which logs at 'debug' level
       it "does something to it", logging: :debug do
-      
+
       end
-    
+
       it "does some other stuff, too"
-    
+
     end
-  
+
   end
 
-The {setup_logging}[rdoc-ref:Loggability::SpecHelpers.setup_logging] helper
+The [setup_logging](rdoc-ref:Loggability::SpecHelpers.setup_logging) helper
 also provides support for displaying the logs inline with spec formatters for
 which outputting the logs to STDERR isn't optimal. The only one that's
-currently uses it is the 
-{'webkit' formatter}[https://rubygems.org/gems/rspec-formatter-webkit], but
+currently uses it is the
+['webkit' formatter](https://rubygems.org/gems/rspec-formatter-webkit), but
 it should be easy to adapt to other HTML displays as well.
 
 It looks for either an +HTML_LOGGING+ environment variable, or for the
@@ -307,23 +316,21 @@ This can be used to append logs to each example when the formatter
 builds the output.
 
 
-== Contributing
+## Contributing
 
 You can check out the current development source with
-Mercurial[http://bitbucket.org/ged/loggability], or if you prefer Git, via
-{its Github mirror}[https://github.com/ged/loggability].
+Mercurial[http://hg.sr.ht/~ged/Loggability], or if you prefer Git, via
+[its Github mirror](https://github.com/ged/loggability).
 
-After checking out the source, run:
 
-    $ rake newb
+## Author
 
-This task will install any missing dependencies, run the tests/specs,
-and generate the API documentation.
+- Michael Granger <ged@faeriemud.org>
 
 
-== License
+## License
 
-Copyright (c) 2012-2017, Michael Granger
+Copyright (c) 2012-2020, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -1,82 +1,9 @@
-#!/usr/bin/env rake
+#!/usr/bin/env ruby -S rake
 
-require 'rake/clean'
+require 'rake/deveiate'
 
-begin
-	require 'hoe'
-rescue LoadError
-	abort "This Rakefile requires 'hoe' (gem install hoe)"
+Rake::DevEiate.setup( 'loggability' ) do |project|
+	project.required_ruby_version = '~> 2.5'
+	project.publish_to = 'deveiate:/usr/local/www/public/code'
 end
 
-GEMSPEC = 'loggability.gemspec'
-
-Hoe.plugin :mercurial
-Hoe.plugin :signing
-Hoe.plugin :deveiate
-
-Hoe.plugins.delete :rubyforge
-
-hoespec = Hoe.spec 'loggability' do
-	self.readme_file = 'README.rdoc'
-	self.history_file = 'History.rdoc'
-	self.extra_rdoc_files = FileList[ '*.rdoc' ]
-
-	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
-
-	self.dependency 'hoe-deveiate',    '~> 0.4', :developer
-	self.dependency 'hoe-bundler',     '~> 1.2', :developer
-	self.dependency 'simplecov',       '~> 0.7', :developer
-	self.dependency 'configurability', '~> 3.1', :developer
-	self.dependency 'timecop',         '~> 0.9', :developer
-
-	self.license "BSD-3-Clause"
-	self.require_ruby_version( '>=1.9.3' )
-	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
-	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
-
-	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
-end
-
-ENV['VERSION'] ||= hoespec.spec.version.to_s
-
-# Ensure the specs pass before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
-
-
-desc "Build a coverage report"
-task :coverage do
-	ENV["COVERAGE"] = 'yes'
-	Rake::Task[:spec].invoke
-end
-CLOBBER.include( 'coverage' )
-
-
-# Use the fivefish formatter for docs generated from development checkout
-if File.directory?( '.hg' )
-	require 'rdoc/task'
-
-	Rake::Task[ 'docs' ].clear
-	RDoc::Task.new( 'docs' ) do |rdoc|
-	    rdoc.main = "README.rdoc"
-	    rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" )
-	    rdoc.generator = :fivefish
-		rdoc.title = 'Loggability'
-	    rdoc.rdoc_dir = 'doc'
-	end
-end
-
-task :gemspec => GEMSPEC
-file GEMSPEC => [ __FILE__, 'lib/loggability.rb' ]
-task GEMSPEC do |task|
-	hoespec = $hoespec.spec
-	hoespec.files.delete( '.gemtest' )
-	hoespec.signing_key = nil
-	hoespec.version = "#{hoespec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
-	hoespec.cert_chain = [ 'certs/ged.pem' ]
-	File.open( task.name, 'w' ) do |fh|
-		fh.write( hoespec.to_ruby )
-	end
-end
-
-CLOBBER.include( GEMSPEC.to_s )
-

data/lib/loggability.rb

@@ -9,10 +9,7 @@ require 'date'
 module Loggability
 
 	# Package version constant
-	VERSION = '0.14.0'
-
-	# VCS revision
-	REVISION = %q$Revision$
+	VERSION = '0.15.1'
 
 	# The key for the global logger (Loggability's own logger)
 	GLOBAL_KEY = :__global__
@@ -29,13 +26,13 @@ module Loggability
 	LOGSPEC_PATTERN = %r{
 		^
 			\s*
-			((?i:debug|info|warn|error|fatal))   # severity
+			(?<severity>(?i:debug|info|warn|error|fatal))
 		    (?:
 				\s+
-				((?:[\w\-/:\.]|\\[ ])+)
+				(?<target>(?:[\w\-/:\.]|\\[ ])+)
 			)?
 			(?: \s+\(
-				(\w+)
+				(?<format>\w+)
 			\) )?
 			\s*
 		$
@@ -64,14 +61,6 @@ module Loggability
 	autoload :Override, 'loggability/override'
 
 
-	### Return the library's version string
-	def self::version_string( include_buildnum=false )
-		vstring = "%s %s" % [ self.name, VERSION ]
-		vstring << " (build %s)" % [ REVISION[/: ([[:xdigit:]]+)/, 1] || '0' ] if include_buildnum
-		return vstring
-	end
-
-
 	### Cast the given +device+ to a Loggability::Logger, if possible, and return it. If
 	### it can't be converted, raises a ArgumentError.
 	def self::Logger( device )

data/lib/loggability/formatter/structured.rb

@@ -0,0 +1,35 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen_string_literal: true
+
+require 'time'
+require 'json'
+
+require 'loggability/formatter' unless defined?( Loggability::Formatter )
+
+
+# Output logs as JSON.
+class Loggability::Formatter::Structured < Loggability::Formatter
+
+	# The version of the format output
+	LOG_FORMAT_VERSION = 1
+
+
+	### Format a message of the specified +severity+ using the given +time+,
+	### +progname+, and +message+.
+	def call( severity, time, progname, message )
+		severity ||= 'DEBUG'
+		time ||= Time.now
+		entry = {
+			'@version' => LOG_FORMAT_VERSION,
+			'@timestamp' => time.iso8601( 3 ),
+			'level' => severity,
+			'progname' => progname,
+			'message' => message,
+		}
+
+		return JSON.generate( entry )
+	end
+
+end # class Loggability::Formatter::Default
+

data/lib/loggability/logger.rb

@@ -28,7 +28,8 @@ class Loggability::Logger < ::Logger
 	# to a file descriptor or a file.
 	class AppendingLogDevice
 
-		### Create a new AppendingLogDevice that will append content to +array+.
+		### Create a new AppendingLogDevice that will append content to +target+ (a
+		### object that responds to #>>).
 		def initialize( target )
 			@target = target
 		end
@@ -182,6 +183,28 @@ class Loggability::Logger < ::Logger
 	end
 
 
+	### Log a message if the +severity+ is high enough. Overridden to account for
+	### the overridden #level.
+	def add( severity, message=nil, progname=nil )
+		return true if severity < self.sev_threshold
+		progname ||= @progname
+
+		unless message
+			if block_given?
+				message = yield
+			else
+				message = progname
+				progname = @progname
+			end
+		end
+
+		msg = self.format_message( self.format_severity(severity), Time.now, progname, message )
+		self.logdev.write( msg )
+
+		return true
+	end
+
+
 	### Append operator -- Override Logger's append so log messages always have
 	### formatting, and are always appended at :debug level.
 	def <<( message )
@@ -224,8 +247,7 @@ class Loggability::Logger < ::Logger
 
 	### Return the logger's level as a Symbol.
 	def level
-		numeric_level = super
-		return LOG_LEVEL_NAMES[ numeric_level ]
+		return LOG_LEVEL_NAMES[ self.sev_threshold ]
 	end
 
 
@@ -256,7 +278,7 @@ class Loggability::Logger < ::Logger
 			self.logdev = target
 		elsif target.respond_to?( :write ) || target.is_a?( String )
 			opts = { :shift_age => args.shift || 0, :shift_size => args.shift || 1048576 }
-			self.logdev = Logger::LogDevice.new( target, opts )
+			self.logdev = Logger::LogDevice.new( target, **opts )
 		elsif target.respond_to?( :<< )
 			self.logdev = AppendingLogDevice.new( target )
 		else
@@ -282,6 +304,13 @@ class Loggability::Logger < ::Logger
 	end
 
 
+	### Return the formatted name of the given +severity+.
+	def format_severity( severity )
+		name = LOG_LEVEL_NAMES[ severity ] || severity.to_s
+		return name.upcase
+	end
+
+
 	### Set a new +formatter+ for the logger. If +formatter+ is +nil+ or +:default+, this causes the
 	### logger to fall back to its default formatter. If it's a Symbol other than +:default+, it looks
 	### for a similarly-named formatter under loggability/formatter/ and uses that. If +formatter+ is

data/spec/helpers.rb

@@ -99,6 +99,8 @@ RSpec.configure do |c|
 	c.mock_with( :rspec ) do |mock|
 		mock.syntax = :expect
 	end
+	c.warnings = true
+	c.profile_examples = 5
 
 	c.include( SpecHelpers )
 	c.include( Loggability::SpecHelpers )

data/spec/loggability/formatter/default_spec.rb

@@ -0,0 +1,50 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen_string_literal: true
+
+require_relative '../../helpers'
+
+require 'loggability/formatter/default'
+
+
+describe Loggability::Formatter::Default do
+
+	it "formats messages with the pattern it's constructed with" do
+		formatter = described_class.new( '[%5$s] %7$s' )
+		result = formatter.call( 'INFO', Time.at(1336286481), nil, 'Foom.' )
+		expect( result ).to match(/\[INFO\] Foom./i)
+	end
+
+
+	it "formats exceptions into useful messages" do
+		formatter = described_class.new( '[%5$s] %7$s' )
+		msg = nil
+
+		begin
+			raise ArgumentError, "invalid argument"
+		rescue => err
+			msg = formatter.call( 'INFO', Time.at(1336286481), nil, err )
+		end
+
+		expect( msg ).to match(/\[INFO\] ArgumentError: invalid argument/i)
+	end
+
+
+	it "formats regular objects into useful messages" do
+		formatter = described_class.new( '[%5$s] %7$s' )
+		result = formatter.call( 'INFO', Time.at(1336286481), nil, Object.new )
+
+		expect( result ).to match(/\[INFO\] #<Object:0x[[:xdigit:]]+>/i)
+	end
+
+
+	it "includes the thread ID if logging from a thread other than the main thread" do
+		formatter = described_class.new( '%4$d' )
+		thr = Thread.new do
+			formatter.call( 'INFO', Time.now, nil, 'Foom.' )
+		end
+		expect( thr.value ).to eq( thr.object_id.to_s )
+	end
+
+end
+

data/spec/loggability/formatter/structured_spec.rb

@@ -0,0 +1,61 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# frozen_string_literal: true
+
+require_relative '../../helpers'
+
+require 'loggability/formatter/structured'
+
+
+describe Loggability::Formatter::Structured do
+
+	before( :each ) do
+		ENV['TZ'] = 'UTC'
+	end
+
+
+	it "outputs a stream of JSON objects" do
+		expect(
+			subject.call('INFO', Time.at(1336286481), nil, "Foom.")
+		).to eq(
+			%q|{"@version":1,"@timestamp":"2012-05-06T06:41:21.000+00:00"| +
+			%q|,"level":"INFO","progname":null,"message":"Foom."}|
+		)
+	end
+
+
+	it "includes a time even if called without one" do
+		Timecop.freeze( Time.at(1563114765.123) ) do
+			expect(
+				subject.call('WARN', nil, nil, "Right.")
+			).to match( %r(
+				\{
+					"@version":1,
+					"@timestamp":"2019-07-14T14:32:45\.\d{3}\+00:00",
+					"level":"WARN",
+					"progname":null,
+					"message":"Right\."
+				\}
+			)x )
+		end
+	end
+
+
+	it "defaults to DEBUG severity" do
+		Timecop.freeze( Time.at(1563114765.123) ) do
+			expect(
+				subject.call(nil, nil, nil, "Crane.")
+			).to match( %r(
+				\{
+					"@version":1,
+					"@timestamp":"2019-07-14T14:32:45\.\d{3}\+00:00",
+					"level":"DEBUG",
+					"progname":null,
+					"message":"Crane\."
+				\}
+			)x )
+		end
+	end
+
+end
+

data/spec/loggability_spec.rb

@@ -23,18 +23,6 @@ describe Loggability do
 	end
 
 
-	describe "version methods" do
-		it "returns a version string if asked" do
-			expect( described_class.version_string ).to match( /\w+ [\d.]+/ )
-		end
-
-		it "returns a version string with a build number if asked" do
-			expect( described_class.version_string(true) ).
-				to match(/\w+ [\d.]+ \(build [[:xdigit:]]+\)/)
-		end
-	end
-
-
 	context "installed in a class as a log host" do
 
 		before( :each ) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggability
 version: !ruby/object:Gem::Version
-  version: 0.15.0.pre20190714094638
+  version: 0.15.1
 platform: ruby
 authors:
 - Michael Granger
@@ -11,8 +11,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xODExMjAxODI5NTlaFw0xOTExMjAxODI5
-  NTlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
+  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -24,74 +24,32 @@ cert_chain:
   N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
   VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
   FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAP9Ffkvg4e8CjIWi8SykQ8oJSS8jbmbgF
-  abke3vXWLG6V9kFiObuJd5wZRBluJANu7bEtjgc3fFaGVP2XxVdCpVjNbmMDg4Qp
-  ovvczP53X6pQP2RSZgxF6Lblvy8y11RziUTVRG/Z2aJHsElo6gI7vQznE/OSDrhC
-  gEhr8uaIUt7D+HZWRbU0+MkKPpL5uMqaFuJbqXEvSwPTuUuYkDfNfsjQO7ruWBac
-  bxHCrvpZ6Tijc0nrlyXi6gPOCLeaqhau2xFnlvKgELwsGYSoKBJyDwqtQ5kwrOlU
-  tkSyLrfZ+RZcH535Hyvif7ZxB0v5OxXXoec+N2vrUsEUMRDL9dg4/WFdN8hIOixF
-  3IPKpZ1ho0Ya5q7yhygtBK9/NBFHw+nbJjcltfPDBXleRe8u73gnQo8AZIhStYSP
-  v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
-  JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
+  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
+  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
+  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
+  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
+  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
+  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
+  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
+  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
+  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hoe-mercurial
+  name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: hoe-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -135,65 +93,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: hoe
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
-description: "A composable logging system built on the standard Logger library.\n\nYou
-  can add Loggability to large libraries and systems, then hook everything\nup later
-  when you know where you want logs to be written, at what level of\nseverity, and
-  in which format.\n\nAn example:\n\n    # Load a bunch of libraries that use Loggability\n
-  \   require 'strelka'\n    require 'inversion'\n    require 'treequel'\n    require
-  'loggability'\n    \n    # Set up our own library\n    module MyProject\n        extend
-  Loggability\n        log_as :my_project\n    \n        class Server\n            extend
-  Loggability\n            log_to :my_project\n    \n            def initialize\n
-  \               self.log.debug \"Listening.\"\n            end\n        end\n    \n
-  \   end\n    \n    # Now tell everything that's using Loggability to log to an HTML\n
-  \   # log file at INFO level\n    Loggability.write_to( '/usr/local/www/htdocs/log.html'
-  )\n    Loggability.format_as( :html )\n    Loggability.level = :info"
+        version: '0.4'
+description: A composable logging system built on the standard Logger library.
 email:
-- ged@FaerieMUD.org
+- ged@faeriemud.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.rdoc
-- Manifest.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
 - ".simplecov"
 - ChangeLog
 - History.rdoc
 - Manifest.txt
-- README.rdoc
+- README.md
 - Rakefile
 - lib/loggability.rb
 - lib/loggability/constants.rb
@@ -201,6 +125,7 @@ files:
 - lib/loggability/formatter/color.rb
 - lib/loggability/formatter/default.rb
 - lib/loggability/formatter/html.rb
+- lib/loggability/formatter/structured.rb
 - lib/loggability/logclient.rb
 - lib/loggability/logger.rb
 - lib/loggability/loghost.rb
@@ -208,36 +133,36 @@ files:
 - lib/loggability/spechelpers.rb
 - spec/helpers.rb
 - spec/loggability/formatter/color_spec.rb
+- spec/loggability/formatter/default_spec.rb
 - spec/loggability/formatter/html_spec.rb
+- spec/loggability/formatter/structured_spec.rb
 - spec/loggability/formatter_spec.rb
 - spec/loggability/logger_spec.rb
 - spec/loggability/loghost_spec.rb
 - spec/loggability/override_spec.rb
 - spec/loggability/spechelpers_spec.rb
 - spec/loggability_spec.rb
-homepage: http://deveiate.org/projects/loggability
+homepage: https://hg.sr.ht/~ged/Loggability
 licenses:
 - BSD-3-Clause
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: A composable logging system built on the standard Logger library
+summary: A composable logging system built on the standard Logger library.
 test_files: []