rubygems-update 3.6.9 → 3.7.1

data/lib/rubygems/vendor/resolv/lib/resolv.rb

@@ -33,7 +33,7 @@ require_relative '../../../vendored_securerandom'
 
 class Gem::Resolv
 
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 
   ##
   # Looks up the first IP address for +name+.
@@ -173,13 +173,16 @@ class Gem::Resolv
 
   class ResolvTimeout < Gem::Timeout::Error; end
 
+  WINDOWS = /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM || ::RbConfig::CONFIG['host_os'] =~ /mswin/
+  private_constant :WINDOWS
+
   ##
   # Gem::Resolv::Hosts is a hostname resolver that uses the system hosts file.
 
   class Hosts
-    if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM and
+    if WINDOWS
       begin
-        require 'win32/resolv'
+        require 'win32/resolv' unless defined?(Win32::Resolv)
         DefaultFileName = Win32::Resolv.get_hosts_path || IO::NULL
       rescue LoadError
       end
@@ -659,8 +662,20 @@ class Gem::Resolv
       }
     end
 
-    def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
-      begin
+    case RUBY_PLATFORM
+    when *[
+      # https://www.rfc-editor.org/rfc/rfc6056.txt
+      # Appendix A. Survey of the Algorithms in Use by Some Popular Implementations
+      /freebsd/, /linux/, /netbsd/, /openbsd/, /solaris/,
+      /darwin/, # the same as FreeBSD
+    ] then
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        udpsock.bind(bind_host, 0)
+      end
+    else
+      # Sequential port assignment
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        # Ephemeral port number range recommended by RFC 6056
         port = random(1024..65535)
         udpsock.bind(bind_host, port)
       rescue Errno::EADDRINUSE, # POSIX
@@ -983,13 +998,13 @@ class Gem::Resolv
             next unless keyword
             case keyword
             when 'nameserver'
-              nameserver.concat(args)
+              nameserver.concat(args.each(&:freeze))
             when 'domain'
               next if args.empty?
-              search = [args[0]]
+              search = [args[0].freeze]
             when 'search'
               next if args.empty?
-              search = args
+              search = args.each(&:freeze)
             when 'options'
               args.each {|arg|
                 case arg
@@ -1000,22 +1015,22 @@ class Gem::Resolv
             end
           }
         }
-        return { :nameserver => nameserver, :search => search, :ndots => ndots }
+        return { :nameserver => nameserver.freeze, :search => search.freeze, :ndots => ndots.freeze }.freeze
       end
 
       def Config.default_config_hash(filename="/etc/resolv.conf")
         if File.exist? filename
-          config_hash = Config.parse_resolv_conf(filename)
+          Config.parse_resolv_conf(filename)
+        elsif WINDOWS
+          require 'win32/resolv' unless defined?(Win32::Resolv)
+          search, nameserver = Win32::Resolv.get_resolv_info
+          config_hash = {}
+          config_hash[:nameserver] = nameserver if nameserver
+          config_hash[:search] = [search].flatten if search
+          config_hash
         else
-          if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
-            require 'win32/resolv'
-            search, nameserver = Win32::Resolv.get_resolv_info
-            config_hash = {}
-            config_hash[:nameserver] = nameserver if nameserver
-            config_hash[:search] = [search].flatten if search
-          end
+          {}
         end
-        config_hash || {}
       end
 
       def lazy_initialize
@@ -1664,6 +1679,7 @@ class Gem::Resolv
           prev_index = @index
           save_index = nil
           d = []
+          size = -1
           while true
             raise DecodeError.new("limit exceeded") if @limit <= @index
             case @data.getbyte(@index)
@@ -1684,7 +1700,10 @@ class Gem::Resolv
               end
               @index = idx
             else
-              d << self.get_label
+              l = self.get_label
+              d << l
+              size += 1 + l.string.bytesize
+              raise DecodeError.new("name label data exceed 255 octets") if size > 255
             end
           end
         end
@@ -2110,7 +2129,14 @@ class Gem::Resolv
 
       attr_reader :ttl
 
