rubygems-update 2.1.11 → 2.2.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82168c6212d521d26ab68880159ab12e862140e9
-  data.tar.gz: f86bf4836cb35a7f9f88385ab703cb1d1ef53ce9
+  metadata.gz: 16286e9749232be3a36bc8fe9bacd580538c2604
+  data.tar.gz: 9d162a488ba83c7ee731f916701915e872dd2eb6
 SHA512:
-  metadata.gz: 4da012899ccde3d603997351752f45c1174ee10cf193bbbe83b07c683f066fbcdb20755a4f25a74cfc4c01bc49a7cfaa01452ed2527b877a631c1be100472836
-  data.tar.gz: 8862f9304744e0ea67c7c6ab1c160f82c5cfc1ff2c2a77392d75147f975fecb7f0f8401d884b3a6342b7f3c713b489b5e8dcbc84893687b4b06d044ce2085f15
+  metadata.gz: 327d139d886f5df53c61cfe5f718d0b12d7fc6442dfdc6d91b0580bcdc5f0460aee4a2b39a97a6814787cd7ba3a5f254ea3eee4eae95cb21b5d0849b7f74c7d8
+  data.tar.gz: 2e2267811edd5a657cba4103d020a8def8dc0fd137f5153466710d933dbf00588bbd86eb76796b39731c91de7c002d9e8712092bba6948ac39b11a1bb20d5ba4

data/.autotest

@@ -5,11 +5,14 @@ Gem.refresh
 require 'autotest/restart'
 require 'autotest/isolate'
 
+Autotest.add_hook :run_command do |_, cmd|
+  cmd.sub! ' -e ', ' -we '
+end
+
 Autotest.add_hook :initialize do |at|
   at.testlib = ''
 
   at.add_exception %r%/\.git/%
-  at.add_exception %r%/\.svn/%
   at.add_exception %r%\.rbc$%
   at.add_exception %r%test/rubygems/rubygems%
 
@@ -24,20 +27,42 @@ Autotest.add_hook :initialize do |at|
     "test/rubygems/test_gem_#{m[1].gsub '/', '_'}.rb"
   end
 
-  at.add_mapping %r%^test/support/(.*).rb$% do |_, m|
-    at.files_matching %r%^test/rubygems/test_(.*)\.rb$%
-  end
-
   args = ARGV.reject { |a| a =~ /^-/ }
   at.find_directories = args unless args.empty?
-end
 
-class Autotest
-  alias :old_path_to_classname :path_to_classname
-  def path_to_classname s
-    classname = old_path_to_classname(s.sub(/test.rubygems.test_/, ""))
-    classname = classname.gsub('Rdoc', 'RDoc')
+  def at.handle_results results
+    results = results.gsub(/\e\[\d+m/, '') # strip ascii color
+    failed = results.scan(self.failed_results_re).map { |m, k|
+      m, k = $1, $2 if m =~ /(\w+)\((\w+)\)/ # minitest 4 output
+      [m, k]
+    }
+
+    completed = results[self.completed_re]
+
+    if completed then
+      completed = completed.scan(/(\d+) (\w+)/).map { |v, k| [k, v.to_i] }
+
+      self.latest_results = Hash[*completed.flatten]
+      self.files_to_test  = consolidate_failures failed
+
+      color = failed.empty? ? :green : :red
+      hook color unless $TESTING
+    else
+      self.latest_results = nil
+    end
+
+    self.tainted = true unless self.files_to_test.empty?
+  end
+
+  def at.path_to_classname s
+    sep = File::SEPARATOR
+
+    f = s.sub(/^test#{sep}rubygems#{sep}/, '').sub(/\.rb$/, '').split sep
+
+    f = f.map { |path| path.split(/_|(\d+)/).map { |seg| seg.capitalize }.join }
 
-    classname
+    f.join('::').
+      gsub('Rdoc', 'RDoc').
+      gsub('GemDependencyApi', 'GemDependencyAPI')
   end
 end

data/History.txt

@@ -1,5 +1,94 @@
 # coding: UTF-8
 
+=== 2.2.0.rc.1 / 2013-12-20
+
+Major enhancements:
+
+* RubyGems can check for gem dependencies files (gem.deps.rb or Gemfile) when
+  rubygems executables are started and uses the found dependencies.  This
+  means `rake` will work similar to `bundle exec rake`.  To enable this set
+  the `RUBYGEMS_GEMDEPS` environment variable to the location of your
+  dependencies file.
+
+  See Gem::use_gemdeps for further details.
+
+* A RubyGems directory may now be shared amongst multiple ruby versions.  Upon
+  activation RubyGems will automatically compile missing extensions for the
+  current platform when the built objects are missing.  Issue #596 by Michal
+  Papis
+
+  By default different platforms do not share gem install locations so this
+  must be configured by setting GEM_HOME to a common directory.  Some gems use
+  fixed paths for requiring extensions and are not compatible with sharing gem
+  directories.
+
+  The default sharing location may be configured by RubyGems packagers through
+  Gem.default_ext_dir_for.  Pull Request #744 by Vít Ondruch.
+
+Minor enhancements:
+
+* RubyGems checks the 'allowed_push_host' metadata value when pushing a gem to
+  prevent an accidental push to a public repository (such as rubygems.org).
+  If you have private gems you should set this value in your gem specification
+  metadata.  Pull request #603 by Seamus Abshere.
+* `gem list` now shows results for multiple arguments.  Pull request #604 by
+  Zach Rabinovich.
+* `gem pristine --extensions` will restore only gems with extensions.  Issue
+  #619 by Postmodern.
+* Gem::Specification#files is now sorted.  Pull request #612 by Justin George.
+* For `gem list` and friends, "LOCAL" and "REMOTE" headers are omitted if
+  only local or remote gem information is requested with --quiet.  Pull
+  request #615 by Michal Papis.
+* Added Gem::Specification#full_require_paths which is like require_paths, but
+  returns a fully-qualified results.  Pull request #632 by Vít Ondruch.
+* RubyGems now looks for the https_proxy environment variable for https://
+  sources.  RubyGems will fall back to http_proxy if there is no https_proxy.
+  Issue #610 by mkristian.
+* RubyGems now creates directories in .gem files.  Issue #631 by marksolaris.
+* RubyGems raises an exception when a specification includes its gem.  Issue
+  #623 by notEthan.
+* RubyGems now displays relevant release note information when updating
+  RubyGems.  Issue #647 by Trevor Wennblom.
+* Deprecated Gem::Installer::ExtensionBuildError in favor of
+  Gem::Ext::BuildError.  The old constant is an alias for the new constant.
+* When extensions are built the gem_make.out file is always written now, even
+  on success.  This will help with debugging bad builds that report success.
+* If a specification fails to validate RubyGems shows a link to the
+  specification reference guide.  Issue #656 by Markus Heiler.
+* When using `gem install -g`, RubyGems now detects the presence of an
+  Isolate, Gemfile or gem.deps.rb file.
+* Added Gem::StubSpecification#stubbed? to help determine if a user should run
+  `gem pristine` to speed up gem loading.  Pull request #694 and #701 by Jon
+  Leighton.
+* RubyGems now warns when a gem has a pessimistic version dependency that may
+  be too strict.
+* RubyGems now warns when a gem has an open-ended dependency.
+* RubyGems now raises an exception when a dependency for a gem is defined
+  twice.
+* Marked the license specification attribute as recommended.  Pull request
+  #713 by Benjamin Fleischer.
+* RubyGems uses io/console instead of `stty` when available.  Pull request
+  #740 by Nobuyoshi Nakada
+* Relaxed Gem.ruby tests for platforms that override where ruby lives.  Pull
+  Request #755 by strzibny.
+
+Bug fixes:
+
+* RubyGems now returns an error status when any file given to `gem which`
+  cannot be found.  Ruby bug #9004 by Eugene Vilensky.
+* Fixed command escaping when building rake extensions.  Pull request #721 by
+  Dmitry Ratnikov.
+* Fixed uninstallation of gems when GEM_HOME is a relative directory.  Issue
+  #708 by Ryan Davis.
+* Default gems are now ignored by Gem::Validator#alien.  Issue #717 by David
+  Bahar.
+* Fixed typos in RubyGems.  Pull requests #723, #725, #731 by Akira Matsuda,
+  pull request #736 by Leo Gallucci, pull request #746 by DV Suresh.
+* RubyGems now holds exclusive locks on cached gem files to prevent incorrect
+  updates.  Pull Request #737 by Smit Shah
+* Improved speed of `gem install --ignore-dependencies`.  Patch by Terence
+  Lee.
+
 === 2.1.11 / 2013-11-12
 
 Bug fixes:
@@ -249,8 +338,8 @@ Bug fixes:
 
 Bug fixes:
 
-* Proxy usernames and passwords are now escaped properly.  Ruby Bug #8979 and
-  patch by Masahiro Tomita, Issue #668 by Kouhei Sutou.
+* Proxy usernames and passwords are now escaped properly.  Ruby Bug #8979 by
+  Masahiro Tomita, Issue #668 by Kouhei Sutou.
 
 === 2.0.11 / 2013-10-08
 
@@ -764,6 +853,14 @@ $SAFE=1.  There is no functional difference compared to Ruby 2.0.0.preview2
   * URI scheme matching is no longer case-sensitive.  Fixes #322
   * ext/builder now checks $MAKE as well as $make (okkez)
 
+=== 1.8.29 / 2013-11-23
+
+Bug fixes:
+
+* Fixed installation when the LANG environment variable is empty.
+* Added DigiCert High Assurance EV Root CA to the default SSL certificates for
+  cloudfront.
+
 === 1.8.28 / 2013-10-08
 
 Bug fixes:

data/MIT.txt

@@ -1,4 +1,5 @@
 Copyright (c) Chad Fowler, Rich Kilmer, Jim Weirich and others.
+Portions copyright (c) Engine Yard and Andre Arko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -57,23 +57,12 @@ lib/rubygems/defaults.rb
 lib/rubygems/dependency.rb
 lib/rubygems/dependency_installer.rb
 lib/rubygems/dependency_list.rb
-lib/rubygems/dependency_resolver.rb
-lib/rubygems/dependency_resolver/activation_request.rb
-lib/rubygems/dependency_resolver/api_set.rb
-lib/rubygems/dependency_resolver/api_specification.rb
-lib/rubygems/dependency_resolver/composed_set.rb
-lib/rubygems/dependency_resolver/current_set.rb
-lib/rubygems/dependency_resolver/dependency_conflict.rb
-lib/rubygems/dependency_resolver/dependency_request.rb
-lib/rubygems/dependency_resolver/index_set.rb
-lib/rubygems/dependency_resolver/index_specification.rb
-lib/rubygems/dependency_resolver/installed_specification.rb
-lib/rubygems/dependency_resolver/installer_set.rb
 lib/rubygems/deprecate.rb
 lib/rubygems/doctor.rb
 lib/rubygems/errors.rb
 lib/rubygems/exceptions.rb
 lib/rubygems/ext.rb
+lib/rubygems/ext/build_error.rb
 lib/rubygems/ext/builder.rb
 lib/rubygems/ext/cmake_builder.rb
 lib/rubygems/ext/configure_builder.rb
@@ -108,7 +97,33 @@ lib/rubygems/remote_fetcher.rb
 lib/rubygems/request.rb
 lib/rubygems/request_set.rb
 lib/rubygems/request_set/gem_dependency_api.rb
+lib/rubygems/request_set/lockfile.rb
 lib/rubygems/requirement.rb
+lib/rubygems/resolver.rb
+lib/rubygems/resolver/activation_request.rb
+lib/rubygems/resolver/api_set.rb
+lib/rubygems/resolver/api_specification.rb
+lib/rubygems/resolver/best_set.rb
+lib/rubygems/resolver/composed_set.rb
+lib/rubygems/resolver/conflict.rb
+lib/rubygems/resolver/current_set.rb
+lib/rubygems/resolver/dependency_request.rb
+lib/rubygems/resolver/git_set.rb
+lib/rubygems/resolver/git_specification.rb
+lib/rubygems/resolver/index_set.rb
+lib/rubygems/resolver/index_specification.rb
+lib/rubygems/resolver/installed_specification.rb
+lib/rubygems/resolver/installer_set.rb
+lib/rubygems/resolver/local_specification.rb
+lib/rubygems/resolver/lock_set.rb
+lib/rubygems/resolver/lock_specification.rb
+lib/rubygems/resolver/requirement_list.rb
+lib/rubygems/resolver/set.rb
+lib/rubygems/resolver/spec_specification.rb
+lib/rubygems/resolver/specification.rb
+lib/rubygems/resolver/stats.rb
+lib/rubygems/resolver/vendor_set.rb
+lib/rubygems/resolver/vendor_specification.rb
 lib/rubygems/security.rb
 lib/rubygems/security/policies.rb
 lib/rubygems/security/policy.rb
@@ -116,9 +131,12 @@ lib/rubygems/security/signer.rb
 lib/rubygems/security/trust_dir.rb
 lib/rubygems/server.rb
 lib/rubygems/source.rb
+lib/rubygems/source/git.rb
 lib/rubygems/source/installed.rb
 lib/rubygems/source/local.rb
+lib/rubygems/source/lock.rb
 lib/rubygems/source/specific_file.rb
+lib/rubygems/source/vendor.rb
 lib/rubygems/source_list.rb
 lib/rubygems/source_local.rb
 lib/rubygems/source_specific_file.rb
@@ -137,7 +155,9 @@ lib/rubygems/text.rb
 lib/rubygems/uninstaller.rb
 lib/rubygems/uri_formatter.rb
 lib/rubygems/user_interaction.rb
+lib/rubygems/util.rb
 lib/rubygems/util/list.rb
+lib/rubygems/util/stringio.rb
 lib/rubygems/validator.rb
 lib/rubygems/version.rb
 lib/rubygems/version_option.rb
@@ -232,13 +252,7 @@ test/rubygems/test_gem_config_file.rb
 test/rubygems/test_gem_dependency.rb
 test/rubygems/test_gem_dependency_installer.rb
 test/rubygems/test_gem_dependency_list.rb
-test/rubygems/test_gem_dependency_resolver.rb
-test/rubygems/test_gem_dependency_resolver_api_specification.rb
-test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb
-test/rubygems/test_gem_dependency_resolver_index_set.rb
-test/rubygems/test_gem_dependency_resolver_index_specification.rb
-test/rubygems/test_gem_dependency_resolver_installed_specification.rb
-test/rubygems/test_gem_dependency_resolver_installer_set.rb
+test/rubygems/test_gem_dependency_resolution_error.rb
 test/rubygems/test_gem_doctor.rb
 test/rubygems/test_gem_ext_builder.rb
 test/rubygems/test_gem_ext_cmake_builder.rb
@@ -266,7 +280,29 @@ test/rubygems/test_gem_rdoc.rb
 test/rubygems/test_gem_remote_fetcher.rb
 test/rubygems/test_gem_request.rb
 test/rubygems/test_gem_request_set.rb
+test/rubygems/test_gem_request_set_gem_dependency_api.rb
+test/rubygems/test_gem_request_set_lockfile.rb
 test/rubygems/test_gem_requirement.rb
+test/rubygems/test_gem_resolver.rb
+test/rubygems/test_gem_resolver_activation_request.rb
+test/rubygems/test_gem_resolver_api_set.rb
+test/rubygems/test_gem_resolver_api_specification.rb
+test/rubygems/test_gem_resolver_best_set.rb
+test/rubygems/test_gem_resolver_conflict.rb
+test/rubygems/test_gem_resolver_dependency_request.rb
+test/rubygems/test_gem_resolver_git_set.rb
+test/rubygems/test_gem_resolver_git_specification.rb
+test/rubygems/test_gem_resolver_index_set.rb
+test/rubygems/test_gem_resolver_index_specification.rb
+test/rubygems/test_gem_resolver_installed_specification.rb
+test/rubygems/test_gem_resolver_installer_set.rb
+test/rubygems/test_gem_resolver_local_specification.rb
+test/rubygems/test_gem_resolver_lock_set.rb
+test/rubygems/test_gem_resolver_lock_specification.rb
+test/rubygems/test_gem_resolver_requirement_list.rb
+test/rubygems/test_gem_resolver_specification.rb
+test/rubygems/test_gem_resolver_vendor_set.rb
+test/rubygems/test_gem_resolver_vendor_specification.rb
 test/rubygems/test_gem_security.rb
 test/rubygems/test_gem_security_policy.rb
 test/rubygems/test_gem_security_signer.rb
@@ -275,10 +311,13 @@ test/rubygems/test_gem_server.rb
 test/rubygems/test_gem_silent_ui.rb
 test/rubygems/test_gem_source.rb
 test/rubygems/test_gem_source_fetch_problem.rb
+test/rubygems/test_gem_source_git.rb
 test/rubygems/test_gem_source_installed.rb
 test/rubygems/test_gem_source_list.rb
 test/rubygems/test_gem_source_local.rb
+test/rubygems/test_gem_source_lock.rb
 test/rubygems/test_gem_source_specific_file.rb
+test/rubygems/test_gem_source_vendor.rb
 test/rubygems/test_gem_spec_fetcher.rb
 test/rubygems/test_gem_specification.rb
 test/rubygems/test_gem_stream_ui.rb
@@ -286,6 +325,7 @@ test/rubygems/test_gem_stub_specification.rb
 test/rubygems/test_gem_text.rb
 test/rubygems/test_gem_uninstaller.rb
 test/rubygems/test_gem_uri_formatter.rb
+test/rubygems/test_gem_util.rb
 test/rubygems/test_gem_validator.rb
 test/rubygems/test_gem_version.rb
 test/rubygems/test_gem_version_option.rb

data/Rakefile

@@ -95,13 +95,11 @@ rescue LoadError, RuntimeError # rake 10.1 on rdoc from ruby 1.9.2 and earlier
   end
 end
 
-task :clean_env do
-  ENV.delete "GEM_HOME"
-  ENV.delete "GEM_PATH"
+desc "Install gems needed to run the tests"
+task :install_test_deps => :clean_env do
+  sh "gem install minitest -v '~> 4.0'"
 end
 
-task :test => :clean_env
-
 # --------------------------------------------------------------------
 # Creating a release
 
@@ -344,7 +342,7 @@ def diff_with dir
   sh "diff #{diff_options} lib/rubygems.rb     #{dir}/lib/rubygems.rb; true"
   sh "diff #{diff_options} lib/rubygems        #{dir}/lib/rubygems;    true"
   sh "diff #{diff_options} lib/rbconfig        #{dir}/lib/rbconfig;    true"
-  sh "diff #{diff_options} test                #{dir}/test/rubygems;   true"
+  sh "diff #{diff_options} test/rubygems       #{dir}/test/rubygems;   true"
 end
 
 rubinius_dir = ENV['RUBINIUS_PATH'] || '../git.rubini.us/code'

data/lib/gauntlet_rubygems.rb

@@ -16,7 +16,7 @@ require 'gauntlet'
 # rvsh-0.4.5           : No such file or directory - bin/rvsh
 # xen-0.1.2.1          : authors must be Array of Strings
 
-class GemGauntlet < Gauntlet
+class GemGauntlet < Gauntlet # :nodoc:
   def run(name)
     warn name
 

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.1.11'
+  VERSION = '2.2.0.rc.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -139,6 +139,7 @@ module Gem
     build_info
     cache
     doc
+    extensions
     gems
     specifications
   ]
@@ -158,6 +159,7 @@ module Gem
   @path_to_default_spec_map = {}
   @platforms = []
   @ruby = nil
+  @ruby_api_version = nil
   @sources = nil
 
   @post_build_hooks     ||= []
@@ -176,8 +178,8 @@ module Gem
   def self.try_activate path
     # finds the _latest_ version... regardless of loaded specs and their deps
     # if another gem had a requirement that would mean we shouldn't
-    # activate the latest version, then either it would alreaby be activated
-    # or if it was ambigious (and thus unresolved) the code in our custom
+    # activate the latest version, then either it would already be activated
+    # or if it was ambiguous (and thus unresolved) the code in our custom
     # require will try to activate the more specific version.
 
     spec = Gem::Specification.find_inactive_by_path path
@@ -213,50 +215,6 @@ module Gem
     end
   end
 
-  def self.detect_gemdeps
-    if path = ENV['RUBYGEMS_GEMDEPS']
-      path = path.dup.untaint
-
-      if path == "-"
-        here = Dir.pwd.untaint
-        start = here
-
-        begin
-          while true
-            path = GEM_DEP_FILES.find { |f| File.file?(f) }
-
-            if path
-              path = File.join here, path
-              break
-            end
-
-            Dir.chdir ".."
-
-            # If we're at a toplevel, stop.
-            return if Dir.pwd == here
-
-            here = Dir.pwd
-          end
-        ensure
-          Dir.chdir start
-        end
-      end
-
-      path.untaint
-
-      return unless File.file? path
-
-      rs = Gem::RequestSet.new
-      rs.load_gemdeps path
-
-      rs.resolve_current.map do |s|
-        sp = s.full_spec
-        sp.activate
-        sp
-      end
-    end
-  end
-
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
   # is not given, the gem's default_executable is chosen, otherwise the
@@ -300,7 +258,6 @@ module Gem
   # The path where gem executables are to be installed.
 
   def self.bindir(install_dir=Gem.dir)
-    # TODO: move to Gem::Dirs
     return File.join install_dir, 'bin' unless
       install_dir.to_s == Gem.default_dir.to_s
     Gem.default_bindir
@@ -360,16 +317,21 @@ module Gem
     Zlib::Deflate.deflate data
   end
 
-  # DOC: needs doc'd or :nodoc'd
+  # Retrieve the PathSupport object that RubyGems uses to
+  # lookup files.
+
   def self.paths
     @paths ||= Gem::PathSupport.new
   end
 
-  # DOC: needs doc'd or :nodoc'd
+  # Initialize the filesystem paths to use from +env+.
+  # +env+ is a hash-like object (typically ENV) that
+  # is queried for 'GEM_HOME', 'GEM_PATH', and 'GEM_SPEC_CACHE'
+
   def self.paths=(env)
     clear_paths
     @paths = Gem::PathSupport.new env
-    Gem::Specification.dirs = @paths.path # FIX: home is at end
+    Gem::Specification.dirs = @paths.path
   end
 
   ##
@@ -378,12 +340,10 @@ module Gem
   # FIXME deprecate these once everything else has been done -ebh
 
   def self.dir
-    # TODO: raise "no"
     paths.home
   end
 
   def self.path
-    # TODO: raise "no"
     paths.path
   end
 
@@ -436,6 +396,18 @@ module Gem
     File.umask old_umask
   end
 
+  ##
+  # The extension API version of ruby.  This includes the static vs non-static
+  # distinction as extensions cannot be shared between the two.
+
+  def self.extension_api_version # :nodoc:
+    if 'no' == RbConfig::CONFIG['ENABLE_SHARED'] then
+      "#{ruby_api_version}-static"
+    else
+      ruby_api_version
+    end
+  end
+
   ##
   # Returns a list of paths matching +glob+ that can be used by a gem to pick
   # up features from other gems.  For example:
@@ -538,42 +510,30 @@ module Gem
 
   private_class_method :find_home
 
+  # FIXME deprecate these in 3.0
+
   ##
   # Zlib::GzipReader wrapper that unzips +data+.
 
   def self.gunzip(data)
-    # TODO: move to utils
-    require 'stringio'
-    require 'zlib'
-    data = StringIO.new data
-
-    unzipped = Zlib::GzipReader.new(data).read
-    unzipped.force_encoding Encoding::BINARY if Object.const_defined? :Encoding
-    unzipped
+    require 'rubygems/util'
+    Gem::Util.gunzip data
   end
 
   ##
   # Zlib::GzipWriter wrapper that zips +data+.
 
   def self.gzip(data)
-    # TODO: move to utils
-    require 'stringio'
-    require 'zlib'
-    zipped = StringIO.new
-    zipped.set_encoding Encoding::BINARY if Object.const_defined? :Encoding
-
-    Zlib::GzipWriter.wrap zipped do |io| io.write data end
-
-    zipped.string
+    require 'rubygems/util'
+    Gem::Util.gzip data
   end
 
   ##
   # A Zlib::Inflate#inflate wrapper
 
   def self.inflate(data)
-    # TODO: move to utils
-    require 'zlib'
-    Zlib::Inflate.inflate data
+    require 'rubygems/util'
+    Gem::Util.inflate data
   end
 
   ##
@@ -679,7 +639,6 @@ module Gem
     file = $1
     lineno = $2.to_i
 
-    # TODO: it is ALWAYS joined! STUPID!
     [file, lineno]
   end
 
@@ -805,7 +764,10 @@ module Gem
   # Safely read a file in binary mode on all platforms.
 
   def self.read_binary(path)
-    File.open path, binary_mode do |f| f.read end
+    open path, 'rb+' do |f|
+      f.flock(File::LOCK_EX)
+      f.read
+    end
   end
 
   ##
@@ -822,6 +784,14 @@ module Gem
     @ruby
   end
 
+  ##
+  # Returns a String containing the API compatibility version of Ruby
+
+  def self.ruby_api_version
+    @ruby_api_version ||=
+      "#{ConfigMap[:MAJOR]}.#{ConfigMap[:MINOR]}.#{ConfigMap[:TEENY]}"
+  end
+
   ##
   # Returns the latest release-version specification for the gem +name+.
 
@@ -952,7 +922,6 @@ module Gem
     paths = nil if paths == [nil]
     paths = paths.first if Array === Array(paths).first
     self.paths = { "GEM_HOME" => home, "GEM_PATH" => paths }
-    # TODO: self.paths = home, paths
   end
 
   ##
@@ -1025,6 +994,56 @@ module Gem
     load_plugin_files files
   end
 
+  ##
+  # Looks for gem dependency files (gem.deps.rb, Gemfile, Isolate) from the
+  # current directory up and activates the gems in the first file found.
+  #
+  # You can run this automatically when rubygems starts.  To enable, set
+  # the <code>RUBYGEMS_GEMDEPS</code> environment variable to either the path
+  # of your Gemfile or "-" to auto-discover in parent directories.
+  #
+  # NOTE: Enabling automatic discovery on multiuser systems can lead to
+  # execution of arbitrary code when used from directories outside your
+  # control.
+
+  def self.use_gemdeps
+    return unless path = ENV['RUBYGEMS_GEMDEPS']
+    path = path.dup
+
+    if path == "-" then
+      require 'rubygems/util'
+
+      Gem::Util.traverse_parents Dir.pwd do |directory|
+        dep_file = GEM_DEP_FILES.find { |f| File.file?(f) }
+
+        next unless dep_file
+
+        path = File.join directory, dep_file
+        break
+      end
+    end
+
+    path.untaint
+
+    return unless File.file? path
+
+    rs = Gem::RequestSet.new
+    rs.load_gemdeps path
+
+    rs.resolve_current.map do |s|
+      sp = s.full_spec
+      sp.activate
+      sp
+    end
+  end
+
+  class << self
+    ##
+    # TODO remove with RubyGems 3.0
+
+    alias detect_gemdeps use_gemdeps # :nodoc:
+  end
+
   # FIX: Almost everywhere else we use the `def self.` way of defining class
   # methods, and then we switch over to `class << self` here. Pick one or the
   # other.
@@ -1087,7 +1106,7 @@ module Gem
     end
 
     ##
-    # Clear default gem related varibles. It is for test
+    # Clear default gem related variables. It is for test
 
     def clear_default_specs
       @path_to_default_spec_map.clear
@@ -1147,16 +1166,18 @@ module Gem
   autoload :ConfigFile,         'rubygems/config_file'
   autoload :Dependency,         'rubygems/dependency'
   autoload :DependencyList,     'rubygems/dependency_list'
-  autoload :DependencyResolver, 'rubygems/dependency_resolver'
+  autoload :DependencyResolver, 'rubygems/resolver'
+  autoload :Installer,          'rubygems/installer'
   autoload :PathSupport,        'rubygems/path_support'
   autoload :Platform,           'rubygems/platform'
   autoload :RequestSet,         'rubygems/request_set'
   autoload :Requirement,        'rubygems/requirement'
+  autoload :Resolver,           'rubygems/resolver'
+  autoload :Source,             'rubygems/source'
   autoload :SourceList,         'rubygems/source_list'
   autoload :SpecFetcher,        'rubygems/spec_fetcher'
   autoload :Specification,      'rubygems/specification'
   autoload :Version,            'rubygems/version'
-  autoload :Source,             'rubygems/source'
 
   require "rubygems/specification"
 end
@@ -1192,4 +1213,5 @@ Gem::Specification.load_defaults
 require 'rubygems/core_ext/kernel_gem'
 require 'rubygems/core_ext/kernel_require'
 
-Gem.detect_gemdeps
+Gem.use_gemdeps
+