rubygems-update 3.3.27 → 3.4.0

data/lib/rubygems/ext/cargo_builder.rb

@@ -37,7 +37,8 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
   def build_env
     build_env = rb_config_env
     build_env["RUBY_STATIC"] = "true" if ruby_static? && ENV.key?("RUBY_STATIC")
-    build_env["RUSTFLAGS"] = "#{ENV["RUSTFLAGS"]} --cfg=rb_sys_gem".strip
+    cfg = "--cfg=rb_sys_gem --cfg=rubygems --cfg=rubygems_#{Gem::VERSION.tr(".", "_")}"
+    build_env["RUSTFLAGS"] = [ENV["RUSTFLAGS"], cfg].compact.join(" ")
     build_env
   end
 
@@ -47,12 +48,13 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 
     cmd = []
     cmd += [cargo, "rustc"]
+    cmd += ["--crate-type", "cdylib"]
     cmd += ["--target", ENV["CARGO_BUILD_TARGET"]] if ENV["CARGO_BUILD_TARGET"]
     cmd += ["--target-dir", dest_path]
     cmd += ["--manifest-path", manifest]
     cmd += ["--lib"]
     cmd += ["--profile", profile.to_s]
-    cmd += ["--locked"] if profile == :release
+    cmd += ["--locked"]
     cmd += Gem::Command.build_args
     cmd += args
     cmd += ["--"]
@@ -75,7 +77,6 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
       *rustc_dynamic_linker_flags(dest_dir),
       *rustc_lib_flags(dest_dir),
       *platform_specific_rustc_args(dest_dir),
-      *debug_flags,
     ]
   end
 
@@ -104,14 +105,23 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
   # We want to use the same linker that Ruby uses, so that the linker flags from
   # mkmf work properly.
   def linker_args
-    # Have to handle CC="cl /nologo" on mswin
     cc_flag = Shellwords.split(makefile_config("CC"))
     linker = cc_flag.shift
     link_args = cc_flag.flat_map {|a| ["-C", "link-arg=#{a}"] }
 
+    return mswin_link_args if linker == "cl"
+
     ["-C", "linker=#{linker}", *link_args]
   end
 
+  def mswin_link_args
+    args = []
+    args += ["-l", makefile_config("LIBRUBYARG_SHARED").chomp(".lib")]
+    args += split_flags("LIBS").flat_map {|lib| ["-l", lib.chomp(".lib")] }
+    args += split_flags("LOCAL_LIBS").flat_map {|lib| ["-l", lib.chomp(".lib")] }
+    args
+  end
+
   def libruby_args(dest_dir)
     libs = makefile_config(ruby_static? ? "LIBRUBYARG_STATIC" : "LIBRUBYARG_SHARED")
     raw_libs = Shellwords.split(libs)
@@ -149,7 +159,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
     prefix = so_ext == "dll" ? "" : "lib"
     path_parts = [dest_path]
     path_parts << ENV["CARGO_BUILD_TARGET"] if ENV["CARGO_BUILD_TARGET"]
-    path_parts += [profile_target_directory, "#{prefix}#{cargo_crate_name}.#{so_ext}"]
+    path_parts += ["release", "#{prefix}#{cargo_crate_name}.#{so_ext}"]
     File.join(*path_parts)
   end
 
@@ -254,13 +264,6 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
     RbConfig.expand(val.dup)
   end
 
-  # Good balance between binary size and debugability
-  def debug_flags
-    return [] if profile == :dev
-
-    ["-C", "debuginfo=1"]
-  end
-
   # Copied from ExtConfBuilder
   def finalize_directory(dest_path, lib_dir, extension_dir)
     require "fileutils"
@@ -299,14 +302,6 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
     path
   end
 
