auto 0.1.3 → 0.1.4

data/gemspec.rb

@@ -15,5 +15,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 end

data/lib/auto/plugins.rb

@@ -1,53 +1,52 @@
-require 'rubygems'
-
 module Auto
   class Plugins
     
-    @@directories = [
-      Gem.dir + "/gems",
-      "~/.auto",
-      "#{File.dirname(__FILE__)}/../../vendor/plugins"
-    ]
+    @@plugin_paths = []
     @@plugins = nil
     
     cattr_accessor :directories
     
     class <<self
       
-      # Add a plugin base directory
+      # Add a plugin directory
       def add(path)
-        Runner.require! Plugin.new(path)
+        @@plugin_paths << path
+        @@plugins = nil
       end
       
-      # Add a directory to the plugin load paths.
-      def add_directory(path)
-        @@directories = [] if $testing
-        @@directories << path
-        @@directories.uniq!
-        @@plugins = nil
+      # Add a repository of plugins
+      def add_repository(path)
+        Dir["#{path}/auto-*"].each do |plugin|
+          Plugins.add plugin
+        end
       end
       
       # Returns an array of Plugin instances.
       def plugins
         return @@plugins if @@plugins
-        directories = @@directories.collect do |d|
-          File.expand_path("#{d}/*auto-*/")
+        unless $testing
+          specs = Gem.source_index.latest_specs.select do |spec|
+            spec.name =~ /^auto-.+/
+          end
+          @@plugin_paths += specs.collect &:full_gem_path
+          # Treat the home directory like a plugin for the .auto directory
+          @@plugin_paths << File.expand_path('~')
+          @@plugin_paths.compact!
         end
-        @@plugins = Dir[*directories].collect do |d|
+        @@plugins = Dir[*@@plugin_paths].collect do |d|
           Plugin.new(d)
         end
-        @@plugins.compact!
-        @@plugins
+        @@plugins || []
       end
       
       # Returns an array of library file paths.
       def libraries
-        collector { |plugin| plugin.library }
+        collector &:library
       end
       
       # Returns an array of modules.
       def modules
-        collector { |plugin| plugin.module }
+        collector &:module
       end
       
       # Returns a sorted array of hashes that describe tasks.
@@ -56,9 +55,7 @@ module Auto
         if task
           tasks.select { |t| t[:name] == task.downcase }.first
         else
-          t = collector { |plugin| plugin.tasks }
-          t = t.flatten
-          t.sort do |a, b|
+          collector(&:tasks).flatten.sort do |a, b|
             a[:name].gsub(':', '0') <=> b[:name].gsub(':', '0')
           end
         end
@@ -85,8 +82,11 @@ module Auto
         name = File.basename(directory)
         name = name.split('-')
         
-        return nil unless name.include?('auto')
-        @name = name[name.index('auto') + 1]
+        if name.include?('auto')
+          @name = name[name.index('auto') + 1]
+        else
+          @name = nil
+        end
         
         # ~/.auto/auto-plugin/lib/plugin.rb
         @library = "#{directory}/lib/auto/#{@name}.rb"
@@ -99,7 +99,7 @@ module Auto
           @module = nil
         end
         
-        # ~/.auto/auto-plugin/auto/task.rb
+        # ~/.auto/auto-plugin/.auto/task.rb
         @tasks = Dir["#{directory}/.auto/**/*.rb"].sort.collect do |path|
           relative = path.gsub("#{directory}/.auto/", '')
           {

data/spec/auto/plugins_spec.rb

@@ -4,7 +4,7 @@ module Auto
   describe Auto::Plugins do
     
     before(:all) do
-      Plugins.add_directory @fixtures = "#{SPEC}/plugins"
+      Plugins.add_repository @fixtures = "#{SPEC}/plugins"
       @libraries = Plugins.libraries
       @modules = Plugins.modules
       @tasks = Plugins.tasks

data/spec/auto/runner_spec.rb

@@ -4,7 +4,7 @@ module Auto
   describe Auto::Runner do
 
     before(:all) do
-      Plugins.add_directory @fixtures = "#{SPEC}/plugins"
+      Plugins.add_repository @fixtures = "#{SPEC}/plugins"
       @runner = Runner.new
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auto
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 -08:00
+date: 2009-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency