rubygems-update 3.1.0.pre3 → 3.1.0

data/test/rubygems/test_project_sanity.rb

@@ -1,28 +1,9 @@
 # frozen_string_literal: true
 
-require "rubygems/test_case"
 require "open3"
 
 class TestProjectSanity < Minitest::Test
 
-  def test_rake_package_builds_ok
-    skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
-
-    with_empty_pkg_folder do
-      output, status = Open3.capture2e("rake package")
-
-      assert_equal true, status.success?, <<~MSG.chomp
-        Expected `rake package` to work, but got errors:
-
-        ```
-        #{output}
-        ```
-
-        If you have added or removed files, make sure you run `rake update_manifest` to update the `Manifest.txt` accordingly
-      MSG
-    end
-  end
-
   def test_manifest_is_up_to_date
     skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
 
@@ -31,28 +12,4 @@ class TestProjectSanity < Minitest::Test
     assert status.success?, "Expected Manifest.txt to be up to date, but it's not. Run `rake update_manifest` to sync it."
   end
 
-  private
-
-  def with_empty_pkg_folder
-    if File.exist?("pkg")
-      FileUtils.cp_r("pkg", "tmp")
-
-      begin
-        FileUtils.rm_rf("pkg")
-        yield
-      ensure
-        FileUtils.rm_rf("pkg")
-        FileUtils.cp_r("tmp/pkg", ".")
-      end
-    else
-      Dir.mkdir("pkg")
-
-      begin
-        yield
-      ensure
-        FileUtils.rm_rf("pkg")
-      end
-    end
-  end
-
 end

data/test/rubygems/test_remote_fetch_error.rb

@@ -5,7 +5,7 @@ class TestRemoteFetchError < Gem::TestCase
 
   def test_password_redacted
     error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://user:secret@gemsource.org')
-    refute_match error.to_s, 'secret'
+    refute_match 'secret', error.to_s
   end
 
   def test_invalid_url

data/test/rubygems/test_require.rb

@@ -124,13 +124,13 @@ class TestGemRequire < Gem::TestCase
     Object.const_set :FILE_ENTERED_LATCH, Latch.new(2)
     Object.const_set :FILE_EXIT_LATCH, Latch.new(1)
 
-    a1 = util_spec "a", "1", nil, "lib/a.rb"
-    b1 = util_spec "b", "1", nil, "lib/b.rb"
+    a1 = util_spec "a#{$$}", "1", nil, "lib/a#{$$}.rb"
+    b1 = util_spec "b#{$$}", "1", nil, "lib/b#{$$}.rb"
 
     install_specs a1, b1
 
-    t1 = create_sync_thread{ assert_require 'a' }
-    t2 = create_sync_thread{ assert_require 'b' }
+    t1 = create_sync_thread{ assert_require "a#{$$}" }
+    t2 = create_sync_thread{ assert_require "b#{$$}" }
 
     # wait until both files are waiting on the exit latch
     FILE_ENTERED_LATCH.await
@@ -326,7 +326,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_doesnt_traverse_development_dependencies
-    a = util_spec("a", "1", nil, "lib/a.rb")
+    a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb")
     z = util_spec("z", "1", "w" => "> 0")
     w1 = util_spec("w", "1") { |s| s.add_development_dependency "non-existent" }
     w2 = util_spec("w", "2") { |s| s.add_development_dependency "non-existent" }
@@ -337,7 +337,7 @@ class TestGemRequire < Gem::TestCase
     assert_equal %w(z-1), loaded_spec_names
     assert_equal ["w (> 0)"], unresolved_names
 
-    assert require("a")
+    assert require("a#{$$}")
   end
 
   def test_default_gem_only
@@ -365,19 +365,16 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_realworld_default_gem
-    begin
-      gem 'json'
-    rescue Gem::MissingSpecError
-      skip "default gems are only available after ruby installation"
-    end
+    testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
+    skip "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
 
     cmd = <<-RUBY
       $stderr = $stdout
       require "json"
-      puts Gem.loaded_specs["json"].default_gem?
+      puts Gem.loaded_specs["json"]
     RUBY
     output = Gem::Util.popen(Gem.ruby, "-e", cmd).strip
-    assert_equal "true", output
+    refute_empty output
   end
 
   def test_default_gem_and_normal_gem
@@ -451,15 +448,15 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_require_default_when_gem_defined
-    a = util_spec("a", "1", nil, "lib/a.rb")
+    a = util_spec("a#{$$}", "1", nil, "lib/a#{$$}.rb")
     install_specs a
     c = Class.new do
       def self.gem(*args)
         raise "received #gem with #{args.inspect}"
       end
     end
-    assert c.send(:require, "a")
-    assert_equal %w(a-1), loaded_spec_names
+    assert c.send(:require, "a#{$$}")
+    assert_equal %W(a#{$$}-1), loaded_spec_names
   end
 
   def test_require_bundler
@@ -499,36 +496,38 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
-  # uplevel is 2.5+ only and jruby has some issues with it
-  if RUBY_VERSION >= "2.5" && !java_platform?
-    def test_no_kernel_require_in_warn_with_uplevel
-      lib = File.realpath("../../../lib", __FILE__)
-      Dir.mktmpdir("warn_test") do |dir|
-        File.write(dir + "/sub.rb", "warn 'uplevel', 'test', uplevel: 1\n")
-        File.write(dir + "/main.rb", "require 'sub'\n")
-        _, err = capture_subprocess_io do
-          system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
-        end
-        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
-        _, err = capture_subprocess_io do
-          system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+  # uplevel is 2.5+ only
+  if RUBY_VERSION >= "2.5"
+    ["", "Kernel."].each do |prefix|
+      define_method "test_no_kernel_require_in_#{prefix.tr(".", "_")}warn_with_uplevel" do
+        lib = File.realpath("../../../lib", __FILE__)
+        Dir.mktmpdir("warn_test") do |dir|
+          File.write(dir + "/sub.rb", "#{prefix}warn 'uplevel', 'test', uplevel: 1\n")
+          File.write(dir + "/main.rb", "require 'sub'\n")
+          _, err = capture_subprocess_io do
+            system(@@ruby, "-w", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+          end
+          assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
+          _, err = capture_subprocess_io do
+            system(@@ruby, "-w", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+          end
+          assert_match(/main\.rb:1: warning: uplevel\ntest\n$/, err)
         end
-        assert_equal "main.rb:1: warning: uplevel\ntest\n", err
       end
-    end
 
-    def test_no_other_behavioral_changes_with_kernel_warn
-      lib = File.realpath("../../../lib", __FILE__)
-      Dir.mktmpdir("warn_test") do |dir|
-        File.write(dir + "/main.rb", "warn({x:1}, {y:2}, [])\n")
-        _, err = capture_subprocess_io do
-          system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
-        end
-        assert_equal "{:x=>1}\n{:y=>2}\n", err
-        _, err = capture_subprocess_io do
-          system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
+      define_method "test_no_other_behavioral_changes_with_#{prefix.tr(".", "_")}warn" do
+        lib = File.realpath("../../../lib", __FILE__)
+        Dir.mktmpdir("warn_test") do |dir|
+          File.write(dir + "/main.rb", "#{prefix}warn({x:1}, {y:2}, [])\n")
+          _, err = capture_subprocess_io do
+            system(@@ruby, "-w", "--disable=gems", "-I", lib, "-C", dir, "main.rb")
+          end
+          assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
+          _, err = capture_subprocess_io do
+            system(@@ruby, "-w", "--enable=gems", "-I", lib, "-C", dir, "main.rb")
+          end
+          assert_match(/{:x=>1}\n{:y=>2}\n$/, err)
         end
-        assert_equal "{:x=>1}\n{:y=>2}\n", err
       end
     end
   end

data/util/bisect

@@ -7,25 +7,4 @@ rescue Gem::GemNotFoundException
   abort "Install minitest-bisect gem to run a rubygems test suite bisection"
 end
 
-#
-# Need to monkeypatch the `path_expander` gem to make sure it uses the same
-# sorted set of files as `rake`. Otherwise `rake test` failures are
-# irreproducible. Can be removed once
-# https://github.com/seattlerb/path_expander/pull/4 is released.
-#
-
-module RefinedPathExpander
-  def expand_dirs_to_files(*dirs)
-    super.sort
-  end
-end
-
-require 'path_expander'
-
-class PathExpander
-
-  prepend RefinedPathExpander
-
-end
-
 load minitest_bisect

data/util/ci.sh

@@ -30,7 +30,7 @@ case $1 in
       fi
 
       gem install rake -v "~>12.0"
-      exec bin/rake spec:travis:deps
+      exec bin/rake spec:deps
     fi
 
     ;;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre3
+  version: 3.1.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,92 +16,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.74.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.74.0
+date: 2019-12-16 00:00:00.000000000 Z
+dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
     that can be invoked by a Ruby program, such as reading and parsing an XML file. We call
@@ -163,9 +79,12 @@ extra_rdoc_files:
 - bundler/man/bundle-clean.1
 - bundler/man/bundle-inject.1
 files:
+- ".bundle/config"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE.txt
 - MAINTAINERS.txt
@@ -241,7 +160,6 @@ files:
 - bundler/lib/bundler/friendly_errors.rb
 - bundler/lib/bundler/gem_helper.rb
 - bundler/lib/bundler/gem_helpers.rb
-- bundler/lib/bundler/gem_remote_fetcher.rb
 - bundler/lib/bundler/gem_tasks.rb
 - bundler/lib/bundler/gem_version_promoter.rb
 - bundler/lib/bundler/gemdeps.rb
@@ -334,7 +252,6 @@ files:
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 - bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
-- bundler/lib/bundler/vendor/fileutils/lib/fileutils/version.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
@@ -371,13 +288,13 @@ files:
 - bundler/lib/bundler/vendor/thor/lib/thor/base.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/command.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
-- bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/error.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/group.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/line_editor.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
+- bundler/lib/bundler/vendor/thor/lib/thor/nested_context.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/parser.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/parser/argument.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
@@ -391,10 +308,24 @@ files:
 - bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/version.rb
+- bundler/lib/bundler/vendor/uri/lib/uri.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/common.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/file.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/ftp.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/generic.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/http.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/https.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/ldap.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/ldaps.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/version.rb
 - bundler/lib/bundler/vendored_fileutils.rb
 - bundler/lib/bundler/vendored_molinillo.rb
 - bundler/lib/bundler/vendored_persistent.rb
 - bundler/lib/bundler/vendored_thor.rb
+- bundler/lib/bundler/vendored_uri.rb
 - bundler/lib/bundler/version.rb
 - bundler/lib/bundler/version_ranges.rb
 - bundler/lib/bundler/vlad.rb
@@ -657,6 +588,8 @@ files:
 - lib/rubygems/text.rb
 - lib/rubygems/uninstaller.rb
 - lib/rubygems/uri_formatter.rb
+- lib/rubygems/uri_parser.rb
+- lib/rubygems/uri_parsing.rb
 - lib/rubygems/user_interaction.rb
 - lib/rubygems/util.rb
 - lib/rubygems/util/licenses.rb

data/bundler/lib/bundler/gem_remote_fetcher.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require "rubygems/remote_fetcher"
-
-module Bundler
-  # Adds support for setting custom HTTP headers when fetching gems from the
-  # server.
-  #
-  # TODO: Get rid of this when and if gemstash only supports RubyGems versions
-  # that contain https://github.com/rubygems/rubygems/commit/3db265cc20b2f813.
-  class GemRemoteFetcher < Gem::RemoteFetcher
-    attr_accessor :headers
-
-    # Extracted from RubyGems 2.4.
-    def fetch_http(uri, last_modified = nil, head = false, depth = 0)
-      fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
-      # beginning of change
-      response   = request uri, fetch_type, last_modified do |req|
-        headers.each {|k, v| req.add_field(k, v) } if headers
-      end
-      # end of change
-
-      case response
-      when Net::HTTPOK, Net::HTTPNotModified then
-        response.uri = uri if response.respond_to? :uri
-        head ? response : response.body
-      when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
-           Net::HTTPTemporaryRedirect then
-        raise FetchError.new("too many redirects", uri) if depth > 10
-
-        location = URI.parse response["Location"]
-
-        if https?(uri) && !https?(location)
-          raise FetchError.new("redirecting to non-https resource: #{location}", uri)
-        end
-
-        fetch_http(location, last_modified, head, depth + 1)
-      else
-        raise FetchError.new("bad response #{response.message} #{response.code}", uri)
-      end
-    end
-  end
-end