-  def profile_target_directory
-    case profile
-    when :release then "release"
-    when :dev     then "debug"
-    else          raise "unknown target directory for profile: #{profile}"
-    end
-  end
-
   # Error raised when no cdylib artifact was created
   class DylibNotFoundError < StandardError
     def initialize(dir)

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -55,6 +55,8 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         destent = ent.class.new(dest_path, ent.rel)
         destent.exist? || FileUtils.mv(ent.path, destent.path)
       end
+
+      make dest_path, results, extension_dir, tmp_dest_relative, ["clean"]
     ensure
       ENV["DESTDIR"] = destdir
     end

data/lib/rubygems/indexer.rb

@@ -397,7 +397,7 @@ class Gem::Indexer
       dst_name = File.join @dest_directory, file # REFACTOR: duped above
 
       FileUtils.mv src_name, dst_name, :verbose => verbose,
-                   :force => true
+                                       :force => true
 
       File.utime newest_mtime, newest_mtime, dst_name
     end

data/lib/rubygems/installer.rb

@@ -234,8 +234,8 @@ class Gem::Installer
       io.gets # blankline
 
       # TODO detect a specially formatted comment instead of trying
-      # to run a regexp against Ruby code.
-      next unless io.gets =~ /This file was generated by RubyGems/
+      # to find a string inside Ruby code.
+      next unless io.gets.to_s.include?("This file was generated by RubyGems")
 
       ruby_executable = true
       existing = io.read.slice(%r{
@@ -649,9 +649,9 @@ class Gem::Installer
 
   def process_options # :nodoc:
     @options = {
-      :bin_dir      => nil,
-      :env_shebang  => false,
-      :force        => false,
+      :bin_dir => nil,
+      :env_shebang => false,
+      :force => false,
       :only_install_dir => false,
       :post_install_message => true,
     }.merge options

data/lib/rubygems/optparse/lib/optparse.rb

@@ -425,7 +425,7 @@
 # If you have any questions, file a ticket at http://bugs.ruby-lang.org.
 #
 class Gem::OptionParser
-  Gem::OptionParser::Version = "0.2.0"
+  Gem::OptionParser::Version = "0.3.0"
 
   # :stopdoc:
   NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
@@ -765,15 +765,15 @@ class Gem::OptionParser
     end
 
     #
-    # Switch that takes an argument, which does not begin with '-'.
+    # Switch that takes an argument, which does not begin with '-' or is '-'.
     #
     class PlacedArgument < self
 
       #
-      # Returns nil if argument is not present or begins with '-'.
+      # Returns nil if argument is not present or begins with '-' and is not '-'.
       #
       def parse(arg, argv, &error)
-        if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0]))
+        if !(val = arg) and (argv.empty? or /\A-./ =~ (val = argv[0]))
           return nil, block, nil
         end
         opt = (val = parse_arg(val, &error))[1]
@@ -1148,6 +1148,7 @@ XXX
     @summary_indent = indent
     @default_argv = ARGV
     @require_exact = false
+    @raise_unknown = true
     add_officious
     yield self if block_given?
   end
@@ -1225,6 +1226,9 @@ XXX
   # abbreviated long option as short option).
   attr_accessor :require_exact
 
+  # Whether to raise at unknown option.
+  attr_accessor :raise_unknown
+
   #
   # Heading banner preceding summary.
   #
@@ -1502,7 +1506,7 @@ XXX
         style = notwice(default_style.guess(arg = o), style, 'style')
         default_pattern, conv = search(:atype, Object) unless default_pattern
       else
-        desc.push(o)
+        desc.push(o) if o && !o.empty?
       end
     end
 
@@ -1639,9 +1643,11 @@ XXX
           begin
             sw, = complete(:long, opt, true)
             if require_exact && !sw.long.include?(arg)
+              throw :terminate, arg unless raise_unknown
               raise InvalidOption, arg
             end
           rescue ParseError
+            throw :terminate, arg unless raise_unknown
             raise $!.set_option(arg, true)
           end
           begin
@@ -1673,6 +1679,7 @@ XXX
               end
             end
           rescue ParseError
