rubygems-update 2.4.8 → 2.5.0

data/test/rubygems/test_gem_request.rb

@@ -16,7 +16,7 @@ class TestGemRequest < Gem::TestCase
   end
 
   def setup
-    @proxies = %w[http_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
+    @proxies = %w[http_proxy https_proxy HTTP_PROXY http_proxy_user HTTP_PROXY_USER http_proxy_pass HTTP_PROXY_PASS no_proxy NO_PROXY]
     @old_proxies = @proxies.map {|k| ENV[k] }
     @proxies.each {|k| ENV[k] = nil }
 

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -80,6 +80,15 @@ class TestGemRequestConnectionPool < Gem::TestCase
     assert_equal ['example', 80], net_http_args
   end
 
+  def test_net_http_args_ipv6
+    pools = Gem::Request::ConnectionPools.new nil, []
+
+    net_http_args = pools.send :net_http_args, URI('http://[::1]'), nil
+
+    expected_host = RUBY_VERSION >= "1.9.3" ? "::1" : "[::1]"
+    assert_equal [expected_host, 80], net_http_args
+  end
+
   def test_net_http_args_proxy
     pools = Gem::Request::ConnectionPools.new nil, []
 
@@ -109,7 +118,7 @@ class TestGemRequestConnectionPool < Gem::TestCase
     pool.checkout
 
     t1 = Thread.new {
-      timeout(1) do
+      Timeout.timeout(1) do
         pool.checkout
       end
     }

data/test/rubygems/test_gem_request_set.rb

@@ -141,10 +141,9 @@ Gems to install:
 
   def test_install_from_gemdeps_lockfile
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 1
-      fetcher.gem 'a', 2
-      fetcher.gem 'b', 1, 'a' => '>= 0'
-      fetcher.clear
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2
+      fetcher.download 'b', 1, 'a' => '>= 0'
     end
 
     rs = Gem::RequestSet.new
@@ -445,10 +444,8 @@ ruby "0"
     end
 
     spec_fetcher do |fetcher|
-      fetcher.gem "a", "1", "b" => "= 1"
-      fetcher.gem "b", "1"
-
-      fetcher.clear
+      fetcher.download "a", "1", "b" => "= 1"
+      fetcher.download "b", "1"
     end
 
     rs = Gem::RequestSet.new

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -338,13 +338,11 @@ DEPENDENCIES
 
   def test_to_s_gem_source
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
     end
 
     spec_fetcher 'http://other.example/' do |fetcher|
-      fetcher.spec 'b', 2
-      fetcher.clear
+      fetcher.download 'b', 2
     end
 
     Gem.sources << 'http://other.example/'

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -19,7 +19,7 @@ class TestGemRequestSetLockfileTokenizer < Gem::TestCase
 
     assert_equal :newline, tokenizer.next_token.first
 
-    assert_equal [:EOF], tokenizer.peek
+    assert_equal :EOF, tokenizer.peek.first
   end
 
   def test_skip

data/test/rubygems/test_gem_resolver.rb

@@ -95,24 +95,6 @@ class TestGemResolver < Gem::TestCase
     assert_same index_set, composed
   end
 
-  def test_handle_conflict
-    a1 = util_spec 'a', 1
-
-    r1 = Gem::Resolver::DependencyRequest.new dep('a', '= 1'), nil
-    r2 = Gem::Resolver::DependencyRequest.new dep('a', '= 2'), nil
-    r3 = Gem::Resolver::DependencyRequest.new dep('a', '= 3'), nil
-
-    existing = Gem::Resolver::ActivationRequest.new a1, r1, false
-
-    res = Gem::Resolver.new [a1]
-
-    res.handle_conflict r2, existing
-    res.handle_conflict r2, existing
-    res.handle_conflict r3, existing
-
-    assert_equal 2, res.conflicts.length
-  end
-
   def test_requests
     a1 = util_spec 'a', 1, 'b' => 2
 
@@ -122,11 +104,11 @@ class TestGemResolver < Gem::TestCase
 
     res = Gem::Resolver.new [a1]
 
-    reqs = Gem::Resolver::RequirementList.new
+    reqs = []
 
     res.requests a1, act, reqs
 
-    assert_equal ['b (= 2)'], reqs.to_a.map { |req| req.to_s }
+    assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
   end
 
   def test_requests_development
@@ -144,11 +126,11 @@ class TestGemResolver < Gem::TestCase
     res = Gem::Resolver.new [act]
     res.development = true
 
-    reqs = Gem::Resolver::RequirementList.new
+    reqs = []
 
     res.requests spec, act, reqs
 
-    assert_equal ['b (= 2)'], reqs.to_a.map { |req| req.to_s }
+    assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
 
     assert spec.instance_variable_defined? :@called
   end
@@ -163,7 +145,7 @@ class TestGemResolver < Gem::TestCase
     res = Gem::Resolver.new [a1]
     res.ignore_dependencies = true
 
-    reqs = Gem::Resolver::RequirementList.new
+    reqs = []
 
     res.requests a1, act, reqs
 
@@ -438,19 +420,19 @@ class TestGemResolver < Gem::TestCase
       r.resolve
     end
 
-    deps = [make_dep("c", "= 1"), make_dep("c", "= 2")]
+    deps = [make_dep("c", "= 2"), make_dep("c", "= 1")]
     assert_equal deps, e.conflicting_dependencies
 
     con = e.conflict
 
     act = con.activated
-    assert_equal "c-2", act.spec.full_name
+    assert_equal "c-1", act.spec.full_name
 
     parent = act.parent
-    assert_equal "b-1", parent.spec.full_name
+    assert_equal "a-1", parent.spec.full_name
 
     act = con.requester
-    assert_equal "a-1", act.spec.full_name
+    assert_equal "b-1", act.spec.full_name
   end
 
   def test_raises_when_a_gem_is_missing
@@ -538,11 +520,11 @@ class TestGemResolver < Gem::TestCase
     assert_equal req('>= 0'), dependency.requirement
 
     activated = e.conflict.activated
-    assert_equal 'c-1', activated.full_name
+    assert_equal 'c-2', activated.full_name
 
-    assert_equal dep('c', '= 1'), activated.request.dependency
+    assert_equal dep('c', '>= 2'), activated.request.dependency
 
-    assert_equal [dep('c', '>= 2'), dep('c', '= 1')],
+    assert_equal [dep('c', '= 1'), dep('c', '>= 2')],
                  e.conflict.conflicting_dependencies
   end
 
@@ -730,4 +712,3 @@ class TestGemResolver < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -1,4 +1,5 @@
 require 'rubygems/test_case'
+require 'rubygems/installer'
 
 class TestGemResolverGitSpecification < Gem::TestCase
 

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -4,9 +4,8 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
   def test_add_always_install
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2
     end
 
     util_gem 'a', 1
@@ -39,11 +38,10 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
   def test_add_always_install_platform
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 1
-      fetcher.spec 'a', 2 do |s|
+      fetcher.download 'a', 1
+      fetcher.download 'a', 2 do |s|
         s.platform = Gem::Platform.new 'x86-freebsd-9'
       end
-      fetcher.clear
     end
 
     set = Gem::Resolver::InstallerSet.new :both
@@ -139,8 +137,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
   def test_find_all_always_install
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
     end
 
     util_gem 'a', 1
@@ -156,9 +153,8 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
   def test_find_all_prerelease
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', '1'
-      fetcher.spec 'a', '1.a'
-      fetcher.clear
+      fetcher.download 'a', '1'
+      fetcher.download 'a', '1.a'
     end
 
     set = Gem::Resolver::InstallerSet.new :both

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -1,4 +1,5 @@
 require 'rubygems/test_case'
+require 'rubygems/installer'
 require 'rubygems/resolver'
 
 class TestGemResolverLockSpecification < Gem::TestCase
@@ -34,8 +35,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
   def test_install
     spec_fetcher do |fetcher|
-      fetcher.gem 'a', 2
-      fetcher.clear
+      fetcher.download 'a', 2
     end
 
     spec = @LS.new @set, 'a', v(2), @source, Gem::Platform::RUBY
@@ -85,6 +85,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
   def test_spec_loaded
     real_spec = util_spec 'a', 2
+    install_specs real_spec
     real_spec.activate
 
     version = v(2)

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -70,6 +70,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
     assert_path_exists @dest_dir
 
     mask = 040700 & (~File.umask)
+    mask |= 0200000 if /aix/ =~ RUBY_PLATFORM
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end
@@ -90,6 +91,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
     @trust_dir.verify
 
     mask = 040700 & (~File.umask)
+    mask |= 0200000 if /aix/ =~ RUBY_PLATFORM
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end

data/test/rubygems/test_gem_server.rb

@@ -7,6 +7,10 @@ class Gem::Server
 end
 
 class TestGemServer < Gem::TestCase
+  def process_based_port
+    0
+  end
+
   def setup
     super
 

data/test/rubygems/test_gem_specification.rb

@@ -1,8 +1,10 @@
+require 'benchmark'
 require 'rubygems/test_case'
 require 'pathname'
 require 'stringio'
 require 'rubygems/ext'
 require 'rubygems/specification'
+require 'rubygems/installer'
 
 class TestGemSpecification < Gem::TestCase
 
@@ -112,7 +114,7 @@ end
       c2 = new_spec "c", "2"
 
       Gem::Specification.reset
-      install_specs a1, b1, b2, c1, c2
+      install_specs c1, c2, b1, b2, a1
 
       a1.activate
       assert_equal %w(a-1), loaded_spec_names
@@ -125,6 +127,32 @@ end
     end
   end
 
+  def test_find_in_unresolved_tree_is_not_exponentiental
+    save_loaded_features do
+      num_of_pkg = 7
+      num_of_version_per_pkg = 3
+      packages = (0..num_of_pkg).map do |pkgi|
+        (0..num_of_version_per_pkg).map do |pkg_version|
+          deps = Hash[((pkgi + 1)..num_of_pkg).map { |deppkgi|
+            ["pkg#{deppkgi}", ">= 0"]
+          }]
+          new_spec "pkg#{pkgi}", pkg_version.to_s, deps
+        end
+      end
+      base = new_spec "pkg_base", "1", {"pkg0" => ">= 0"}
+
+      Gem::Specification.reset
+      install_specs(*packages.flatten.reverse)
+      install_specs base
+      base.activate
+
+      tms = Benchmark.measure {
+        assert_raises(LoadError) { require 'no_such_file_foo' }
+      }
+      assert_operator tms.total, :<=, 10
+    end
+  end
+
   def test_self_activate_ambiguous_indirect
     save_loaded_features do
       a1 = new_spec "a", "1", "b" => "> 0"
@@ -133,7 +161,7 @@ end
       c1 = new_spec "c", "1", nil, "lib/d.rb"
       c2 = new_spec "c", "2", nil, "lib/d.rb"
 
-      install_specs a1, b1, b2, c1, c2
+      install_specs c1, c2, b1, b2, a1
 
       a1.activate
       assert_equal %w(a-1), loaded_spec_names
@@ -155,7 +183,7 @@ end
       c1 = new_spec "c", "1", nil, "lib/d.rb"
       c2 = new_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
 
-      install_specs a1, a2, b1, b2, c1, c2
+      install_specs c1, b1, a1, a2, c2, b2
 
       a2.activate
       assert_equal %w(a-2), loaded_spec_names
@@ -177,7 +205,7 @@ end
       c2 = new_spec "c", "2"
       d1 = new_spec "d", "1", nil, "lib/d.rb"
 
-      install_specs a1, b1, b2, c1, c2, d1
+      install_specs d1, c1, c2, b1, b2, a1
 
       a1.activate
       assert_equal %w(a-1), loaded_spec_names
@@ -190,6 +218,155 @@ end
     end
   end
 
+  def test_require_should_prefer_latest_gem_level1
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      b1 = new_spec "b", "1", "c" => ">= 0" # unresolved
+      b2 = new_spec "b", "2", "c" => ">= 0"
+      c1 = new_spec "c", "1", nil, "lib/c.rb"  # 1st level
+      c2 = new_spec "c", "2", nil, "lib/c.rb"
+
+      install_specs c1, c2, b1, b2, a1
+
+      a1.activate
+
+      require "c"
+
+      assert_equal %w(a-1 b-2 c-2), loaded_spec_names
+    end
+  end
+
+  def test_require_should_prefer_latest_gem_level2
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      b1 = new_spec "b", "1", "c" => ">= 0" # unresolved
+      b2 = new_spec "b", "2", "c" => ">= 0"
+      c1 = new_spec "c", "1", "d" => ">= 0"  # 1st level
+      c2 = new_spec "c", "2", "d" => ">= 0"
+      d1 = new_spec "d", "1", nil, "lib/d.rb" # 2nd level
+      d2 = new_spec "d", "2", nil, "lib/d.rb"
+
+      install_specs d1, d2, c1, c2, b1, b2, a1
+
+      a1.activate
+
+      require "d"
+
+      assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
+    end
+  end
+
+  def test_require_finds_in_2nd_level_indirect
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      b1 = new_spec "b", "1", "c" => ">= 0" # unresolved
+      b2 = new_spec "b", "2", "c" => ">= 0"
+      c1 = new_spec "c", "1", "d" => "<= 2" # 1st level
+      c2 = new_spec "c", "2", "d" => "<= 2"
+      d1 = new_spec "d", "1", nil, "lib/d.rb" # 2nd level
+      d2 = new_spec "d", "2", nil, "lib/d.rb"
+      d3 = new_spec "d", "3", nil, "lib/d.rb"
+
+      install_specs d1, d2, d3, c1, c2, b1, b2, a1
+
+      a1.activate
+
+      require "d"
+
+      assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
+    end
+  end
+
+  def test_require_should_prefer_reachable_gems
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      b1 = new_spec "b", "1", "c" => ">= 0" # unresolved
+      b2 = new_spec "b", "2", "c" => ">= 0"
+      c1 = new_spec "c", "1", "d" => "<= 2" # 1st level
+      c2 = new_spec "c", "2", "d" => "<= 2"
+      d1 = new_spec "d", "1", nil, "lib/d.rb" # 2nd level
+      d2 = new_spec "d", "2", nil, "lib/d.rb"
+      d3 = new_spec "d", "3", nil, "lib/d.rb"
+      e  = new_spec "anti_d", "1", nil, "lib/d.rb"
+
+      install_specs d1, d2, d3, e, c1, c2, b1, b2, a1
+
+      a1.activate
+
+      require "d"
+
+      assert_equal %w(a-1 b-2 c-2 d-2), loaded_spec_names
+    end
+  end
+
+  def test_require_should_not_conflict
+    save_loaded_features do
+      base = new_spec "0", "1", "A" => ">= 1"
+      a1 = new_spec "A", "1", {"c" => ">= 2", "b" => "> 0"}, "lib/a.rb"
+      a2 = new_spec "A", "2", {"c" => ">= 2", "b" => "> 0"}, "lib/a.rb"
+      b1 = new_spec "b", "1", {"c" => "= 1"}, "lib/d.rb"
+      b2 = new_spec "b", "2", {"c" => "= 2"}, "lib/d.rb"
+      c1 = new_spec "c", "1", {}, "lib/c.rb"
+      c2 = new_spec "c", "2", {}, "lib/c.rb"
+      c3 = new_spec "c", "3", {}, "lib/c.rb"
+
+      install_specs c1, c2, c3, b1, b2, a1, a2, base
+
+      base.activate
+      assert_equal %w(0-1), loaded_spec_names
+      assert_equal ["A (>= 1)"], unresolved_names
+
+      require "d"
+
+      assert_equal %w(0-1 A-2 b-2 c-2), loaded_spec_names
+      assert_equal [], unresolved_names
+    end
+  end
+
+  def test_inner_clonflict_in_indirect_gems
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      b1 = new_spec "b", "1", "c" => ">= 1" # unresolved
+      b2 = new_spec "b", "2", "c" => ">= 1", "d" => "< 3"
+      c1 = new_spec "c", "1", "d" => "<= 2" # 1st level
+      c2 = new_spec "c", "2", "d" => "<= 2"
+      c3 = new_spec "c", "3", "d" => "<= 3"
+      d1 = new_spec "d", "1", nil, "lib/d.rb" # 2nd level
+      d2 = new_spec "d", "2", nil, "lib/d.rb"
+      d3 = new_spec "d", "3", nil, "lib/d.rb"
+
+      install_specs d1, d2, d3, c1, c2, c3, b1, b2, a1
+
+      a1.activate
+
+      require "d"
+
+      assert_includes [%w(a-1 b-2 c-3 d-2),%w(a-1 b-2 d-2)], loaded_spec_names
+    end
+  end
+
+  def test_inner_clonflict_in_indirect_gems_reversed
+    save_loaded_features do
+      a1 = new_spec "a", "1", "b" => "> 0"
+      b1 = new_spec "b", "1", "xc" => ">= 1" # unresolved
+      b2 = new_spec "b", "2", "xc" => ">= 1", "d" => "< 3"
+      c1 = new_spec "xc", "1", "d" => "<= 3" # 1st level
+      c2 = new_spec "xc", "2", "d" => "<= 2"
+      c3 = new_spec "xc", "3", "d" => "<= 3"
+      d1 = new_spec "d", "1", nil, "lib/d.rb" # 2nd level
+      d2 = new_spec "d", "2", nil, "lib/d.rb"
+      d3 = new_spec "d", "3", nil, "lib/d.rb"
+
+      install_specs d1, d2, d3, c1, c2, c3, b1, b2, a1
+
+      a1.activate
+
+      require "d"
+
+      assert_includes [%w(a-1 b-2 d-2 xc-3), %w(a-1 b-2 d-2)], loaded_spec_names
+    end
+  end
+
   ##
   # [A] depends on
   #     [C]  = 1.0 depends on
@@ -197,13 +374,14 @@ end
   #     [B] ~> 1.0 (satisfied by 1.0)
 
   def test_self_activate_checks_dependencies
-    a, _  = util_spec 'a', '1.0'
+    a  = util_spec 'a', '1.0'
             a.add_dependency 'c', '= 1.0'
             a.add_dependency 'b', '~> 1.0'
 
-            util_spec 'b', '1.0'
-            util_spec 'b', '2.0'
-    c,  _ = util_spec 'c', '1.0', 'b' => '= 2.0'
+    b1 = util_spec 'b', '1.0'
+    b2 = util_spec 'b', '2.0'
+    c  = util_spec 'c', '1.0', 'b' => '= 2.0'
+    install_specs b1, b2, c, a
 
     e = assert_raises Gem::LoadError do
       assert_activate nil, a, c, "b"
@@ -220,10 +398,12 @@ end
   #         [B] = 2.0
 
   def test_self_activate_divergent
-    a, _  = util_spec 'a', '1.0', 'b' => '~> 1.0', 'c' => '= 1.0'
-            util_spec 'b', '1.0'
-            util_spec 'b', '2.0'
-    c,  _ = util_spec 'c', '1.0', 'b' => '= 2.0'
+    a  = util_spec 'a', '1.0', 'b' => '~> 1.0', 'c' => '= 1.0'
+    b1 = util_spec 'b', '1.0'
+    b2 = util_spec 'b', '2.0'
+    c  = util_spec 'c', '1.0', 'b' => '= 2.0'
+
+    install_specs b1, b2, c, a
 
     e = assert_raises Gem::ConflictError do
       assert_activate nil, a, c, "b"
@@ -241,6 +421,8 @@ end
     @d1 = util_spec 'd', '1'
     @d2 = util_spec 'd', '2'
 
+    install_specs @d1, @d2, e1
+
     assert_activate %w[d-1 e-1], e1, "d"
   end
 
@@ -259,6 +441,7 @@ end
     @w1 = util_spec 'w', '1', 'x' => nil
 
     util_set_arch 'cpu-my_platform1'
+    install_specs @x1_m, @x1_o, @w1
 
     assert_activate %w[x-1-cpu-my_platform-1 w-1], @w1, @x1_m
   end
@@ -274,6 +457,7 @@ end
     end
 
     @z1 = util_spec 'z', '1', 'y' => nil
+    install_specs @y1, @y1_1_p, @z1
 
     assert_activate %w[y-1 z-1], @z1, @y1
   end
@@ -291,6 +475,7 @@ end
       s.add_dependency 'a'
       s.add_development_dependency 'aa'
     end
+    install_specs @a1_pre, @b1, @c1_pre
 
     assert_activate %w[a-1.a b-1 c-1.a], @c1_pre, @a1_pre, @b1
   end
@@ -300,7 +485,7 @@ end
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"
     b2 = new_spec "b", "2", nil, "lib/b/c.rb"
 
-    install_specs a1, b1, b2
+    install_specs b1, b2, a1
 
     a1.activate
     save_loaded_features do
@@ -320,7 +505,7 @@ end
       d1 = new_spec "d", "1", { "c" => "< 2" },  "lib/d.rb"
       d2 = new_spec "d", "2", { "c" => "< 2" },  "lib/d.rb" # this
 
-      install_specs a1, b1, b2, c1, c2, d1, d2
+      install_specs c1, c2, b1, b2, d1, d2, a1
 
       a1.activate
 
@@ -347,7 +532,7 @@ end
     c1 = new_spec "c", "1"
     c2 = new_spec "c", "2"
 
-    install_specs a1, b1, b2, c1, c2
+    install_specs c1, c2, b1, b2, a1
 
     a1.activate
     assert_equal %w(a-1 b-1 c-1), loaded_spec_names
@@ -367,8 +552,9 @@ end
 
   def test_self_activate_unrelated
     a = util_spec 'a', '1.0', 'b' => '>= 1.0'
-        util_spec 'b', '1.0'
+    b = util_spec 'b', '1.0'
     c = util_spec 'c', '1.0'
+    install_specs b, c, a
 
     assert_activate %w[b-1.0 c-1.0 a-1.0], a, c, "b"
   end
@@ -384,10 +570,11 @@ end
 
   def test_self_activate_over
     a = util_spec 'a', '1.0', 'b' => '>= 1.0', 'c' => '= 1.0'
-    util_spec 'b', '1.0'
-    util_spec 'b', '1.1'
-    util_spec 'b', '2.0'
-    util_spec 'c', '1.0', 'b' => '~> 1.0'
+    install_specs util_spec 'b', '1.0'
+    install_specs util_spec 'b', '1.1'
+    install_specs util_spec 'b', '2.0'
+    install_specs util_spec 'c', '1.0', 'b' => '~> 1.0'
+    install_specs a
 
     a.activate
 
@@ -407,10 +594,12 @@ end
   # first resolve through a dependency that is later pruned.
 
   def test_self_activate_under
-    a,   _ = util_spec 'a', '1.0', 'b' => '~> 1.0', 'c' => '= 1.0'
-             util_spec 'b', '1.0'
-             util_spec 'b', '1.1'
-    c,   _ = util_spec 'c', '1.0', 'b' => '= 1.0'
+    a    = util_spec 'a', '1.0', 'b' => '~> 1.0', 'c' => '= 1.0'
+    b1   = util_spec 'b', '1.0'
+    b1_1 = util_spec 'b', '1.1'
+    c    = util_spec 'c', '1.0', 'b' => '= 1.0'
+
+    install_specs b1, b1_1, c, a
 
     assert_activate %w[b-1.0 c-1.0 a-1.0], a, c, "b"
   end
@@ -424,10 +613,11 @@ end
   # [C1] depends on nothing
 
   def test_self_activate_dropped
-    a1, = util_spec 'a', '1', 'b' => nil
-          util_spec 'b', '1', 'c' => nil
-          util_spec 'b', '2'
-          util_spec 'c', '1'
+    a1 = util_spec 'a', '1', 'b' => nil
+    b1 = util_spec 'b', '1', 'c' => nil
+    b2 = util_spec 'b', '2'
+    c1 = util_spec 'c', '1'
+    install_specs c1, b1, b2, a1
 
     assert_activate %w[b-2 a-1], a1, "b"
   end
@@ -443,17 +633,20 @@ end
   # resolve.
 
   def test_self_activate_raggi_the_edgecase_generator
-    a,  _ = util_spec 'a', '1.0', 'b' => '>= 1.0', 'c' => '>= 1.0'
-            util_spec 'b', '1.0'
-            util_spec 'b', '1.1', 'z' => '>= 1.0'
-    c,  _ = util_spec 'c', '1.0', 'b' => '= 1.0'
+    a    = util_spec 'a', '1.0', 'b' => '>= 1.0', 'c' => '>= 1.0'
+    b1   = util_spec 'b', '1.0'
+    b1_0 = util_spec 'b', '1.1', 'z' => '>= 1.0'
+    c    = util_spec 'c', '1.0', 'b' => '= 1.0'
+    z    = util_spec 'z', '1'
+
+    install_specs z, b1, b1_0, c, z
 
     assert_activate %w[b-1.0 c-1.0 a-1.0], a, c, "b"
   end
 
   def test_self_activate_conflict
-    util_spec 'b', '1.0'
-    util_spec 'b', '2.0'
+    install_specs util_spec 'b', '1.0'
+    install_specs util_spec 'b', '2.0'
 
     gem "b", "= 1.0"
 
@@ -465,6 +658,7 @@ end
   def test_self_all_equals
     a = new_spec "foo", "1", nil, "lib/foo.rb"
 
+    install_specs a
     Gem::Specification.all = [a]
 
     assert_equal a, Gem::Specification.find_inactive_by_path('foo')
@@ -748,8 +942,12 @@ dependencies: []
     @a2.name = 'a};raise "improper escaping";%q{'
 
     full_path = @a2.spec_file
-    write_file full_path do |io|
-      io.write @a2.to_ruby_for_cache
+    begin
+      write_file full_path do |io|
+        io.write @a2.to_ruby_for_cache
+      end
+    rescue Errno::EINVAL
+      skip "cannot create '#{full_path}' on this platform"
     end
 
     spec = Gem::Specification.load full_path
@@ -763,8 +961,12 @@ dependencies: []
     @a2.name = 'a#{raise %<improper escaping>}'
 
     full_path = @a2.spec_file
-    write_file full_path do |io|
-      io.write @a2.to_ruby_for_cache
+    begin
+      write_file full_path do |io|
+        io.write @a2.to_ruby_for_cache
+      end
+    rescue Errno::EINVAL
+      skip "cannot create '#{full_path}' on this platform"
     end
 
     spec = Gem::Specification.load full_path
@@ -778,8 +980,12 @@ dependencies: []
     @a2.name = 'a";raise "improper escaping";"'
 
     full_path = @a2.spec_file
-    write_file full_path do |io|
-      io.write @a2.to_ruby_for_cache
+    begin
+      write_file full_path do |io|
+        io.write @a2.to_ruby_for_cache
+      end
+    rescue Errno::EINVAL
+      skip "cannot create '#{full_path}' on this platform"
     end
 
     spec = Gem::Specification.load full_path
@@ -854,9 +1060,7 @@ dependencies: []
 
   def test_self_outdated
     spec_fetcher do |fetcher|
-      fetcher.spec 'a', 4
-
-      fetcher.clear
+      fetcher.download 'a', 4
 
       fetcher.spec 'a', 3
     end
@@ -866,10 +1070,8 @@ dependencies: []
 
   def test_self_outdated_and_latest_remotes
     specs = spec_fetcher do |fetcher|
-      fetcher.spec 'a', 4
-      fetcher.spec 'b', 3
-
-      fetcher.clear
+      fetcher.download 'a', 4
+      fetcher.download 'b', 3
 
       fetcher.spec 'a', '3.a'
       fetcher.spec 'b', 2
@@ -884,10 +1086,13 @@ dependencies: []
   end
 
   def test_self_remove_spec
+    install_specs @a1
+
     assert_includes Gem::Specification.all_names, 'a-1'
     assert_includes Gem::Specification.stubs.map { |s| s.full_name }, 'a-1'
 
-    Gem::Specification.remove_spec @a1
+    uninstall_gem @a1
+    Gem::Specification.reset
 
     refute_includes Gem::Specification.all_names, 'a-1'
     refute_includes Gem::Specification.stubs.map { |s| s.full_name }, 'a-1'
@@ -902,7 +1107,7 @@ dependencies: []
 
     FileUtils.rm @a1.spec_file # bug #698
 
-    Gem::Specification.remove_spec @a1
+    Gem::Specification.reset
 
     refute_includes Gem::Specification.all_names, 'a-1'
     refute_includes Gem::Specification.stubs.map { |s| s.full_name }, 'a-1'
@@ -973,7 +1178,7 @@ dependencies: []
       s.summary = 'summary'
       s.description = 'description'
       s.authors = 'author a', 'author b'
-      s.licenses = 'BSD'
+      s.licenses = 'BSD-2-Clause'
       s.files = 'lib/file.rb'
       s.test_files = 'test/file.rb'
       s.rdoc_options = '--foo'
@@ -1183,6 +1388,17 @@ dependencies: []
     assert_path_exists @ext.extension_dir
   end
 
+  def test_default_spec_stub_is_marked_default
+    default = new_default_spec 'default', 2
+    install_default_gems default
+
+    stub = Gem::Specification.stubs.find { |s| s.name == 'default' }
+    assert_predicate stub, :default_gem?
+
+    stub = Gem::Specification.find_all_by_name('default').first
+    assert_predicate stub, :default_gem?
+  end
+
   def test_build_extensions_built
     ext_spec
 
@@ -1419,7 +1635,9 @@ dependencies: []
 
     assert_empty @gem.dependent_gems
 
-    bonobo = util_spec 'bonobo'
+    bonobo = util_spec 'bonobo', 1
+    install_gem bonobo
+    install_gem @gem
 
     expected = [
       [@gem, @bonobo, [bonobo]],
@@ -1506,6 +1724,8 @@ dependencies: []
     class << Gem
       alias orig_default_ext_dir_for default_ext_dir_for
 
+      remove_method :default_ext_dir_for
+
       def Gem.default_ext_dir_for(base_dir)
         'elsewhere'
       end
@@ -1815,6 +2035,8 @@ dependencies: []
   def test_require_paths_default_ext_dir_for
     class << Gem
       send :alias_method, :orig_default_ext_dir_for, :default_ext_dir_for
+
+      remove_method :default_ext_dir_for
     end
 
     def Gem.default_ext_dir_for base_dir
@@ -1932,7 +2154,7 @@ dependencies: []
       c1 = new_spec "c", "1", nil, "lib/d.rb"
       c2 = new_spec("c", "2", { "a" => "1" }, "lib/d.rb") # conflicts with a-2
 
-      install_specs a1, a2, b1, b2, c1, c2
+      install_specs c1, b1, a1, a2, c2, b2
 
       a1.activate
       c1.activate
@@ -2014,6 +2236,19 @@ dependencies: []
     assert_equal ['test/suite.rb'], @a1.test_files
   end
 
+  def test_runtime_predicate_true
+    @a2.add_runtime_dependency 'b', '1'
+    assert_predicate @a2.dependencies.first, :runtime?
+
+    @a2.dependencies.first.instance_variable_set :@type, nil
+    assert_predicate @a2.dependencies.first, :runtime?
+  end
+
+  def test_runtime_predicate_false
+    @a2.add_development_dependency 'b', '1'
+    refute_predicate @a2.dependencies.first, :runtime?
+  end
+
   def test_to_ruby
     @a2.add_runtime_dependency 'b', '1'
     @a2.dependencies.first.instance_variable_set :@type, nil
@@ -2377,12 +2612,14 @@ end
     end
   end
 
-  def test_validate_dependencies_open_ended
+  def test_validate_dependencies_duplicates
     util_setup_validate
 
     Dir.chdir @tempdir do
       @a1.add_runtime_dependency 'b', '~> 1.2'
       @a1.add_runtime_dependency 'b', '>= 1.2.3'
+      @a1.add_development_dependency 'c', '~> 1.2'
+      @a1.add_development_dependency 'c', '>= 1.2.3'
 
       use_ui @ui do
         e = assert_raises Gem::InvalidSpecificationException do
@@ -2392,6 +2629,8 @@ end
         expected = <<-EXPECTED
 duplicate dependency on b (>= 1.2.3), (~> 1.2) use:
     add_runtime_dependency 'b', '>= 1.2.3', '~> 1.2'
+duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
+    add_development_dependency 'c', '>= 1.2.3', '~> 1.2'
         EXPECTED
 
         assert_equal expected, e.message
@@ -2403,6 +2642,21 @@ duplicate dependency on b (>= 1.2.3), (~> 1.2) use:
     end
   end
 
+  def test_validate_dependencies_allowed_duplicates
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @a1.add_runtime_dependency 'b', '~> 1.2'
+      @a1.add_development_dependency 'b', '= 1.2.3'
+
+      use_ui @ui do
+        @a1.validate
+      end
+
+      assert_equal '', @ui.error, 'warning'
+    end
+  end
+
   def test_validate_description
     util_setup_validate
 
@@ -2413,8 +2667,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
@@ -2535,13 +2787,13 @@ duplicate dependency on b (>= 1.2.3), (~> 1.2) use:
     @a1.extensions << 'ext/a/extconf.rb'
 
     Dir.chdir @tempdir do
-      FileUtils.ln_s '/root/path', 'lib2' unless vc_windows?
+      FileUtils.ln_s 'lib/code.rb', 'lib2' unless vc_windows?
 
-      e = assert_raises Gem::InvalidSpecificationException do
+      use_ui @ui do
         @a1.validate
       end
 
-      assert_equal '["lib2"] are not files', e.message
+      assert_match 'WARNING:  lib2 is a symlink, which is not supported on all platforms', @ui.error
     end
 
     assert_equal %w[bin/exec ext/a/extconf.rb lib/code.rb lib2 test/suite.rb].sort,
@@ -2603,8 +2855,22 @@ duplicate dependency on b (>= 1.2.3), (~> 1.2) use:
     end
 
     assert_match <<-warning, @ui.error
-WARNING:  licenses is empty, but is recommended.  Use a license abbreviation from:
-http://opensource.org/licenses/alphabetical
+WARNING:  licenses is empty, but is recommended.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+    warning
+  end
+
+  def test_validate_license_values
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.licenses = ['BSD']
+      @a1.validate
+    end
+
+    assert_match <<-warning, @ui.error
+WARNING: license value 'BSD' is invalid.  Use a license identifier from
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
     warning
   end
 
@@ -2658,6 +2924,20 @@ http://opensource.org/licenses/alphabetical
     end
   end
 
+  def test_validate_permissions_of_missing_file_non_packaging
+    skip 'chmod not supported' if Gem.win_platform?
+
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      File.delete File.join('lib', 'code.rb')
+
+      use_ui @ui do
+        assert @a1.validate(false)
+      end
+    end
+  end
+
   def test_validate_platform_legacy
     util_setup_validate
 
@@ -2994,7 +3274,8 @@ end
   end
 
   def test_find_by_name
-    util_spec "a"
+    install_specs util_spec "a"
+    install_specs util_spec "a", 1
 
     assert Gem::Specification.find_by_name "a"
     assert Gem::Specification.find_by_name "a", "1"
@@ -3010,6 +3291,8 @@ end
 
     b.activate
 
+    install_specs b
+
     assert Gem::Specification.find_by_name "b"
 
     assert_raises Gem::LoadError do