diff options
| author | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-31 23:32:32 +0000 |
|---|---|---|
| committer | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-31 23:32:32 +0000 |
| commit | bb5022e7f729fb8b1ea4c18cc336a410abc7a905 (patch) | |
| tree | 3e70f4689f7aa6f79fd0e52bae1d25225654a0f4 /lib/mongrel | |
| parent | 4e40f52863e5b922aefd49fbf5a08f7447bd3951 (diff) | |
| download | unicorn-bb5022e7f729fb8b1ea4c18cc336a410abc7a905.tar.gz | |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@852 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel')
| -rw-r--r-- | lib/mongrel/command.rb | 7 | ||||
| -rw-r--r-- | lib/mongrel/init.rb | 10 |
2 files changed, 4 insertions, 13 deletions
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 - - - |