* lib/rubygems: Update to RubyGems 2.4.6 and HEAD(800f2e6).

  Fixed #1159, #1171, #1173 on rubygems/rubygems
* test/rubygems: ditto.

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

5 files changed, 56 insertions, 31 deletions

diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index 38e00bb1cc..ec5f3ad186 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -225,6 +225,28 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
+  def test_skip
+    a = util_spec 'a'
+    b = util_spec 'b'
+
+    install_gem a
+    install_gem b
+
+    @cmd.options[:args] = %w[a b]
+    @cmd.options[:skip] = 'a'
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+
+    assert_equal "Restoring gems to pristine condition...", out.shift
+    assert_equal "Skipped #{a.full_name}, it was given through options", out.shift
+    assert_equal "Restored #{b.full_name}", out.shift
+    assert_empty out, out.inspect
+  end
+
   def test_execute_many_multi_repo
     a = util_spec 'a'
     install_gem a
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
index 32c03bacf6..5d7f2d1296 100644
--- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb
+++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb
@@ -88,7 +88,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal %w[a], @gda.requires['a']
 
-    expected = { 'a' => nil }
+    expected = { 'a' => Gem::Requirement.default }
 
     assert_equal expected, @gda.dependencies
   end
@@ -112,7 +112,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal %w[git/a master], @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -125,7 +125,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[https://example@bitbucket.org/example/repository.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -138,7 +138,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[https://example@bitbucket.org/example/example.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -193,7 +193,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[git://github.com/example/repository.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -206,7 +206,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[git://github.com/example/example.git master],
                  @git_set.repositories['a']
 
-    expected = { 'a' => '!' }
+    expected = { 'a' => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -224,7 +224,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_empty @set.dependencies
 
-    expected = { 'a' => nil }
+    expected = { 'a' => Gem::Requirement.default }
 
     assert_equal expected, @gda.dependencies
   end
@@ -246,7 +246,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal "#{name}-#{version}", loaded.full_name
 
-    expected = { name => '!' }
+    expected = { name => Gem::Requirement.create('!') }
 
     assert_equal expected, @gda.dependencies
   end
@@ -405,7 +405,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep('a', '~> 1.0')], @set.dependencies
 
-    expected = { 'a' => ['~> 1.0'] }
+    expected = { 'a' => Gem::Requirement.create(['~> 1.0']) }
 
     assert_equal expected, @gda.dependencies
   end
@@ -415,7 +415,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     assert_equal [dep('b', '~> 1.0', '>= 1.0.2')], @set.dependencies
 
-    expected = { 'b' => ['~> 1.0', '>= 1.0.2'] }
+    expected = { 'b' => Gem::Requirement.create(['~> 1.0', '>= 1.0.2']) }
 
     assert_equal expected, @gda.dependencies
   end
@@ -485,7 +485,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[a], @gda.requires['a']
 
     expected = {
-      'a' => '!',
+      'a' => Gem::Requirement.create('!'),
       'b' => req('= 2'),
       'c' => req('= 3'),
     }
diff --git a/test/rubygems/test_gem_request_set_lockfile.rb b/test/rubygems/test_gem_request_set_lockfile.rb
index f825a8b359..6d5b4de581 100644
--- a/test/rubygems/test_gem_request_set_lockfile.rb
+++ b/test/rubygems/test_gem_request_set_lockfile.rb
@@ -21,7 +21,10 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     @gem_deps_file = 'gem.deps.rb'
 
-    @lockfile = Gem::RequestSet::Lockfile.new @set, @gem_deps_file
+  end
+
+  def lockfile
+    Gem::RequestSet::Lockfile.build @set, @gem_deps_file
   end
 
   def write_lockfile lockfile
@@ -44,7 +47,7 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     out = []
 
-    @lockfile.add_DEPENDENCIES out
+    lockfile.add_DEPENDENCIES out
 
     expected = [
       'DEPENDENCIES',
@@ -62,7 +65,7 @@ class TestGemRequestSetLockfile < Gem::TestCase
       end
     end
 
-    dependencies = { 'a' => '~> 2.0' }
+    dependencies = { 'a' => Gem::Requirement.new('~> 2.0') }
 
     @set.gem 'a'
     @set.resolve
@@ -100,7 +103,7 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     out = []
 
-    @lockfile.add_GEM out, @lockfile.spec_groups
+    lockfile.add_GEM out, lockfile.spec_groups
 
     expected = [
       'GEM',
@@ -131,7 +134,7 @@ class TestGemRequestSetLockfile < Gem::TestCase
 
     out = []
 
-    @lockfile.add_PLATFORMS out
+    lockfile.add_PLATFORMS out
 
     expected = [
       'PLATFORMS',
@@ -144,11 +147,11 @@ class TestGemRequestSetLockfile < Gem::TestCase
   end
 
   def test_relative_path_from
-    path = @lockfile.relative_path_from '/foo', '/foo/bar'
+    path = lockfile.relative_path_from '/foo', '/foo/bar'
 
     assert_equal File.expand_path('/foo'), path
 
-    path = @lockfile.relative_path_from '/foo', '/foo'
+    path = lockfile.relative_path_from '/foo', '/foo'
 
     assert_equal '.', path
   end
@@ -173,7 +176,7 @@ DEPENDENCIES
   a
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_dependency
@@ -204,7 +207,7 @@ DEPENDENCIES
   c
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_dependency_non_default
@@ -232,7 +235,7 @@ DEPENDENCIES
   b
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_dependency_requirement
@@ -259,7 +262,7 @@ DEPENDENCIES
   b
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_path
@@ -282,7 +285,7 @@ DEPENDENCIES
   a!
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_path_absolute
@@ -305,7 +308,7 @@ DEPENDENCIES
   a!
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_platform
@@ -330,7 +333,7 @@ DEPENDENCIES
   a
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_gem_source
@@ -368,7 +371,7 @@ DEPENDENCIES
   b
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_to_s_git
@@ -435,11 +438,11 @@ DEPENDENCIES
   c!
     LOCKFILE
 
-    assert_equal expected, @lockfile.to_s
+    assert_equal expected, lockfile.to_s
   end
 
   def test_write
-    @lockfile.write
+    lockfile.write
 
     gem_deps_lock_file = "#{@gem_deps_file}.lock"
 
@@ -458,7 +461,7 @@ DEPENDENCIES
     end
 
     assert_raises Gem::UnsatisfiableDependencyError do
-      @lockfile.write
+      lockfile.write
     end
 
     assert_path_exists gem_deps_lock_file
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 020cfb2ae6..27650837be 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -2413,8 +2413,6 @@ duplicate dependency on b (>= 1.2.3), (~> 1.2) use:
         @a1.validate
       end
 
-      assert_match "#{w}:  no description specified\n", @ui.error, "error"
-
       @ui = Gem::MockGemUi.new
       @a1.summary = "this is my summary"
       @a1.description = @a1.summary
diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb
index e5cfc41e61..90f81fcd51 100644
--- a/test/rubygems/test_gem_text.rb
+++ b/test/rubygems/test_gem_text.rb
@@ -64,6 +64,8 @@ Without the wrapping, the text might not look good in the RSS feed.
   def test_levenshtein_distance_remove
     assert_equal 3, levenshtein_distance("zentest", "zentestxxx")
     assert_equal 3, levenshtein_distance("zentestxxx", "zentest")
+    assert_equal 13, levenshtein_distance("cat", "thundercatsarego")
+    assert_equal 13, levenshtein_distance("thundercatsarego", "cat")
   end
 
   def test_levenshtein_distance_replace