diff --git a/rubygems/lib/rubygems/package.rb b/rubygems/lib/rubygems/package.rb index 57b08431dae2..65874d1c1b00 100644 --- a/rubygems/lib/rubygems/package.rb +++ b/rubygems/lib/rubygems/package.rb @@ -6,6 +6,10 @@ require 'yaml' require 'yaml/syck' require 'fileutils' +require 'zlib' +require 'digest/md5' +require 'fileutils' +require 'find' require 'rubygems/specification' @@ -14,7 +18,6 @@ module Gem # Wrapper for FileUtils meant to provide logging and additional operations if # needed. class FileOperations - require 'fileutils' extend FileUtils class << self # additional methods not implemented in FileUtils @@ -464,8 +467,6 @@ class TarInput include FSyncDir include Enumerable attr_reader :metadata - require 'zlib' - require 'digest/md5' class << self; private :new end def initialize(io) @@ -580,8 +581,6 @@ def file_class end class TarOutput - require 'zlib' - require 'yaml' class << self; private :new end @@ -712,7 +711,6 @@ def dir_class end def find_class - require 'find' Find end end diff --git a/rubygems/lib/rubygems/remote_installer.rb b/rubygems/lib/rubygems/remote_installer.rb index 0bd813004d96..ba197d1b6e57 100644 --- a/rubygems/lib/rubygems/remote_installer.rb +++ b/rubygems/lib/rubygems/remote_installer.rb @@ -208,7 +208,7 @@ def write_gem_to_file(body, destination_file) end def fetch_size( uri_str ) - require 'open-uri' + require 'rubygems/open-uri' size = nil begin open(uri_str, :proxy => @http_proxy, :content_length_proc => lambda {|t| size = t; raise "break"}) {|i| } @@ -218,7 +218,7 @@ def fetch_size( uri_str ) end def fetch( uri_str ) - require 'open-uri' + require 'rubygems/open-uri' open(uri_str, :proxy => @http_proxy) do |input| input.read end