* lib/rubygems: Update to RubyGems HEAD(c202db2).

  this version contains many enhancements see http://git.io/vtNwF
* test/rubygems: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: hsbt

ChangeLog

@@ -1,3 +1,9 @@
+Thu Jul  2 06:49:44 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems: Update to RubyGems HEAD(c202db2).
+	  this version contains many enhancements see http://git.io/vtNwF
+	* test/rubygems: ditto.
+
 Wed Jul  1 23:50:34 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/net/http/test_httpresponse.rb

lib/rubygems.rb

@@ -9,7 +9,7 @@
 require 'thread'
 
 module Gem
-  VERSION = '2.4.8'
+  VERSION = '2.5.0'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -26,12 +26,12 @@ module Gem
 # For user documentation, see:
 #
 # * <tt>gem help</tt> and <tt>gem help [command]</tt>
-# * {RubyGems User Guide}[http://docs.rubygems.org/read/book/1]
-# * {Frequently Asked Questions}[http://docs.rubygems.org/read/book/3]
+# * {RubyGems User Guide}[http://guides.rubygems.org/]
+# * {Frequently Asked Questions}[http://guides.rubygems.org/faqs]
 #
 # For gem developer documentation see:
 #
-# * {Creating Gems}[http://docs.rubygems.org/read/chapter/5]
+# * {Creating Gems}[http://guides.rubygems.org/make-your-own-gem]
 # * Gem::Specification
 # * Gem::Version for version dependency notes
 #
@@ -156,6 +156,7 @@ module Gem
   @@win_platform = nil
 
   @configuration = nil
+  @gemdeps = nil
   @loaded_specs = {}
   LOADED_SPECS_MUTEX = Mutex.new
   @path_to_default_spec_map = {}
@@ -184,13 +185,9 @@ def self.try_activate path
     # 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
-
-    unless spec
-      spec = Gem::Specification.find_by_path path
-      return true if spec && spec.activated?
-      return false
-    end
+    spec = Gem::Specification.find_by_path path
+    return false unless spec
+    return true if spec.activated?
 
     begin
       spec.activate
@@ -433,7 +430,7 @@ def self.find_files(glob, check_load_path=true)
 
     files = find_files_from_load_path glob if check_load_path
 
