pluggability 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c5c85715daf5f17c850a2e30068fb8cf9e91e78215228273422093768b040e
-  data.tar.gz: 21f1401f755a1f4fc4c0c1d80b40497701a5eddeeb9c78c5851aa1d9d14840ca
+  metadata.gz: e23ede1e5fd763077f3a64da3b661d1f769da80c52e951d251e49bff33a20cc8
+  data.tar.gz: 77cc7a5f4b8454d0575ca95f3f4da6d41b6788348a5cbab058a30bda6bcc587c
 SHA512:
-  metadata.gz: 294a6fa9924a062b02ed858b87a20d75f298ec47e026fbc9bedb25e61fd4ec8a9f8207a3cb72202317df2a516cf269b7e06089ef008baddd5cd342f0e173e3bf
-  data.tar.gz: b50fcf256c417e4e7ff0dff4e09f540c7719320beeae835ac00463a2427056f708f0e3ccc6fa1446046f83cc329e7409c0f8c8b86da4c12c7ee7b67c6dfd3420
+  metadata.gz: c6e5e411c4e132b979edf119454c3c92bdc6964d25a49ad7e1571a52321b2bb9a29d91d50817138af9a6337553b3a16fc6d9703a9066bdae5a632356a2ec2353
+  data.tar.gz: c0e57bc0cf6f70345fe4bc247501a78d2dba35c602bfa640c54cd1e7babe74592467fb0999d91baae30ebf6b8faeef2f420486aa107aa8077df16e36456adc28

data/History.md

@@ -1,3 +1,8 @@
+## v0.6.0 [2018-03-12] Michael Granger <ged@FaerieMUD.org>
+
+- Switch back to require for loading derivatives
+
+
 ## v0.5.0 [2018-01-19] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/lib/pluggability.rb

@@ -12,7 +12,7 @@ module Pluggability
 
 
 	# Library version
-	VERSION = '0.5.0'
+	VERSION = '0.6.0'
 
 
 	# An exception class for Pluggability specific errors.
@@ -279,7 +279,7 @@ module Pluggability
 
 			candidates.each do |path|
 				next if self.is_excluded_path?( path )
-				Kernel.load( path )
+				Kernel.require( path )
 			end
 		end
 
@@ -333,8 +333,7 @@ module Pluggability
 
 
 	### Search for the module with the specified <tt>mod_name</tt>, using any
-	### #plugin_prefixes that have been set. Return the result of +Kernel.load+ing
-	### the first candidate.
+	### #plugin_prefixes that have been set. Return the path that was required.
 	def require_derivative( mod_name )
 		plugin_path = self.find_plugin_path( mod_name )
 		unless plugin_path
@@ -347,7 +346,7 @@ module Pluggability
 			raise Pluggability::PluginError, errmsg
 		end
 
-		Kernel.load( plugin_path.untaint )
+		Kernel.require( plugin_path.untaint )
 
 		return plugin_path
 	end

data/spec/pluggability_spec.rb

@@ -51,7 +51,7 @@ describe Pluggability do
 
 		it "returns derivatives directly if they're already loaded" do
 			class AlreadyLoadedPlugin < Plugin; end
-			expect( Kernel ).to_not receive( :load )
+			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 )
@@ -94,7 +94,7 @@ describe Pluggability do
 			expect( Gem ).to receive( :find_latest_files ).
 				at_least( :once ).
 				and_return( ['/some/path/to/plugins/dazzle.rb'] )
-			expect( Kernel ).to receive( :load ).with( '/some/path/to/plugins/dazzle.rb' ) do |*args|
+			expect( Kernel ).to receive( :require ).with( '/some/path/to/plugins/dazzle.rb' ) do |*args|
 				loaded_class = Class.new( Plugin )
 				# Simulate a named class, since we're not really requiring
 				Plugin.derivatives['dazzle'] = loaded_class
@@ -122,7 +122,7 @@ describe Pluggability do
 			expect( Gem ).to receive( :find_latest_files ).
 				at_least( :once ).
 				and_return( ['/some/path/to/corruscating.rb'] )
-			expect( Kernel ).to receive( :load ).
+			expect( Kernel ).to receive( :require ).
 				with( '/some/path/to/corruscating.rb' ).
 				and_return( true )
 
@@ -136,7 +136,7 @@ describe Pluggability do
 			expect( Gem ).to receive( :find_latest_files ).
 				at_least( :once ).
 				and_return( ['/some/path/to/portable.rb'] )
-			expect( Kernel ).to receive( :load ).
+			expect( Kernel ).to receive( :require ).
 				with( '/some/path/to/portable.rb' ).
 				and_raise( ScriptError.new("error while parsing path") )
 
@@ -152,8 +152,8 @@ describe Pluggability do
 				and_return( ['/some/path/to/portable', '/some/path/to/portable.rb'] )
 			expect( File ).to receive( :file? ).and_return( false )
 
-			expect( Kernel ).to_not receive( :load ).with( '/some/path/to/portable' )
-			expect( Kernel ).to receive( :load ).
+			expect( Kernel ).to_not receive( :require ).with( '/some/path/to/portable' )
+			expect( Kernel ).to receive( :require ).
 				with( '/some/path/to/portable.rb' ).
 				and_return( true )
 
@@ -169,11 +169,11 @@ describe Pluggability do
 			expect( Gem ).to receive( :find_latest_files ).with( 'plugins/private/*.rb' ).
 				and_return([ 'plugins/private/second.rb', 'plugins/private/third.rb' ])
 
-			expect( Kernel ).to receive( :load ).with( 'plugins/first.rb' ).
+			expect( Kernel ).to receive( :require ).with( 'plugins/first.rb' ).
 				and_return( true )
-			expect( Kernel ).to receive( :load ).with( 'plugins/private/second.rb' ).
+			expect( Kernel ).to receive( :require ).with( 'plugins/private/second.rb' ).
 				and_return( true )
-			expect( Kernel ).to receive( :load ).with( 'plugins/private/third.rb' ).
+			expect( Kernel ).to receive( :require ).with( 'plugins/private/third.rb' ).
 				and_return( true )
 
 			Plugin.load_all
@@ -185,10 +185,10 @@ describe Pluggability do
 			expect( Gem ).to receive( :find_latest_files ).with( 'plugins/private/*.rb' ).
 				and_return([ '/path/to/plugins/private/second.rb', '/path/to/plugins/private/third.rb' ])
 
-			expect( Kernel ).to receive( :load ).with( '/path/to/plugins/first.rb' ).
+			expect( Kernel ).to receive( :require ).with( '/path/to/plugins/first.rb' ).
 				and_return( true )
-			expect( Kernel ).to_not receive( :load ).with( '/path/to/plugins/private/second.rb' )
-			expect( Kernel ).to_not receive( :load ).with( '/path/to/plugins/private/third.rb' )
+			expect( Kernel ).to_not receive( :require ).with( '/path/to/plugins/private/second.rb' )
+			expect( Kernel ).to_not receive( :require ).with( '/path/to/plugins/private/third.rb' )
 
 			Plugin.plugin_exclusions( %r{/private} )
 			Plugin.load_all
@@ -201,11 +201,11 @@ describe Pluggability do
 			expect( Gem ).to receive( :find_latest_files ).with( 'plugins/private/*.rb' ).
 				and_return([ 'plugins/private/second.rb', 'plugins/private/third.rb' ])
 
-			expect( Kernel ).to receive( :load ).with( 'plugins/first.rb' ).
+			expect( Kernel ).to receive( :require ).with( 'plugins/first.rb' ).
 				and_return( true )
-			expect( Kernel ).to receive( :load ).with( 'plugins/private/second.rb' ).
+			expect( Kernel ).to receive( :require ).with( 'plugins/private/second.rb' ).
 				and_return( true )
-			expect( Kernel ).to_not receive( :load ).with( 'plugins/private/third.rb' )
+			expect( Kernel ).to_not receive( :require ).with( 'plugins/private/third.rb' )
 
 			Plugin.plugin_exclusions( '**/third.rb' )
 			Plugin.load_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluggability
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Martin Chase
@@ -36,7 +36,7 @@ cert_chain:
   X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
   OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability