rubygems-update 3.1.6 → 3.2.0

data/test/rubygems/test_gem_requirement.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require "rubygems/requirement"
 
 class TestGemRequirement < Gem::TestCase
-
   def test_concat
     r = req '>= 1'
 
@@ -23,6 +22,8 @@ class TestGemRequirement < Gem::TestCase
     refute_requirement_equal "~> 1.3", "~> 1.3.0"
     refute_requirement_equal "~> 1.3.0", "~> 1.3"
 
+    assert_requirement_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
+
     assert_requirement_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
     assert_requirement_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
 
@@ -82,6 +83,12 @@ class TestGemRequirement < Gem::TestCase
       Gem::Requirement.parse(Gem::Version.new('2'))
   end
 
+  if RUBY_VERSION >= '2.5'
+    def test_parse_deduplication
+      assert_same '~>', Gem::Requirement.parse('~> 1').first
+    end
+  end
+
   def test_parse_bad
     [
       nil,
@@ -390,8 +397,8 @@ class TestGemRequirement < Gem::TestCase
     r2 = req('2.0', '1.0')
     assert_equal r1.hash, r2.hash
 
-    r1 = req('1.0', '2.0').tap { |r| r.concat(['3.0']) }
-    r2 = req('3.0', '1.0').tap { |r| r.concat(['2.0']) }
+    r1 = req('1.0', '2.0').tap {|r| r.concat(['3.0']) }
+    r2 = req('3.0', '1.0').tap {|r| r.concat(['2.0']) }
     assert_equal r1.hash, r2.hash
   end
 
@@ -421,5 +428,4 @@ class TestGemRequirement < Gem::TestCase
     refute req(requirement).satisfied_by?(v(version)),
       "#{requirement} is not satisfied by #{version}"
   end
-
 end

data/test/rubygems/test_gem_resolver.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolver < Gem::TestCase
-
   def setup
     super
 
@@ -26,10 +25,10 @@ class TestGemResolver < Gem::TestCase
   def assert_resolves_to(expected, resolver)
     actual = resolver.resolve
 
-    exp = expected.sort_by { |s| s.full_name }
-    act = actual.map { |a| a.spec.spec }.sort_by { |s| s.full_name }
+    exp = expected.sort_by {|s| s.full_name }
+    act = actual.map {|a| a.spec.spec }.sort_by {|s| s.full_name }
 
-    msg = "Set of gems was not the same: #{exp.map { |x| x.full_name}.inspect} != #{act.map { |x| x.full_name}.inspect}"
+    msg = "Set of gems was not the same: #{exp.map {|x| x.full_name }.inspect} != #{act.map {|x| x.full_name }.inspect}"
 
     assert_equal exp, act, msg
   rescue Gem::DependencyResolutionError => e
@@ -105,7 +104,7 @@ class TestGemResolver < Gem::TestCase
 
     res.requests a1, act, reqs
 
-    assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
+    assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
   end
 
   def test_requests_development
@@ -127,7 +126,7 @@ class TestGemResolver < Gem::TestCase
 
     res.requests spec, act, reqs
 
-    assert_equal ['b (= 2)'], reqs.map { |req| req.to_s }
+    assert_equal ['b (= 2)'], reqs.map {|req| req.to_s }
 
     assert spec.instance_variable_defined? :@called
   end
@@ -546,7 +545,7 @@ class TestGemResolver < Gem::TestCase
 
     dependency = e.conflict.dependency
 
-    assert_includes %w(a b), dependency.name
+    assert_includes %w[a b], dependency.name
     assert_equal req('>= 0'), dependency.requirement
 
     activated = e.conflict.activated
@@ -789,5 +788,4 @@ class TestGemResolver < Gem::TestCase
     assert_match "No match for 'a (= 1)' on this platform. Found: c-p-1",
                  e.message
   end
-
 end

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverActivationRequest < Gem::TestCase
-
   def setup
     super
 
@@ -40,5 +39,4 @@ class TestGemResolverActivationRequest < Gem::TestCase
 
     assert @req.installed?
   end
-
 end

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverAPISet < Gem::TestCase
-
   def setup
     super
 
@@ -23,14 +22,14 @@ class TestGemResolverAPISet < Gem::TestCase
 
     assert_equal URI('https://rubygemsserver.com/mygems/api/v1/dependencies'), set.dep_uri
     assert_equal URI('https://rubygemsserver.com/mygems/'),                    set.uri
-    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')),    set.source
+    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/mygems/')), set.source
   end
 
   def test_initialize_uri
     set = @DR::APISet.new @dep_uri
 
     assert_equal URI("#{@gem_repo}api/v1/dependencies"), set.dep_uri
-    assert_equal URI("#{@gem_repo}"),                     set.uri
+    assert_equal URI("#{@gem_repo}"), set.uri
   end
 
   def test_find_all
@@ -40,7 +39,7 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
     @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
@@ -50,7 +49,7 @@ class TestGemResolverAPISet < Gem::TestCase
     a_dep = @DR::DependencyRequest.new dep('a'), nil
 
     expected = [
-      @DR::APISpecification.new(set, data.first)
+      @DR::APISpecification.new(set, data.first),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -63,7 +62,7 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
     @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
@@ -75,7 +74,7 @@ class TestGemResolverAPISet < Gem::TestCase
     set.prefetch [a_dep]
 
     expected = [
-      @DR::APISpecification.new(set, data.first)
+      @DR::APISpecification.new(set, data.first),
     ]
 
     assert_equal expected, set.find_all(a_dep)
@@ -115,7 +114,7 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
     @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
@@ -128,7 +127,7 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep, b_dep]
 
-    assert_equal %w[a-1], set.find_all(a_dep).map { |s| s.full_name }
+    assert_equal %w[a-1], set.find_all(a_dep).map {|s| s.full_name }
     assert_empty          set.find_all(b_dep)
   end
 
@@ -139,7 +138,7 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
     @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
@@ -164,7 +163,7 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
     @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
@@ -188,7 +187,7 @@ class TestGemResolverAPISet < Gem::TestCase
       { :name         => 'a',
         :number       => '1',
         :platform     => 'ruby',
-        :dependencies => [], },
+        :dependencies => [] },
     ]
 
     @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
@@ -204,5 +203,4 @@ class TestGemResolverAPISet < Gem::TestCase
 
     assert_empty set.instance_variable_get :@data
   end
-
 end

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverAPISpecification < Gem::TestCase
-
   def test_initialize
     set = Gem::Resolver::APISet.new
     data = {
@@ -164,5 +163,4 @@ class TestGemResolverAPISpecification < Gem::TestCase
     assert_kind_of Gem::Specification, spec
     assert_equal 'j-1-java', spec.full_name
   end
-
 end

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverBestSet < Gem::TestCase
-
   def setup
     super
 
@@ -30,7 +29,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map { |s| s.full_name }
+    assert_equal %w[a-1], found.map {|s| s.full_name }
   end
 
   def test_find_all_fallback
@@ -50,7 +49,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map { |s| s.full_name }
+    assert_equal %w[a-1], found.map {|s| s.full_name }
   end
 
   def test_find_all_local
@@ -133,5 +132,4 @@ class TestGemResolverBestSet < Gem::TestCase
 
     assert_equal error, e
   end
-
 end

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverComposedSet < Gem::TestCase
-
   def test_errors
     index_set   = Gem::Resolver::IndexSet.new
     current_set = Gem::Resolver::CurrentSet.new
@@ -41,5 +40,4 @@ class TestGemResolverComposedSet < Gem::TestCase
     refute best_set.remote?
     refute current_set.remote?
   end
-
 end

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverConflict < Gem::TestCase
-
   def test_explanation
     root  =
       dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
@@ -74,10 +73,9 @@ class TestGemResolverConflict < Gem::TestCase
 
     expected = [
       'net-ssh (>= 2.0.13), 2.2.2 activated',
-      'rye (= 0.9.8), 0.9.8 activated'
+      'rye (= 0.9.8), 0.9.8 activated',
     ]
 
     assert_equal expected, conflict.request_path(child.requester)
   end
-
 end

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverDependencyRequest < Gem::TestCase
-
   def setup
     super
 
@@ -80,5 +79,4 @@ class TestGemResolverDependencyRequest < Gem::TestCase
 
     assert_equal dependency, dr.dependency
   end
-
 end

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverGitSet < Gem::TestCase
-
   def setup
     super
 
@@ -185,5 +184,4 @@ class TestGemResolverGitSet < Gem::TestCase
 
     assert_equal "#{@gemhome}2", spec.source.root_dir
   end
-
 end

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/installer'
 
 class TestGemResolverGitSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -110,5 +109,4 @@ class TestGemResolverGitSpecification < Gem::TestCase
 
     assert called
   end
-
 end

data/test/rubygems/test_gem_resolver_index_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverIndexSet < Gem::TestCase
-
   def setup
     super
 
@@ -42,7 +41,7 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1], found.map { |s| s.full_name }
+    assert_equal %w[a-1], found.map {|s| s.full_name }
   end
 
   def test_find_all_local
@@ -83,7 +82,6 @@ class TestGemResolverIndexSet < Gem::TestCase
 
     found = set.find_all req
 
-    assert_equal %w[a-1.a], found.map { |s| s.full_name }
+    assert_equal %w[a-1.a], found.map {|s| s.full_name }
   end
-
 end

data/test/rubygems/test_gem_resolver_index_specification.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/available_set'
 
 class TestGemResolverIndexSpecification < Gem::TestCase
-
   def test_initialize
     set     = Gem::Resolver::IndexSet.new
     source  = Gem::Source.new @gem_repo
@@ -90,5 +89,4 @@ class TestGemResolverIndexSpecification < Gem::TestCase
 
     assert_equal a_2_p.full_name, spec.full_name
   end
-
 end

data/test/rubygems/test_gem_resolver_installed_specification.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverInstalledSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -44,5 +43,4 @@ class TestGemResolverInstalledSpecification < Gem::TestCase
 
     assert b_spec.installable_platform?
   end
-
 end

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverInstallerSet < Gem::TestCase
-
   def test_add_always_install
     spec_fetcher do |fetcher|
       fetcher.download 'a', 1
@@ -15,7 +14,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep('a')
 
-    assert_equal %w[a-2], set.always_install.map { |s| s.full_name }
+    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')
@@ -49,7 +48,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep('a')
 
-    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
   end
 
   def test_add_always_install_prerelease
@@ -62,7 +61,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     set.add_always_install dep('a')
 
-    assert_equal %w[a-1], set.always_install.map { |s| s.full_name }
+    assert_equal %w[a-1], set.always_install.map {|s| s.full_name }
   end
 
   def test_add_always_install_prerelease_only
@@ -93,7 +92,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_consider_local_eh
@@ -149,7 +148,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-2], set.find_all(req).map { |spec| spec.full_name }
+    assert_equal %w[a-2], set.find_all(req).map {|spec| spec.full_name }
   end
 
   def test_find_all_prerelease
@@ -162,12 +161,12 @@ class TestGemResolverInstallerSet < Gem::TestCase
 
     req = Gem::Resolver::DependencyRequest.new dep('a'), nil
 
-    assert_equal %w[a-1], set.find_all(req).map { |spec| spec.full_name }
+    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
+                 set.find_all(req).map {|spec| spec.full_name }.sort
   end
 
   def test_load_spec
@@ -255,5 +254,4 @@ class TestGemResolverInstallerSet < Gem::TestCase
     refute set.consider_local?
     refute set.consider_remote?
   end
-
 end