lib/bundler/rubygems_integration.rb in bundler-1.3.0 vs lib/bundler/rubygems_integration.rb in bundler-1.3.1

@@ -164,10 +164,19 @@
 
     def download_gem(spec, uri, path)
       Gem::RemoteFetcher.fetcher.download(spec, uri, path)
     end
 
+    def security_policies
+      @security_policies ||= begin
+        require 'rubygems/security'
+        Gem::Security::Policies
+      rescue LoadError
+        {}
+      end
+    end
+
     def reverse_rubygems_kernel_mixin
       # Disable rubygems' gem activation system
       ::Kernel.class_eval do
         if private_method_defined?(:gem_original_require)
           alias rubygems_require require
@@ -422,12 +431,10 @@
       end
     end
 
     # Rubygems 2.0
     class Future < RubygemsIntegration
-      require 'rubygems/package'
-
       def stub_rubygems(specs)
         Gem::Specification.all = specs
 
         Gem.post_reset {
           Gem::Specification.all = specs
@@ -458,15 +465,17 @@
 
         hash
       end
 
       def gem_from_path(path, policy = nil)
+        require 'rubygems/package'
         p = Gem::Package.new(path)
         p.security_policy = policy if policy
         return p
       end
 
       def build(spec)
+        require 'rubygems/package'
         Gem::Package.build(spec)
       end
 
     end