rubygems-update 2.3.0 → 2.4.0

data/test/rubygems/test_gem_resolver.rb

@@ -170,6 +170,45 @@ class TestGemResolver < Gem::TestCase
     assert_empty reqs
   end
 
+  def test_resolve_conservative
+    a1_spec = util_spec 'a', 1
+    a2_spec = util_spec 'a', 2 do |s|
+      s.add_dependency 'b', 2
+      s.add_dependency 'c'
+    end
+    b1_spec = util_spec 'b', 1
+    b2_spec = util_spec 'b', 2
+    c1_spec = util_spec 'c', 1 do |s| s.add_dependency 'd', 2 end
+    c2_spec = util_spec 'c', 2 do |s| s.add_dependency 'd', 2 end
+    d1_spec = util_spec 'd', 1 do |s| s.add_dependency 'e' end
+    d2_spec = util_spec 'd', 2 do |s| s.add_dependency 'e' end
+    e1_spec = util_spec 'e', 1
+    e2_spec = util_spec 'e', 2
+
+    a_dep = make_dep 'a', '= 2'
+    e_dep = make_dep 'e'
+
+    # When requesting to install:
+    # a-2, e
+    deps = [a_dep, e_dep]
+
+    s = set a1_spec, a2_spec, b1_spec, b2_spec, c1_spec, c2_spec, d1_spec, d2_spec, e1_spec, e2_spec
+
+    res = Gem::Resolver.new deps, s
+
+    # With the following gems already installed:
+    # a-1, b-1, c-1, e-1
+    res.skip_gems = {'a'=>[a1_spec], 'b'=>[b1_spec], 'c'=>[c1_spec], 'e'=>[e1_spec]}
+
+    # Make sure the following gems end up getting used/installed/upgraded:
+    # a-2 (upgraded)
+    # b-2 (upgraded), specific dependency from a-2
+    # c-1 (used, not upgraded), open dependency from a-2
+    # d-2 (installed), specific dependency from c-2
+    # e-1 (used, not upgraded), open dependency from request
+    assert_resolves_to [a2_spec, b2_spec, c1_spec, d2_spec, e1_spec], res
+  end
+
   def test_resolve_development
     a_spec = util_spec 'a', 1 do |s| s.add_development_dependency 'b' end
     b_spec = util_spec 'b', 1 do |s| s.add_development_dependency 'c' end

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -32,6 +32,26 @@ class TestGemResolverBestSet < Gem::TestCase
     assert_equal %w[a-1], found.map { |s| s.full_name }
   end
 
+  def test_find_all_fallback
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+    end
+
+    set = @DR::BestSet.new
+
+    api_uri = URI(@gem_repo) + './api/v1/dependencies'
+
+    set.sets << Gem::Resolver::APISet.new(api_uri)
+
+    dependency = dep 'a', '~> 1'
+
+    req = @DR::DependencyRequest.new dependency, nil
+
+    found = set.find_all req
+
+    assert_equal %w[a-1], found.map { |s| s.full_name }
+  end
+
   def test_find_all_local
     spec_fetcher do |fetcher|
       fetcher.spec 'a', 1
@@ -76,5 +96,42 @@ class TestGemResolverBestSet < Gem::TestCase
     assert_empty set.sets
   end
 
+  def test_replace_failed_api_set
+    set = @DR::BestSet.new
+
+    api_uri = URI(@gem_repo) + './api/v1/dependencies'
+    api_set = Gem::Resolver::APISet.new api_uri
+
+    set.sets << api_set
+
+    error_uri = api_uri + '?gems=a'
+
+    error = Gem::RemoteFetcher::FetchError.new 'bogus', error_uri
+
+    set.replace_failed_api_set error
+
+    assert_equal 1, set.sets.size
+
+    refute_includes set.sets, api_set
+
+    assert_kind_of Gem::Resolver::IndexSet, set.sets.first
+  end
+
+  def test_replace_failed_api_set_no_api_set
+    set = @DR::BestSet.new
+
+    index_set = Gem::Resolver::IndexSet.new Gem::Source.new @gem_repo
+
+    set.sets << index_set
+
+    error = Gem::RemoteFetcher::FetchError.new 'bogus', @gem_repo
+
+    e = assert_raises Gem::RemoteFetcher::FetchError do
+      set.replace_failed_api_set error
+    end
+
+    assert_equal error, e
+  end
+
 end
 

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -22,10 +22,17 @@ class TestGemResolverConflict < Gem::TestCase
       Gem::Resolver::Conflict.new child, active
 
     expected = <<-EXPECTED
