plugin_manager 1.3 → 1.4

data/lib/plugin_manager.rb

@@ -128,7 +128,7 @@ class PluginManager
         Dependency.new(self, n, ">0")
       end
     end
-    remaining_to_load = expand_dependencies(target_dependencies)
+    remaining_to_load = remove_already_loaded_dependencies(expand_dependencies(target_dependencies))
     while remaining_to_load.length > 0
       previous_length = remaining_to_load.length
       if plugin = next_to_load(remaining_to_load)
@@ -176,15 +176,21 @@ class PluginManager
       if pl = latest_version_by_name(dep.required_name)
         [dep, pl.dependencies]
       else
-        dep
+        raise "couldn't find a plugin called #{dep.required_name}"
       end
-    end.flatten.uniq
+    end.flatten.compact.uniq
     if new_dependency_array.length > previous_length
       expand_dependencies(new_dependency_array)
     else
       new_dependency_array
     end
   end
+  
+  def remove_already_loaded_dependencies(dependency_array)
+    dependency_array.reject do |dep| 
+      loaded_plugins.map(&:name).include?(dep.required_name)
+    end
+  end
 
   def next_to_load(dependency_array)
     hash = Hash.new {|h,k| h[k] = []}

metadata

@@ -1,72 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: plugin_manager
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: '1.4'
   prerelease: 
-  version: "1.3"
 platform: ruby
-authors: 
-  - Daniel Lucraft
+authors:
+- Daniel Lucraft
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-14 00:00:00 +01:00
+date: 2011-11-16 00:00:00.000000000 +00:00
 default_executable: 
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
-    version_requirements: *id001
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70305755296240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70305755296240
 description: 
 email: dan@fluentradical.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - README.md
-files: 
-  - README.md
-  - Rakefile
-  - lib/plugin_manager.rb
-  - lib/plugin_manager/definition_builder.rb
-  - lib/plugin_manager/plugin.rb
-  - lib/plugin_manager/plugin_definition.rb
+extra_rdoc_files:
+- README.md
+files:
+- README.md
+- Rakefile
+- lib/plugin_manager/definition_builder.rb
+- lib/plugin_manager/plugin.rb
+- lib/plugin_manager/plugin_definition.rb
+- lib/plugin_manager.rb
 has_rdoc: true
 homepage: http://github.com/danlucraft/plugin_manager
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-  - --main
-  - README.md
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+rdoc_options:
+- --main
+- README.md
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby plugin loader
 test_files: []
-