rubygems-update 2.2.5 → 2.3.0

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -19,6 +19,16 @@ class TestGemResolverActivationRequest < Gem::TestCase
     @req = @DR::ActivationRequest.new @a3, @dep, [@a1, @a2]
   end
 
+  def test_development_eh
+    refute @req.development?
+
+    dep_req = @DR::DependencyRequest.new dep('a', '>= 0', :development), nil
+
+    act_req = @DR::ActivationRequest.new @a3, dep_req, [@a1, @a2]
+
+    assert act_req.development?
+  end
+
   def test_inspect
     assert_match 'a-3',                         @req.inspect
     assert_match 'from a (>= 0)',               @req.inspect

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -73,13 +73,13 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
-
     expected = [
       @DR::APISpecification.new(set, data.first)
     ]
 
     assert_equal expected, set.find_all(a_dep)
+
+    @fetcher.data.delete "#{@dep_uri}?gems=a"
   end
 
   def test_find_all_local

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -28,6 +28,46 @@ class TestGemResolverAPISpecification < Gem::TestCase
     assert_equal expected, spec.dependencies
   end
 
+  def test_fetch_development_dependencies
+    specs = spec_fetcher do |fetcher|
+      fetcher.spec 'rails', '3.0.3' do |s|
+        s.add_runtime_dependency 'bundler',  '~> 1.0'
+        s.add_runtime_dependency 'railties', '= 3.0.3'
+        s.add_development_dependency 'a',    '= 1'
+      end
+    end
+
+    rails = specs['rails-3.0.3']
+
+    repo = @gem_repo + 'api/v1/dependencies'
+
+    set = Gem::Resolver::APISet.new repo
+
+    data = {
+      :name     => 'rails',
+      :number   => '3.0.3',
+      :platform => 'ruby',
+      :dependencies => [
+        ['bundler',  '~> 1.0'],
+        ['railties', '= 3.0.3'],
+      ],
+    }
+
+    util_setup_spec_fetcher rails
+
+    spec = Gem::Resolver::APISpecification.new set, data
+
+    spec.fetch_development_dependencies
+
+    expected = [
+      Gem::Dependency.new('bundler',  '~> 1.0'),
+      Gem::Dependency.new('railties', '= 3.0.3'),
+      Gem::Dependency.new('a',        '= 1', :development),
+    ]
+
+    assert_equal expected, spec.dependencies
+  end
+
   def test_installable_platform_eh
     set = Gem::Resolver::APISet.new
     data = {

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -2,6 +2,20 @@ require 'rubygems/test_case'
 
 class TestGemResolverComposedSet < Gem::TestCase
 
+  def test_errors
+    index_set   = Gem::Resolver::IndexSet.new
+    current_set = Gem::Resolver::CurrentSet.new
+
+    set = Gem::Resolver::ComposedSet.new index_set, current_set
+
+    set.instance_variable_get(:@errors) << :a
+    current_set.errors << :b
+
+    assert_includes set.errors, :a
+    assert_includes set.errors, :b
+    assert_includes set.errors, index_set.errors.first
+  end
+
   def test_remote_equals
     best_set    = Gem::Resolver::BestSet.new
     current_set = Gem::Resolver::CurrentSet.new

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -8,6 +8,61 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     @DR = Gem::Resolver::DependencyRequest
   end
 
+  def test_development_eh
+    a_dep = dep 'a', '>= 1'
+
+    a_dep_req = @DR.new a_dep, nil
+
+    refute a_dep_req.development?
+
+    b_dep = dep 'b', '>= 1', :development
+
+    b_dep_req = @DR.new b_dep, nil
+
+    assert b_dep_req.development?
+  end
+
+  def test_match_eh
+    spec = util_spec 'a', 1
+    dependency = dep 'a', '>= 1'
+
+    dr = @DR.new dependency, nil
+
+    assert dr.match? spec
+  end
+
+  def test_match_eh_prerelease
+    spec = util_spec 'a', '1.a'
+
+    a_dep = dep 'a', '>= 1'
+    a_dr = @DR.new a_dep, nil
+
+    refute a_dr.match? spec
+
+    a_pre_dep = dep 'a', '>= 1.a'
+    a_pre_dr = @DR.new a_pre_dep, nil
+
+    assert a_pre_dr.match? spec
+  end
+
+  def test_matches_spec_eh
+    spec = util_spec 'a', 1
+    dependency = dep 'a', '>= 1'
+
+    dr = @DR.new dependency, nil
+
+    assert dr.matches_spec? spec
+  end
+
+  def test_matches_spec_eh_prerelease
+    spec = util_spec 'a', '1.a'
+
+    dependency = dep 'a', '>= 0'
+    dr = @DR.new dependency, nil
+
+    assert dr.matches_spec? spec
+  end
+
   def test_requirement
     dependency = dep 'a', '>= 1'
 

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -85,6 +85,32 @@ class TestGemResolverGitSet < Gem::TestCase
     assert_empty @set.find_all dependency
   end
 
+  def test_find_all_prerelease
+    name, _, repository, = git_gem 'a', '1.a'
+
+    @set.add_git_gem name, repository, 'master', false
+
+    dependency = dep 'a', '>= 0'
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
+    @reqs.add req
+
+    @set.prefetch @reqs
+
+    found = @set.find_all dependency
+
+    assert_empty found
+
+    dependency = dep 'a', '>= 0.a'
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
+    @reqs.add req
+
+    @set.prefetch @reqs
+
+    found = @set.find_all dependency
+
+    refute_empty found
+  end
+
   def test_root_dir
     assert_equal Gem.dir, @set.root_dir
 

data/test/rubygems/test_gem_resolver_index_set.rb

@@ -22,6 +22,8 @@ class TestGemResolverIndexSet < Gem::TestCase
     fetcher = set.instance_variable_get :@f
 
     refute_same Gem::SpecFetcher.fetcher, fetcher
+
+    refute_empty set.errors
   end
 
   def test_find_all
@@ -31,7 +33,7 @@ class TestGemResolverIndexSet < Gem::TestCase
       fetcher.spec 'b', 1
     end
 
-    set = @DR::BestSet.new
+    set = @DR::IndexSet.new
 
     dependency = dep 'a', '~> 1'
 
@@ -49,7 +51,7 @@ class TestGemResolverIndexSet < Gem::TestCase
       fetcher.spec 'b', 1
     end
 
-    set = @DR::BestSet.new
+    set = @DR::IndexSet.new
     set.remote = false
 
     dependency = dep 'a', '~> 1'
@@ -59,5 +61,29 @@ class TestGemResolverIndexSet < Gem::TestCase
     assert_empty set.find_all req
   end
 
+  def test_find_all_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', '1.a'
+    end
+
+    set = @DR::IndexSet.new
+
+    dependency = dep 'a'
+
+    req = @DR::DependencyRequest.new dependency, nil
+
+    found = set.find_all req
+
+    assert_empty found
+
+    dependency.prerelease = true
+
+    req = @DR::DependencyRequest.new dependency, nil
+
+    found = set.find_all req
+
+    assert_equal %w[a-1.a], found.map { |s| s.full_name }
+  end
+
 end
 

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -2,6 +2,101 @@ require 'rubygems/test_case'
 
 class TestGemResolverInstallerSet < Gem::TestCase
 
+  def test_add_always_install
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 2
+      fetcher.clear
+    end
+
+    util_gem 'a', 1
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_always_install dep('a')
+
+    assert_equal %w[a-2], set.always_install.map { |s| s.full_name }
+
+    e = assert_raises Gem::UnsatisfiableDependencyError do
+      set.add_always_install dep('b')
+    end
+
+    assert_equal dep('b'), e.dependency.dependency
+  end
+
+  def test_add_always_install_errors
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    e = assert_raises Gem::UnsatisfiableDependencyError do
+      set.add_always_install dep 'a'
+    end
+
+    refute_empty e.errors
+  end
+
+  def test_add_always_install_platform
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.spec 'a', 2 do |s|
+        s.platform = Gem::Platform.new 'x86-freebsd-9'
+      end
+      fetcher.clear
+    end
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_always_install dep('a')
+
+    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+  end
+
+  def test_add_always_install_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+      fetcher.gem 'a', '3.a'
+    end
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_always_install dep('a')
+
+    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+  end
+
+  def test_add_always_install_prerelease_only
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '3.a'
+    end
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    assert_raises Gem::UnsatisfiableDependencyError do
+      set.add_always_install dep('a')
+    end
+  end
+
+  def test_add_local
+    a_1, a_1_gem = util_gem 'a', 1
+
+    a_1_source = Gem::Source::SpecificFile.new a_1_gem
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_local File.basename(a_1_gem), a_1, a_1_source
+
+    assert set.local? File.basename(a_1_gem)
+
+    FileUtils.rm a_1_gem
+    util_clear_gems
+
+    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+
+    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+  end
+
   def test_consider_local_eh
     set = Gem::Resolver::InstallerSet.new :remote
 
@@ -30,6 +125,54 @@ class TestGemResolverInstallerSet < Gem::TestCase
     refute set.consider_remote?
   end
 
+  def test_errors
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.instance_variable_get(:@errors) << :a
+
+    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+
+    set.find_all req
+
+    assert_equal [:a, set.remote_set.errors.first], set.errors
+  end
+
+  def test_find_all_always_install
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 2
+      fetcher.clear
+    end
+
+    util_gem 'a', 1
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    set.add_always_install dep 'a'
+
+    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+
+    assert_equal %w[a-2], set.find_all(req).map { |spec| spec.full_name }
+  end
+
+  def test_find_all_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', '1'
+      fetcher.spec 'a', '1.a'
+      fetcher.clear
+    end
+
+    set = Gem::Resolver::InstallerSet.new :both
+
+    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+
+    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+
+    req = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
+
+    assert_equal %w[a-1 a-1.a],
+                 set.find_all(req).map { |spec| spec.full_name }.sort
+  end
+
   def test_load_spec
     specs = spec_fetcher do |fetcher|
       fetcher.spec 'a', 2

data/test/rubygems/test_gem_resolver_lock_set.rb

@@ -5,14 +5,15 @@ class TestGemResolverLockSet < Gem::TestCase
   def setup
     super
 
-    @source      = Gem::Source.new @gem_repo
-    @lock_source = Gem::Source::Lock.new @source
+    @sources     = [Gem::Source.new(@gem_repo)]
+    @lock_source = Gem::Source::Lock.new @sources.first
 
-    @set = Gem::Resolver::LockSet.new @source
+    @set = Gem::Resolver::LockSet.new @sources
   end
 
   def test_add
-    spec = @set.add 'a', '2', Gem::Platform::RUBY
+    specs = @set.add 'a', '2', Gem::Platform::RUBY
+    spec = specs.first
 
     assert_equal %w[a-2], @set.specs.map { |t| t.full_name }
 
@@ -26,12 +27,17 @@ class TestGemResolverLockSet < Gem::TestCase
   end
 
   def test_find_all
-    @set.add 'a', '2', Gem::Platform::RUBY
-    @set.add 'b', '2', Gem::Platform::RUBY
+    @set.add 'a', '1.a', Gem::Platform::RUBY
+    @set.add 'a', '2',   Gem::Platform::RUBY
+    @set.add 'b', '2',   Gem::Platform::RUBY
 
     found = @set.find_all dep 'a'
 
     assert_equal %w[a-2], found.map { |s| s.full_name }
+
+    found = @set.find_all dep 'a', '>= 0.a'
+
+    assert_equal %w[a-1.a a-2], found.map { |s| s.full_name }
   end
 
   def test_load_spec