-  Activated net-ssh-2.2.2 via:
-    net-ssh-2.2.2 (>= 2.0.13)
-  instead of (>= 2.6.5) via:
-    net-ssh-2.2.2 (>= 2.0.13), rye-0.9.8 (= 0.9.8)
+  Activated net-ssh-2.2.2
+  which does not match conflicting dependency (>= 2.6.5)
+
+  Conflicting dependency chains:
+    net-ssh (>= 2.0.13), 2.2.2 activated
+
+  versus:
+    rye (= 0.9.8), 0.9.8 activated depends on
+    net-ssh (>= 2.0.13), 2.2.2 activated depends on
+    net-ssh (>= 2.6.5)
+
     EXPECTED
 
     assert_equal expected, conflict.explanation
@@ -44,10 +51,15 @@ class TestGemResolverConflict < Gem::TestCase
     conflict = @DR::Conflict.new a1_req, activated
 
     expected = <<-EXPECTED
-  Activated a-2 via:
-    a-2 (= 2)
-  instead of (= 1) via:
-    user request (gem command or Gemfile)
+  Activated a-2
+  which does not match conflicting dependency (= 1)
+
+  Conflicting dependency chains:
+    a (= 2), 2 activated
+
+  versus:
+    a (= 1)
+
     EXPECTED
 
     assert_equal expected, conflict.explanation
@@ -64,8 +76,8 @@ class TestGemResolverConflict < Gem::TestCase
       Gem::Resolver::Conflict.new nil, nil
 
     expected = [
-      'net-ssh-2.2.2 (>= 2.0.13)',
-      'rye-0.9.8 (= 0.9.8)'
+      'net-ssh (>= 2.0.13), 2.2.2 activated',
+      'rye (= 0.9.8), 0.9.8 activated'
     ]
 
     assert_equal expected, conflict.request_path(child.requester)

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -32,6 +32,18 @@ class TestGemResolverGitSpecification < Gem::TestCase
     refute_equal g_spec_a, i_spec
   end
 
+  def test_add_dependency
+    git_gem 'a', 1
+
+    git_spec = Gem::Resolver::GitSpecification.new @set, @spec
+
+    b_dep = dep 'b'
+
+    git_spec.add_dependency b_dep
+
+    assert_equal [b_dep], git_spec.dependencies
+  end
+
   def test_install
     git_gem 'a', 1
 

data/test/rubygems/test_gem_source_git.rb

@@ -194,14 +194,18 @@ class TestGemSourceGit < Gem::TestCase
     git       = Gem::Source::Git.new 'a', 'git/a', 'master', false
     remote    = Gem::Source.new @gem_repo
     installed = Gem::Source::Installed.new
+    vendor    = Gem::Source::Vendor.new 'vendor/foo'
 
     assert_equal( 0, git.      <=>(git),       'git    <=> git')
 
     assert_equal( 1, git.      <=>(remote),    'git    <=> remote')
     assert_equal(-1, remote.   <=>(git),       'remote <=> git')
 
-    assert_equal( 1, installed.<=>(git),       'installed <=> git')
-    assert_equal(-1, git.      <=>(installed), 'git       <=> installed')
+    assert_equal( 1, git.      <=>(installed), 'git       <=> installed')
+    assert_equal(-1, installed.<=>(git),       'installed <=> git')
+
+    assert_equal(-1, git.      <=>(vendor),    'git       <=> vendor')
+    assert_equal( 1, vendor.   <=>(git),       'vendor    <=> git')
   end
 
   def test_specs

data/test/rubygems/test_gem_source_installed.rb

@@ -11,6 +11,8 @@ class TestGemSourceInstalled < Gem::TestCase
     specific  = Gem::Source::SpecificFile.new a1.cache_file
     installed = Gem::Source::Installed.new
     local     = Gem::Source::Local.new
+    git       = Gem::Source::Git.new 'a', 'a', 'master'
+    vendor    = Gem::Source::Vendor.new 'a'
 
     assert_equal( 0, installed.<=>(installed), 'installed <=> installed')
 
@@ -22,6 +24,12 @@ class TestGemSourceInstalled < Gem::TestCase
 
     assert_equal(-1, specific. <=>(installed), 'specific  <=> installed')
     assert_equal( 1, installed.<=>(specific),  'installed <=> specific')
+
+    assert_equal( 1, git.      <=>(installed), 'git       <=> installed')
+    assert_equal(-1, installed.<=>(git),       'installed <=> git')
+
+    assert_equal( 1, vendor.   <=>(installed), 'vendor    <=> installed')
+    assert_equal(-1, installed.<=>(vendor),    'installed <=> vendor')
   end
 
 end

data/test/rubygems/test_gem_source_lock.rb

@@ -43,8 +43,8 @@ class TestGemSourceLock < Gem::TestCase
     assert_equal( 0, i_lock.<=>(i_lock), 'i_lock <=> i_lock')
     assert_equal( 0, v_lock.<=>(v_lock), 'v_lock <=> v_lock')
 