-    files.concat Gem::Specification.map { |spec|
+    files.concat Gem::Specification.stubs.map { |spec|
       spec.matches_for_glob("#{glob}#{Gem.suffix_pattern}")
     }.flatten
 
@@ -598,7 +595,7 @@ def self.load_yaml
 
     unless test_syck
       begin
-        gem 'psych', '~> 1.2', '>= 1.2.1'
+        gem 'psych', '>= 1.2.1'
       rescue Gem::LoadError
         # It's OK if the user does not have the psych gem installed.  We will
         # attempt to require the stdlib version
@@ -1052,7 +1049,7 @@ def self.use_gemdeps path = nil
     end
 
     rs = Gem::RequestSet.new
-    rs.load_gemdeps path
+    @gemdeps = rs.load_gemdeps path
 
     rs.resolve_current.map do |s|
       sp = s.full_spec
@@ -1082,6 +1079,12 @@ class << self
 
     attr_reader :loaded_specs
 
+    ##
+    # GemDependencyAPI object, which is set when .use_gemdeps is called.
+    # This contains all the information from the Gemfile.
+
+    attr_reader :gemdeps
+
     ##
     # Register a Gem::Specification for default gem.
     #

lib/rubygems/basic_specification.rb

@@ -22,13 +22,17 @@ class Gem::BasicSpecification
   ##
   # The path this gemspec was loaded from.  This attribute is not persisted.
 
-  attr_reader :loaded_from
+  attr_accessor :loaded_from
 
   ##
   # Allows correct activation of git: and path: gems.
 
   attr_writer :full_gem_path # :nodoc:
 
+  def initialize
+    internal_init
+  end
+
   def self.default_specifications_dir
     File.join(Gem.default_dir, "specifications", "default")
   end
@@ -141,7 +145,7 @@ def full_require_paths
     @full_require_paths ||=
     begin
       full_paths = raw_require_paths.map do |path|
-        File.join full_gem_path, path
+        File.join full_gem_path, path.untaint
       end
 
       full_paths << extension_dir unless @extensions.nil? || @extensions.empty?
@@ -189,13 +193,7 @@ def gems_dir
     @gems_dir ||= File.join(loaded_from && base_dir || Gem.dir, "gems")
   end
 
-  ##
-  # Set the path the Specification was loaded from. +path+ is converted to a
-  # String.
-
-  def loaded_from= path
-    @loaded_from   = path && path.to_s
-
+  def internal_init # :nodoc:
     @extension_dir = nil
     @extensions_dir = nil
     @full_gem_path         = nil
@@ -263,6 +261,30 @@ def source_paths
     paths.uniq
   end
 
+  ##
+  # Return all files in this gem that match for +glob+.
+
+  def matches_for_glob glob # TODO: rename?
+    # TODO: do we need these?? Kill it
+    glob = File.join(self.lib_dirs_glob, glob)
+
+    Dir[glob].map { |f| f.untaint } # FIX our tests are broken, run w/ SAFE=1
+  end
+
+  ##
+  # Returns a string usable in Dir.glob to match all requirable paths
+  # for this spec.
+
+  def lib_dirs_glob
+    dirs = if self.require_paths.size > 1 then
+             "{#{self.require_paths.join(',')}}"
+           else
+             self.require_paths.first
+           end
+
+    "#{self.full_gem_path}/#{dirs}"
+  end
+
   ##
   # Return a Gem::Specification from this gem
 

lib/rubygems/commands/dependency_command.rb

@@ -61,27 +61,24 @@ def fetch_remote_specs dependency # :nodoc:
     ss.map { |spec, _| spec }
   end
 
-  def fetch_specs dependency # :nodoc:
+  def fetch_specs name_pattern, dependency # :nodoc:
     specs = []
 
-    specs.concat dependency.matching_specs     if local?
+    if local?
+      specs.concat Gem::Specification.stubs.find_all { |spec|
+        name_pattern =~ spec.name and
+          dependency.requirement.satisfied_by? spec.version
+      }.map(&:to_spec)
+    end
+
     specs.concat fetch_remote_specs dependency if remote?
 
     ensure_specs specs
 
     specs.uniq.sort
   end
 
-  def gem_dependency args, version, prerelease # :nodoc:
-    args << '' if args.empty?
-
-    pattern = if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m then
-                flags = $2 ? Regexp::IGNORECASE : nil
-                Regexp.new $1, flags
-              else
-                /\A#{Regexp.union(*args)}/
-              end
-
+  def gem_dependency pattern, version, prerelease # :nodoc:
     dependency = Gem::Deprecate.skip_during {
       Gem::Dependency.new pattern, version
     }
@@ -121,10 +118,12 @@ def display_readable specs, reverse # :nodoc:
   def execute
     ensure_local_only_reverse_dependencies
 
+    pattern = name_pattern options[:args]
+
     dependency =
-      gem_dependency options[:args], options[:version], options[:prerelease]
+      gem_dependency pattern, options[:version], options[:prerelease]
 
-    specs = fetch_specs dependency
+    specs = fetch_specs pattern, dependency
 
     reverse = reverse_dependencies specs
 
@@ -203,5 +202,16 @@ def find_reverse_dependencies spec # :nodoc:
     result
   end
 
-end
+  private
 
+  def name_pattern args
+    args << '' if args.empty?
+
+    if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m then
+      flags = $2 ? Regexp::IGNORECASE : nil
+      Regexp.new $1, flags
+    else
+      /\A#{Regexp.union(*args)}/
+    end
+  end
+end

lib/rubygems/commands/install_command.rb

@@ -275,7 +275,7 @@ def install_gem_without_dependencies name, req # :nodoc:
       gem = fetcher.download_to_cache dependency
     end
 
-    inst = Gem::Installer.new gem, options
+    inst = Gem::Installer.at gem, options
     inst.install
 
     require 'rubygems/dependency_installer'

lib/rubygems/commands/list_command.rb

@@ -33,7 +33,7 @@ def description # :nodoc:
   end
 
   def usage # :nodoc:
-    "#{program_name} [STRING ...]"
+    "#{program_name} [REGEXP ...]"
   end
 
 end

lib/rubygems/commands/pristine_command.rb

@@ -156,7 +156,7 @@ def execute
           install_defaults.to_s['--env-shebang']
         end
 
-      installer = Gem::Installer.new(gem,
+      installer = Gem::Installer.at(gem,
                                      :wrappers => true,
                                      :force => true,
                                      :install_dir => spec.base_dir,

lib/rubygems/commands/query_command.rb

@@ -227,7 +227,7 @@ def entry_details entry, detail_tuple, specs, platforms
 
     name_tuple, spec = detail_tuple
 
-    spec = spec.fetch_spec name_tuple unless Gem::Specification === spec
+    spec = spec.fetch_spec name_tuple if spec.respond_to? :fetch_spec
 
     entry << "\n"
 

lib/rubygems/core_ext/kernel_require.rb

@@ -66,7 +66,7 @@ def require path
 
     begin
       RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(spec.to_fullpath(path) || path)
+      return gem_original_require(path)
     end if spec
 
     # Attempt to find +path+ in any unresolved gems...
@@ -105,7 +105,7 @@ def require path
 
       # Ok, now find a gem that has no conflicts, starting
       # at the highest version.
-      valid = found_specs.select { |s| s.conflicts.empty? }.last
+      valid = found_specs.reject { |s| s.has_conflicts? }.last
 
       unless valid then
         le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"

lib/rubygems/dependency.rb

@@ -164,6 +164,10 @@ def type
     @type ||= :runtime
   end
 
+  def runtime?
+    @type == :runtime || !@type
+  end
+
   def == other # :nodoc:
     Gem::Dependency === other &&
       self.name        == other.name &&
@@ -270,9 +274,8 @@ def merge other
   end
 
   def matching_specs platform_only = false
-    matches = Gem::Specification.stubs.find_all { |spec|
-      self.name === spec.name and # TODO: == instead of ===
-        requirement.satisfied_by? spec.version
+    matches = Gem::Specification.stubs_for(name).find_all { |spec|
+      requirement.satisfied_by? spec.version
     }.map(&:to_spec)
 
     if platform_only