backport from github, attempt to load mime-types locally before loadi…

…ng rubygems
aughey · Oct 8, 2010 · 120baf9 · 120baf9
1 parent f569b05
commit 120baf9
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/grit.rb b/lib/grit.rb
@@ -18,12 +18,18 @@
 end
 
 # third party
-require 'rubygems'
+
 begin
-  gem "mime-types", ">=0"
   require 'mime/types'
-rescue Gem::LoadError => e
-  puts "WARNING: Gem LoadError: #{e.message}"
+  require 'rubygems'
+rescue LoadError
+  require 'rubygems'
+  begin
+    gem "mime-types", ">=0"
+    require 'mime/types'
+  rescue Gem::LoadError => e
+    puts "WARNING: Gem LoadError: #{e.message}"
+  end
 end
 
 # ruby 1.9 compatibility