14 files changed, 93 insertions, 36 deletions
@@ -124,7 +124,7 @@ require 'rbconfig'
 # -The RubyGems Team
 module Gem
- VERSION = '1.6.0'
 ##
 # Raised when RubyGems is unable to load or activate a gem. Contains the
@@ -258,6 +258,7 @@ module Gem
 # list of candidate gems, then we have a version conflict.
 existing_spec = @loaded_specs[dep.name]
 unless matches.any? { |spec| spec.version == existing_spec.version } then
 sources_message = sources.map { |spec| spec.full_name }
 stack_message = @loaded_stacks[dep.name].map { |spec| spec.full_name }
@@ -1221,7 +1222,7 @@ module Gem
 def self.cache # :nodoc:
 warn "#{Gem.location_of_caller.join ':'}:Warning: " \
 "Gem::cache is deprecated and will be removed on or after " \
- "August 2012. " \
 "Use Gem::source_index."
 source_index
@@ -1292,7 +1293,13 @@ end
 # "#{ConfigMap[:datadir]}/#{package_name}".
 def RbConfig.datadir(package_name)
- require 'rbconfig/datadir' # TODO Deprecate after June 2010.
 Gem.datadir(package_name) ||
 File.join(Gem::ConfigMap[:datadir], package_name)
 end
@@ -1323,7 +1330,7 @@ end
 ##
 # Enables the require hook for RubyGems.
-require 'rubygems/custom_require' unless Gem::GEM_PRELUDE_SUCKAGE
 Gem.clear_paths
@@ -25,12 +25,13 @@ class Gem::Commands::OutdatedCommand < Gem::Command
 locals = Gem::SourceIndex.from_installed_gems
 locals.outdated.sort.each do |name|
- local = locals.find_name(name).last
-
- dep = Gem::Dependency.new local.name, ">= #{local.version}"
 remotes = Gem::SpecFetcher.fetcher.fetch dep
- remote = remotes.last.first
 say "#{local.name} (#{local.version} < #{remote.version})"
 end
 end
@@ -335,7 +335,7 @@ abort "#{deprecation_message}"
 require 'rdoc/rdoc'
- args << '--main' << 'README.rdoc'
 args << '.'
 args << 'README.rdoc' << 'UPGRADING.rdoc'
 args << 'LICENSE.txt' << 'GPL.txt' << 'History.txt'
@@ -12,10 +12,16 @@
 module Kernel
- ##
- # The Kernel#require from before RubyGems was loaded.
- alias gem_original_require require
 ##
 # When RubyGems is required, Kernel#require is replaced with our own which
@@ -35,15 +41,20 @@ module Kernel
 if Gem.unresolved_deps.empty? or Gem.loaded_path? path then
 gem_original_require path
 else
- specs = Gem.searcher.find_in_unresolved path
- unless specs.empty? then
- specs = [specs.last]
- else
- specs = Gem.searcher.find_in_unresolved_tree path
- end
- specs.each do |spec|
- Gem.activate spec.name, spec.version # FIX: this is dumb
 end
 return gem_original_require path
@@ -57,7 +68,6 @@ module Kernel
 end
 private :require
- private :gem_original_require
 end
@@ -74,7 +74,7 @@ class Gem::DependencyInstaller
 @installed_gems = []
 @install_dir = options[:install_dir] || Gem.dir
- @cache_dir = options[:cache_dir] || Gem.cache_dir(@install_dir)
 # Set with any errors that SpecFetcher finds while search through
 # gemspecs for a dep
@@ -121,7 +121,7 @@ class Gem::DependencyList
 def why_not_ok? quick = false
 unsatisfied = Hash.new { |h,k| h[k] = [] }
 source_index = Gem.source_index
- @specs.each do |spec|
 spec.runtime_dependencies.each do |dep|
 inst = source_index.any? { |_, installed_spec|
 dep.name == installed_spec.name and
@@ -171,6 +171,7 @@ class Gem::DocManager
 args << @spec.require_paths.clone
 args << @spec.extra_rdoc_files
 args << '--title' << "#{@spec.full_name} Documentation"
 args = args.flatten.map do |arg| arg.to_s end
 if self.class.rdoc_version >= Gem::Version.new('2.4.0') then
@@ -56,6 +56,14 @@ class Gem::GemPathSearcher
 end
 end
 ##
 # Works like #find, but finds all gemspecs matching +glob+.
@@ -15,7 +15,9 @@ module Gem::GemcutterUtilities
 # Add the --key option
 def add_key_option
- add_option '-k', '--key KEYNAME', Symbol, 'Use the given API key' do |value,options|
 options[:key] = value
 end
 end
@@ -6,6 +6,7 @@
 require 'rubygems'
 require 'rubygems/format'
 begin
 gem 'builder'
@@ -37,7 +37,7 @@ class Gem::MockGemUi < Gem::StreamUI
 outs.extend TTY
 errs.extend TTY
- super ins, outs, errs
 @terminated = false
 end
@@ -76,7 +76,8 @@ class Gem::SpecFetcher
 # Returns the local directory to write +uri+ to.
 def cache_dir(uri)
- escaped_path = uri.path.sub(%r[^/([a-z]):/]i, '/\\1-/') # Correct for windows paths
 File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
 end
@@ -86,8 +87,14 @@ class Gem::SpecFetcher
 # false, all platforms are returned. If +prerelease+ is true,
 # prerelease versions are included.
- def fetch_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
- specs_and_sources, errors = find_matching_with_errors dependency, all, matching_platform, prerelease
 ss = specs_and_sources.map do |spec_tuple, source_uri|
 [fetch_spec(spec_tuple, URI.parse(source_uri)), source_uri]
@@ -463,7 +463,6 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 util_build_gem spec
 cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
- gems_dir = File.dirname cache_file
 FileUtils.mkdir_p File.dirname cache_file
 FileUtils.mv Gem.cache_gem("#{spec.original_name}.gem"), cache_file
 FileUtils.rm File.join(@gemhome, 'specifications', spec.spec_name)
@@ -138,10 +138,19 @@ class Gem::StreamUI
 attr_reader :ins, :outs, :errs
- def initialize(in_stream, out_stream, err_stream=STDERR)
 @ins = in_stream
 @outs = out_stream
 @errs = err_stream
 end
 ##
@@ -173,7 +182,7 @@ class Gem::StreamUI
 # default.
 def ask_yes_no(question, default=nil)
- unless @ins.tty? then
 if default.nil? then
 raise Gem::OperationNotSupportedError,
 "Not connected to a tty and no default specified"
@@ -209,7 +218,7 @@ class Gem::StreamUI
 # Ask a question. Returns an answer if connected to a tty, nil otherwise.
 def ask(question)
- return nil if not @ins.tty?
 @outs.print(question + " ")
 @outs.flush
@@ -224,7 +233,7 @@ class Gem::StreamUI
 # Ask for a password. Does not echo response to terminal.
 def ask_for_password(question)
- return nil if not @ins.tty?
 require 'io/console'
@@ -240,7 +249,7 @@ class Gem::StreamUI
 # Ask for a password. Does not echo response to terminal.
 def ask_for_password(question)
- return nil if not @ins.tty?
 @outs.print(question + " ")
 @outs.flush
@@ -252,6 +261,8 @@ class Gem::StreamUI
 # Asks for a password that works on windows. Ripped from the Heroku gem.
 def ask_for_password_on_windows
 require "Win32API"
 char = nil
 password = ''
@@ -273,6 +284,8 @@ class Gem::StreamUI
 # Asks for a password that works on unix
 def ask_for_password_on_unix
 system "stty -echo"
 password = @ins.gets
 password.chomp! if password
@@ -333,6 +346,10 @@ class Gem::StreamUI
 # Return a progress reporter object chosen from the current verbosity.
 def progress_reporter(*args)
 case Gem.configuration.verbose
 when nil, false
 SilentProgressReporter.new(@outs, *args)
@@ -435,6 +452,10 @@ class Gem::StreamUI
 # Return a download reporter object chosen from the current verbosity
 def download_reporter(*args)
 case Gem.configuration.verbose
 when nil, false
 SilentDownloadReporter.new(@outs, *args)
@@ -518,7 +539,7 @@ end
 class Gem::ConsoleUI < Gem::StreamUI
 def initialize
- super STDIN, STDOUT, STDERR
 end
 end
@@ -537,7 +558,7 @@ class Gem::SilentUI < Gem::StreamUI
 writer = File.open('nul', 'w')
 end
- super reader, writer, writer
 end
 def download_reporter(*args)