plugman 0.1 → 0.1.1

data/lib/plugman.rb

@@ -2,22 +2,32 @@
 
 require 'plugman/finder'
 require 'plugman/plugin_base'
+require 'logger'
+require 'stringio'
 
 class Plugman
 
-  def initialize(finder)
-    @finder  = finder
+  def initialize(finder_or_name)
+    if finder_or_name.is_a?(String)
+      @finder = Finder::Standard.new(finder_or_name)
+    else
+      @finder = finder
+    end
     @plugins = []
+    @log = StringIO.new("")
+    @logger = Logger.new(@log)
     Plugman::PluginBase.manager = self
   end
 
+  def log 
+    @log.string
+  end
+
   def load_plugins
-    begin
-      @finder.plugin_files.each {|f| require f }
-    rescue => e
-      warn e
+    @finder.plugin_files.each do |f|
+      require_plugin(f)
     end
-    
+
     # All plugins are now registered. Requiering the plugins will
     # magically call Plugman::Plugin::inherited for each
     # plugin. inherited() will in turn call register_plugin()
@@ -42,4 +52,15 @@ class Plugman
 
   # FIX implement respond_to? to match method_missing?
 
+  private
+
+
+  def require_plugin(f)
+    @logger.debug "Requiering #{f}"
+    require f
+  rescue => e
+    @logger.error(e.class.to_s + ": " + e.message)
+  end
+
+
 end

data/lib/plugman/finder/standard.rb

@@ -1,23 +1,23 @@
-
 require 'rubygems'
 
 class Plugman
   module Finder
     class Standard
 
-      def initialize(glob)
-        @glob = glob
+      def initialize(name)
+        @glob = "#{name}/plugin/*"
       end
 
       def plugin_files
         # FIX assuming here that array is sorted correctly. Assumption correct?
         seen = {}
-        Gem.find_files(@plugin_glob, true).each do |p|
+        files = []
+        Gem.find_files(@glob, true).each do |p|
           name = File.basename(p)
-          require p unless seen[name]
+          files << p unless seen[name]
           seen[name] = true
         end
-
+        files
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plugman
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-30 00:00:00.000000000 +02:00
+date: 2011-06-01 00:00:00.000000000 +02:00
 default_executable: 
 dependencies: []
 description: FIX