rubygems-update 3.2.2 → 3.2.7

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -205,7 +205,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
           @test_data
         end
 
-        raise Gem::RemoteFetcher::FetchError.new("haha!", nil)
+        raise Gem::RemoteFetcher::FetchError.new("haha!", '')
       end
     end
 

data/test/rubygems/test_gem_requirement.rb

@@ -402,6 +402,27 @@ class TestGemRequirement < Gem::TestCase
     assert_equal r1.hash, r2.hash
   end
 
+  def test_hash_returns_equal_hashes_for_equivalent_requirements
+    refute_requirement_hash_equal "= 1.2", "= 1.3"
+    refute_requirement_hash_equal "= 1.3", "= 1.2"
+
+    refute_requirement_hash_equal "~> 1.3", "~> 1.3.0"
+    refute_requirement_hash_equal "~> 1.3.0", "~> 1.3"
+
+    assert_requirement_hash_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
+
+    assert_requirement_hash_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
+    assert_requirement_hash_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
+
+    assert_requirement_hash_equal "= 1.0", "= 1.0.0"
+    assert_requirement_hash_equal "= 1.1", "= 1.1.0"
+    assert_requirement_hash_equal "= 1", "= 1.0.0"
+
+    assert_requirement_hash_equal "1.0", "1.0.0"
+    assert_requirement_hash_equal "1.1", "1.1.0"
+    assert_requirement_hash_equal "1", "1.0.0"
+  end
+
   # Assert that two requirements are equal. Handles Gem::Requirements,
   # strings, arrays, numbers, and versions.
 
@@ -416,6 +437,13 @@ class TestGemRequirement < Gem::TestCase
       "#{requirement} is satisfied by #{version}"
   end
 
+  # Assert that two requirement hashes are equal. Handles Gem::Requirements,
+  # strings, arrays, numbers, and versions.
+
+  def assert_requirement_hash_equal(expected, actual)
+    assert_equal req(expected).hash, req(actual).hash
+  end
+
   # Refute the assumption that two requirements are equal.
 
   def refute_requirement_equal(unexpected, actual)
@@ -428,4 +456,10 @@ class TestGemRequirement < Gem::TestCase
     refute req(requirement).satisfied_by?(v(version)),
       "#{requirement} is not satisfied by #{version}"
   end
+
+  # Refute the assumption that two requirements hashes are equal.
+
+  def refute_requirement_hash_equal(unexpected, actual)
+    refute_equal req(unexpected).hash, req(actual).hash
+  end
 end

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -6,29 +6,29 @@ class TestGemResolverAPISet < Gem::TestCase
     super
 
     @DR = Gem::Resolver
-    @dep_uri = URI "#{@gem_repo}api/v1/dependencies"
+    @dep_uri = URI "#{@gem_repo}info/"
   end
 
   def test_initialize
     set = @DR::APISet.new
 
-    assert_equal URI('https://rubygems.org/api/v1/dependencies'), set.dep_uri
-    assert_equal URI('https://rubygems.org'),                     set.uri
-    assert_equal Gem::Source.new(URI('https://rubygems.org')),    set.source
+    assert_equal URI('https://index.rubygems.org/info/'),            set.dep_uri
+    assert_equal URI('https://index.rubygems.org/'),                 set.uri
+    assert_equal Gem::Source.new(URI('https://index.rubygems.org')), set.source
   end
 
   def test_initialize_deeper_uri
-    set = @DR::APISet.new 'https://rubygemsserver.com/mygems/api/v1/dependencies'
+    set = @DR::APISet.new 'https://rubygemsserver.com/mygems/info'
 
-    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 URI('https://rubygemsserver.com/mygems/info'),       set.dep_uri
+    assert_equal URI('https://rubygemsserver.com/'),                  set.uri
+    assert_equal Gem::Source.new(URI('https://rubygemsserver.com/')), 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}info/"), set.dep_uri
     assert_equal URI("#{@gem_repo}"), set.uri
   end
 
@@ -42,7 +42,7 @@ class TestGemResolverAPISet < Gem::TestCase
         :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
     set = @DR::APISet.new @dep_uri
 
@@ -69,7 +69,7 @@ class TestGemResolverAPISet < Gem::TestCase
         :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1\n2.a"
 
     set = @DR::APISet.new @dep_uri
     set.prerelease = true
@@ -94,7 +94,7 @@ class TestGemResolverAPISet < Gem::TestCase
         :dependencies => [] },
     ]
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  "
 
     set = @DR::APISet.new @dep_uri
 
@@ -108,7 +108,7 @@ class TestGemResolverAPISet < Gem::TestCase
 
     assert_equal expected, set.find_all(a_dep)
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
+    @fetcher.data.delete "#{@dep_uri}a"
   end
 
   def test_find_all_local
@@ -123,7 +123,7 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_find_all_missing
     spec_fetcher
 
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
@@ -131,7 +131,7 @@ class TestGemResolverAPISet < Gem::TestCase
 
     assert_empty set.find_all(a_dep)
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
+    @fetcher.data.delete "#{@dep_uri}a"
 
     assert_empty set.find_all(a_dep)
   end
@@ -139,15 +139,8 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [] },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
@@ -163,14 +156,7 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_cache
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [] },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
 
     set = @DR::APISet.new @dep_uri
 
@@ -179,8 +165,8 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a"
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data.delete "#{@dep_uri}a"
+    @fetcher.data["#{@dep_uri}?b"] = "---"
 
     set.prefetch [a_dep, b_dep]
   end
@@ -188,14 +174,8 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_cache_missing
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [] },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
 
@@ -204,7 +184,8 @@ class TestGemResolverAPISet < Gem::TestCase
 
     set.prefetch [a_dep, b_dep]
 
-    @fetcher.data.delete "#{@dep_uri}?gems=a,b"
+    @fetcher.data.delete "#{@dep_uri}a"
+    @fetcher.data.delete "#{@dep_uri}b"
 
     set.prefetch [a_dep, b_dep]
   end
@@ -212,15 +193,8 @@ class TestGemResolverAPISet < Gem::TestCase
   def test_prefetch_local
     spec_fetcher
 
-    data = [
-      { :name         => 'a',
-        :number       => '1',
-        :platform     => 'ruby',
-        :dependencies => [] },
-    ]
-
-    @fetcher.data["#{@dep_uri}?gems=a,b"] = Marshal.dump data
-    @fetcher.data["#{@dep_uri}?gems=b"]   = Marshal.dump []
+    @fetcher.data["#{@dep_uri}a"] = "---\n1  \n"
+    @fetcher.data["#{@dep_uri}b"] = "---"
 
     set = @DR::APISet.new @dep_uri
     set.remote = false

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -39,7 +39,7 @@ class TestGemResolverAPISpecification < Gem::TestCase
 
     rails = specs['rails-3.0.3']
 
-    repo = @gem_repo + 'api/v1/dependencies'
+    repo = @gem_repo + 'info'
 
     set = Gem::Resolver::APISet.new repo
 
@@ -123,7 +123,7 @@ class TestGemResolverAPISpecification < Gem::TestCase
       fetcher.spec 'a', 1
     end
 
-    dep_uri = URI(@gem_repo) + 'api/v1/dependencies'
+    dep_uri = URI(@gem_repo) + 'info'
     set = Gem::Resolver::APISet.new dep_uri
     data = {
       :name         => 'a',
@@ -147,7 +147,7 @@ class TestGemResolverAPISpecification < Gem::TestCase
       end
     end
 
-    dep_uri = URI(@gem_repo) + 'api/v1/dependencies'
+    dep_uri = URI(@gem_repo) + 'info'
     set = Gem::Resolver::APISet.new dep_uri
     data = {
       :name         => 'j',

data/test/rubygems/test_gem_resolver_best_set.rb

@@ -39,7 +39,7 @@ class TestGemResolverBestSet < Gem::TestCase
 
     set = @DR::BestSet.new
 
-    api_uri = URI(@gem_repo) + './api/v1/dependencies'
+    api_uri = URI(@gem_repo)
 
     set.sets << Gem::Resolver::APISet.new(api_uri)
 
@@ -99,12 +99,12 @@ class TestGemResolverBestSet < Gem::TestCase
   def test_replace_failed_api_set
     set = @DR::BestSet.new
 
-    api_uri = URI(@gem_repo) + './api/v1/dependencies'
+    api_uri = URI(@gem_repo) + './info/'
     api_set = Gem::Resolver::APISet.new api_uri
 
     set.sets << api_set
 
-    error_uri = api_uri + '?gems=a'
+    error_uri = api_uri + 'a'
 
     error = Gem::RemoteFetcher::FetchError.new 'bogus', error_uri
 
@@ -132,4 +132,27 @@ class TestGemResolverBestSet < Gem::TestCase
 
     assert_equal error, e
   end
+
+  def test_replace_failed_api_set_uri_with_credentials
+    set = @DR::BestSet.new
+
+    api_uri = URI(@gem_repo) + './info/'
+    api_uri.user = 'user'
+    api_uri.password = 'pass'
+    api_set = Gem::Resolver::APISet.new api_uri
+
+    set.sets << api_set
+
+    error_uri = api_uri + '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
 end

data/test/rubygems/test_gem_source.rb

@@ -44,9 +44,9 @@ class TestGemSource < Gem::TestCase
 
   def test_dependency_resolver_set_bundler_api
     response = Net::HTTPResponse.new '1.1', 200, 'OK'
-    response.uri = URI('http://example') if response.respond_to? :uri
+    response.uri = URI('http://example')
 
-    @fetcher.data["#{@gem_repo}api/v1/dependencies"] = response
+    @fetcher.data[@gem_repo] = response
 
     set = @source.dependency_resolver_set
 

data/test/rubygems/test_gem_source_subpath_problem.rb

@@ -21,9 +21,9 @@ class TestGemSourceSubpathProblem < Gem::TestCase
 
   def test_dependency_resolver_set
     response = Net::HTTPResponse.new '1.1', 200, 'OK'
-    response.uri = URI('http://example') if response.respond_to? :uri
+    response.uri = URI('http://example')
 
-    @fetcher.data["#{@gem_repo}/api/v1/dependencies"] = response
+    @fetcher.data["#{@gem_repo}/"] = response
 
     set = @source.dependency_resolver_set
 

data/test/rubygems/test_gem_specification.rb

@@ -1161,6 +1161,14 @@ dependencies: []
     Gem::Specification.class_variable_set(:@@stubs, nil)
   end
 
+  def test_self_stubs_for_no_lazy_loading_after_all_specs_setup
+    Gem::Specification.all = [util_spec('a', '1')]
+
+    save_gemspec('b-1', '1', File.join(Gem.dir, 'specifications')){|s| s.name = 'b' }
+
+    assert_equal [], Gem::Specification.stubs_for('b').map {|s| s.full_name }
+  end
+
   def test_self_stubs_for_mult_platforms
     # gems for two different platforms are installed with --user-install
     # the correct one should be returned in the array
@@ -1200,10 +1208,8 @@ dependencies: []
     Gem.platforms = orig_platform
   end
 
-  DATA_PATH = File.expand_path "../data", __FILE__
-
   def test_handles_private_null_type
-    path = File.join DATA_PATH, "null-type.gemspec.rz"
+    path = File.expand_path "../data/null-type.gemspec.rz", __FILE__
 
     data = Marshal.load Gem::Util.inflate(Gem.read_binary(path))
 

data/test/rubygems/test_gem_stream_ui.rb

@@ -5,7 +5,7 @@ require 'timeout'
 
 class TestGemStreamUI < Gem::TestCase
   # increase timeout with MJIT for --jit-wait testing
-  mjit_enabled = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
+  mjit_enabled = defined?(RubyVM::JIT) ? RubyVM::JIT.enabled? : defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
   SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !mjit_enabled) ? 0.1 : 1.0
 
   module IsTty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.7
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -39,7 +39,7 @@ executables:
 - update_rubygems
 extensions: []
 extra_rdoc_files:
-- History.txt
+- CHANGELOG.md
 - LICENSE.txt
 - MAINTAINERS.txt
 - MIT.txt
@@ -53,34 +53,10 @@ extra_rdoc_files:
 - bundler/LICENSE.md
 - bundler/README.md
 - hide_lib_for_update/note.txt
-- bundler/man/bundle-init.1
-- bundler/man/bundle-add.1
-- bundler/man/bundle-remove.1
-- bundler/man/bundle-info.1
-- bundler/man/bundle.1
-- bundler/man/bundle-check.1
-- bundler/man/bundle-exec.1
-- bundler/man/bundle-show.1
-- bundler/man/bundle-outdated.1
-- bundler/man/bundle-platform.1
-- bundler/man/bundle-gem.1
-- bundler/man/bundle-inject.1
-- bundler/man/bundle-binstubs.1
-- bundler/man/bundle-doctor.1
-- bundler/man/bundle-lock.1
-- bundler/man/bundle-viz.1
-- bundler/man/bundle-config.1
-- bundler/man/bundle-list.1
-- bundler/man/bundle-clean.1
-- bundler/man/bundle-update.1
-- bundler/man/bundle-pristine.1
-- bundler/man/bundle-open.1
-- bundler/man/bundle-cache.1
-- bundler/man/bundle-install.1
 files:
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
-- History.txt
 - LICENSE.txt
 - MAINTAINERS.txt
 - MIT.txt
@@ -132,6 +108,7 @@ files:
 - bundler/lib/bundler/cli/viz.rb
 - bundler/lib/bundler/compact_index_client.rb
 - bundler/lib/bundler/compact_index_client/cache.rb
+- bundler/lib/bundler/compact_index_client/gem_parser.rb
 - bundler/lib/bundler/compact_index_client/updater.rb
 - bundler/lib/bundler/constants.rb
 - bundler/lib/bundler/current_ruby.rb
@@ -170,31 +147,57 @@ files:
 - bundler/lib/bundler/lockfile_generator.rb
 - bundler/lib/bundler/lockfile_parser.rb
 - bundler/lib/bundler/man/.document
+- bundler/lib/bundler/man/bundle-add.1
 - bundler/lib/bundler/man/bundle-add.1.ronn
+- bundler/lib/bundler/man/bundle-binstubs.1
 - bundler/lib/bundler/man/bundle-binstubs.1.ronn
+- bundler/lib/bundler/man/bundle-cache.1
 - bundler/lib/bundler/man/bundle-cache.1.ronn
+- bundler/lib/bundler/man/bundle-check.1
 - bundler/lib/bundler/man/bundle-check.1.ronn
+- bundler/lib/bundler/man/bundle-clean.1
 - bundler/lib/bundler/man/bundle-clean.1.ronn
+- bundler/lib/bundler/man/bundle-config.1
 - bundler/lib/bundler/man/bundle-config.1.ronn
+- bundler/lib/bundler/man/bundle-doctor.1
 - bundler/lib/bundler/man/bundle-doctor.1.ronn
+- bundler/lib/bundler/man/bundle-exec.1
 - bundler/lib/bundler/man/bundle-exec.1.ronn
+- bundler/lib/bundler/man/bundle-gem.1
 - bundler/lib/bundler/man/bundle-gem.1.ronn
+- bundler/lib/bundler/man/bundle-info.1
 - bundler/lib/bundler/man/bundle-info.1.ronn
+- bundler/lib/bundler/man/bundle-init.1
 - bundler/lib/bundler/man/bundle-init.1.ronn
+- bundler/lib/bundler/man/bundle-inject.1
 - bundler/lib/bundler/man/bundle-inject.1.ronn
+- bundler/lib/bundler/man/bundle-install.1
 - bundler/lib/bundler/man/bundle-install.1.ronn
+- bundler/lib/bundler/man/bundle-list.1
 - bundler/lib/bundler/man/bundle-list.1.ronn
+- bundler/lib/bundler/man/bundle-lock.1
 - bundler/lib/bundler/man/bundle-lock.1.ronn
+- bundler/lib/bundler/man/bundle-open.1
 - bundler/lib/bundler/man/bundle-open.1.ronn
+- bundler/lib/bundler/man/bundle-outdated.1
 - bundler/lib/bundler/man/bundle-outdated.1.ronn
+- bundler/lib/bundler/man/bundle-platform.1
 - bundler/lib/bundler/man/bundle-platform.1.ronn
+- bundler/lib/bundler/man/bundle-pristine.1
 - bundler/lib/bundler/man/bundle-pristine.1.ronn
+- bundler/lib/bundler/man/bundle-remove.1
 - bundler/lib/bundler/man/bundle-remove.1.ronn
+- bundler/lib/bundler/man/bundle-show.1
 - bundler/lib/bundler/man/bundle-show.1.ronn
+- bundler/lib/bundler/man/bundle-update.1
 - bundler/lib/bundler/man/bundle-update.1.ronn
+- bundler/lib/bundler/man/bundle-viz.1
 - bundler/lib/bundler/man/bundle-viz.1.ronn
+- bundler/lib/bundler/man/bundle.1
 - bundler/lib/bundler/man/bundle.1.ronn
+- bundler/lib/bundler/man/gemfile.5
 - bundler/lib/bundler/man/gemfile.5.ronn
+- bundler/lib/bundler/man/index.txt
 - bundler/lib/bundler/match_platform.rb
 - bundler/lib/bundler/mirror.rb
 - bundler/lib/bundler/plugin.rb
@@ -359,32 +362,6 @@ files:
 - bundler/lib/bundler/vlad.rb
 - bundler/lib/bundler/worker.rb
 - bundler/lib/bundler/yaml_serializer.rb
-- bundler/man/bundle-add.1
-- bundler/man/bundle-binstubs.1
-- bundler/man/bundle-cache.1
-- bundler/man/bundle-check.1
-- bundler/man/bundle-clean.1
-- bundler/man/bundle-config.1
-- bundler/man/bundle-doctor.1
-- bundler/man/bundle-exec.1
-- bundler/man/bundle-gem.1
-- bundler/man/bundle-info.1
-- bundler/man/bundle-init.1
-- bundler/man/bundle-inject.1
-- bundler/man/bundle-install.1
-- bundler/man/bundle-list.1
-- bundler/man/bundle-lock.1
-- bundler/man/bundle-open.1
-- bundler/man/bundle-outdated.1
-- bundler/man/bundle-platform.1
-- bundler/man/bundle-pristine.1
-- bundler/man/bundle-remove.1
-- bundler/man/bundle-show.1
-- bundler/man/bundle-update.1
-- bundler/man/bundle-viz.1
-- bundler/man/bundle.1
-- bundler/man/gemfile.5
-- bundler/man/index.txt
 - hide_lib_for_update/note.txt
 - lib/rubygems.rb
 - lib/rubygems/available_set.rb
@@ -492,6 +469,7 @@ files:
 - lib/rubygems/resolver.rb
 - lib/rubygems/resolver/activation_request.rb
 - lib/rubygems/resolver/api_set.rb
+- lib/rubygems/resolver/api_set/gem_parser.rb
 - lib/rubygems/resolver/api_specification.rb
 - lib/rubygems/resolver/best_set.rb
 - lib/rubygems/resolver/composed_set.rb
@@ -589,6 +567,7 @@ files:
 - test/rubygems/client.pem
 - test/rubygems/data/gem-private_key.pem
 - test/rubygems/data/gem-public_cert.pem
+- test/rubygems/data/null-required-rubygems-version.gemspec.rz
 - test/rubygems/data/null-type.gemspec.rz
 - test/rubygems/encrypted_private_key.pem
 - test/rubygems/expired_cert.pem
@@ -786,7 +765,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.1
+rubygems_version: 3.2.7
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.