configurability 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcbf8e77d923a5ec95be628f03c79c1fa1e2b778
-  data.tar.gz: 0c1a8adda3938b47948a4fe192ab30039b9b0a67
+  metadata.gz: ae00303104896fbdb4479b741a713cf98447ca1a
+  data.tar.gz: d7aaa1d875c3f4dd0e20e152ba76ba52e62be667
 SHA512:
-  metadata.gz: 5194373054a7d8d4ef615f7fa0a24f65f01389efdda7315635d7a6759ff6b1fdf0381c96d25e8af59a66c0ee7bc4080da2f6860e2af51b8a00aac3b97d4a9316
-  data.tar.gz: 6c1905c42901a5020190bb5f25d2e6eed93ee42995cc125e79f8c8c8381be6fd733bc99191500e441cf9b96bac60754e9093c68ac23a8e1693ae41639172a05f
+  metadata.gz: fd1b469747088b887326ec6c65996e3c5485606eb20ce62556e45b407ba50b26d964fdcc6893130a7e26ae1c5981e549cff58638b1b2edb7cc709fc149574ee6
+  data.tar.gz: 68d3cb5b755de3e19b5ff1d910cd8f7b8ba12856627484d7d9c90da6219db3ff928aabc4250231329afa1a93367b8bfa43f84b95257e2a1afe7b983367b824b8

data/ChangeLog

@@ -1,8 +1,49 @@
+2013-08-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile, lib/configurability.rb,
+	spec/configurability/config_spec.rb, spec/configurability_spec.rb:
+	Fix behavior of inherited Configurability
+	[9a8961d68e99] [tip]
+
+	* lib/configurability/behavior.rb,
+	spec/configurability/config_spec.rb,
+	spec/configurability/deferredconfig_spec.rb,
+	spec/configurability_spec.rb, spec/helpers.rb, spec/lib/helpers.rb:
+	Convert specs to use expect syntax
+	[290c7286bd8b]
+
+2013-06-14  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .hgtags:
+	Added tag v2.0.2 for changeset b8b7c6673cde
+	[842a42780d63]
+
+	* .hgsigs:
+	Added signature for changeset e53b53d65079
+	[b8b7c6673cde] [v2.0.2]
+
+	* History.rdoc, lib/configurability.rb:
+	Bump to version 2.0.2.
+	[e53b53d65079]
+
+	* lib/configurability/config.rb:
+	Explicit check for safe_yaml, load YAML with default security
+	settings if it is installed, and silence stderr warnings.
+	[e33909a2e0d1]
+
 2013-06-07  Mahlon E. Smith  <mahlon@martini.nu>
 
+	* .hgtags:
+	Added tag v2.0.1 for changeset c25da00ba16e
+	[1aa2c0e1c744] [github/master]
+
+	* .hgsigs:
+	Added signature for changeset bbf0ba1d6deb
+	[c25da00ba16e] [v2.0.1]
+
 	* History.rdoc, lib/configurability.rb:
 	Bump version to v2.0.1.
-	[bbf0ba1d6deb] [tip]
+	[bbf0ba1d6deb]
 
 	* lib/configurability.rb:
 	Inject support into Loggability directly, avoiding load order
@@ -188,6 +229,15 @@
 	Merged with 29a1c3384b7f
 	[afa3d24b4117]
 
+2012-02-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/configurability.rb:
+	Make unknown config log message less chatty.
+
+	Thanks to Mahlon E. Smith for the gargantuan patch. "Ssssh baby.
+	It's cool. Don't say a word. There will also be corn served."
+	[29a1c3384b7f]
+
 2012-01-27  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -207,35 +257,6 @@
 	Merged with ssh://hg@bitbucket.org/ged/configurability@86718657a466
 	[d3f6f8d77060]
 
-2011-11-01  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v1.0.8 for changeset 5b3d66af5a59
-	[86718657a466]
-
-	* .hgsigs:
-	Added signature for changeset 97a03db6f41c
-	[5b3d66af5a59] [v1.0.8]
-
-	* History.rdoc, lib/configurability.rb:
-	Bumped patch version and updated the History file.
-	[97a03db6f41c]
-
-	* spec/configurability/config_spec.rb:
-	Fix for Ruby 1.9.3.
-	[a26cd541ea8f]
-
-2012-02-06  Michael Granger  <ged@FaerieMUD.org>
-
-	* lib/configurability.rb:
-	Make unknown config log message less chatty.
-
-	Thanks to Mahlon E. Smith for the gargantuan patch. "Ssssh baby.
-	It's cool. Don't say a word. There will also be corn served."
-	[29a1c3384b7f]
-
-2012-01-27  Michael Granger  <ged@FaerieMUD.org>
-
 	* .hgtags:
 	Added tag v1.0.8 for changeset 6a7852aa7398
 	[5e85b9cb1122]
@@ -260,6 +281,24 @@
 	Adding TextMate properties
 	[45b92add3e1e]
 
+2011-11-01  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.0.8 for changeset 5b3d66af5a59
+	[86718657a466]
+
+	* .hgsigs:
+	Added signature for changeset 97a03db6f41c
+	[5b3d66af5a59] [v1.0.8]
+
+	* History.rdoc, lib/configurability.rb:
+	Bumped patch version and updated the History file.
+	[97a03db6f41c]
+
+	* spec/configurability/config_spec.rb:
+	Fix for Ruby 1.9.3.
+	[a26cd541ea8f]
+
 2011-10-13  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
@@ -344,24 +383,6 @@
 	Removed tag v1.0.4
 	[1ef1012b278c]
 
-	* .hgtags:
-	Added tag v1.0.4 for changeset 84718f122b7b
-	[99d382b750f6]
-
-	* .hgsigs:
-	Added signature for changeset eef299ea1d29
-	[84718f122b7b]
-
-	* lib/configurability.rb, lib/configurability/config.rb,
-	spec/configurability/config_spec.rb:
-	Fix for config files with nil keys (fixes #1)
-	[eef299ea1d29]
-
-	* .hgsub, .hgsubstate, .hgsubstate, History.md, LICENSE, Manifest.txt,
-	README.md, Rakefile, project.yml:
-	Converted to Hoe.
-	[fb024df77138]
-
 2010-11-29  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgsub:
@@ -384,6 +405,28 @@
 	Adding Github mirror to the README
 	[bb8f2829eb37]
 
+2011-02-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.0.4 for changeset 84718f122b7b
+	[99d382b750f6]
+
+	* .hgsigs:
+	Added signature for changeset eef299ea1d29
+	[84718f122b7b]
+
+	* lib/configurability.rb, lib/configurability/config.rb,
+	spec/configurability/config_spec.rb:
+	Fix for config files with nil keys (fixes #1)
+	[eef299ea1d29]
+
+	* .hgsub, .hgsubstate, .hgsubstate, History.md, LICENSE, Manifest.txt,
+	README.md, Rakefile, project.yml:
+	Converted to Hoe.
+	[fb024df77138]
+
+2010-11-29  Michael Granger  <ged@FaerieMUD.org>
+
 	* .hgtags:
 	Added tag v1.0.3 for changeset 910ae8ac082f
 	[a2ae16f86c98]
@@ -425,6 +468,16 @@
 	* Merged with 17:e2bf2e43bccf
 	[17a6999c08b9]
 
+2010-08-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag 1.0.1 for changeset e3605ccbe057
+	[4bff6d5f7b6e]
+
+	* .hgsigs:
+	Added signature for changeset 41bc1de0bf36
+	[e3605ccbe057] [1.0.1]
+
 2010-10-25  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/configurability/behavior.rb:
@@ -437,16 +490,6 @@
 	Converted tests to RSpec 2.
 	[5d18e28e387b]
 
-2010-08-08  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag 1.0.1 for changeset e3605ccbe057
-	[4bff6d5f7b6e]
-
-	* .hgsigs:
-	Added signature for changeset 41bc1de0bf36
-	[e3605ccbe057] [1.0.1]
-
 2010-08-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, README.md, lib/configurability/config.rb,

data/History.rdoc

@@ -1,3 +1,14 @@
+== v2.1.0 [2013-08-13] Michael Granger <ged@FaerieMUD.org>
+
+- Fix behavior of inherited Configurability
+- Convert specs to use RSpec expect syntax
+- Drop support for Ruby 1.8.7.
+
+
+== v2.0.2 [2013-06-14] Mahlon E. Smith <mahlon@martini.nu>
+
+- Added signature for changeset e53b53d65079
+
 == v2.0.2 [2013-06-14] Mahlon E. Smith <mahlon@martini.nu>
 
 - Load YAML safely if the safe_yaml gem is present.

data/Manifest.txt

@@ -14,4 +14,4 @@ lib/configurability/deferredconfig.rb
 spec/configurability/config_spec.rb
 spec/configurability/deferredconfig_spec.rb
 spec/configurability_spec.rb
-spec/lib/helpers.rb
+spec/helpers.rb

data/README.rdoc

@@ -263,7 +263,7 @@ and generate the API documentation.
 
 == License
 
-Copyright (c) 2010, 2011  Michael Granger
+Copyright (c) 2010-2013 Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -24,12 +24,12 @@ hoespec = Hoe.spec 'configurability' do
 
 	self.dependency 'loggability', '~> 0.4'
 
-	self.dependency 'rspec', '~> 2.4', :developer
-	self.dependency 'simplecov', '~> 0.3', :developer
+	self.dependency 'rspec', '~> 2.14', :developer
+	self.dependency 'simplecov', '~> 0.5', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Configurability Toolkit']
-	self.require_ruby_version( '>= 1.8.7' )
+	self.require_ruby_version( '>= 1.9.2' )
 
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"

data/lib/configurability.rb

@@ -18,10 +18,10 @@ module Configurability
 
 
 	# Library version constant
-	VERSION = '2.0.2'
+	VERSION = '2.1.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: e53b53d65079 $
+	REVISION = %q$Revision: d27195f9c3df $
 
 	require 'configurability/deferredconfig'
 
@@ -99,10 +99,10 @@ module Configurability
 	end
 
 
-	### Configure objects that have had Configurability added to them with 
-	### the sections of the specified +config+ that correspond to their 
+	### Configure objects that have had Configurability added to them with
+	### the sections of the specified +config+ that correspond to their
 	### +config_key+. If the +config+ doesn't #respond_to the object's
-	### +config_key+, the object's #configure method is called with +nil+ 
+	### +config_key+, the object's #configure method is called with +nil+
 	### instead.
 	def self::configure_objects( config )
 		self.log.debug "Splitting up config %p between %d objects with configurability." %
@@ -170,13 +170,13 @@ module Configurability
 	def self::gather_defaults( collection={} )
 		self.configurable_objects.each do |obj|
 			next unless obj.respond_to?( :defaults )
-			unless subhash = obj.defaults
+			if subhash = obj.defaults
+				section = obj.config_key.to_sym
+				Configurability.log.debug "Defaults for %p (%p): %p" % [ obj, section, subhash ]
+				collection.merge!( section => subhash )
+			else
 				Configurability.log.warn "No defaults for %p; skipping" % [ obj ]
-				next
 			end
-			section = obj.config_key.to_sym
-
-			collection.merge!( section => subhash )
 		end
 
 		return collection
@@ -199,7 +199,7 @@ module Configurability
 
 	### Get (and optionally set) the +config_key+ (a Symbol).
 	def config_key( sym=nil )
-		@config_key = sym unless sym.nil?
+		self.config_key = sym unless sym.nil?
 		@config_key ||= Configurability.make_key_from_object( self )
 		@config_key
 	end
@@ -207,6 +207,7 @@ module Configurability
 
 	### Set the config key of the object.
 	def config_key=( sym )
+		Configurability.configurable_objects |= [ self ]
 		@config_key = sym
 	end
 
@@ -230,12 +231,12 @@ module Configurability
 		return nil unless respond_to?( :const_defined? )
 
 		Configurability.log.debug "Looking for defaults in %p's constants." % [ self ]
-		if self.const_defined?( :DEFAULT_CONFIG )
+		if self.const_defined?( :DEFAULT_CONFIG, false )
 			Configurability.log.debug "  found DEFAULT_CONFIG"
-			return self.const_get( :DEFAULT_CONFIG ).dup
-		elsif self.const_defined?( :CONFIG_DEFAULTS )
+			return self.const_get( :DEFAULT_CONFIG, false ).dup
+		elsif self.const_defined?( :CONFIG_DEFAULTS, false )
 			Configurability.log.debug "  found CONFIG_DEFAULTS"
-			return self.const_get( :CONFIG_DEFAULTS ).dup
+			return self.const_get( :CONFIG_DEFAULTS, false ).dup
 		else
 			Configurability.log.debug "  no default constants."
 			return nil

data/lib/configurability/behavior.rb

@@ -5,21 +5,16 @@ require 'rspec'
 
 share_examples_for "an object with Configurability" do
 
-	let( :config ) do
-		described_class
-	end
-
-
 	it "is extended with Configurability" do
-		Configurability.configurable_objects.should include( self.config )
+		expect( Configurability.configurable_objects ).to include( described_class )
 	end
 
 	it "has a Symbol config key" do
-		self.config.config_key.should be_a( Symbol )
+		expect( described_class.config_key ).to be_a( Symbol )
 	end
 
 	it "has a config key that is a reasonable section name" do
-		self.config.config_key.to_s.should =~ /^[a-z][a-z0-9]*$/i
+		expect( described_class.config_key.to_s ).to match( /^[a-z][a-z0-9]*$/i )
 	end
 
 end

data/lib/configurability/config.rb

@@ -39,7 +39,7 @@ class Configurability::Config
 	       Loggability
 
 
-   	# Loggability API -- set up logging through the Configurability module's logger
+	# Loggability API -- set up logging through the Configurability module's logger
 	log_to :configurability
 
 

data/spec/configurability/config_spec.rb

@@ -1,21 +1,11 @@
 #!/usr/bin/env ruby
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
+require 'helpers'
 
 require 'logger'
 require 'fileutils'
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'configurability/config'
 
 
@@ -56,11 +46,11 @@ describe Configurability::Config do
 	end
 
 	it "can dump itself as YAML" do
-		Configurability::Config.new.dump.strip.should == "--- {}"
+		expect( Configurability::Config.new.dump.strip ).to eq( "--- {}" )
 	end
 
 	it "returns nil as its change description" do
-		Configurability::Config.new.changed_reason.should be_nil()
+		expect( Configurability::Config.new.changed_reason ).to be_nil()
 	end
 
 	it "autogenerates accessors for non-existant struct members" do
@@ -68,18 +58,21 @@ describe Configurability::Config do
 		config.plugins ||= {}
 		config.plugins.filestore ||= {}
 		config.plugins.filestore.maxsize = 1024
-		config.plugins.filestore.maxsize.should == 1024
+
+		expect( config.plugins.filestore.maxsize ).to eq( 1024 )
 	end
 
 	it "merges values loaded from the config with any defaults given" do
 		config = Configurability::Config.new( TEST_CONFIG, :defaultkey => "Oh yeah." )
-		config.defaultkey.should == "Oh yeah."
+
+		expect( config.defaultkey ).to eq( "Oh yeah." )
 	end
 
 	it "yields itself if a block is given at creation" do
 		yielded_self = nil
 		config = Configurability::Config.new { yielded_self = self }
-		yielded_self.should equal( config )
+
+		expect( yielded_self ).to equal( config )
 	end
 
 	it "passes itself as the block argument if a block of arity 1 is given at creation" do
@@ -89,23 +82,26 @@ describe Configurability::Config do
 			yielded_self = self
 			arg_self = arg
 		end
-		yielded_self.should_not equal( config )
-		arg_self.should equal( config )
+
+		expect( yielded_self ).not_to equal( config )
+		expect( arg_self ).to equal( config )
 	end
 
 	it "supports both Symbols and Strings for Hash-like access" do
 		config = Configurability::Config.new( TEST_CONFIG )
-		config[:section]['subsection'][:subsubsection].should == 'value'
+
+		expect( config[:section]['subsection'][:subsubsection] ).to eq( 'value' )
 	end
 
 	it "autoloads predicates for its members" do
 		config = Configurability::Config.new( TEST_CONFIG )
-		config.mergekey?.should be_true()
-		config.mergemonkey?.should be_false()
-		config.section?.should be_true()
-		config.section.subsection?.should be_true()
-		config.section.subsection.subsubsection?.should be_true()
-		config.section.monkeysubsection?.should be_false()
+
+		expect( config.mergekey? ).to be_true()
+		expect( config.mergemonkey? ).to be_false()
+		expect( config.section? ).to be_true()
+		expect( config.section.subsection? ).to be_true()
+		expect( config.section.subsection.subsubsection? ).to be_true()
+		expect( config.section.monkeysubsection? ).to be_false()
 	end
 
 
@@ -122,17 +118,16 @@ describe Configurability::Config do
 		          - pattern2
 		}.gsub(/^\t{2}/, '')
 
-		before( :each ) do
-			@config = Configurability::Config.new( NIL_KEY_CONFIG )
-		end
+		let( :config ) { Configurability::Config.new(NIL_KEY_CONFIG) }
 
 		it "doesn't raise a NoMethodError when loading (issue #1)" do
-			@config[:trap_on]['low disk space alert'][nil][:notepad][:patterns].
-				should == [ 'pattern1', 'pattern2' ]
+			val = config[:trap_on]['low disk space alert'][nil][:notepad][:patterns]
+			expect( val ).to eq([ 'pattern1', 'pattern2' ])
 		end
 
 		it "knows that it has a nil member" do
-			@config[:trap_on]['low disk space alert'].should have_member( nil )
+			val = config[:trap_on]['low disk space alert']
+			expect( val ).to have_member( nil )
 		end
 
 	end
@@ -140,69 +135,67 @@ describe Configurability::Config do
 
 	context "created with in-memory YAML source" do
 
-		before( :each ) do
-			@config = Configurability::Config.new( TEST_CONFIG )
-		end
+		let( :config ) { Configurability::Config.new(TEST_CONFIG) }
 
 		it "responds to methods which are the same as struct members" do
-			@config.should respond_to( :section )
-			@config.section.should respond_to( :subsection )
-			@config.should_not respond_to( :pork_sausage )
+			expect( config ).to respond_to( :section )
+			expect( config.section ).to respond_to( :subsection )
+			expect( config ).not_to respond_to( :pork_sausage )
 		end
 
 		it "contains values specified in the source" do
 			# section:
 			#   subsection:
 			#     subsubsection: value
-			@config.section.subsection.subsubsection.should == 'value'
+			expect( config.section.subsection.subsubsection ).to eq( 'value' )
 
 			# listsection:
 			#   - list
 			#   - values
 			#   - are
 			#   - neat
-			@config.listsection.should == %w[list values are neat]
+			expect( config.listsection ).to eq( %w[list values are neat] )
 
 			# mergekey: Yep.
-			@config.mergekey.should == 'Yep.'
+			expect( config.mergekey ).to eq( 'Yep.' )
 
 			# textsection: |-
 			#   With some text as the value
 			#   ...and another line.
-			@config.textsection.should == "With some text as the value\n...and another line."
+			expect( config.textsection ).to eq("With some text as the value\n...and another line.")
 		end
 
 		it "returns struct members as an Array of Symbols" do
-			@config.members.should be_an_instance_of( Array )
-			@config.members.should have_at_least( 4 ).things
-			@config.members.each do |member|
-				member.should be_an_instance_of( Symbol)
+			expect( config.members ).to be_an_instance_of( Array )
+			expect( config.members ).to have_at_least( 4 ).things
+			config.members.each do |member|
+				expect( member ).to be_an_instance_of( Symbol )
 			end
 		end
 
 		it "is able to iterate over sections" do
-			@config.each do |key, struct|
-				key.should be_an_instance_of( Symbol)
+			config.each do |key, struct|
+				expect( key ).to be_an_instance_of( Symbol )
 			end
 		end
 
 		it "dumps values specified in the source" do
-			@config.dump.should =~ /^section:/
-			@config.dump.should =~ /^\s+subsection:/
-			@config.dump.should =~ /^\s+subsubsection:/
-			@config.dump.should =~ /^- list/
+			expect( config.dump ).to match( /^section:/ )
+			expect( config.dump ).to match( /^\s+subsection:/ )
+			expect( config.dump ).to match( /^\s+subsubsection:/ )
+			expect( config.dump ).to match( /^- list/ )
 		end
 
 		it "provides a human-readable description of itself when inspected" do
-			@config.inspect.should =~ /4 sections/i
-			@config.inspect.should =~ /mergekey/
-			@config.inspect.should =~ /textsection/
-			@config.inspect.should =~ /from memory/i
+			expect( config.inspect ).to match( /4 sections/i )
+			expect( config.inspect ).to match( /mergekey/ )
+			expect( config.inspect ).to match( /textsection/ )
+			expect( config.inspect ).to match( /from memory/i )
 		end
 
 		it "raises an exception when reloaded" do
 			expect {
-				@config.reload
+				config.reload
 			}.to raise_exception( RuntimeError, /can't reload from an in-memory source/i )
 		end
 
@@ -211,19 +204,19 @@ describe Configurability::Config do
 
 	# saving if changed since loaded
 	context " whose internal values have been changed since loaded" do
-		before( :each ) do
-			@config = Configurability::Config.new( TEST_CONFIG )
-			@config.section.subsection.anothersection = 11451
+		let( :config ) do
+			config = Configurability::Config.new( TEST_CONFIG )
+			config.section.subsection.anothersection = 11451
+			config
 		end
 
 
-		### Specifications
 		it "should report that it is changed" do
-			@config.changed?.should == true
+			expect( config.changed? ).to be_true()
 		end
 
 		it "should report that its internal struct was modified as the reason for the change" do
-			@config.changed_reason.should =~ /struct was modified/i
+			expect( config.changed_reason ).to match( /struct was modified/i )
 		end
 
 	end
@@ -241,35 +234,35 @@ describe Configurability::Config do
 			@tmpfile.unlink
 		end
 
-		before( :each ) do
-			@config = Configurability::Config.load( @tmpfile.to_s )
-		end
+		let( :config ) { Configurability::Config.load(@tmpfile.to_s) }
 
 
 		### Specifications
 		it "remembers which file it was loaded from" do
-			@config.path.should == @tmpfile.expand_path
+			expect( config.path ).to eq( @tmpfile.expand_path )
 		end
 
 		it "writes itself back to the same file by default" do
-			@config.port = 114411
-			@config.write
+			config.port = 114411
+			config.write
 			otherconfig = Configurability::Config.load( @tmpfile.to_s )
 
-			otherconfig.port.should == 114411
+			expect( otherconfig.port ).to eq( 114411 )
 		end
 
 		it "can be written to a different file" do
+			begin
 			path = Dir::Tmpname.make_tmpname( './another-', '.config' )
 
-			@config.write( path )
-			File.read( path ).should =~ /section:\n  subsection/
-
-			File.unlink( path )
+				config.write( path )
+				expect( File.read(path) ).to match( /section: ?\n  subsection/ )
+			ensure
+				File.unlink( path ) if path
+			end
 		end
 
 		it "includes the name of the file in its inspect output" do
-			@config.inspect.should include( File.basename(@tmpfile.to_s) )
+			expect( config.inspect ).to include( File.basename(@tmpfile.to_s) )
 		end
 
 		it "yields itself if a block is given at load-time" do
@@ -277,7 +270,7 @@ describe Configurability::Config do
 			config = Configurability::Config.load( @tmpfile.to_s ) do
 				yielded_self = self
 			end
-			yielded_self.should equal( config )
+			expect( yielded_self ).to equal( config )
 		end
 
 		it "passes itself as the block argument if a block of arity 1 is given at load-time" do
@@ -287,14 +280,15 @@ describe Configurability::Config do
 				yielded_self = self
 				arg_self = arg
 			end
-			yielded_self.should_not equal( config )
-			arg_self.should equal( config )
+
+			expect( yielded_self ).not_to equal( config )
+			expect( arg_self ).to equal( config )
 		end
 
 		it "doesn't re-read its source file if it hasn't changed" do
-			@config.path.should_not_receive( :read )
-			Configurability.should_not_receive( :configure_objects )
-			@config.reload.should be_false()
+			expect( config.path ).not_to receive( :read )
+			expect( Configurability ).not_to receive( :configure_objects )
+			expect( config.reload ).to be_false()
 		end
 	end
 
@@ -323,39 +317,38 @@ describe Configurability::Config do
 
 		### Specifications
 		it "reports that it is changed" do
-			@config.should be_changed
+			expect( @config ).to be_changed
 		end
 
 		it "reports that its source was updated as the reason for the change" do
-			@config.changed_reason.should =~ /source.*updated/i
+			expect( @config.changed_reason ).to match( /source.*updated/i )
 		end
 
 		it "re-reads its file when reloaded" do
-			@config.path.should_receive( :read ).and_return( TEST_CONFIG )
-			Configurability.should_receive( :configure_objects ).with( @config )
-			@config.reload.should be_true()
+			expect( @config.path ).to receive( :read ).and_return( TEST_CONFIG )
+			expect( Configurability ).to receive( :configure_objects ).with( @config )
+			expect( @config.reload ).to be_true()
 		end
 
 		it "reapplies its defaults when reloading" do
-			config = Configurability::Config.load( @tmpfile.to_s, :defaultskey => 8 )
-			config.reload
-			config.defaultskey.should == 8
+			@config = Configurability::Config.load( @tmpfile.to_s, :defaultskey => 8 )
+			@config.reload
+
+			expect( @config.defaultskey ).to eq( 8 )
 		end
 	end
 
 
 	# merging
 	context " created by merging two other configs" do
-		before( :each ) do
-			@config1 = Configurability::Config.new
-			@config2 = Configurability::Config.new( TEST_CONFIG )
-			@merged = @config1.merge( @config2 )
-		end
+		let( :config1 ) { Configurability::Config.new }
+		let( :config2 ) { Configurability::Config.new(TEST_CONFIG) }
+		let( :merged ) { config1.merge(config2) }
 
 
 		### Specifications
 		it "should contain values from both" do
-			@merged.mergekey.should == @config2.mergekey
+			expect( merged.mergekey ).to eq( config2.mergekey )
 		end
 	end