+            throw :terminate, arg unless raise_unknown
             raise $!.set_option(arg, true)
           end
           begin
@@ -1862,12 +1869,7 @@ XXX
     end
     all_candidates.select! {|cand| cand.is_a?(String) }
     checker = DidYouMean::SpellChecker.new(dictionary: all_candidates)
-    suggestions = all_candidates & checker.correct(opt)
-    if DidYouMean.respond_to?(:formatter)
-      DidYouMean.formatter.message_for(suggestions)
-    else
-       "\nDid you mean?  #{suggestions.join("\n               ")}"
-    end
+    DidYouMean.formatter.message_for(all_candidates & checker.correct(opt))
   end
 
   def candidate(word)
@@ -1908,10 +1910,13 @@ XXX
   # directory ~/.options, then the basename with '.options' suffix
   # under XDG and Haiku standard places.
   #
-  def load(filename = nil)
+  # The optional +into+ keyword argument works exactly like that accepted in
+  # method #parse.
+  #
+  def load(filename = nil, into: nil)
     unless filename
       basename = File.basename($0, '.*')
-      return true if load(File.expand_path(basename, '~/.options')) rescue nil
+      return true if load(File.expand_path(basename, '~/.options'), into: into) rescue nil
       basename << ".options"
       return [
         # XDG
@@ -1923,11 +1928,11 @@ XXX
         '~/config/settings',
       ].any? {|dir|
         next if !dir or dir.empty?
-        load(File.expand_path(basename, dir)) rescue nil
+        load(File.expand_path(basename, dir), into: into) rescue nil
       }
     end
     begin
-      parse(*IO.readlines(filename).each {|s| s.chomp!})
+      parse(*File.readlines(filename, chomp: true), into: into)
       true
     rescue Errno::ENOENT, Errno::ENOTDIR
       false

data/lib/rubygems/package/tar_header.rb

@@ -103,22 +103,22 @@ class Gem::Package::TarHeader
 
     fields = header.unpack UNPACK_FORMAT
 
-    new :name     => fields.shift,
-        :mode     => strict_oct(fields.shift),
-        :uid      => oct_or_256based(fields.shift),
-        :gid      => oct_or_256based(fields.shift),
-        :size     => strict_oct(fields.shift),
-        :mtime    => strict_oct(fields.shift),
+    new :name => fields.shift,
+        :mode => strict_oct(fields.shift),
+        :uid => oct_or_256based(fields.shift),
+        :gid => oct_or_256based(fields.shift),
+        :size => strict_oct(fields.shift),
+        :mtime => strict_oct(fields.shift),
         :checksum => strict_oct(fields.shift),
         :typeflag => fields.shift,
         :linkname => fields.shift,
-        :magic    => fields.shift,
-        :version  => strict_oct(fields.shift),
-        :uname    => fields.shift,
-        :gname    => fields.shift,
+        :magic => fields.shift,
+        :version => strict_oct(fields.shift),
+        :uname => fields.shift,
+        :gname => fields.shift,
         :devmajor => strict_oct(fields.shift),
         :devminor => strict_oct(fields.shift),
-        :prefix   => fields.shift,
+        :prefix => fields.shift,
 
         :empty => empty
   end

data/lib/rubygems/platform.rb

@@ -97,7 +97,6 @@ class Gem::Platform
       when /darwin(\d+)?/ then          [ "darwin",    $1  ]
       when /^macruby$/ then             [ "macruby",   nil ]
       when /freebsd(\d+)?/ then         [ "freebsd",   $1  ]
-      when /hpux(\d+)?/ then            [ "hpux",      $1  ]
       when /^java$/, /^jruby$/ then     [ "java",      nil ]
       when /^java([\d.]*)/ then         [ "java",      $1  ]
       when /^dalvik(\d+)?$/ then        [ "dalvik",    $1  ]
