Commits

Mahlon Smith  committed 27cc08f

Remove explicit loading of Configurability to avoid load order
dependency issues.

  • Participants
  • Parent commits 4b93e16

Comments (0)

Files changed (4)

 
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer
-	self.dependency 'configurability', '~> 1.2', :developer
+	self.dependency 'configurability', '~> 2.0.1', :developer
 
 	self.spec_extras[:licenses] = ["Ruby"]
 	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Loggability Toolkit']

File lib/loggability.rb

 module Loggability
 
 	# Package version constant
-	VERSION = '0.6.0'
+	VERSION = '0.6.1'
 
 	# VCS revision
 	REVISION = %q$Revision$
 	# :section: Configurability Support
 	#
 
-	# Load the Configurability library if it's installed
-	begin
-		require 'configurability'
-	rescue LoadError
-	end
-
-
-	# Configurability support -- load Loggability configuration from the 'logging' section
-	# of the config.
-	if defined?( Configurability )
-		extend Configurability
-		config_key :logging if respond_to?( :config_key )
-	end
-
 	### Configurability API -- configure logging.
 	def self::configure( config=nil )
 		if config

File spec/lib/helpers.rb

 	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
 

File spec/loggability_spec.rb

 	end
 
 
-	describe "Configurability support" do
+	describe "Configurability support", :configurability do
 
 		after( :each ) do
 			File.delete( 'spec-error.log' ) if File.exist?( 'spec-error.log' )