rubygems-update 3.4.21 → 3.5.0

data/lib/rubygems/request_set/gem_dependency_api.rb

@@ -33,22 +33,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"
@@ -57,39 +57,39 @@ 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,
-    :x64_mingw_20 => x64_mingw,
-    :x64_mingw_21 => 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
 
   gt_eq_0        = Gem::Requirement.new ">= 0"
@@ -99,70 +99,70 @@ 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,
-    :x64_mingw_20 => tilde_gt_2_0_0,
-    :x64_mingw_21 => tilde_gt_2_1_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,
-    :x64_mingw_20 => :only,
-    :x64_mingw_21 => :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
 
   ##
@@ -262,7 +262,7 @@ class Gem::RequestSet::GemDependencyAPI
       raise ArgumentError, "no gemspecs found at #{Dir.pwd}"
     else
       raise ArgumentError,
-        "found multiple gemspecs at #{Dir.pwd}, " +
+        "found multiple gemspecs at #{Dir.pwd}, " \
         "use the name: option to specify the one you want"
     end
   end
@@ -280,7 +280,7 @@ class Gem::RequestSet::GemDependencyAPI
   # Loads the gem dependency file and returns self.
 
   def load
-    instance_eval File.read(@path).tap(&Gem::UNTAINT), @path, 1
+    instance_eval File.read(@path), @path, 1
 
     self
   end
@@ -533,8 +533,8 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # platform matches the current platform.
 
   def gem_platforms(name, options) # :nodoc:
-    platform_names = Array(options.delete :platform)
-    platform_names.concat Array(options.delete :platforms)
+    platform_names = Array(options.delete(:platform))
+    platform_names.concat Array(options.delete(:platforms))
     platform_names.concat @current_platforms if @current_platforms
 
     return true if platform_names.empty?
@@ -593,7 +593,6 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
     @current_repository = repository
 
     yield
-
   ensure
     @current_repository = nil
   end
@@ -685,7 +684,6 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
     @current_groups = groups
 
     yield
-
   ensure
     @current_groups = nil
   end
@@ -760,7 +758,6 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
     @current_platforms = platforms
 
     yield
-
   ensure
     @current_platforms = nil
   end
@@ -771,7 +768,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
   # Block form for restricting gems to a particular set of platforms.  See
   # #platform.
 
-  alias :platforms :platform
+  alias_method :platforms, :platform
 
   ##
   # :category: Gem Dependencies DSL
@@ -793,15 +790,15 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
 
     return true if @installing
 
-    unless RUBY_VERSION == version
-      message = "Your Ruby version is #{RUBY_VERSION}, " +
+    unless version == RUBY_VERSION
+      message = "Your Ruby version is #{RUBY_VERSION}, " \
                 "but your #{gem_deps_file} requires #{version}"
 
       raise Gem::RubyVersionMismatch, message
     end
 
     if engine && engine != Gem.ruby_engine
-      message = "Your Ruby engine is #{Gem.ruby_engine}, " +
+      message = "Your Ruby engine is #{Gem.ruby_engine}, " \
                 "but your #{gem_deps_file} requires #{engine}"
 
       raise Gem::RubyVersionMismatch, message
@@ -810,14 +807,14 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
     if engine_version
       if engine_version != RUBY_ENGINE_VERSION
         message =
-          "Your Ruby engine version is #{Gem.ruby_engine} #{RUBY_ENGINE_VERSION}, " +
+          "Your Ruby engine version is #{Gem.ruby_engine} #{RUBY_ENGINE_VERSION}, " \
           "but your #{gem_deps_file} requires #{engine} #{engine_version}"
 
         raise Gem::RubyVersionMismatch, message
       end
     end
 
-    return true
+    true
   end
 
   ##

data/lib/rubygems/request_set/lockfile/parser.rb

@@ -48,7 +48,7 @@ class Gem::RequestSet::Lockfile::Parser
     if expected_types && !Array(expected_types).include?(token.type)
       unget token
 
-      message = "unexpected token [#{token.type.inspect}, #{token.value.inspect}], " +
+      message = "unexpected token [#{token.type.inspect}, #{token.value.inspect}], " \
                 "expected #{expected_types.inspect}"
 
       raise Gem::RequestSet::Lockfile::ParseError.new message, token.column, token.line, @filename
@@ -57,8 +57,8 @@ class Gem::RequestSet::Lockfile::Parser
     if expected_value && expected_value != token.value
       unget token
 
-      message = "unexpected token [#{token.type.inspect}, #{token.value.inspect}], " +
-                "expected [#{expected_types.inspect}, " +
+      message = "unexpected token [#{token.type.inspect}, #{token.value.inspect}], " \
+                "expected [#{expected_types.inspect}, " \
                 "#{expected_value.inspect}]"
 
       raise Gem::RequestSet::Lockfile::ParseError.new message, token.column, token.line, @filename
@@ -68,7 +68,7 @@ class Gem::RequestSet::Lockfile::Parser
   end
 
   def parse_DEPENDENCIES # :nodoc:
-    while !@tokens.empty? && :text == peek.type do
+    while !@tokens.empty? && peek.type == :text do
       token = get :text
 
       requirements = []