@@ -112,7 +111,6 @@ class Gem::Platform
         [os, version]
       when /netbsdelf/ then             [ "netbsdelf", nil ]
       when /openbsd(\d+\.\d+)?/ then    [ "openbsd",   $1  ]
-      when /bitrig(\d+\.\d+)?/ then     [ "bitrig",    $1  ]
       when /solaris(\d+\.\d+)?/ then    [ "solaris",   $1  ]
       # test
       when /^(\w+_platform)(\d+)?/ then [ $1,          $2  ]

data/lib/rubygems/request_set/gem_dependency_api.rb

@@ -32,22 +32,22 @@
 
 class Gem::RequestSet::GemDependencyAPI
   ENGINE_MAP = { # :nodoc:
-    :jruby        => %w[jruby],
-    :jruby_18     => %w[jruby],
-    :jruby_19     => %w[jruby],
-    :maglev       => %w[maglev],
-    :mri          => %w[ruby],
-    :mri_18       => %w[ruby],
-    :mri_19       => %w[ruby],
-    :mri_20       => %w[ruby],
-    :mri_21       => %w[ruby],
-    :rbx          => %w[rbx],
-    :truffleruby  => %w[truffleruby],
-    :ruby         => %w[ruby rbx maglev truffleruby],
-    :ruby_18      => %w[ruby rbx maglev truffleruby],
-    :ruby_19      => %w[ruby rbx maglev truffleruby],
-    :ruby_20      => %w[ruby rbx maglev truffleruby],
-    :ruby_21      => %w[ruby rbx maglev truffleruby],
+    :jruby => %w[jruby],
+    :jruby_18 => %w[jruby],
+    :jruby_19 => %w[jruby],
+    :maglev => %w[maglev],
+    :mri => %w[ruby],
+    :mri_18 => %w[ruby],
+    :mri_19 => %w[ruby],
+    :mri_20 => %w[ruby],
+    :mri_21 => %w[ruby],
+    :rbx => %w[rbx],
+    :truffleruby => %w[truffleruby],
+    :ruby => %w[ruby rbx maglev truffleruby],
+    :ruby_18 => %w[ruby rbx maglev truffleruby],
+    :ruby_19 => %w[ruby rbx maglev truffleruby],
+    :ruby_20 => %w[ruby rbx maglev truffleruby],
+    :ruby_21 => %w[ruby rbx maglev truffleruby],
   }.freeze
 
   mswin     = Gem::Platform.new "x86-mswin32"
@@ -56,37 +56,37 @@ class Gem::RequestSet::GemDependencyAPI
   x64_mingw = Gem::Platform.new "x64-mingw32"
 
   PLATFORM_MAP = { # :nodoc:
-    :jruby        => Gem::Platform::RUBY,
-    :jruby_18     => Gem::Platform::RUBY,
-    :jruby_19     => Gem::Platform::RUBY,
-    :maglev       => Gem::Platform::RUBY,
-    :mingw        => x86_mingw,
-    :mingw_18     => x86_mingw,
-    :mingw_19     => x86_mingw,
-    :mingw_20     => x86_mingw,
-    :mingw_21     => x86_mingw,
-    :mri          => Gem::Platform::RUBY,
-    :mri_18       => Gem::Platform::RUBY,
-    :mri_19       => Gem::Platform::RUBY,
-    :mri_20       => Gem::Platform::RUBY,
-    :mri_21       => Gem::Platform::RUBY,
-    :mswin        => mswin,
-    :mswin_18     => mswin,
-    :mswin_19     => mswin,
-    :mswin_20     => mswin,
-    :mswin_21     => mswin,
-    :mswin64      => mswin64,
-    :mswin64_19   => mswin64,
-    :mswin64_20   => mswin64,
-    :mswin64_21   => mswin64,
-    :rbx          => Gem::Platform::RUBY,
-    :ruby         => Gem::Platform::RUBY,
-    :ruby_18      => Gem::Platform::RUBY,
-    :ruby_19      => Gem::Platform::RUBY,
-    :ruby_20      => Gem::Platform::RUBY,
-    :ruby_21      => Gem::Platform::RUBY,
-    :truffleruby  => Gem::Platform::RUBY,
-    :x64_mingw    => x64_mingw,
+    :jruby => Gem::Platform::RUBY,
+    :jruby_18 => Gem::Platform::RUBY,
+    :jruby_19 => Gem::Platform::RUBY,
+    :maglev => Gem::Platform::RUBY,
+    :mingw => x86_mingw,
+    :mingw_18 => x86_mingw,
+    :mingw_19 => x86_mingw,
+    :mingw_20 => x86_mingw,
+    :mingw_21 => x86_mingw,
+    :mri => Gem::Platform::RUBY,
+    :mri_18 => Gem::Platform::RUBY,
+    :mri_19 => Gem::Platform::RUBY,
+    :mri_20 => Gem::Platform::RUBY,
+    :mri_21 => Gem::Platform::RUBY,
+    :mswin => mswin,
+    :mswin_18 => mswin,
+    :mswin_19 => mswin,
+    :mswin_20 => mswin,
+    :mswin_21 => mswin,
+    :mswin64 => mswin64,
+    :mswin64_19 => mswin64,
+    :mswin64_20 => mswin64,
+    :mswin64_21 => mswin64,
+    :rbx => Gem::Platform::RUBY,
+    :ruby => Gem::Platform::RUBY,
+    :ruby_18 => Gem::Platform::RUBY,
+    :ruby_19 => Gem::Platform::RUBY,
+    :ruby_20 => Gem::Platform::RUBY,
+    :ruby_21 => Gem::Platform::RUBY,
+    :truffleruby => Gem::Platform::RUBY,
+    :x64_mingw => x64_mingw,
     :x64_mingw_20 => x64_mingw,
     :x64_mingw_21 => x64_mingw,
   }.freeze
@@ -98,68 +98,68 @@ class Gem::RequestSet::GemDependencyAPI
   tilde_gt_2_1_0 = Gem::Requirement.new "~> 2.1.0"
 
   VERSION_MAP = { # :nodoc:
-    :jruby        => gt_eq_0,
-    :jruby_18     => tilde_gt_1_8_0,
-    :jruby_19     => tilde_gt_1_9_0,
-    :maglev       => gt_eq_0,
-    :mingw        => gt_eq_0,
-    :mingw_18     => tilde_gt_1_8_0,
-    :mingw_19     => tilde_gt_1_9_0,
-    :mingw_20     => tilde_gt_2_0_0,
-    :mingw_21     => tilde_gt_2_1_0,
-    :mri          => gt_eq_0,
-    :mri_18       => tilde_gt_1_8_0,
-    :mri_19       => tilde_gt_1_9_0,
-    :mri_20       => tilde_gt_2_0_0,
-    :mri_21       => tilde_gt_2_1_0,
-    :mswin        => gt_eq_0,
-    :mswin_18     => tilde_gt_1_8_0,
-    :mswin_19     => tilde_gt_1_9_0,
-    :mswin_20     => tilde_gt_2_0_0,
-    :mswin_21     => tilde_gt_2_1_0,
-    :mswin64      => gt_eq_0,
-    :mswin64_19   => tilde_gt_1_9_0,
-    :mswin64_20   => tilde_gt_2_0_0,
-    :mswin64_21   => tilde_gt_2_1_0,
-    :rbx          => gt_eq_0,
-    :ruby         => gt_eq_0,
-    :ruby_18      => tilde_gt_1_8_0,
-    :ruby_19      => tilde_gt_1_9_0,
-    :ruby_20      => tilde_gt_2_0_0,
-    :ruby_21      => tilde_gt_2_1_0,
-    :truffleruby  => gt_eq_0,
-    :x64_mingw    => gt_eq_0,
+    :jruby => gt_eq_0,
+    :jruby_18 => tilde_gt_1_8_0,
+    :jruby_19 => tilde_gt_1_9_0,
+    :maglev => gt_eq_0,
+    :mingw => gt_eq_0,
+    :mingw_18 => tilde_gt_1_8_0,
+    :mingw_19 => tilde_gt_1_9_0,
+    :mingw_20 => tilde_gt_2_0_0,
+    :mingw_21 => tilde_gt_2_1_0,
+    :mri => gt_eq_0,
+    :mri_18 => tilde_gt_1_8_0,
+    :mri_19 => tilde_gt_1_9_0,
+    :mri_20 => tilde_gt_2_0_0,
+    :mri_21 => tilde_gt_2_1_0,
+    :mswin => gt_eq_0,
+    :mswin_18 => tilde_gt_1_8_0,
+    :mswin_19 => tilde_gt_1_9_0,
+    :mswin_20 => tilde_gt_2_0_0,
+    :mswin_21 => tilde_gt_2_1_0,
+    :mswin64 => gt_eq_0,
+    :mswin64_19 => tilde_gt_1_9_0,
+    :mswin64_20 => tilde_gt_2_0_0,
+    :mswin64_21 => tilde_gt_2_1_0,
+    :rbx => gt_eq_0,
+    :ruby => gt_eq_0,
+    :ruby_18 => tilde_gt_1_8_0,
+    :ruby_19 => tilde_gt_1_9_0,
+    :ruby_20 => tilde_gt_2_0_0,
+    :ruby_21 => tilde_gt_2_1_0,
+    :truffleruby => gt_eq_0,
+    :x64_mingw => gt_eq_0,
     :x64_mingw_20 => tilde_gt_2_0_0,
     :x64_mingw_21 => tilde_gt_2_1_0,
   }.freeze
 
   WINDOWS = { # :nodoc:
-    :mingw        => :only,
-    :mingw_18     => :only,
-    :mingw_19     => :only,
-    :mingw_20     => :only,
-    :mingw_21     => :only,
-    :mri          => :never,
-    :mri_18       => :never,
-    :mri_19       => :never,
-    :mri_20       => :never,
-    :mri_21       => :never,
-    :mswin        => :only,
-    :mswin_18     => :only,
-    :mswin_19     => :only,
-    :mswin_20     => :only,
-    :mswin_21     => :only,
-    :mswin64      => :only,
-    :mswin64_19   => :only,
-    :mswin64_20   => :only,
-    :mswin64_21   => :only,
-    :rbx          => :never,
-    :ruby         => :never,
-    :ruby_18      => :never,
-    :ruby_19      => :never,
-    :ruby_20      => :never,
-    :ruby_21      => :never,
-    :x64_mingw    => :only,
+    :mingw => :only,
+    :mingw_18 => :only,
+    :mingw_19 => :only,
+    :mingw_20 => :only,
+    :mingw_21 => :only,
+    :mri => :never,
+    :mri_18 => :never,
+    :mri_19 => :never,
+    :mri_20 => :never,
+    :mri_21 => :never,
+    :mswin => :only,
+    :mswin_18 => :only,
+    :mswin_19 => :only,
+    :mswin_20 => :only,
+    :mswin_21 => :only,
+    :mswin64 => :only,
+    :mswin64_19 => :only,
+    :mswin64_20 => :only,
+    :mswin64_21 => :only,
+    :rbx => :never,
+    :ruby => :never,
+    :ruby_18 => :never,
+    :ruby_19 => :never,
+    :ruby_20 => :never,
+    :ruby_21 => :never,
+    :x64_mingw => :only,
     :x64_mingw_20 => :only,
     :x64_mingw_21 => :only,
   }.freeze

data/lib/rubygems/requirement.rb

