loggability 0.4.0 → 0.5.0

data.tar.gz.sig

@@ -1 +1,2 @@
-?�R�
<��R��?�pmC:�kΊda����$}#eY��}G�����lM+ۋ�|i��� �>!
 #���.����j����m9��h�e���F1d�d�"�y�u�ƀѰ�����-���5@�+���߱�a��ึ�����C>[��kv:���F�a���6P�/l&٧�GJjl�=�^��ST��
+��[-���p5���A&A���
+��f)�{�3F�l/�m�N����X#׆����P^��D>0��5��"H���ccB�����E;�pJF��"P��y�Z"�S������!i>nl���D����֬��f�����;mZ��NRj��[���>����,@3�'�Â��:�4e��}}i���?�´�P���ڛH��2VЩf�Ȝ�hQ�E���V�~���

data/ChangeLog

@@ -1,8 +1,30 @@
+2012-06-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.4.0 for changeset b5e9220fe7a9
+	[740a4e834be2] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 2615ed217d34
+	[b5e9220fe7a9] [v0.4.0]
+
+	* History.rdoc, lib/loggability.rb:
+	Bump the minor version, update history.
+	[2615ed217d34]
+
+	* lib/loggability.rb, lib/loggability/logger.rb,
+	spec/loggability/logger_spec.rb, spec/loggability_spec.rb:
+	Add some conversion-convenience code.
+
+	Auto-convert Logger instances into Loggability::Logger instances
+	with the same device if assigned directly, etc.
+	[943e0a67d246]
+
 2012-05-26  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.3.0 for changeset 6c526d42bafb
-	[581580843d12] [tip]
+	[581580843d12]
 
 	* .hgsigs:
 	Added signature for changeset 7b6ef57de872
@@ -21,7 +43,7 @@
 	* lib/loggability/formatter.rb, spec/loggability/formatter_spec.rb,
 	spec/loggability/logger_spec.rb:
 	Downcase the severity before outputting.
-	[040bb1a5dc84] [github/master]
+	[040bb1a5dc84]
 
 2012-05-18  Michael Granger  <ged@FaerieMUD.org>
 

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.5.0 [2012-08-03] Michael Granger <ged@FaerieMUD.org>
+
+- Remove dependency on PluginFactory/Pluggability to avoid circular
+  dependency.
+
+
 == v0.4.0 [2012-05-26] Michael Granger <ged@FaerieMUD.org>
 
 - Add some conversion-convenience code. You can now assign ::Logger

data/Rakefile

@@ -21,8 +21,6 @@ hoespec = Hoe.spec 'loggability' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'pluginfactory',   '~> 1.0'
-
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer
 	self.dependency 'configurability', '~> 1.2', :developer

data/lib/loggability.rb

@@ -9,10 +9,10 @@ require 'date'
 module Loggability
 
 	# Package version constant
-	VERSION = '0.4.0'
+	VERSION = '0.5.0'
 
 	# VCS revision
-	REVISION = %q$Revision: 2615ed217d34 $
+	REVISION = %q$Revision: 0db162246900 $
 
 	# The key for the global logger (Loggability's own logger)
 	GLOBAL_KEY = :__global__

data/lib/loggability/formatter.rb

@@ -2,26 +2,47 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
-require 'pluginfactory'
-
 require 'loggability' unless defined?( Loggability )
 
 
 ### An abstract base class for Loggability log formatters.
 class Loggability::Formatter
-	extend PluginFactory
 
 	# The default sprintf pattern
 	DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
 
 
-	### PluginFactory API -- return the Array of paths prefixes to use when searching
-	### formatter plugins.
-	def self::derivative_dirs
-		return ['loggability/formatter']
+	##
+	# Derivative classes, keyed by name
+	class << self; attr_reader :derivatives; end
+	@derivatives = {}
+
+
+	### Inherited hook -- add subclasses to the ::derivatives Array.
+	def self::inherited( subclass )
+		super
+		classname = subclass.name.sub( /.*::/, '' ).downcase.to_sym
+		Loggability::Formatter.derivatives[ classname ] = subclass
+	end
+
+
+	### Create a formatter of the specified +type+, loading it if it hasn't already been
+	### loaded.
+	def self::create( type, *args )
+		require "loggability/formatter/#{type}"
+		type = type.to_sym
+
+		if self.derivatives.key?( type )
+			return self.derivatives[ type ].new( *args )
+		else
+			raise LoadError,
+				"require of %s formatter succeeded (%p), but it didn't load a class named %p::%s" %
+				[ type, self.derivatives, self, type.to_s.capitalize ]
+		end
 	end
 
 
+
 	### Initialize a new Loggability::Formatter. The specified +logformat+ should
 	### be a sprintf pattern with positional placeholders:
 	###

data/spec/loggability/formatter_spec.rb

@@ -16,11 +16,6 @@ require 'loggability/formatter/default'
 
 describe Loggability::Formatter do
 
-	it "loads plugins out of loggability/formatter" do
-		Loggability::Formatter.derivative_dirs.should == ['loggability/formatter']
-	end
-
-
 	it "formats messages with the pattern it's constructed with" do
 		formatter = Loggability::Formatter.new( '[%5$s] %7$s' )
 		formatter.call( 'INFO', Time.at(1336286481), nil, 'Foom.' ).should =~

data/spec/loggability_spec.rb

@@ -216,7 +216,7 @@ describe Loggability do
 		it "raises an error if configured with a bogus formatter" do
 			expect {
 				Loggability.configure( 'class1' => 'debug (mindwaves)' )
-			}.to raise_error( FactoryError, /couldn't find a formatter/i )
+			}.to raise_error( LoadError, /cannot load such file/i )
 		end
 
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggability
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,24 +36,8 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: pluginfactory
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement