Fixed up unit tests and cleaned up more of the gem plugin code. Temporarily removed the alternative directory since rubygems doesn't support it too well.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@82 19e92222-5c0b-0410-8929-a290d50e31e9

1 files changed, 2 insertions, 10 deletions

diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index 059c782..1cb339b 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -111,7 +111,7 @@ class Start < Mongrel::Plugin "/commands"
     end
 
     # hook up any rails specific plugins
-    Mongrel::PluginManager.instance.load(MONGREL_PLUGINS_DIR)
+    Mongrel::PluginManager.instance.load
 
     begin
       STDERR.puts "Server ready."
@@ -214,13 +214,5 @@ class Restart < Mongrel::Plugin "/commands"
   end
 end
 
-if ARGV[0] == "-L" || ARGV[0] == "--load"
-  ARGV.shift # drop the -L
-  MONGREL_PLUGINS_DIR=ARGV.shift
-else
-  MONGREL_PLUGINS_DIR=nil
-end
-
-
-Mongrel::PluginManager.instance.load(MONGREL_PLUGINS_DIR, ["rails"])
+Mongrel::PluginManager.instance.load ["rails"]
 Mongrel::Command::Registry.instance.run ARGV