@@ -10,13 +10,13 @@ require_relative "version"
 
 class Gem::Requirement
   OPS = { #:nodoc:
-    "="  =>  lambda {|v, r| v == r },
-    "!=" =>  lambda {|v, r| v != r },
-    ">"  =>  lambda {|v, r| v >  r },
-    "<"  =>  lambda {|v, r| v <  r },
-    ">=" =>  lambda {|v, r| v >= r },
-    "<=" =>  lambda {|v, r| v <= r },
-    "~>" =>  lambda {|v, r| v >= r && v.release < r.bump },
+    "=" => lambda {|v, r| v == r },
+    "!=" => lambda {|v, r| v != r },
+    ">" => lambda {|v, r| v >  r },
+    "<" => lambda {|v, r| v <  r },
+    ">=" => lambda {|v, r| v >= r },
+    "<=" => lambda {|v, r| v <= r },
+    "~>" => lambda {|v, r| v >= r && v.release < r.bump },
   }.freeze
 
   SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:

data/lib/rubygems/resolver/installer_set.rb

@@ -66,7 +66,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
 
     found = found.select do |s|
       Gem::Source::SpecificFile === s.source ||
-        Gem::Platform.match(s.platform)
+        Gem::Platform.match_spec?(s)
     end
 
     found = found.sort_by do |s|

data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb

@@ -32,7 +32,7 @@ module Gem::Resolver::Molinillo
     #   all belong to the same graph.
     # @return [Array<Vertex>] The sorted vertices.
     def self.tsort(vertices)
-      TSort.tsort(
+      Gem::TSort.tsort(
         lambda { |b| vertices.each(&b) },
         lambda { |v, &b| (v.successors & vertices).each(&b) }
       )

data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb

@@ -107,36 +107,42 @@ module Gem::Resolver::Molinillo
         end
       end
 
-      conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
-        o << "\n" << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
-        if conflict.locked_requirement
-          o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
-          o << %(    #{printable_requirement.call(conflict.locked_requirement)}\n)
-          o << %(\n)
-        end
-        o << %(  In #{name_for_explicit_dependency_source}:\n)
-        trees = reduce_trees.call(conflict.requirement_trees)
-
-        o << trees.map do |tree|
-          t = ''.dup
-          depth = 2
-          tree.each do |req|
-            t << '  ' * depth << printable_requirement.call(req)
-            unless tree.last == req
-              if spec = conflict.activated_by_name[name_for(req)]
-                t << %( was resolved to #{version_for_spec.call(spec)}, which)
+      full_message_for_conflict = opts.delete(:full_message_for_conflict) do
+        proc do |name, conflict|
+          o = "\n".dup << incompatible_version_message_for_conflict.call(name, conflict) << "\n"
+          if conflict.locked_requirement
+            o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
+            o << %(    #{printable_requirement.call(conflict.locked_requirement)}\n)
+            o << %(\n)
+          end
+          o << %(  In #{name_for_explicit_dependency_source}:\n)
+          trees = reduce_trees.call(conflict.requirement_trees)
+
+          o << trees.map do |tree|
+            t = ''.dup
+            depth = 2
+            tree.each do |req|
+              t << '  ' * depth << printable_requirement.call(req)
+              unless tree.last == req
+                if spec = conflict.activated_by_name[name_for(req)]
+                  t << %( was resolved to #{version_for_spec.call(spec)}, which)
+                end
+                t << %( depends on)
               end
-              t << %( depends on)
+              t << %(\n)
+              depth += 1
             end
-            t << %(\n)
-            depth += 1
-          end
-          t
-        end.join("\n")
+            t
+          end.join("\n")
 
-        additional_message_for_conflict.call(o, name, conflict)
+          additional_message_for_conflict.call(o, name, conflict)
 
-        o
+          o
+        end
+      end
+
+      conflicts.sort.reduce(''.dup) do |o, (name, conflict)|
+        o << full_message_for_conflict.call(name, conflict)
       end.strip
     end
   end

data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb

@@ -2,5 +2,5 @@
 
 module Gem::Resolver::Molinillo
   # The version of Gem::Resolver::Molinillo.
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end