pluggability 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6657aec37785ba2a1d1b7be5f114acf4924000bc
-  data.tar.gz: b86d76b06fa680fee6fb5288de1058340d67910d
+  metadata.gz: 7600ea51c42f4decce2b6402e83f70aa7b12d5c2
+  data.tar.gz: cee2efb2884df9d5f930d6bb284d6c8e7fce3668
 SHA512:
-  metadata.gz: 91f428c726410e0e67fb3a5c9e83f2782e97aba1adfdbadffc38729a0bafe9c867ec18b9f75540675e8a325776a0d073ca25214e612d90015f113afdf4432aab
-  data.tar.gz: 6b332d73c7d3abd9fb3ae481eed77931eca4760a8bb37371cb9925b5556ecc78ae4a4ec0d1fa8388da4b168ce69a3c0f0940f01725f813780d741d7b941a3b1e
+  metadata.gz: 7889a6316ded531e79c33b91f84537e0ecbd848e52f25eb51df7346d2b9d351758e4608f128c163d0e84aeb1672e7201dcc115f4c1af0bf8e86e4e12c9dcead6
+  data.tar.gz: 0dc094f630d4dcb4b6a4ca50ea311a56c83e3980fecff63fe44f58e8b67859d7f3864d9f0191885dc643ff8f6741b6cff21b2461b687388eca440962c55079d5

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.3.0 [2013-09-25] Michael Granger <ged@FaerieMUD.org>
+
+- Add plugin exclusion patterns
+
+
 == v0.2.0 [2013-03-28] Michael Granger <ged@FaerieMUD.org>
 
 - Fix loading of grandchildren of plugins

data/Manifest.txt

@@ -4,5 +4,5 @@ Manifest.txt
 README.rdoc
 Rakefile
 lib/pluggability.rb
-spec/lib/helpers.rb
+spec/helpers.rb
 spec/pluggability_spec.rb

data/README.rdoc

@@ -77,22 +77,18 @@ formats:
         def read_from_file( path ); end
     end
 
-When you attempt to load the 'apache' data-driver class like so:
+When you attempt to load the 'apache' logreader class like so:
 
     LogReader.create( 'apache' )
 
 Pluggability searches for modules with the following names:
 
-    'apachedatadriver'
-    'apache_datadriver'
-    'apacheLogReader'
-    'apache_LogReader'
-    'ApacheLogReader'
-    'Apache_LogReader'
-    'apache'
-    'Apache'
-
-Obviously the last one will load something other than what is intended,
+    ApacheLogReader
+    apachelogreader
+    apache_log_reader
+    apache
+ 
+Obviously the last one might load something other than what is intended,
 so you can also tell Pluggability that plugins should be loaded from a
 subdirectory by declaring one or more +plugin_prefixes+ in the base
 class. Each prefix will be tried (in the order they're declared) when
@@ -105,50 +101,74 @@ searching for a subclass:
 
 This will change the list that is required to:
 
-    'drivers/apachedatadriver'
-    'drivers/apache_datadriver'
-    'drivers/apacheLogReader'
-    'drivers/apache_LogReader'
-    'drivers/ApacheLogReader'
-    'drivers/Apache_LogReader'
-    'drivers/apache'
-    'drivers/Apache'
+    drivers/apache_logreader
+    drivers/apache_LogReader
+    drivers/apachelogreader
+    drivers/apacheLogReader
+    drivers/apache
 
-If you return more than one subdirectory, each of them will be tried in
+If you specify more than one subdirectory, each of them will be tried in
 turn:
 
     class LogReader
         extend Pluggability
-        plugin_prefixes 'drivers', 'datadriver'
+        plugin_prefixes 'drivers', 'logreader'
     end
 
 will change the search to include:
 
-    'drivers/apachedatadriver'
-    'drivers/apache_datadriver'
+    'drivers/apachelogreader'
+    'drivers/apache_logreader'
     'drivers/apacheLogReader'
     'drivers/apache_LogReader'
     'drivers/ApacheLogReader'
     'drivers/Apache_LogReader'
     'drivers/apache'
     'drivers/Apache'
-    'datadriver/apachedatadriver'
-    'datadriver/apache_datadriver'
-    'datadriver/apacheLogReader'
-    'datadriver/apache_LogReader'
-    'datadriver/ApacheLogReader'
-    'datadriver/Apache_LogReader'
-    'datadriver/apache'
-    'datadriver/Apache'
+    'logreader/apachelogreader'
+    'logreader/apache_logreader'
+    'logreader/apacheLogReader'
+    'logreader/apache_LogReader'
+    'logreader/ApacheLogReader'
+    'logreader/Apache_LogReader'
+    'logreader/apache'
+    'logreader/Apache'
 
 If the plugin is not found, a Pluggability::PluginError is raised, and
 the message will list all the permutations that were tried.
 
 
+=== Preloaded Plugins
+
+Sometimes you don't want to wait for plugins to be loaded on demand. For
+that case, Pluggability provides the load_all[rdoc-ref:Pluggability#load_all]
+method. This will find all possible matches for plugin files and load
+them, returning an Array of all the loaded classes:
+
+    class Template::Tag
+        extend Pluggability
+        plugin_prefixes 'tag'
+    end
+
+    tag_classes = Template::Tag.load_all
+
+
+=== Excluding Some Files
+
+You can also prevent some files from being automatically loaded by
+either create[rdoc-ref:Pluggability#create] or 
+load_all[rdoc-ref:Pluggability#load_all] by setting one or more exclusion
+patterns:
+
+    LogReader.plugin_exclusions 'spec/*', %r{/test/}
+
+The patterns can either be Regexps or glob Strings.
+
+
 === Logging
 
 If you need a little more insight into what's going on, Pluggability
-uses the "Loggability":https://rubygems.org/gems/loggability library.
+uses the Loggability[https://rubygems.org/gems/loggability] library.
 Just set the log level to 'debug' and it'll explain what's going on:
 
     require 'pluggability'
@@ -166,32 +186,31 @@ Just set the log level to 'debug' and it'll explain what's going on:
     
     LogReader.create( 'ringbuffer' )
 
-this might generate a log that looks like:
+this might generate a log that looks (something) like:
 
     [...] debug {} -- Loading derivative ringbuffer
     [...] debug {} -- Subdirs are: [""]
-    [...] debug {} -- Path is: ["ringbuffer_datadriver", 
-      "ringbuffer_LogReader", "ringbufferdatadriver", 
-      "ringbufferLogReader", "ringbuffer"]...
-    [...] debug {} -- Trying ringbuffer_datadriver...
-    [...] debug {} -- No module at 'ringbuffer_datadriver', trying the 
-      next alternative: 'cannot load such file -- ringbuffer_datadriver'
+    [...] debug {} -- Path is: ["ringbuffer_logreader", "ringbuffer_LogReader",
+      "ringbufferlogreader", "ringbufferLogReader", "ringbuffer"]...
+    [...] debug {} -- Trying ringbuffer_logreader...
+    [...] debug {} -- No module at 'ringbuffer_logreader', trying the next alternative:
+      'cannot load such file -- ringbuffer_logreader'
     [...] debug {} -- Trying ringbuffer_LogReader...
-    [...] debug {} -- No module at 'ringbuffer_LogReader', trying the
-      next alternative: 'cannot load such file -- ringbuffer_LogReader'
-    [...] debug {} -- Trying ringbufferdatadriver...
-    [...] debug {} -- No module at 'ringbufferdatadriver', trying the
-      next alternative: 'cannot load such file -- ringbufferdatadriver'
+    [...] debug {} -- No module at 'ringbuffer_LogReader', trying the next alternative:
+      'cannot load such file -- ringbuffer_LogReader'
+    [...] debug {} -- Trying ringbufferlogreader...
+    [...] debug {} -- No module at 'ringbufferlogreader', trying the next alternative:
+      'cannot load such file -- ringbufferlogreader'
     [...] debug {} -- Trying ringbufferLogReader...
-    [...] debug {} -- No module at 'ringbufferLogReader', trying the
-      next alternative: 'cannot load such file -- ringbufferLogReader'
+    [...] debug {} -- No module at 'ringbufferLogReader', trying the next alternative:
+      'cannot load such file -- ringbufferLogReader'
     [...] debug {} -- Trying ringbuffer...
-    [...] debug {} -- No module at 'ringbuffer', trying the next
-      alternative: 'cannot load such file -- ringbuffer'
+    [...] debug {} -- No module at 'ringbuffer', trying the next alternative:
+      'cannot load such file -- ringbuffer'
     [...] debug {} -- fatals = []
-    [...] error {} -- Couldn't find a LogReader named 'ringbuffer':
-      tried ["ringbuffer_datadriver", "ringbuffer_LogReader", 
-      "ringbufferdatadriver", "ringbufferLogReader", "ringbuffer"]
+    [...] error {} -- Couldn't find a LogReader named 'ringbuffer': tried 
+      ["ringbuffer_logreader", "ringbuffer_LogReader", 
+      "ringbufferlogreader", "ringbufferLogReader", "ringbuffer"]
 
 
 == Installation

data/Rakefile

@@ -5,6 +5,7 @@ require 'hoe'
 Hoe.plugin :deveiate
 Hoe.plugin :mercurial
 Hoe.plugin :signing
+Hoe.plugin :bundler
 
 Hoe.plugins.delete :rubyforge
 
@@ -13,21 +14,32 @@ hoespec = Hoe.spec 'pluggability' do
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 	self.spec_extras[:rdoc_options] = ['-t', 'Pluggability Toolkit']
-	self.spec_extras[:rdoc_options] += [ '-f', 'fivefish' ] if File.directory?( '.hg' )
+
+	# Hoops to avoid adding a formatting to the gem's spec, but still build
+	# with a custom formatter locally
+	self.spec_extras[:rdoc_options] += [ '-f', 'fivefish' ] if
+		File.directory?( '.hg' ) && !(ARGV.include?('gem') || ARGV.include?('release'))
 
 	self.developer 'Martin Chase', 'stillflame@FaerieMUD.org'
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.dependency 'loggability', '~> 0.6'
+	self.dependency 'loggability', '~> 0.7'
 
-	self.dependency 'hoe-deveiate', '~> 0.2', :development
+	self.dependency 'hoe-deveiate', '~> 0.3', :development
+	self.dependency 'hoe-bundler', '~> 1.2', :development
+	self.dependency 'rdoc-generator-fivefish', '~> 0.1', :development
 
-	self.spec_extras[:licenses] = ["BSD"]
+	self.license "BSD"
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
 	self.check_history_on_release = true if self.respond_to?( :check_history_on_release= )
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 
+task :gem do
+	hoespec.spec.rdoc_options.delete( '-f' )
+	hoespec.spec.rdoc_options.delete( 'fivefish' )
+end
+
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 task 'hg:precheckin' => [ :check_history, :check_manifest, :spec ]

data/lib/pluggability.rb

@@ -12,7 +12,7 @@ module Pluggability
 
 
 	# Library version
-	VERSION = '0.2.0'
+	VERSION = '0.3.0'
 
 
 	# An exception class for Pluggability specific errors.
@@ -23,6 +23,7 @@ module Pluggability
 	### Add the @derivatives instance variable to including classes.
 	def self::extend_object( obj )
 		obj.instance_variable_set( :@plugin_prefixes, [] )
+		obj.instance_variable_set( :@plugin_exclusions, [] )
 		obj.instance_variable_set( :@derivatives, {} )
 
 		Pluggability.pluggable_classes << obj
@@ -69,6 +70,50 @@ module Pluggability
 	end
 
 
+	### Get/set patterns which cause files in a plugin path to not be loaded. Typical
+	### use case is to exclude test/spec directories:
+	###
+	###     MyFactoryType.plugin_exclude( 'spec/**' )
+	###
+	def plugin_exclusions( *exclusions )
+		@plugin_exclusions.replace( exclusions ) if !exclusions.empty?
+		return @plugin_exclusions
+	end
+
+
+	### Set the plugin exclusion patterns which cause files in a plugin path to not
+	### be loaded.
+	def plugin_exclusions=( args )
+		@plugin_exclusions = Array( args )
+	end
+
+
+	### Returns +true+ if any of the #plugin_exclusions match the specified
+	### +path.
+	def is_excluded_path?( path )
+		rval = self.plugin_exclusions.find do |exclusion|
+			case exclusion
+			when Regexp
+				path =~ exclusion
+			when String
+				flags = 0
+				flags &= File::FNM_EXTGLOB if defined?( File::FNM_EXTGLOB )
+				File.fnmatch( exclusion, path, flags )
+			else
+				Pluggability.log.warn "Don't know how to apply exclusion: %p" % [ exclusion ]
+				false
+			end
+		end
+
+		if rval
+			Pluggability.log.debug "load path %p is excluded by %p" % [ path, rval ]
+			return true
+		else
+			return false
+		end
+	end
+
+
 	### Returns the type name used when searching for a derivative.
 	def plugin_type
 		base = Pluggability.plugin_base_class( self ) or
@@ -216,7 +261,10 @@ module Pluggability
 			Pluggability.log.debug "  found %d matching files" % [ candidates.length ]
 			next if candidates.empty?
 
-			candidates.each {|path| require(path) }
+			candidates.each do |path|
+				next if self.is_excluded_path?( path )
+				require( path )
+			end
 		end
 
 		return self.derivative_classes
@@ -284,6 +332,8 @@ module Pluggability
 		# module.
 		subdirs.map( &:strip ).each do |subdir|
 			self.make_require_path( mod_name, subdir ).each do |path|
+				next if self.is_excluded_path?( path )
+
 				Pluggability.logger.debug "Trying #{path}..."
 				tries << path
 

data/spec/{lib/helpers.rb → helpers.rb}

@@ -1,31 +1,23 @@
 #!/usr/bin/ruby
 # coding: utf-8
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent
-
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
-}
-
 require 'rspec'
 require 'loggability/spechelpers'
 require 'pluggability'
 
-
-
 ### Mock with Rspec
 RSpec.configure do |config|
-	ruby_version_vec = RUBY_VERSION.split('.').map {|c| c.to_i }.pack( "N*" )
 
-	config.include( Loggability::SpecHelpers )
 	config.treat_symbols_as_metadata_keys_with_true_values = true
+	config.run_all_when_everything_filtered = true
+	config.filter_run :focus
+	config.order = 'random'
+	config.mock_with( :rspec ) do |mock_config|
+		mock_config.syntax = :expect
+	end
 
-	config.mock_with :rspec
+	config.include( Loggability::SpecHelpers )
 end
 
-
 # vim: set nosta noet ts=4 sw=4:
 

data/spec/pluggability_spec.rb

@@ -1,18 +1,8 @@
 #!/usr/bin/env ruby
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent
+require_relative 'helpers'
 
-	libdir = basedir + "lib"
-
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
-
-require 'rspec'
 require 'pluggability'
-require 'spec/lib/helpers'
 
 
 #
@@ -39,17 +29,21 @@ class SubSubPlugin < SubPlugin; end
 #
 describe Pluggability do
 
+	before( :all ) do
+		setup_logging()
+	end
+
 	before( :each ) do
-		setup_logging( :fatal )
+		Plugin.plugin_exclusions = []
 	end
 
-	after( :each ) do
+	after( :all ) do
 		reset_logging()
 	end
 
 
 	it "allows extended objects to declare one or more prefixes to use when requiring derviatives" do
-		Plugin.plugin_prefixes.should == ['plugins', 'plugins/private']
+		expect( Plugin.plugin_prefixes ).to eq( ['plugins', 'plugins/private'] )
 	end
 
 
@@ -57,19 +51,17 @@ describe Pluggability do
 	context "-extended class" do
 
 		it "knows about all of its derivatives" do
-			Plugin.derivatives.keys.should include( 'sub' )
-			Plugin.derivatives.keys.should include( 'subplugin' )
-			Plugin.derivatives.keys.should include( 'SubPlugin' )
-			Plugin.derivatives.keys.should include( SubPlugin )
+			expect( Plugin.derivatives.keys ).
+				to include( 'sub', 'subplugin', 'SubPlugin', SubPlugin )
 		end
 
 		it "returns derivatives directly if they're already loaded" do
 			class AlreadyLoadedPlugin < Plugin; end
-			Kernel.should_not_receive( :require )
-			Plugin.create( 'alreadyloaded' ).should be_an_instance_of( AlreadyLoadedPlugin )
-			Plugin.create( 'AlreadyLoaded' ).should be_an_instance_of( AlreadyLoadedPlugin )
-			Plugin.create( 'AlreadyLoadedPlugin' ).should be_an_instance_of( AlreadyLoadedPlugin )
-			Plugin.create( AlreadyLoadedPlugin ).should be_an_instance_of( AlreadyLoadedPlugin )
+			expect( Kernel ).to_not receive( :require )
+			expect( Plugin.create('alreadyloaded') ).to be_an_instance_of( AlreadyLoadedPlugin )
+			expect( Plugin.create('AlreadyLoaded') ).to be_an_instance_of( AlreadyLoadedPlugin )
+			expect( Plugin.create('AlreadyLoadedPlugin') ).to be_an_instance_of( AlreadyLoadedPlugin )
+			expect( Plugin.create(AlreadyLoadedPlugin) ).to be_an_instance_of( AlreadyLoadedPlugin )
 		end
 
 		it "filters errors that happen when creating an instance of derivatives so they " +
@@ -89,7 +81,7 @@ describe Pluggability do
 				fail "Expected an exception to be raised."
 			end
 
-			exception.backtrace.first.should =~ /#{__FILE__}/
+			expect( exception.backtrace.first ).to match(/#{__FILE__}/)
 		end
 
 		it "will refuse to create an object other than one of its derivatives" do
@@ -103,14 +95,14 @@ describe Pluggability do
 		it "will load new plugins from the require path if they're not loaded yet" do
 			loaded_class = nil
 
-			Plugin.should_receive( :require ).with( 'plugins/dazzle_plugin' ).and_return do |*args|
+			expect( Plugin ).to receive( :require ).with( 'plugins/dazzle_plugin' ).and_return do |*args|
 				loaded_class = Class.new( Plugin )
 				# Simulate a named class, since we're not really requiring
 				Plugin.derivatives['dazzle'] = loaded_class
 				true
 			end
 
-			Plugin.create( 'dazzle' ).should be_an_instance_of( loaded_class )
+			expect( Plugin.create('dazzle') ).to be_an_instance_of( loaded_class )
 		end
 
 
@@ -118,7 +110,7 @@ describe Pluggability do
 			"derivative fails" do
 
 			# at least 6 -> 3 variants * 2 paths
-			Plugin.should_receive( :require ).
+			expect( Plugin ).to receive( :require ).
 				at_least(6).times.
 				and_return {|path| raise LoadError, "path" }
 
@@ -130,7 +122,7 @@ describe Pluggability do
 
 		it "will output a sensible description when a require succeeds, but it loads something unintended" do
 			# at least 6 -> 3 variants * 2 paths
-			Plugin.should_receive( :require ).and_return( true )
+			expect( Plugin ).to receive( :require ).and_return( true )
 
 			expect {
 				Plugin.create('corruscating')
@@ -142,9 +134,8 @@ describe Pluggability do
 			"derivative if none of the paths work" do
 
 			# at least 6 -> 3 variants * 2 paths
-			Plugin.should_receive( :require ).at_least(6).times.and_return {|path|
-				raise ScriptError, "error while parsing #{path}"
-			}
+			expect( Plugin ).to receive( :require ).at_least(6).times.
+				and_raise( ScriptError.new("error while parsing path") )
 
 			expect {
 				Plugin.create('portable')
@@ -153,31 +144,65 @@ describe Pluggability do
 
 
 		it "can preload all of its derivatives" do
-			Gem.should_receive( :find_files ).with( 'plugins/*.rb' ).
+			expect( Gem ).to receive( :find_files ).with( 'plugins/*.rb' ).
+				and_return([ 'plugins/first.rb' ])
+			expect( Gem ).to receive( :find_files ).with( 'plugins/private/*.rb' ).
+				and_return([ 'plugins/private/second.rb', 'plugins/private/third.rb' ])
+
+			expect( Plugin ).to receive( :require ).with( 'plugins/first.rb' ).
+				and_return( true )
+			expect( Plugin ).to receive( :require ).with( 'plugins/private/second.rb' ).
+				and_return( true )
+			expect( Plugin ).to receive( :require ).with( 'plugins/private/third.rb' ).
+				and_return( true )
+
+			Plugin.load_all
+		end
+
+
+		it "doesn't preload derivatives whose path matches a Regexp exclusion" do
+			expect( Gem ).to receive( :find_files ).with( 'plugins/*.rb' ).
 				and_return([ 'plugins/first.rb' ])
-			Gem.should_receive( :find_files ).with( 'plugins/private/*.rb' ).
+			expect( Gem ).to receive( :find_files ).with( 'plugins/private/*.rb' ).
 				and_return([ 'plugins/private/second.rb', 'plugins/private/third.rb' ])
 
-			Plugin.should_receive( :require ).with( 'plugins/first.rb' ).
+			expect( Plugin ).to receive( :require ).with( 'plugins/first.rb' ).
 				and_return( true )
-			Plugin.should_receive( :require ).with( 'plugins/private/second.rb' ).
+			expect( Plugin ).to_not receive( :require ).with( 'plugins/private/second.rb' )
+			expect( Plugin ).to_not receive( :require ).with( 'plugins/private/third.rb' )
+
+			Plugin.plugin_exclusions( %r{/private} )
+			Plugin.load_all
+		end
+
+
+		it "doesn't preload derivatives whose path matches a glob String exclusion" do
+			expect( Gem ).to receive( :find_files ).with( 'plugins/*.rb' ).
+				and_return([ 'plugins/first.rb' ])
+			expect( Gem ).to receive( :find_files ).with( 'plugins/private/*.rb' ).
+				and_return([ 'plugins/private/second.rb', 'plugins/private/third.rb' ])
+
+			expect( Plugin ).to receive( :require ).with( 'plugins/first.rb' ).
 				and_return( true )
-			Plugin.should_receive( :require ).with( 'plugins/private/third.rb' ).
+			expect( Plugin ).to receive( :require ).with( 'plugins/private/second.rb' ).
 				and_return( true )
+			expect( Plugin ).to_not receive( :require ).with( 'plugins/private/third.rb' )
 
+			Plugin.plugin_exclusions( '**/third.rb' )
 			Plugin.load_all
 		end
+
 	end
 
 
 	context "derivative of an extended class" do
 
 		it "knows what type of plugin loads it" do
-			TestingPlugin.plugin_type.should == 'Plugin'
+			expect( TestingPlugin.plugin_type ).to eq( 'Plugin' )
 		end
 
 		it "raises a PluginError if it can't figure out what type of factory loads it" do
-			TestingPlugin.stub!( :ancestors ).and_return( [] )
+			allow( TestingPlugin ).to receive( :ancestors ).and_return( [] )
 			expect {
 				TestingPlugin.plugin_type
 			}.to raise_error( Pluggability::PluginError, /couldn't find plugin base/i )
@@ -188,11 +213,11 @@ describe Pluggability do
 	context "derivative of an extended class that isn't named <Something>Plugin" do
 
 		it "is still creatable via its full name" do
-			Plugin.create( 'blacksheep' ).should be_an_instance_of( BlackSheep )
+			expect( Plugin.create('blacksheep') ).to be_an_instance_of( BlackSheep )
 		end
 
 		it "is loadable via its underbarred name" do
-			Plugin.create( 'black_sheep' ).should be_an_instance_of( BlackSheep )
+			expect( Plugin.create('black_sheep') ).to be_an_instance_of( BlackSheep )
 		end
 
 	end
@@ -201,7 +226,7 @@ describe Pluggability do
 	context "derivative of an extended class in another namespace" do
 
 		it "is still creatable via its derivative name" do
-			Plugin.create( 'loadable' ).should be_an_instance_of( Test::LoadablePlugin )
+			expect( Plugin.create('loadable') ).to be_an_instance_of( Test::LoadablePlugin )
 		end
 
 	end
@@ -210,7 +235,7 @@ describe Pluggability do
 	context "subclass of a derivative" do
 
 		it "is still registered with the base class" do
-			Plugin.derivatives[ 'subsub' ].should == SubSubPlugin
+			expect( Plugin.derivatives['subsub'] ).to eq( SubSubPlugin )
 		end
 
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluggability
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin Chase
@@ -31,7 +31,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -81,42 +81,70 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        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: rdoc-generator-fivefish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 description: "Pluggability is a mixin module that turns an including class into a\nfactory
   for its derivatives, capable of searching for and loading them\nby name. This is
   useful when you have an abstract base class which\ndefines an interface and basic
@@ -154,7 +182,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/pluggability.rb
-- spec/lib/helpers.rb
+- spec/helpers.rb
 - spec/pluggability_spec.rb
 - .gemtest
 homepage: https://bitbucket.org/ged/pluggability
@@ -165,8 +193,6 @@ post_install_message:
 rdoc_options:
 - -t
 - Pluggability Toolkit
-- -f
-- fivefish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -181,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pluggability
-rubygems_version: 2.0.3
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Pluggability is a mixin module that turns an including class into a factory