From bb5022e7f729fb8b1ea4c18cc336a410abc7a905 Mon Sep 17 00:00:00 2001
From: evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Wed, 31 Oct 2007 23:32:32 +0000
Subject: Mongrel::Gems helper to deal with Rubygems and ActiveSupport
 infighting

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@852 19e92222-5c0b-0410-8929-a290d50e31e9
---
 Manifest               |  2 +-
 lib/mongrel.rb         | 33 +++++++--------------------------
 lib/mongrel/command.rb |  7 ++-----
 lib/mongrel/init.rb    | 10 ++--------
 4 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/Manifest b/Manifest
index e34d6eb..d428b94 100644
--- a/Manifest
+++ b/Manifest
@@ -22,7 +22,6 @@ ext/http11/http11_parser.h
 ext/http11/http11_parser.java.rl
 ext/http11/http11_parser.rl
 ext/http11/http11_parser_common.rl
-ext/http11/MANIFEST
 ext/http11_java/Http11Service.java
 ext/http11_java/org/jruby/mongrel/Http11.java
 ext/http11_java/org/jruby/mongrel/Http11Parser.java
@@ -32,6 +31,7 @@ lib/mongrel/command.rb
 lib/mongrel/configurator.rb
 lib/mongrel/const.rb
 lib/mongrel/debug.rb
+lib/mongrel/gems.rb
 lib/mongrel/handlers.rb
 lib/mongrel/header_out.rb
 lib/mongrel/http_request.rb
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 2559eac..5cde698 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -1,6 +1,5 @@
 
 require 'socket'
-require 'http11'
 require 'tempfile'
 require 'yaml'
 require 'time'
@@ -8,20 +7,13 @@ require 'etc'
 require 'uri'
 require 'stringio'
 
-begin
-  require 'fastthread'
-rescue LoadError, RuntimeError
-  require 'rubygems' and retry
-ensure
-  require 'thread'
-end
+require 'mongrel/gems'
 
-begin
-  require 'cgi_multipart_eof_fix'
-rescue LoadError
-  require 'rubygems' and retry
-end
+Mongrel::Gems.require 'cgi_multipart_eof_fix'
+Mongrel::Gems.require 'fastthread'
+require 'thread'
 
+require 'http11'
 require 'mongrel/cgi'
 require 'mongrel/handlers'
 require 'mongrel/command'
@@ -347,16 +339,5 @@ end
 # Load experimental library, if present. We put it here so it can override anything
 # in regular Mongrel.
 
-begin  
-  # Look for SVN version
-  $LOAD_PATH.unshift 'projects/mongrel_experimental/lib/'
-  require 'mongrel_experimental'  
-rescue LoadError
-  begin
-    # Look for gem
-    gem 'mongrel_experimental', '=1.1' if respond_to? 'gem'
-    require 'mongrel_experimental'  
-  rescue LoadError
-    # Not found
-  end
-end
+$LOAD_PATH.unshift 'projects/mongrel_experimental/lib/'
+Mongrel::Gems.require 'mongrel_experimental', '=1.1'
diff --git a/lib/mongrel/command.rb b/lib/mongrel/command.rb
index 64d2509..a3ee57d 100644
--- a/lib/mongrel/command.rb
+++ b/lib/mongrel/command.rb
@@ -7,11 +7,8 @@
 require 'singleton'
 require 'optparse'
 
-begin
-  require 'gem_plugin'
-rescue LoadError
-  require 'rubygems' and retry
-end
+require 'mongrel/gems'
+Mongrel::Gems.require 'gem_plugin'
 
 module Mongrel
 
diff --git a/lib/mongrel/init.rb b/lib/mongrel/init.rb
index 968f2cd..00911f4 100644
--- a/lib/mongrel/init.rb
+++ b/lib/mongrel/init.rb
@@ -4,13 +4,7 @@
 # Additional work donated by contributors.  See http://mongrel.rubyforge.org/attributions.html 
 # for more information.
 
-begin
-  require 'gem_plugin'
-rescue LoadError
-  require 'rubygems' and retry
-end
+require 'mongrel/gems'
+Mongrel::Gems.require 'gem_plugin'
 
 # File is just a stub that makes sure the mongrel_plugins gem is loaded and ready
-
-
-
-- 
cgit v1.2.3-24-ge0c7