-    assert_equal(-1, g_lock.<=>(i_lock), 'g_lock <=> i_lock')
-    assert_equal( 1, i_lock.<=>(g_lock), 'i_lock <=> g_lock')
+    assert_equal( 1, g_lock.<=>(i_lock), 'g_lock <=> i_lock')
+    assert_equal(-1, i_lock.<=>(g_lock), 'i_lock <=> g_lock')
 
     assert_equal(-1, g_lock.<=>(v_lock), 'g_lock <=> v_lock')
     assert_equal( 1, v_lock.<=>(g_lock), 'v_lock <=> g_lock')

data/test/rubygems/test_gem_source_vendor.rb

@@ -12,6 +12,7 @@ class TestGemSourceVendor < Gem::TestCase
   def test_spaceship
     vendor    = Gem::Source::Vendor.new 'vendor/foo'
     remote    = Gem::Source.new @gem_repo
+    git       = Gem::Source::Git.new 'a', 'a', 'master'
     installed = Gem::Source::Installed.new
 
     assert_equal( 0, vendor.   <=>(vendor),    'vendor    <=> vendor')
@@ -19,6 +20,9 @@ class TestGemSourceVendor < Gem::TestCase
     assert_equal( 1, vendor.   <=>(remote),    'vendor    <=> remote')
     assert_equal(-1, remote.   <=>(vendor),    'remote    <=> vendor')
 
+    assert_equal( 1, vendor.   <=>(git),       'vendor    <=> git')
+    assert_equal(-1, git.      <=>(vendor),    'git       <=> vendor')
+
     assert_equal( 1, vendor.   <=>(installed), 'vendor    <=> installed')
     assert_equal(-1, installed.<=>(vendor),    'installed <=> vendor')
   end

data/test/rubygems/test_kernel.rb

@@ -33,6 +33,12 @@ class TestKernel < Gem::TestCase
     assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
   end
 
+  def test_gem_prerelease
+    quick_gem 'd', '1.1.a'
+    refute gem('d', '>= 1'),   'release requirement must not load prerelease'
+    assert gem('d', '>= 1.a'), 'prerelease requirement may load prerelease'
+  end
+
   def test_gem_conflicting
     assert gem('a', '= 1'), "Should load"
 

data/test/rubygems/test_require.rb

@@ -2,6 +2,26 @@ require 'rubygems/test_case'
 require 'rubygems'
 
 class TestGemRequire < Gem::TestCase
+  class Latch
+    def initialize count = 1
+      @count = count
+      @lock  = Monitor.new
+      @cv    = @lock.new_cond
+    end
+
+    def release
+      @lock.synchronize do
+        @count -= 1 if @count > 0
+        @cv.broadcast if @count.zero?
+      end
+    end
+
+    def await
+      @lock.synchronize do
+        @cv.wait_while { @count > 0 }
+      end
+    end
+  end
 
   def setup
     super
@@ -17,6 +37,46 @@ class TestGemRequire < Gem::TestCase
     assert require(path), "'#{path}' was already required"
   end
 
+  def append_latch spec
+    dir = spec.gem_dir
+    Dir.chdir dir do
+      spec.files.each do |file|
+        File.open file, 'a' do |fp|
+          fp.puts "FILE_ENTERED_LATCH.release"
+          fp.puts "FILE_EXIT_LATCH.await"
+        end
+      end
+    end
+  end
+
+  def test_concurrent_require
+    Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
+    Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
+
+    a1 = new_spec "a", "1", nil, "lib/a.rb"
+    b1 = new_spec "b", "1", nil, "lib/b.rb"
+
+    install_specs a1, b1
+
+    append_latch a1
+    append_latch b1
+
+    t1 = Thread.new { assert_require 'a' }
+    t2 = Thread.new { assert_require 'b' }
+
+    # wait until both files are waiting on the exit latch
+    FILE_ENTERED_LATCH.await
+
+    # now let them finish
+    FILE_EXIT_LATCH.release
+
+    assert t1.join, "thread 1 should exit"
+    assert t2.join, "thread 2 should exit"
+  ensure
+    Object.send :remove_const, :FILE_ENTERED_LATCH
+    Object.send :remove_const, :FILE_EXIT_LATCH
+  end
+
   def test_require_is_not_lazy_with_exact_req
     a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
     b1 = new_spec "b", "1", nil, "lib/b/c.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -31,7 +31,7 @@ cert_chain:
   pfkQPF5Ezsi73pEpFN93Fy21NKCYQH1jCwWeKUF29MIMGd6kE3ZmHW/7fz5GwKIM
   Ls5SgY48a0l7Hw==
   -----END CERTIFICATE-----
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -548,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubygems-update
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby