use rubygems a little less aggressively

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

lib/mongrel.rb

@@ -10,14 +10,17 @@ require 'stringio'
 
 begin
   require 'fastthread'
-rescue RuntimeError => e
+rescue LoadError, RuntimeError
-  warn "fastthread not loaded: #{ e.message }"
+  require 'rubygems' and retry
-rescue LoadError
 ensure
   require 'thread'
 end
 
-require 'cgi_multipart_eof_fix'
+begin
+  require 'cgi_multipart_eof_fix'
+rescue LoadError
+  require 'rubygems' and retry
+end
 
 require 'mongrel/cgi'
 require 'mongrel/handlers'

lib/mongrel/command.rb

@@ -4,10 +4,14 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
 # for more information.
 
-require 'rubygems'
 require 'singleton'
 require 'optparse'
-require 'gem_plugin'
+
+begin
+  require 'gem_plugin'
+rescue LoadError
+  require 'rubygems' and retry
+end
 
 module Mongrel
 

lib/mongrel/configurator.rb

@@ -39,6 +39,8 @@ module Mongrel
 
     # You pass in initial defaults and then a block to continue configuring.
     def initialize(defaults={}, &block)
+      p defaults
+      p instance_variables
       @listener = nil
       @listener_name = nil
       @listeners = {}

lib/mongrel/init.rb

@@ -4,10 +4,13 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
 # for more information.
 
-require 'rubygems'
+begin
-require 'gem_plugin'
+  require 'gem_plugin'
+rescue LoadError
+  require 'rubygems' and retry
+end
 
-# file is just a stub that makes sure the mongrel_plugins gem is loaded and ready
+# File is just a stub that makes sure the mongrel_plugins gem is loaded and ready