-      ClassHash = {} # :nodoc:
+      ClassHash = Module.new do
+        module_function
+
+        def []=(type_class_value, klass)
+          type_value, class_value = type_class_value
+          Resource.const_set(:"Type#{type_value}_Class#{class_value}", klass)
+        end
+      end
 
       def encode_rdata(msg) # :nodoc:
         raise NotImplementedError.new
@@ -2148,7 +2174,9 @@ class Gem::Resolv
       end
 
       def self.get_class(type_value, class_value) # :nodoc:
-        return ClassHash[[type_value, class_value]] ||
+        cache = :"Type#{type_value}_Class#{class_value}"
+
+        return (const_defined?(cache) && const_get(cache)) ||
                Generic.create(type_value, class_value)
       end
 
@@ -2577,7 +2605,7 @@ class Gem::Resolv
         end
 
         ##
-        # Flags for this proprty:
+        # Flags for this property:
         # - Bit 0 : 0 = not critical, 1 = critical
 
         attr_reader :flags

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.6.9"
+  VERSION = "3.7.1"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -249,6 +249,16 @@ module Gem
     find_spec_for_exe(name, exec_name, requirements).bin_file exec_name
   end
 
+  def self.find_and_activate_spec_for_exe(name, exec_name, requirements)
+    spec = find_spec_for_exe name, exec_name, requirements
+    Gem::LOADED_SPECS_MUTEX.synchronize do
+      spec.activate
+      finish_resolve
+    end
+    spec
+  end
+  private_class_method :find_and_activate_spec_for_exe
+
   def self.find_spec_for_exe(name, exec_name, requirements)
     raise ArgumentError, "you must supply exec_name" unless exec_name
 
@@ -273,6 +283,42 @@ module Gem
   end
   private_class_method :find_spec_for_exe
 
+  ##
+  # Find and load the full path to the executable for gem +name+.  If the
+  # +exec_name+ is not given, an exception will be raised, otherwise the
+  # specified executable's path is returned.  +requirements+ allows
+  # you to specify specific gem versions.
+  #
+  # A side effect of this method is that it will activate the gem that
+  # contains the executable.
+  #
+  # This method should *only* be used in bin stub files.
+
+  def self.activate_and_load_bin_path(name, exec_name = nil, *requirements)
+    spec = find_and_activate_spec_for_exe name, exec_name, requirements
+
+    if spec.name == "bundler"
+      # Old versions of Bundler need a workaround to support nested `bundle
+      # exec` invocations by overriding `Gem.activate_bin_path`. However,
+      # RubyGems now uses this new `Gem.activate_and_load_bin_path` helper in
+      # binstubs, which is of course not overridden in Bundler since it didn't
+      # exist at the time. So, include the override here to workaround that.
+      load ENV["BUNDLE_BIN_PATH"] if ENV["BUNDLE_BIN_PATH"] && spec.version <= "2.5.22"
+
+      # Make sure there's no version of Bundler in `$LOAD_PATH` that's different
+      # from the version we just activated. If that was the case (it happens
+      # when testing Bundler from ruby/ruby), we would load Bundler extensions
+      # to RubyGems from the copy in `$LOAD_PATH` but then load the binstub from
+      # an installed copy, causing those copies to be mixed and yet more
+      # redefinition warnings.
+      #
+      require_path = $LOAD_PATH.resolve_feature_path("bundler").last.delete_suffix("/bundler.rb")
+      Gem.load_bundler_extensions(spec.version) if spec.full_require_paths.include?(require_path)
+    end
+
+    load spec.bin_file(exec_name)
+  end
+
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
   # is not given, an exception will be raised, otherwise the
@@ -285,12 +331,7 @@ module Gem
   # This method should *only* be used in bin stub files.
 
   def self.activate_bin_path(name, exec_name = nil, *requirements) # :nodoc:
-    spec = find_spec_for_exe name, exec_name, requirements
-    Gem::LOADED_SPECS_MUTEX.synchronize do
-      spec.activate
-      finish_resolve
-    end
-    spec.bin_file exec_name
+    find_and_activate_spec_for_exe(name, exec_name, requirements).bin_file exec_name
   end
 
   ##
@@ -636,6 +677,30 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
     @safe_marshal_loaded = true
   end
 
+  ##
+  # Load Bundler extensions to RubyGems, making sure to avoid redefinition
+  # warnings in platform constants
+
+  def self.load_bundler_extensions(version)
+    return unless version <= "2.6.9"
+
+    previous_platforms = {}
+
+    platform_const_list = ["JAVA", "MSWIN", "MSWIN64", "MINGW", "X64_MINGW_LEGACY", "X64_MINGW", "UNIVERSAL_MINGW", "WINDOWS", "X64_LINUX", "X64_LINUX_MUSL"]
+
+    platform_const_list.each do |platform|
+      previous_platforms[platform] = Gem::Platform.const_get(platform)
+      Gem::Platform.send(:remove_const, platform)
+    end
+
+    require "bundler/rubygems_ext"
+
+    platform_const_list.each do |platform|
+      Gem::Platform.send(:remove_const, platform) if Gem::Platform.const_defined?(platform)
+      Gem::Platform.const_set(platform, previous_platforms[platform])
+    end
+  end
+
   ##
   # The file name and line number of the caller of the caller of this method.
   #

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.6.9"
+  s.version = "3.7.1"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
     "hide_lib_for_update/note.txt", *Dir["bundler/lib/bundler/man/*.1", base: __dir__]
   ]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 
   s.specification_version = 4

data/setup.rb

@@ -7,7 +7,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-abort "RubyGems only supports Ruby 3.1 or higher" if RUBY_VERSION < "3.1.0"
+abort "RubyGems only supports Ruby 3.2 or higher" if RUBY_VERSION < "3.2.0"
 
 # Make sure rubygems isn't already loaded.
 if ENV["RUBYOPT"] || defined? Gem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.6.9
+  version: 3.7.1
 platform: ruby
 authors:
 - Jim Weirich
@@ -85,10 +85,12 @@ extra_rdoc_files:
 files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - LICENSE.txt
 - MIT.txt
 - Manifest.txt
 - README.md
+- SECURITY.md
 - bundler/CHANGELOG.md
 - bundler/LICENSE.md
 - bundler/README.md
@@ -160,7 +162,6 @@ files:
 - bundler/lib/bundler/force_platform.rb
 - bundler/lib/bundler/friendly_errors.rb
 - bundler/lib/bundler/gem_helper.rb
-- bundler/lib/bundler/gem_helpers.rb
 - bundler/lib/bundler/gem_tasks.rb
 - bundler/lib/bundler/gem_version_promoter.rb
 - bundler/lib/bundler/graph.rb
@@ -298,7 +299,6 @@ files:
 - bundler/lib/bundler/stub_specification.rb
 - bundler/lib/bundler/templates/.document
 - bundler/lib/bundler/templates/Executable
-- bundler/lib/bundler/templates/Executable.bundler
 - bundler/lib/bundler/templates/Executable.standalone
 - bundler/lib/bundler/templates/Gemfile
 - bundler/lib/bundler/templates/newgem/CHANGELOG.md.tt
@@ -341,22 +341,18 @@ files:
 - bundler/lib/bundler/uri_credentials_filter.rb
 - bundler/lib/bundler/uri_normalizer.rb
 - bundler/lib/bundler/vendor/.document
-- bundler/lib/bundler/vendor/connection_pool/.document
 - bundler/lib/bundler/vendor/connection_pool/LICENSE
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb
-- bundler/lib/bundler/vendor/fileutils/.document
 - bundler/lib/bundler/vendor/fileutils/COPYING
 - bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
-- bundler/lib/bundler/vendor/net-http-persistent/.document
 - bundler/lib/bundler/vendor/net-http-persistent/README.rdoc
 - bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
 - bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb
 - bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb
 - bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb
-- bundler/lib/bundler/vendor/pub_grub/.document
 - bundler/lib/bundler/vendor/pub_grub/LICENSE.txt
 - bundler/lib/bundler/vendor/pub_grub/lib/pub_grub.rb
 - bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb
@@ -375,10 +371,8 @@ files:
 - bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb
 - bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb
 - bundler/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb
-- bundler/lib/bundler/vendor/securerandom/.document
 - bundler/lib/bundler/vendor/securerandom/COPYING
 - bundler/lib/bundler/vendor/securerandom/lib/securerandom.rb
-- bundler/lib/bundler/vendor/thor/.document
 - bundler/lib/bundler/vendor/thor/LICENSE.md
 - bundler/lib/bundler/vendor/thor/lib/thor.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/actions.rb
@@ -415,10 +409,8 @@ files:
 - bundler/lib/bundler/vendor/thor/lib/thor/shell/wrapped_printer.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/version.rb
-- bundler/lib/bundler/vendor/tsort/.document
 - bundler/lib/bundler/vendor/tsort/LICENSE.txt
 - bundler/lib/bundler/vendor/tsort/lib/tsort.rb
-- bundler/lib/bundler/vendor/uri/.document
 - bundler/lib/bundler/vendor/uri/COPYING
 - bundler/lib/bundler/vendor/uri/lib/uri.rb
 - bundler/lib/bundler/vendor/uri/lib/uri/common.rb
@@ -618,8 +610,7 @@ files:
 - lib/rubygems/specification_policy.rb
 - lib/rubygems/specification_record.rb
 - lib/rubygems/ssl_certs/.document
-- lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
-- lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
+- lib/rubygems/ssl_certs/rubygems.org/GlobalSign.pem
 - lib/rubygems/stub_specification.rb
 - lib/rubygems/target_rbconfig.rb
 - lib/rubygems/text.rb
@@ -633,7 +624,7 @@ files:
 - lib/rubygems/util/licenses.rb
 - lib/rubygems/util/list.rb
 - lib/rubygems/validator.rb
-- lib/rubygems/vendor/molinillo/.document
+- lib/rubygems/vendor/.document
 - lib/rubygems/vendor/molinillo/LICENSE
 - lib/rubygems/vendor/molinillo/lib/molinillo.rb
 - lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
@@ -655,7 +646,6 @@ files:
 - lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
 - lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
 - lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
-- lib/rubygems/vendor/net-http/.document
 - lib/rubygems/vendor/net-http/COPYING
 - lib/rubygems/vendor/net-http/lib/net/http.rb
 - lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
@@ -668,10 +658,8 @@ files:
 - lib/rubygems/vendor/net-http/lib/net/http/responses.rb
 - lib/rubygems/vendor/net-http/lib/net/http/status.rb
 - lib/rubygems/vendor/net-http/lib/net/https.rb
-- lib/rubygems/vendor/net-protocol/.document
 - lib/rubygems/vendor/net-protocol/LICENSE.txt
 - lib/rubygems/vendor/net-protocol/lib/net/protocol.rb
-- lib/rubygems/vendor/optparse/.document
 - lib/rubygems/vendor/optparse/COPYING
 - lib/rubygems/vendor/optparse/lib/optionparser.rb
 - lib/rubygems/vendor/optparse/lib/optparse.rb
@@ -682,19 +670,14 @@ files:
 - lib/rubygems/vendor/optparse/lib/optparse/time.rb
 - lib/rubygems/vendor/optparse/lib/optparse/uri.rb
 - lib/rubygems/vendor/optparse/lib/optparse/version.rb
-- lib/rubygems/vendor/resolv/.document
 - lib/rubygems/vendor/resolv/COPYING
 - lib/rubygems/vendor/resolv/lib/resolv.rb
-- lib/rubygems/vendor/securerandom/.document
 - lib/rubygems/vendor/securerandom/COPYING
 - lib/rubygems/vendor/securerandom/lib/securerandom.rb
-- lib/rubygems/vendor/timeout/.document
 - lib/rubygems/vendor/timeout/COPYING
 - lib/rubygems/vendor/timeout/lib/timeout.rb
-- lib/rubygems/vendor/tsort/.document
 - lib/rubygems/vendor/tsort/LICENSE.txt
 - lib/rubygems/vendor/tsort/lib/tsort.rb
-- lib/rubygems/vendor/uri/.document
 - lib/rubygems/vendor/uri/COPYING
 - lib/rubygems/vendor/uri/lib/uri.rb
 - lib/rubygems/vendor/uri/lib/uri/common.rb
@@ -741,14 +724,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded
   and installed by `gem update --system`, so that the `gem` CLI can update itself.

data/bundler/lib/bundler/gem_helpers.rb

@@ -1,144 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  module GemHelpers
-    GENERIC_CACHE = { Gem::Platform::RUBY => Gem::Platform::RUBY } # rubocop:disable Style/MutableConstant
-    GENERICS = [
-      Gem::Platform::JAVA,
-      *Gem::Platform::WINDOWS,
-    ].freeze
-
-    def generic(p)
-      GENERIC_CACHE[p] ||= begin
-        found = GENERICS.find do |match|
-          p === match
-        end
-        found || Gem::Platform::RUBY
-      end
-    end
-    module_function :generic
-
-    def generic_local_platform
-      generic(local_platform)
-    end
-    module_function :generic_local_platform
-
-    def local_platform
-      Bundler.local_platform
-    end
-    module_function :local_platform
-
-    def generic_local_platform_is_ruby?
-      generic_local_platform == Gem::Platform::RUBY
-    end
-    module_function :generic_local_platform_is_ruby?
-
-    def platform_specificity_match(spec_platform, user_platform)
-      spec_platform = Gem::Platform.new(spec_platform)
-
-      PlatformMatch.specificity_score(spec_platform, user_platform)
-    end
-    module_function :platform_specificity_match
-
-    def select_all_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
-      matching = if force_ruby
-        specs.select {|spec| spec.match_platform(Gem::Platform::RUBY) && spec.force_ruby_platform! }
-      else
-        specs.select {|spec| spec.match_platform(platform) }
-      end
-
-      if prefer_locked
-        locked_originally = matching.select {|spec| spec.is_a?(LazySpecification) }
-        return locked_originally if locked_originally.any?
-      end
-
-      matching
-    end
-    module_function :select_all_platform_match
-
-    def select_best_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
-      matching = select_all_platform_match(specs, platform, force_ruby: force_ruby, prefer_locked: prefer_locked)
-
-      sort_and_filter_best_platform_match(matching, platform)
-    end
-    module_function :select_best_platform_match
-
-    def select_best_local_platform_match(specs, force_ruby: false)
-      matching = select_all_platform_match(specs, local_platform, force_ruby: force_ruby).filter_map(&:materialized_for_installation)
-
-      sort_best_platform_match(matching, local_platform)
-    end
-    module_function :select_best_local_platform_match
-
-    def sort_and_filter_best_platform_match(matching, platform)
-      return matching if matching.one?
-
-      exact = matching.select {|spec| spec.platform == platform }
-      return exact if exact.any?
-
-      sorted_matching = sort_best_platform_match(matching, platform)
-      exemplary_spec = sorted_matching.first
-
-      sorted_matching.take_while {|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
-    end
-    module_function :sort_and_filter_best_platform_match
-
-    def sort_best_platform_match(matching, platform)
-      matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
-    end
-    module_function :sort_best_platform_match
-
-    class PlatformMatch
-      def self.specificity_score(spec_platform, user_platform)
-        return -1 if spec_platform == user_platform
-        return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
-
-        os_match(spec_platform, user_platform) +
-          cpu_match(spec_platform, user_platform) * 10 +
-          platform_version_match(spec_platform, user_platform) * 100
-      end
-
-      def self.os_match(spec_platform, user_platform)
-        if spec_platform.os == user_platform.os
-          0
-        else
-          1
-        end
-      end
-
-      def self.cpu_match(spec_platform, user_platform)
-        if spec_platform.cpu == user_platform.cpu
-          0
-        elsif spec_platform.cpu == "arm" && user_platform.cpu.to_s.start_with?("arm")
-          0
-        elsif spec_platform.cpu.nil? || spec_platform.cpu == "universal"
-          1
-        else
-          2
-        end
-      end
-
-      def self.platform_version_match(spec_platform, user_platform)
-        if spec_platform.version == user_platform.version
-          0
-        elsif spec_platform.version.nil?
-          1
-        else
-          2
-        end
-      end
-    end
-
-    def same_specificity(platform, spec, exemplary_spec)
-      platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
-    end
-    module_function :same_specificity
-
-    def same_deps(spec, exemplary_spec)
-      same_runtime_deps = spec.dependencies.sort == exemplary_spec.dependencies.sort
-      same_metadata_deps = spec.required_ruby_version == exemplary_spec.required_ruby_version && spec.required_rubygems_version == exemplary_spec.required_rubygems_version
-      same_runtime_deps && same_metadata_deps
-    end
-    module_function :same_deps
-  end
-end