rubinius · Dec 20, 2015 · Dec 20, 2015
diff --git a/library/rubygems.rb b/library/rubygems.rb
@@ -9,7 +9,7 @@
 require 'thread'
 
 module Gem
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -307,11 +307,10 @@ def self.configuration=(config)
   # package is not available as a gem, return nil.
 
   def self.datadir(gem_name)
-# TODO: deprecate and move to Gem::Specification
-#       and drop the extra ", gem_name" which is uselessly redundant
+# TODO: deprecate
     spec = @loaded_specs[gem_name]
     return nil if spec.nil?
-    File.join spec.full_gem_path, "data", gem_name
+    spec.datadir
   end
 
   ##

diff --git a/library/rubygems/basic_specification.rb b/library/rubygems/basic_specification.rb
@@ -37,6 +37,14 @@ def self.default_specifications_dir
     File.join(Gem.default_dir, "specifications", "default")
   end
 
+  ##
+  # The path to the gem.build_complete file within the extension install
+  # directory.
+
+  def gem_build_complete_path # :nodoc:
+    File.join extension_dir, 'gem.build_complete'
+  end
+
   ##
   # True when the gem has been activated
 
@@ -50,39 +58,24 @@ def activated?
   # eg: /usr/local/lib/ruby/gems/1.8
 
   def base_dir
-    return Gem.dir unless loaded_from
-    @base_dir ||= if default_gem? then
-                    File.dirname File.dirname File.dirname loaded_from
-                  else
-                    File.dirname File.dirname loaded_from
-                  end
+    raise NotImplementedError
   end
 
   ##
   # Return true if this spec can require +file+.
 
   def contains_requirable_file? file
-    @contains_requirable_file ||= {}
-    @contains_requirable_file[file] ||=
-    begin
-      if instance_variable_defined?(:@ignored) then
-        return false
-      elsif missing_extensions? then
-        @ignored = true
-
-        warn "Ignoring #{full_name} because its extensions are not built.  " +
-             "Try: gem pristine #{name} --version #{version}"
-        return false
-      end
-
-      suffixes = Gem.suffixes
+    if @ignored then
+      return false
+    elsif missing_extensions? then
+      @ignored = true
+
+      warn "Ignoring #{full_name} because its extensions are not built.  " +
+        "Try: gem pristine #{name} --version #{version}"
+      return false
+    end
 
-      full_require_paths.any? do |dir|
-        base = "#{dir}/#{file}"
-        suffixes.any? { |suf| File.file? "#{base}#{suf}" }
-      end
-    end ? :yes : :no
-    @contains_requirable_file[file] == :yes
+    have_file? file, Gem.suffixes
   end
 
   def default_gem?
@@ -94,7 +87,7 @@ def default_gem?
   # Returns full path to the directory where gem's extensions are installed.
 
   def extension_dir
-    @extension_dir ||= File.expand_path File.join(extensions_dir, full_name)
+    @extension_dir ||= File.expand_path(File.join(extensions_dir, full_name)).untaint
   end
 
   ##
@@ -110,7 +103,7 @@ def find_full_gem_path # :nodoc:
     # TODO: also, shouldn't it default to full_name if it hasn't been written?
     path = File.expand_path File.join(gems_dir, full_name)
     path.untaint
-    path if File.directory? path
+    path
   end
 
   private :find_full_gem_path
@@ -148,12 +141,20 @@ def full_require_paths
         File.join full_gem_path, path.untaint
       end
 
-      full_paths << extension_dir unless @extensions.nil? || @extensions.empty?
+      full_paths << extension_dir if have_extensions?
 
       full_paths
     end
   end
 
+  ##
+  # The path to the data directory for this gem.
+
+  def datadir
+# TODO: drop the extra ", gem_name" which is uselessly redundant
+    File.expand_path(File.join(gems_dir, full_name, "data", name)).untaint
+  end
+
   ##
   # Full path of the target library file.
   # If the file is not in this gem, return nil.
@@ -165,8 +166,8 @@ def to_fullpath path
       begin
         fullpath = nil
         suffixes = Gem.suffixes
-        full_require_paths.find do |dir|
-          suffixes.find do |suf|
+        suffixes.find do |suf|
+          full_require_paths.find do |dir|
             File.file?(fullpath = "#{dir}/#{path}#{suf}")
           end
         end ? fullpath : nil
@@ -189,17 +190,15 @@ def gem_dir
   # gem directory. eg: /usr/local/lib/ruby/1.8/gems
 
   def gems_dir
-    # TODO: this logic seems terribly broken, but tests fail if just base_dir
-    @gems_dir ||= File.join(loaded_from && base_dir || Gem.dir, "gems")
+    raise NotImplementedError
   end
 
   def internal_init # :nodoc:
     @extension_dir = nil
     @extensions_dir = nil
     @full_gem_path         = nil
     @gem_dir               = nil
-    @gems_dir              = nil
-    @base_dir              = nil
+    @ignored = nil
   end
 
   ##
@@ -217,7 +216,7 @@ def platform
   end
 
   def raw_require_paths # :nodoc:
-    Array(@require_paths)
+    raise NotImplementedError
   end
 
   ##
@@ -238,7 +237,7 @@ def raw_require_paths # :nodoc:
   #   spec.require_path = '.'
 
   def require_paths
-    return raw_require_paths if @extensions.nil? || @extensions.empty?
+    return raw_require_paths unless have_extensions?
 
     [extension_dir].concat raw_require_paths
   end
@@ -250,8 +249,8 @@ def require_paths
   def source_paths
     paths = raw_require_paths.dup
 
-    if @extensions then
-      ext_dirs = @extensions.map do |extension|
+    if have_extensions? then
+      ext_dirs = extensions.map do |extension|
         extension.split(File::SEPARATOR, 2).first
       end.uniq
 
@@ -307,5 +306,23 @@ def stubbed?
     raise NotImplementedError
   end
 
+  private
+
+  def have_extensions?; !extensions.empty?; end
+
+  def have_file? file, suffixes
+    return true if raw_require_paths.any? do |path|
+      base = File.join(gems_dir, full_name, path.untaint, file).untaint
+      suffixes.any? { |suf| File.file? base + suf }
+    end
+
+    if have_extensions?
+      base = File.join extension_dir, file
+      suffixes.any? { |suf| File.file? base + suf }
+    else
+      false
+    end
+  end
+
 end
 
diff --git a/library/rubygems/commands/list_command.rb b/library/rubygems/commands/list_command.rb
@@ -3,7 +3,7 @@
 
 ##
 # An alternate to Gem::Commands::QueryCommand that searches for gems starting
-# with the the supplied argument.
+# with the supplied argument.
 
 class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
 

diff --git a/library/rubygems/core_ext/kernel_require.rb b/library/rubygems/core_ext/kernel_require.rb
@@ -60,9 +60,7 @@ def require path
     #--
     # TODO request access to the C implementation of this to speed up RubyGems
 
-    spec = Gem::Specification.stubs.find { |s|
-      s.activated? and s.contains_requirable_file? path
-    }
+    spec = Gem::Specification.find_active_stub_by_path path
 
     begin
       RUBYGEMS_ACTIVATION_MONITOR.exit

diff --git a/library/rubygems/installer.rb b/library/rubygems/installer.rb
@@ -391,15 +391,15 @@ def unpack(directory)
   end
 
   ##
-  # The location of of the spec file that is installed.
+  # The location of the spec file that is installed.
   #
 
   def spec_file
     File.join gem_home, "specifications", "#{spec.full_name}.gemspec"
   end
 
   ##
-  # The location of of the default spec file for default gems.
+  # The location of the default spec file for default gems.
   #
 
   def default_spec_file

diff --git a/library/rubygems/request.rb b/library/rubygems/request.rb
@@ -185,6 +185,10 @@ def perform_request request # :nodoc:
 
       bad_response = true
       retry
+    rescue Net::HTTPFatalError
+      verbose "fatal error"
+
+      raise Gem::RemoteFetcher::FetchError.new('fatal error', @uri)
     # HACK work around EOFError bug in Net::HTTP
     # NOTE Errno::ECONNABORTED raised a lot on Windows, and make impossible
     # to install gems.
@@ -241,4 +245,3 @@ def user_agent
 require 'rubygems/request/http_pool'
 require 'rubygems/request/https_pool'
 require 'rubygems/request/connection_pools'
-
diff --git a/library/rubygems/requirement.rb b/library/rubygems/requirement.rb
@@ -89,9 +89,9 @@ def self.source_set # :nodoc:
   # specification, like <tt>">= 1.2"</tt>, or a simple version number,
   # like <tt>"1.2"</tt>.
   #
-  #     parse("> 1.0")                 # => [">", "1.0"]
-  #     parse("1.0")                   # => ["=", "1.0"]
-  #     parse(Gem::Version.new("1.0")) # => ["=,  "1.0"]
+  #     parse("> 1.0")                 # => [">", Gem::Version.new("1.0")]
+  #     parse("1.0")                   # => ["=", Gem::Version.new("1.0")]
+  #     parse(Gem::Version.new("1.0")) # => ["=,  Gem::Version.new("1.0")]
 
   def self.parse obj
     return ["=", obj] if Gem::Version === obj

diff --git a/library/rubygems/resolver.rb b/library/rubygems/resolver.rb
@@ -187,7 +187,7 @@ def debug?
 
   def resolve
     locking_dg = Molinillo::DependencyGraph.new
-    Molinillo::Resolver.new(self, self).resolve(@needed.map { |d| DependencyRequest.new d, nil }, locking_dg).tsort.map(&:payload)
+    Molinillo::Resolver.new(self, self).resolve(@needed.map { |d| DependencyRequest.new d, nil }, locking_dg).tsort.map(&:payload).compact
   rescue Molinillo::VersionConflict => e
     conflict = e.conflicts.values.first
     raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement)
@@ -232,7 +232,7 @@ def search_for(dependency)
       exc.errors = @set.errors
       raise exc
     end
-    possibles.sort_by { |s| [s.source, s.version, s.platform == Gem::Platform.local.to_s ? 1 : 0] }.
+    possibles.sort_by { |s| [s.source, s.version, s.platform.to_s == Gem::Platform.local.to_s ? 1 : 0] }.
       map { |s| ActivationRequest.new s, dependency, [] }
   end