configurability 1.2.0 → 2.0.0

data/ChangeLog

@@ -1,12 +1,103 @@
+2013-01-30  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* .hgtags:
+	Added tag v2.0.0 for changeset 120cbb7d7020
+	[ef82f9cfdc97] [tip]
+
+	* .hgsigs:
+	Added signature for changeset c4f53e99a024
+	[120cbb7d7020] [v2.0.0]
+
+2013-01-30  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.rdoc, lib/configurability.rb:
+	Bump major version, update history.
+	[c4f53e99a024]
+
+	* lib/configurability/config.rb, spec/configurability/config_spec.rb:
+	Make missing config values return nil instead of auto-vivifying to a
+	Struct.
+
+	This is not a backward-compatible change, but in practice, far more
+	work was done to detect non-existant values than was saved by the
+	debatable convenience of being able to auto-create nested structs.
+	[71e0fdf7525c] [github/master]
+
+	* .tm_properties:
+	Set indent for specs, too
+	[652d73f009ee]
+
+2012-08-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/configurability/deferredconfig_spec.rb:
+	Added a test for propagating config defaults.
+	[6a9b96abf9c9]
+
+2012-06-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile, lib/configurability/config.rb,
+	spec/configurability/config_spec.rb, spec/configurability_spec.rb,
+	spec/lib/helpers.rb:
+	Update to loggability 0.4 and add Rubinius (1.9-mode) fixes.
+	[e4f8f58e87f9]
+
+2012-05-19  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* bin/configurability:
+	Fix a minor copy/paste omission.
+	[67eaa6009847]
+
+2012-05-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems:
+	Bumping Loggability dependency for inheritance bugfix
+	[ab21216307cc]
+
+2012-05-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Bump dependency on Loggability to 0.2.
+	[6e9391f1b7fa]
+
+2012-05-09  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.2.0 for changeset 393e62010a17
+	[2cbdc041962d]
+
+	* .hgsigs:
+	Added signature for changeset 6b5e075386ee
+	[393e62010a17] [v1.2.0]
+
+	* .rvm.gems, History.rdoc, Rakefile, lib/configurability.rb:
+	Bump the minor version, update history.
+	[6b5e075386ee]
+
+	* .hgignore:
+	Ignore Rubinius bytecode cache
+	[2987cb594c6c]
+
+2012-05-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/configurability:
+	Bugfix for bin/configurability.
+	[68fdbae52542]
+
+	* .rvm.gems, Manifest.txt, Rakefile, bin/configurability,
+	lib/configurability.rb, lib/configurability/config.rb,
+	lib/configurability/logging.rb, spec/lib/helpers.rb:
+	Converted to Loggability for logging.
+	[1631d0c31d81]
+
 2012-04-25  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/configurability:
 	Add first version of a command-line utility
-	[ad1ff0049fcf] [tip]
+	[ad1ff0049fcf]
 
 	* .hgtags:
 	Added tag v1.1.0 for changeset 070e4bfc8e55
-	[cc2d783fd316] [github/master]
+	[cc2d783fd316]
 
 	* .hgsigs:
 	Added signature for changeset 2e082d901553
@@ -80,6 +171,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:
@@ -99,35 +199,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]
@@ -152,6 +223,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:
@@ -236,24 +325,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:
@@ -276,6 +347,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]
@@ -317,6 +410,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:
@@ -329,16 +432,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,15 @@
+== v2.0.0 [2013-01-30] Michael Granger <ged@FaerieMUD.org>
+
+- Make missing Configurability::Config values return nil instead of
+  auto-vivifying to a Struct.
+
+  This is not a backward-compatible change, but in practice, far more
+  work was done to detect non-existant values than was saved by the
+  debatable convenience of being able to auto-create nested structs.
+
+- Update to loggability 0.4 and add Rubinius (1.9-mode) fixes.
+
+
 == v1.2.0 [2012-05-09] Michael Granger <ged@FaerieMUD.org>
 
 - Added a command-line utility.

data/Rakefile

@@ -8,12 +8,12 @@ end
 
 
 Hoe.plugin :mercurial
-Hoe.plugin :yard
 Hoe.plugin :signing
 Hoe.plugin :deveiate
 
 Hoe.plugins.delete :rubyforge
 
+Encoding.default_internal = Encoding::UTF_8
 
 hoespec = Hoe.spec 'configurability' do
 	self.readme_file = 'README.rdoc'
@@ -22,7 +22,7 @@ hoespec = Hoe.spec 'configurability' do
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'loggability', '~> 0.1'
+	self.dependency 'loggability', '~> 0.4'
 
 	self.dependency 'rspec', '~> 2.4', :developer
 	self.dependency 'simplecov', '~> 0.3', :developer
@@ -40,3 +40,10 @@ ENV['VERSION'] ||= hoespec.spec.version.to_s
 # Ensure the specs pass before checking in
 task 'hg:precheckin' => [ :check_history, :check_manifest, :spec ]
 
+
+desc "Build a coverage report"
+task :coverage do
+	ENV["COVERAGE"] = 'yes'
+	Rake::Task[:spec].invoke
+end
+

data/bin/configurability

@@ -286,7 +286,7 @@ class Configurability::Command
 	def version_command( *args )
 		message( "<%= color 'Version:', :header %> " + Configurability.version_string(true) )
 	end
-	help :version, "Prints the Ruby-Mongrel2 version."
+	help :version, "Prints the Configurability version."
 
 
 	#

data/lib/configurability.rb

@@ -18,10 +18,10 @@ module Configurability
 
 
 	# Library version constant
-	VERSION = '1.2.0'
+	VERSION = '2.0.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 6b5e075386ee $
+	REVISION = %q$Revision: c4f53e99a024 $
 
 	require 'configurability/deferredconfig'
 

data/lib/configurability/config.rb

@@ -352,7 +352,7 @@ class Configurability::Config
 		# config values.
 		Kernel.methods(false).each {|meth|
 			next unless method_defined?( meth )
-			next if /^(?:__|dup|object_id|inspect|class|raise|method_missing)/.match( meth )
+			next if /^(?:__|dup|object_id|inspect|class|raise|method_missing)/.match( meth.to_s )
 			undef_method( meth )
 		}
 
@@ -382,12 +382,8 @@ class Configurability::Config
 		def []( key )
 			key = key.untaint.to_sym if key.respond_to?( :to_sym )
 
-			# Create the config struct on the fly for subsections
-			if !@hash.key?( key )
-				@hash[ key ] = self.class.new
-			elsif @hash[ key ].is_a?( Hash )
-				@hash[ key ] = self.class.new( @hash[key] )
-			end
+			# Convert Hashes to Struct on the fly for subsections
+			@hash[ key ] = self.class.new( @hash[key] ) if @hash[ key ].is_a?( Hash )
 
 			return @hash[ key ]
 		end

data/spec/configurability/config_spec.rb

@@ -24,7 +24,6 @@ require 'configurability/config'
 ###	C O N T E X T S
 #####################################################################
 describe Configurability::Config do
-	include Configurability::SpecHelpers
 
 	TEST_CONFIG = %{
 	---
@@ -66,6 +65,8 @@ describe Configurability::Config do
 
 	it "autogenerates accessors for non-existant struct members" do
 		config = Configurability::Config.new
+		config.plugins ||= {}
+		config.plugins.filestore ||= {}
 		config.plugins.filestore.maxsize = 1024
 		config.plugins.filestore.maxsize.should == 1024
 	end

data/spec/configurability/deferredconfig_spec.rb

@@ -51,6 +51,23 @@ describe Configurability::DeferredConfig do
 		a_class.config_object.should == :testing_config
 	end
 
+
+	it "includes defaults when configuring" do
+		config = { :testing => :testing_config }
+		Configurability.configure_objects( config )
+
+		a_class = Class.new do
+			extend Configurability::DeferredConfig
+			class << self; attr_accessor :config_object; end
+			def self::config_key; "testing"; end
+			def self::configure( config )
+				self.config_object = config
+			end
+		end
+
+		a_class.config_object.should == :testing_config
+	end
+
 end
 
 # vim: set nosta noet ts=4 sw=4:

data/spec/configurability_spec.rb

@@ -23,7 +23,6 @@ require 'configurability/config'
 #####################################################################
 
 describe Configurability do
-	include Configurability::SpecHelpers
 
 	before( :all ) do
 		setup_logging( :fatal )
@@ -261,9 +260,8 @@ describe Configurability do
 		it "doesn't reconfigure objects that have already been configured unless the config changes" do
 			first_objectclass = Class.new do
 				extend Configurability
-				@configs = []
 				config_key :postconfig
-				def self::configure( config ); @configs << config; end
+				def self::configure( config ); @configs ||= []; @configs << config; end
 				def self::inherited( subclass ); subclass.instance_variable_set(:@configs, []); super; end
 				class << self; attr_reader :configs; end
 			end
@@ -271,13 +269,13 @@ describe Configurability do
 			second_objectclass = Class.new( first_objectclass ) do
 				extend Configurability
 				config_key :postconfig
-				def self::configure( config ); @configs << config; end
+				def self::configure( config ); @configs ||= []; @configs << config; end
 			end
 
 			third_objectclass = Class.new( second_objectclass ) do
 				extend Configurability
 				config_key :postconfig
-				def self::configure( config ); @configs << config; end
+				def self::configure( config ); @configs ||= []; @configs << config; end
 			end
 
 			first_objectclass.configs.should == [ @config[:postconfig] ]

data/spec/lib/helpers.rb

@@ -10,55 +10,26 @@ BEGIN {
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 }
 
-require 'simplecov'
+if ENV['COVERAGE']
+	warn "Coverage doesn't work so great under non-MRI interpreters." if RUBY_ENGINE != "ruby"
+	require 'simplecov'
+	SimpleCov.start { add_filter '/spec/' }
+end
+
 require 'rspec'
 
 require 'logger'
 require 'erb'
 require 'yaml'
 
-SimpleCov.start do
-	add_filter '/spec/'
-end
-require 'configurability'
-
-
-### RSpec helper functions.
-module Configurability::SpecHelpers
-
-	###############
-	module_function
-	###############
+require 'loggability/spechelpers'
 
-	### Reset the logging subsystem to its default state.
-	def reset_logging
-		Loggability.formatter = nil
-		Loggability.output_to( $stderr )
-		Loggability.level = :fatal
-	end
-
-
-	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=:fatal )
-
-		# Only do this when executing from a spec in TextMate
-		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			logarray = []
-			Thread.current['logger-output'] = logarray
-			Loggability.output_to( logarray )
-			Loggability.format_as( :html )
-			Loggability.level = :debug
-		else
-			Loggability.level = level
-		end
-	end
-
-end
+require 'configurability'
 
 
 RSpec.configure do |config|
 	config.mock_with( :rspec )
-	config.include( Configurability::SpecHelpers )
+	config.include( Loggability::SpecHelpers )
 	config.treat_symbols_as_metadata_keys_with_true_values = true
 
 	config.filter_run_excluding :only_ruby_19 if RUBY_VERSION < '1.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurability
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 description: ! 'Configurability is a unified, unintrusive, assume-nothing configuration
   system
 
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: configurability
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Configurability is a unified, unintrusive, assume-nothing configuration system

metadata.gz.sig

@@ -1 +1 @@
-A=��%���ۋc����M�2V������J}2�q�NCL5�nW�]9��h ����;�5'�G�g��l�M!Ǝ���k��q���0"��}�F����TTn^&f�h+����r���<P���/��tG9�67!�t��0��c�	sY�]� c�n��B!�„�a!Yc��>3�8W[ÅVIA�D�}+��
+xF6� ����W:|:�������CJ:bx5������z)�"�i��z;�,���?�Vk|��W���Q�u�7����
�p|�~����Ygcu�$�!�Sl$�\�DW�q�u7!8Gՙ���Fw�^/�RR�X�a�	�&�:�q�	{W�E��O�ꪍ��>R�@�^Sy��8���絗Q��/����U���Qh�M-}`�Ә������f?/�
���n�x{
4!�6���J�v'�$������>