@@ -111,7 +111,7 @@ class Gem::RequestSet::Lockfile::Parser
   def parse_GEM # :nodoc:
     sources = []
 
-    while [:entry, "remote"] == peek.first(2) do
+    while peek.first(2) == [:entry, "remote"] do
       get :entry, "remote"
       data = get(:text).value
       skip :newline
@@ -128,7 +128,7 @@ class Gem::RequestSet::Lockfile::Parser
     set = Gem::Resolver::LockSet.new sources
     last_specs = nil
 
-    while !@tokens.empty? && :text == peek.type do
+    while !@tokens.empty? && peek.type == :text do
       token = get :text
       name = token.value
       column = token.column
@@ -200,7 +200,7 @@ class Gem::RequestSet::Lockfile::Parser
 
     last_spec = nil
 
-    while !@tokens.empty? && :text == peek.type do
+    while !@tokens.empty? && peek.type == :text do
       token = get :text
       name = token.value
       column = token.column
@@ -247,7 +247,7 @@ class Gem::RequestSet::Lockfile::Parser
     set = Gem::Resolver::VendorSet.new
     last_spec = nil
 
-    while !@tokens.empty? && :text == peek.first do
+    while !@tokens.empty? && peek.first == :text do
       token = get :text
       name = token.value
       column = token.column
@@ -282,7 +282,7 @@ class Gem::RequestSet::Lockfile::Parser
   end
 
   def parse_PLATFORMS # :nodoc:
-    while !@tokens.empty? && :text == peek.first do
+    while !@tokens.empty? && peek.first == :text do
       name = get(:text).value
 
       @platforms << name

data/lib/rubygems/request_set/lockfile/tokenizer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#) frozen_string_literal: true
+# ) frozen_string_literal: true
 require_relative "parser"
 
 class Gem::RequestSet::Lockfile::Tokenizer
@@ -50,7 +50,7 @@ class Gem::RequestSet::Lockfile::Tokenizer
   def next_token
     @tokens.shift
   end
-  alias :shift :next_token
+  alias_method :shift, :next_token
 
   def peek
     @tokens.first || EOF
@@ -75,13 +75,14 @@ class Gem::RequestSet::Lockfile::Tokenizer
       end
 
       @tokens <<
-        case
-        when s.scan(/\r?\n/) then
+        if s.scan(/\r?\n/)
+
           token = Token.new(:newline, nil, *token_pos(pos))
           @line_pos = s.pos
           @line += 1
           token
-        when s.scan(/[A-Z]+/) then
+        elsif s.scan(/[A-Z]+/)
+
           if leading_whitespace
             text = s.matched
             text += s.scan(/[^\s)]*/).to_s # in case of no match
@@ -89,20 +90,27 @@ class Gem::RequestSet::Lockfile::Tokenizer
           else
             Token.new(:section, s.matched, *token_pos(pos))
           end
-        when s.scan(/([a-z]+):\s/) then
+        elsif s.scan(/([a-z]+):\s/)
+
           s.pos -= 1 # rewind for possible newline
           Token.new(:entry, s[1], *token_pos(pos))
-        when s.scan(/\(/) then
+        elsif s.scan(/\(/)
+
           Token.new(:l_paren, nil, *token_pos(pos))
-        when s.scan(/\)/) then
+        elsif s.scan(/\)/)
+
           Token.new(:r_paren, nil, *token_pos(pos))
-        when s.scan(/<=|>=|=|~>|<|>|!=/) then
+        elsif s.scan(/<=|>=|=|~>|<|>|!=/)
+
           Token.new(:requirement, s.matched, *token_pos(pos))
-        when s.scan(/,/) then
+        elsif s.scan(/,/)
+
           Token.new(:comma, nil, *token_pos(pos))
-        when s.scan(/!/) then
+        elsif s.scan(/!/)
+
           Token.new(:bang, nil, *token_pos(pos))
-        when s.scan(/[^\s),!]*/) then
+        elsif s.scan(/[^\s),!]*/)
+
           Token.new(:text, s.matched, *token_pos(pos))
         else
           raise "BUG: can't create token for: #{s.string[s.pos..-1].inspect}"

data/lib/rubygems/request_set/lockfile.rb

@@ -76,18 +76,13 @@ class Gem::RequestSet::Lockfile
     @dependencies  = dependencies
     @gem_deps_file = File.expand_path(gem_deps_file)
     @gem_deps_dir  = File.dirname(@gem_deps_file)
-
-    if RUBY_VERSION < "2.7"
-      @gem_deps_file.untaint unless gem_deps_file.tainted?
-    end
-
     @platforms = []
   end
 
   def add_DEPENDENCIES(out) # :nodoc:
     out << "DEPENDENCIES"
 
-    out.concat @dependencies.sort_by {|name,| name }.map {|name, requirement|
+    out.concat @dependencies.sort.map {|name, requirement|
       "  #{name}#{requirement.for_lockfile}"
     }
 
@@ -106,10 +101,10 @@ class Gem::RequestSet::Lockfile
       out << "  remote: #{group}"
       out << "  specs:"
 
-      requests.sort_by {|request| request.name }.each do |request|
+      requests.sort_by(&:name).each do |request|
         next if request.spec.name == "bundler"
         platform = "-#{request.spec.platform}" unless
-          Gem::Platform::RUBY == request.spec.platform
+          request.spec.platform == Gem::Platform::RUBY
 
         out << "    #{request.name} (#{request.version}#{platform})"
 
@@ -138,10 +133,10 @@ class Gem::RequestSet::Lockfile
       out << "  revision: #{revision}"
       out << "  specs:"
 
-      requests.sort_by {|request| request.name }.each do |request|
+      requests.sort_by(&:name).each do |request|
         out << "    #{request.name} (#{request.version})"
 
-        dependencies = request.spec.dependencies.sort_by {|dep| dep.name }
+        dependencies = request.spec.dependencies.sort_by(&:name)
         dependencies.each do |dep|
           out << "      #{dep.name}#{dep.requirement.for_lockfile}"
         end
@@ -185,7 +180,7 @@ class Gem::RequestSet::Lockfile
 
     platforms = requests.map {|request| request.spec.platform }.uniq
 
-    platforms = platforms.sort_by {|platform| platform.to_s }
+    platforms = platforms.sort_by(&:to_s)
 
     platforms.each do |platform|
       out << "  #{platform}"

data/lib/rubygems/request_set.rb

@@ -160,7 +160,7 @@ class Gem::RequestSet
     end
 
     # Create N threads in a pool, have them download all the gems
-    threads = Gem.configuration.concurrent_downloads.times.map do
+    threads = Array.new(Gem.configuration.concurrent_downloads) do
       # When a thread pops this item, it knows to stop running. The symbol
       # is queued here so that there will be one symbol per thread.
       download_queue << :stop
@@ -324,7 +324,7 @@ class Gem::RequestSet
 
     @git_set.root_dir = @install_dir
 
-    lock_file = "#{File.expand_path(path)}.lock".dup.tap(&Gem::UNTAINT)
+    lock_file = "#{File.expand_path(path)}.lock"
     begin
       tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file lock_file
       parser = tokenizer.make_parser self, []
@@ -376,7 +376,7 @@ class Gem::RequestSet
       q.text "sets:"
 
       q.breakable
-      q.pp @sets.map {|set| set.class }
+      q.pp @sets.map(&:class)
     end
   end
 
@@ -430,7 +430,7 @@ class Gem::RequestSet
   end
 
   def specs
-    @specs ||= @requests.map {|r| r.full_spec }
+    @specs ||= @requests.map(&:full_spec)
   end
 
   def specs_in(dir)
@@ -448,7 +448,7 @@ class Gem::RequestSet
       next if dep.type == :development && !@development
 
       match = @requests.find do |r|
-        dep.match? r.spec.name, r.spec.version, r.spec.is_a?(Gem::Resolver::InstalledSpecification) || @prerelease
+        dep.match?(r.spec.name, r.spec.version, r.spec.is_a?(Gem::Resolver::InstalledSpecification) || @prerelease)
       end
 
       unless match

data/lib/rubygems/requirement.rb

@@ -10,7 +10,7 @@ require_relative "version"
 # together in RubyGems.
 
 class Gem::Requirement
-  OPS = { #:nodoc:
+  OPS = { # :nodoc:
     "=" => lambda {|v, r| v == r },
     "!=" => lambda {|v, r| v != r },
     ">" => lambda {|v, r| v >  r },
@@ -23,12 +23,12 @@ class Gem::Requirement
   SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
 
   quoted = OPS.keys.map {|k| Regexp.quote k }.join "|"
-  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*" # :nodoc:
+  PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*".freeze # :nodoc:
 
   ##
   # A regular expression that matches a requirement
 
-  PATTERN = /\A#{PATTERN_RAW}\z/.freeze
+  PATTERN = /\A#{PATTERN_RAW}\z/
 
   ##
   # The default requirement matches any non-prerelease version
@@ -120,7 +120,7 @@ class Gem::Requirement
   # An array of requirement pairs. The first element of the pair is
   # the op, and the second is the Gem::Version.
 
-  attr_reader :requirements #:nodoc:
+  attr_reader :requirements # :nodoc:
 
   ##
   # Constructs a requirement from +requirements+. Requirements can be
@@ -156,7 +156,7 @@ class Gem::Requirement
   # Formats this requirement for use in a Gem::RequestSet::Lockfile.
 
   def for_lockfile # :nodoc:
-    return if [DefaultRequirement] == @requirements
+    return if @requirements == [DefaultRequirement]
 
     list = requirements.sort_by do |_, version|
       version
@@ -245,8 +245,8 @@ class Gem::Requirement
     requirements.all? {|op, rv| OPS[op].call version, rv }
   end
 
-  alias :=== :satisfied_by?
-  alias :=~ :satisfied_by?
+  alias_method :===, :satisfied_by?
+  alias_method :=~, :satisfied_by?
 
   ##
   # True if the requirement will not always match the latest version.

data/lib/rubygems/resolv/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.