delay loading rubygems/format until we use it

2 files changed, 4 insertions, 7 deletions

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index d0ad0359b7..35e09d4200 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -101,7 +101,10 @@ module Bundler
     end
 
     def spec_from_gem(path)
+      require 'rubygems/format'
       Gem::Format.from_file_by_path(path).spec
+    rescue Gem::Package::FormatError
+      raise Bundler::GemspecError, "Could not read gem at #{path}. It may be corrupted."
     end
 
     def download_gem(spec, uri, path)
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 3455f4d296..aaabeed0c3 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -204,13 +204,7 @@ module Bundler
           path = Bundler.app_cache
           Dir["#{path}/*.gem"].each do |gemfile|
             next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
-
-            begin
-              s ||= Bundler.rubygems.spec_from_gem(gemfile)
-            rescue Gem::Package::FormatError
-              raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted."
-            end
-
+            s ||= Bundler.rubygems.spec_from_gem(gemfile)
             s.source = self
             idx << s
           end