plugin_manager 1 → 1.1

data/lib/plugin_manager/definition_builder.rb

@@ -20,11 +20,11 @@ class PluginManager
     end
     
     def object(value)
-      @definition.object = value
+      @definition.object_string = value
     end
     
-    def file(value)
-      @definition.file = value
+    def file(*values)
+      @definition.file = values
     end
     
     def dependencies(*deps)

data/lib/plugin_manager/plugin_definition.rb

@@ -3,25 +3,38 @@ class PluginManager
   class PluginDefinition
     attr_accessor :name,
                   :version,
-                  :object,
+                  :object_string,
                   :file,
                   :dependencies,
                   :definition_file
                   
-    def inspect
+    def inspect1              
       "<Plugin #{name} #{version} depends:[#{(dependencies||[]).map{|dep| dep.join("")}.join(", ")}] #{required_files.length} files>"
     end
     
+    def inspect
+      inspect1
+    end
+    
     def required_files
       @required_files ||= []
     end
     
     def load
       required_files.each {|file| $".delete(file) }
+      load_file = File.expand_path(File.join(File.dirname(definition_file), file))
+      $:.unshift(File.dirname(load_file))
       new_files = log_requires do
-        require File.expand_path(File.join(File.dirname(definition_file), file))
+        require load_file
       end
       required_files.unshift(*new_files)
+      if object.respond_to?(:loaded)
+        object.loaded
+      end
+    end
+    
+    def object
+      eval(object_string)
     end
     
     private

data/lib/plugin_manager.rb

@@ -6,7 +6,7 @@ require 'plugin_manager/plugin_definition'
 require 'plugin_manager/definition_builder'
 
 class PluginManager
-  attr_reader :unreadable_definitions, :plugins_with_errors, :loaded_plugins
+  attr_reader :unreadable_definitions, :plugins_with_errors, :loaded_plugins, :unloaded_plugins
 
   def initialize
     @unloaded_plugins = []
@@ -28,8 +28,10 @@ class PluginManager
           definition = instance_eval(File.read(file))
           definition.definition_file = File.expand_path(file)
           definition
-        rescue Object
+        rescue Object => e
           puts "Unreadable plugin definition: #{file}"
+          puts "  " + e.message
+          puts e.backtrace.map {|l| "  " + l }
           @unreadable_definitions << file
           nil
         end
@@ -43,14 +45,15 @@ class PluginManager
       previous_length = @unloaded_plugins.length
       if plugin = next_to_load
         begin
+          puts "[PluginManager] loading #{plugin.name}" if ENV["PLUGIN_DEBUG"]
           plugin.load
+          @loaded_plugins << plugin
         rescue Object => e
-          puts "Error loading plugin: #{plugin}"
+          puts "Error loading plugin: #{plugin.inspect}"
           puts "  " + e.message
           puts e.backtrace.map {|l| "  " + l }
           @plugins_with_errors << plugin
         end
-        @loaded_plugins << plugin
         @unloaded_plugins.delete(plugin)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: plugin_manager
 version: !ruby/object:Gem::Version 
-  version: "1"
+  version: "1.1"
 platform: ruby
 authors: 
 - Daniel Lucraft
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 +00:00
+date: 2010-01-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency