loggability 0.7.0 → 0.8.0.pre.65

data/spec/loggability_spec.rb

@@ -1,13 +1,9 @@
 # -*- rspec -*-
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-}
+require_relative 'helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
+
 require 'loggability'
 require 'loggability/logger'
 
@@ -21,19 +17,21 @@ describe Loggability do
 		reset_logging()
 	end
 
+
 	it "is itself a log host for the global logger" do
-		described_class.logger.should be_a( Loggability::Logger )
-		described_class.log_hosts.should include( Loggability::GLOBAL_KEY => Loggability )
+		expect( described_class.logger ).to be_a( Loggability::Logger )
+		expect( described_class.log_hosts ).to include( Loggability::GLOBAL_KEY => Loggability )
 	end
 
 
 	describe "version methods" do
 		it "returns a version string if asked" do
-			described_class.version_string.should =~ /\w+ [\d.]+/
+			expect( described_class.version_string ).to match( /\w+ [\d.]+/ )
 		end
 
 		it "returns a version string with a build number if asked" do
-			described_class.version_string(true).should =~ /\w+ [\d.]+ \(build [[:xdigit:]]+\)/
+			expect( described_class.version_string(true) ).
+				to match(/\w+ [\d.]+ \(build [[:xdigit:]]+\)/)
 		end
 	end
 
@@ -53,40 +51,41 @@ describe Loggability do
 
 
 		it "is included in the list of log hosts" do
-			Loggability.log_hosts.should include( :testing => @class )
+			expect( Loggability.log_hosts ).to include( :testing => @class )
 		end
 
 		it "has an associated Loggability::Logger" do
-			@class.logger.should be_a( Loggability::Logger )
+			expect( @class.logger ).to be_a( Loggability::Logger )
 		end
 
 		it "has an associated default Loggability::Logger" do
-			@class.default_logger.should be( @class.logger )
+			expect( @class.default_logger ).to be( @class.logger )
 		end
 
 		it "registers itself with the Loggability module" do
-			Loggability[ @class ].should be( @class.logger )
+			expect( Loggability[@class] ).to be( @class.logger )
 		end
 
 		it "registers its key with the Loggability module" do
-			Loggability[ :testing ].should be( @class.logger )
+			expect( Loggability[:testing] ).to be( @class.logger )
 		end
 
 		it "has a proxy for its logger in its instances" do
-			@class.new.log.logger.should be( @class.logger )
+			expect( @class.new.log.logger ).to be( @class.logger )
 		end
 
 		it "wraps Logger instances assigned as its logger in a Loggability::Logger" do
 			logger = ::Logger.new( $stderr )
 
 			@class.logger = logger
-			@class.logger.should be_a( Loggability::Logger )
+			expect( @class.logger ).to be_a( Loggability::Logger )
 
 			@class.log.debug "This shouldn't raise."
 		end
 
 	end
 
+
 	context "installed in a class as a logging client" do
 
 		before( :each ) do
@@ -107,28 +106,28 @@ describe Loggability do
 
 
 		it "has a proxy for its log host's logger" do
-			@class.log.logger.should be( @loghost.logger )
+			expect( @class.log.logger ).to be( @loghost.logger )
 		end
 
 		it "is associated with its log host's logger through the Loggability module" do
-			Loggability[ @class ].should be( @loghost.logger )
+			expect( Loggability[@class] ).to be( @loghost.logger )
 		end
 
 		it "has a proxy for its log host's logger available from its instances" do
 			obj = @class.new
-			obj.log.logger.should be( @loghost.logger )
+			expect( obj.log.logger ).to be( @loghost.logger )
 		end
 
 
 		it "is associated with its log host's logger via its instances through the Loggability module" do
 			obj = @class.new
-			Loggability[ obj ].should be( @loghost.logger )
+			expect( Loggability[obj] ).to be( @loghost.logger )
 		end
 
 		it "propagates its log host key to subclasses" do
 			subclass = Class.new( @class )
-			subclass.log.logger.should be( @loghost.logger )
-			Loggability[ subclass ].should be( @loghost.logger )
+			expect( subclass.log.logger ).to be( @loghost.logger )
+			expect( Loggability[subclass] ).to be( @loghost.logger )
 		end
 
 	end
@@ -147,19 +146,123 @@ describe Loggability do
 
 		it "can propagate a logging level to every loghost" do
 			Loggability.level = :warn
-			Loggability[ @loghost ].level.should == :warn
+			expect( Loggability[@loghost].level ).to be( :warn )
 		end
 
 		it "can propagate an outputter to every loghost" do
 			Loggability.output_to( $stdout )
-			Loggability[ @loghost ].logdev.dev.should be( $stdout )
+			expect( Loggability[@loghost].logdev.dev ).to be( $stdout )
 		end
 
 		it "can propagate a formatter to every loghost" do
 			Loggability.format_with( :color )
-			Loggability[ @loghost ].formatter.should be_a( Loggability::Formatter::Color )
+			expect( Loggability[@loghost].formatter ).to be_a( Loggability::Formatter::Color )
+		end
+
+
+		describe "overrideable behaviors" do
+
+			before( :each ) do
+				@default_output = []
+				Loggability.level = :info
+				Loggability.output_to( @default_output )
+			end
+
+
+			it "can temporarily override where Loggability outputs to while executing a block" do
+				tmp_output = []
+
+				Loggability[ @loghost ].info "Before the override"
+				Loggability.outputting_to( tmp_output ) do
+					Loggability[ @loghost ].info "During the override"
+				end
+				Loggability[ @loghost ].info "After the override"
+
+				expect( @default_output ).to have( 2 ).log_entries
+				expect( tmp_output ).to have( 1 ).log_entry
+			end
+
+
+			it "can return an object that overrides where Loggability outputs to for any block" do
+				tmp_output = []
+				with_tmp_logging = Loggability.outputting_to( tmp_output )
+
+				Loggability[ @loghost ].info "Before the overrides"
+				with_tmp_logging.call do
+					Loggability[ @loghost ].info "During the first override"
+				end
+				Loggability[ @loghost ].info "Between overrides"
+				with_tmp_logging.call do
+					Loggability[ @loghost ].info "During the second override"
+				end
+				Loggability[ @loghost ].info "After the overrides"
+
+				expect( @default_output ).to have( 3 ).log_entries
+				expect( tmp_output ).to have( 2 ).log_entries
+			end
+
+
+			it "can temporarily override what level Loggability logs at while executing a block" do
+				Loggability[ @loghost ].debug "Before the override"
+				Loggability.with_level( :debug ) do
+					Loggability[ @loghost ].debug "During the override"
+				end
+				Loggability[ @loghost ].debug "After the override"
+
+				expect( @default_output ).to have( 1 ).log_entry
+			end
+
+
+			it "can return an object that overrides what level Loggability logs at for any block" do
+				with_debug_logging = Loggability.with_level( :debug )
+
+				Loggability[ @loghost ].debug "Before the overrides"
+				with_debug_logging.call do
+					Loggability[ @loghost ].debug "During the first override"
+				end
+				Loggability[ @loghost ].debug "Between overrides"
+				with_debug_logging.call do
+					Loggability[ @loghost ].debug "During the second override"
+				end
+				Loggability[ @loghost ].debug "After the overrides"
+
+				expect( @default_output ).to have( 2 ).log_entries
+			end
+
+
+			it "can temporarily override what formatter loggers use while executing a block" do
+				Loggability[ @loghost ].info "Before the override"
+				Loggability.formatted_with( :html ) do
+					Loggability[ @loghost ].info "During the override"
+				end
+				Loggability[ @loghost ].info "After the override"
+
+				expect( @default_output ).to have( 3 ).log_entries
+				expect( @default_output.grep(/<div/) ).to have( 1 ).entry
+			end
+
+
+			it "can return an object that overrides what formatter loggers use for any block" do
+				with_html_logging = Loggability.formatted_with( :html )
+
+				Loggability[ @loghost ].info "Before the overrides"
+				with_html_logging.call do
+					Loggability[ @loghost ].info "During the first override"
+				end
+				Loggability[ @loghost ].info "Between overrides"
+				with_html_logging.call do
+					Loggability[ @loghost ].info "During the second override"
+				end
+				Loggability[ @loghost ].info "After the overrides"
+
+				expect( @default_output ).to have( 5 ).log_entries
+				expect( @default_output.grep(/<div/) ).to have( 2 ).log_entries
+			end
+
+
 		end
 
+
 	end
 
 
@@ -169,56 +272,58 @@ describe Loggability do
 			File.delete( 'spec-error.log' ) if File.exist?( 'spec-error.log' )
 		end
 
+
+		let!( :class1 ) { Class.new {extend Loggability; log_as :class1} }
+		let!( :class2 ) { Class.new {extend Loggability; log_as :class2} }
+
+
 		it "can parse a logging config spec with just a severity" do
-			Loggability.parse_config_spec( 'debug' ).should == [ 'debug', nil, nil ]
+			result = Loggability.parse_config_spec( 'debug' )
+			expect( result ).to eq([ 'debug', nil, nil ])
 		end
 
 		it "can parse a logging config spec with a severity and STDERR" do
-			Loggability.parse_config_spec( 'fatal STDERR' ).should == [ 'fatal', nil, $stderr ]
+			result = Loggability.parse_config_spec( 'fatal STDERR' )
+			expect( result ).to eq([ 'fatal', nil, $stderr ])
 		end
 
 		it "can parse a logging config spec with a severity and STDOUT" do
-			Loggability.parse_config_spec( 'error STDOUT' ).should == [ 'error', nil, $stdout ]
+			result = Loggability.parse_config_spec( 'error STDOUT' )
+			expect( result ).to eq([ 'error', nil, $stdout ])
 		end
 
 		it "can parse a logging config spec with a severity and a path" do
-			Loggability.parse_config_spec( 'debug /var/log/debug.log' ).
-				should == [ 'debug', nil, '/var/log/debug.log' ]
+			result = Loggability.parse_config_spec( 'debug /var/log/debug.log' )
+			expect( result ).to eq([ 'debug', nil, '/var/log/debug.log' ])
 		end
 
 		it "can parse a logging config spec with a severity and a path with escaped spaces" do
-			Loggability.parse_config_spec( 'debug /store/media/Stormcrow\\ and\\ Raven/dl.log' ).
-				should == [ 'debug', nil, '/store/media/Stormcrow\\ and\\ Raven/dl.log' ]
+			result = Loggability.parse_config_spec( 'debug /store/media/Stormcrow\\ and\\ Raven/dl.log' )
+			expect( result ).to	eq([ 'debug', nil, '/store/media/Stormcrow\\ and\\ Raven/dl.log' ])
 		end
 
 		it "can parse a logging config spec with a severity and a formatter" do
-			Loggability.parse_config_spec( 'warn (html)' ).
-				should == [ 'warn', 'html', nil ]
+			result = Loggability.parse_config_spec( 'warn (html)' )
+			expect( result ).to eq([ 'warn', 'html', nil ])
 		end
 
 		it "can parse a logging config spec with a severity, a path, and a formatter" do
-			Loggability.parse_config_spec( 'info /usr/local/www/htdocs/log.html (html)' ).
-				should == [ 'info', 'html', '/usr/local/www/htdocs/log.html' ]
+			result = Loggability.parse_config_spec( 'info /usr/local/www/htdocs/log.html (html)' )
+			expect( result ).to eq([ 'info', 'html', '/usr/local/www/htdocs/log.html' ])
 		end
 
 		it "can configure loghosts via its ::configure method" do
-			class1 = Class.new { extend Loggability; log_as :class1 }
-			class2 = Class.new { extend Loggability; log_as :class2 }
-
 			config = {'class1' => 'debug (html)', 'class2' => 'error spec-error.log'}
 			Loggability.configure( config )
 
-			Loggability[ class1 ].level.should == :debug
-			Loggability[ class1 ].formatter.should be_a( Loggability::Formatter::HTML )
-			Loggability[ class2 ].level.should == :error
-			Loggability[ class2 ].logdev.dev.should be_a( File )
-			Loggability[ class2 ].logdev.dev.path.should == 'spec-error.log'
+			expect( Loggability[class1].level ).to be( :debug )
+			expect( Loggability[class1].formatter ).to be_a( Loggability::Formatter::HTML )
+			expect( Loggability[class2].level ).to be( :error )
+			expect( Loggability[class2].logdev.dev ).to be_a( File )
+			expect( Loggability[class2].logdev.dev.path ).to eq( 'spec-error.log' )
 		end
 
 		it "can configure loghosts with a Configurability::Config object" do
-			class1 = Class.new { extend Loggability; log_as :class1 }
-			class2 = Class.new { extend Loggability; log_as :class2 }
-
 			configsource = (<<-"END_CONFIG").gsub( /^\t{3}/, '' )
 			---
 			logging:
@@ -230,20 +335,20 @@ describe Loggability do
 			config = Configurability::Config.new( configsource )
 			config.install
 
-			Loggability[ class1 ].level.should == :debug
-			Loggability[ class1 ].formatter.should be_a( Loggability::Formatter::HTML )
-			Loggability[ class2 ].level.should == :error
-			Loggability[ class2 ].logdev.dev.should be_a( File )
-			Loggability[ class2 ].logdev.dev.path.should == 'spec-error.log'
+			expect( Loggability[class1].level ).to be( :debug )
+			expect( Loggability[class1].formatter ).to be_a( Loggability::Formatter::HTML )
+			expect( Loggability[class2].level ).to be( :error )
+			expect( Loggability[class2].logdev.dev ).to be_a( File )
+			expect( Loggability[class2].logdev.dev.path ).to eq( 'spec-error.log' )
 		end
 
 		it "can configure all loghosts with a config key of __default__" do
 			Loggability.configure( '__default__' => 'debug STDERR (html)' )
 
-			all_loggers = Loggability.log_hosts.values.map( &:logger )
-			all_loggers.all? {|lh| lh.level == :debug }.should be_true()
-			all_loggers.all? {|lh| lh.formatter.class == Loggability::Formatter::HTML }.should be_true()
-			all_loggers.all? {|lh| lh.logdev.dev.should == $stderr }.should be_true()
+			loggers = Loggability.log_hosts.values.map( &:logger )
+			expect( loggers.map(&:level) ).to all_be( :debug )
+			expect( loggers.map(&:formatter) ).to all_be_a( Loggability::Formatter::HTML )
+			expect( loggers.map(&:logdev).map(&:dev) ).to all_be( $stderr )
 		end
 
 		it "raises an error if configured with a logspec with an invalid severity" do

data.tar.gz.sig

@@ -1,2 +1,2 @@
-k��}����x�R��};{
-X�Q
+����D��`����<!y_Ѯ��/S������([�ST�u��#HmM|���n�>���k�s�Y����
+=�Y4�������3��N��f���#�?��n$S�ϓi��X�$A�A�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggability
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0.pre.65
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -88,6 +88,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: hoe-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -162,13 +176,17 @@ files:
 - lib/loggability/formatter/color.rb
 - lib/loggability/formatter/default.rb
 - lib/loggability/formatter/html.rb
+- lib/loggability/logclient.rb
 - lib/loggability/logger.rb
+- lib/loggability/loghost.rb
+- lib/loggability/override.rb
 - lib/loggability/spechelpers.rb
-- spec/lib/helpers.rb
+- spec/helpers.rb
 - spec/loggability/formatter/color_spec.rb
 - spec/loggability/formatter/html_spec.rb
 - spec/loggability/formatter_spec.rb
 - spec/loggability/logger_spec.rb
+- spec/loggability/override_spec.rb
 - spec/loggability_spec.rb
 - .gemtest
 homepage: http://deveiate.org/projects/loggability
@@ -185,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -193,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: loggability
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A composable logging system built on the standard Logger library

metadata.gz.sig

@@ -1,3 +1,3 @@
-8��-
-��[^�񶴱�ԈW��Am�eo8ٞ�G
��璷̒㔌���4��WM.�8�
����dV���.�%����l;��Z頯���\�SN�#�o���E
-?.����l
+�½�Q! 5�Scᮑ�Ҿ��qu?���r�{�Ӎ'�������zz
+�IJ�!?��������ϚwqϮ��h�c��Y�g������������<F�����7��6~Ʉ�O���R�����(�aM�~m����E���3S�D6K���q�1��c����^���m�n�d�?��"��uQ/�!r�GW*����0o�T}�-�jcY祉��ÛC�V'�+x|M��a�ښ~!�-8
+F-����f�`������

data/spec/lib/helpers.rb

@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
-
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
-# SimpleCov test coverage reporting; enable this using the :coverage rake task
-if ENV['COVERAGE']
-	$stderr.puts "\n\n>>> Enabling coverage report.\n\n"
-	require 'simplecov'
-	SimpleCov.start do
-		add_filter 'spec'
-	end
-end
-
-begin
-	require 'configurability'
-rescue LoadError
-end
-
-require 'loggability' unless defined?( Loggability )
-require 'loggability/spechelpers'
-
-
-### Mock with RSpec
-RSpec.configure do |c|
-	c.mock_with( :rspec )
-	c.treat_symbols_as_metadata_keys_with_true_values = true
-
-	c.include( Loggability::SpecHelpers )
-	c.filter_run_excluding( :configurability ) unless defined?( Configurability )
-end
-