Grabbing tasks from ~/.auto

winton · Nov 16, 2009 · 73f0515 · 73f0515
1 parent f34d30b
commit 73f0515
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/lib/auto/plugins.rb b/lib/auto/plugins.rb
@@ -1,13 +1,7 @@
-require 'rubygems'
-
 module Auto
   class Plugins
 
-    @@directories = [
+    @@directories = [ "#{Gem.dir}/gems" ]
-      Gem.dir + "/gems",
-      "~/.auto",
-      "#{File.dirname(__FILE__)}/../../vendor/plugins"
-    ]
     @@plugins = nil
 
     cattr_accessor :directories
@@ -33,6 +27,8 @@ def plugins
         directories = @@directories.collect do |d|
           File.expand_path("#{d}/*auto-*/")
         end
+        # Treat the home directory like a plugin for the .auto directory
+        directories << File.expand_path('~') unless $testing
         @@plugins = Dir[*directories].collect do |d|
           Plugin.new(d)
         end
@@ -85,8 +81,11 @@ def initialize(directory)
         name = File.basename(directory)
         name = name.split('-')
 
-        return nil unless name.include?('auto')
+        if name.include?('auto')
-        @name = name[name.index('auto') + 1]
+          @name = name[name.index('auto') + 1]
+        else
+          @name = nil
+        end
 
         # ~/.auto/auto-plugin/lib/plugin.rb
         @library = "#{directory}/lib/auto/#{@name}.rb"
@@ -99,7 +98,7 @@ def initialize(directory)
           @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/", '')
           {