ruby-nuggets 0.8.1 → 0.8.2

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ruby-nuggets version 0.8.1
+This documentation refers to ruby-nuggets version 0.8.2
 
 
 == DESCRIPTION

data/lib/nuggets/util/pluggable.rb

@@ -25,57 +25,68 @@
 ###############################################################################
 #++
 
+require 'set'
+
 module Util
 
   module Pluggable
 
-    class << self
-
-      def load_plugins_for(*klasses)
-        klasses.map { |klass| klass.extend(self).load_plugins }
-      end
+    def self.load_plugins_for(*klasses)
+      klasses.map { |klass| klass.extend(self).load_plugins }
+    end
 
-      def extended(base)
-        base.plugin_filename ||= "#{base.name.
-          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-          gsub(/([a-z\d])([A-Z])/,     '\1_\2').
-          gsub(/::/, '/').tr('-', '_').downcase}_plugin.rb"
-      end
+    def load_plugins(name = plugin_filename)
+      load_path_plugins(name)
+      load_gem_plugins(name)
+      load_env_plugins(name)
 
+      loaded_plugins.to_a
     end
 
-    attr_accessor :plugin_filename
+    def loaded_plugins
+      @loaded_plugins ||= Set.new
+    end
 
-    def load_plugins
-      plugins, name = [], plugin_filename
-      plugins.concat(load_env_plugins(name))
-      plugins.concat(load_gem_plugins(name)) if defined?(::Gem)
-      plugins
+    def plugin_filename
+      @plugin_filename ||= "#{name.
+        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/,     '\1_\2').
+        gsub(/::/, '/').tr('-', '_').downcase}_plugin.rb"
     end
 
+    attr_writer :plugin_filename
+
     private
 
-    def load_env_plugins(name)
-      load_plugin_files($LOAD_PATH.map { |path|
+    def load_path_plugins(name)
+      $LOAD_PATH.dup.each { |path|
         plugin = ::File.expand_path(name, path)
-        plugin if ::File.file?(plugin)
-      }.compact)
+        load_plugin_file(plugin) if ::File.file?(plugin)
+      }
     end
 
     def load_gem_plugins(name)
-      load_plugin_files(::Gem::Specification.map { |spec|
-        spec.matches_for_glob(name)
-      }.flatten)
+      ::Gem::Specification.latest_specs.each { |spec|
+        load_plugin_files(spec.matches_for_glob(name))
+      } if ::Object.const_defined?(:Gem)
+    end
+
+    def load_env_plugins(name)
+      path = ::ENV["#{name.chomp(ext = ::File.extname(name)).upcase}_PATH"]
+      path.split(::File::PATH_SEPARATOR).each { |dir|
+        load_plugin_files(::Dir["#{dir}/*#{ext}"])
+      } if path
+    end
+
+    def load_plugin_file(plugin)
+      load plugin if loaded_plugins.add?(plugin)
+    rescue ::Exception => err
+      raise unless loaded_plugins.delete?(plugin)
+      warn "Error loading #{name} plugin: #{plugin}: #{err} (#{err.class})"
     end
 
     def load_plugin_files(plugins)
-      plugins.each { |plugin|
-        begin
-          load plugin
-        rescue ::Exception => err
-          warn "Error loading #{name} plugin: #{plugin}: #{err} (#{err.class})"
-        end
-      }
+      plugins.each { |plugin| load_plugin_file(::File.expand_path(plugin)) }
     end
 
   end

data/lib/nuggets/version.rb

@@ -4,7 +4,7 @@ module Nuggets
 
     MAJOR = 0
     MINOR = 8
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nuggets
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: []
 
 description: Some extensions to the Ruby programming language.
@@ -204,7 +204,7 @@ rdoc_options:
 - --charset
 - UTF-8
 - --title
-- ruby-nuggets Application documentation (v0.8.1)
+- ruby-nuggets Application documentation (v0.8.2)
 - --line-numbers
 require_paths: 
 - lib