rubygems-update 2.7.9 → 2.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6736c355ae1a7a8a8818d475210864d02a45fa719d077fa0fbdb3364f66516a8
-  data.tar.gz: d1e05cf09f69a1138e938415d01efe56899cbd01566d7ec00e012d91435aa21e
+  metadata.gz: 7d5b46d3734b85b5918d8e3dc8a02b1ab011b0880bc5eaf1037c7d43f78bb172
+  data.tar.gz: 534d6caa35ce33777a04ec8c13c93a10a6fde6229ae888354dded07a73930fb7
 SHA512:
-  metadata.gz: baefafb2d473d18a0261483e5210052a01a89be4332fd2329530d0f0340f6e9bf7c1c902d6e519d9212a33d3f942f6c905a685c61480cb06833df0773b4cfef5
-  data.tar.gz: 9f3c018f865fbe4cf5f11efba601c40cd5b6bc470f1e782cfa7b9fdfa2a2f3b9e2df3bf563a0f857906f9757691cd335224358fb67e2b037097f711f3da5023e
+  metadata.gz: dbba7ff99a566c7932ebdd64c03f2b708aabfb81aff9bc4841a5aed3084e278ac04a90153ce304bc897431941baa5189cc120f45e668f5ae9fd70cbe0d0108df
+  data.tar.gz: 9e7761b5124571a60c3c6cc74658acb9ce1d2929e5ab06290248bc1ef41cf8026c2971b97808d39fb80ed4251c27b4ce5f2fafd3d1faf4b5d1b3d2576d871dcf

data/History.txt

@@ -1,5 +1,15 @@
 # coding: UTF-8
 
+=== 2.7.10 / 2019-06-14
+
+Minor enhancements:
+
+* Fix bundler rubygems binstub not properly looking for bundler. Pull request #2426
+  by David Rodríguez.
+* [BudlerVersionFinder] set .filter! and .compatible? to match only on major versions.
+  Pull request #2515 by Colby Swandale.
++ Update for compatibilty with new minitest. Pull request #2118 by MSP-Greg.
+
 === 2.7.9 / 2019-03-05
 
 Security fixes:

data/bundler/lib/bundler/build_metadata.rb

@@ -4,7 +4,7 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2019-03-04".freeze
+    @built_at = "2019-06-14".freeze
     @git_commit_sha = "8a789f00b".freeze
     @release = false
     # end ivars

data/lib/rubygems.rb

@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = "2.7.9"
+  VERSION = "2.7.10"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -270,12 +270,7 @@ module Gem
 
     return loaded if loaded && dep.matches_spec?(loaded)
 
-    find_specs = proc { dep.matching_specs(true) }
-    if dep.to_s == "bundler (>= 0.a)"
-      specs = Gem::BundlerVersionFinder.without_filtering(&find_specs)
-    else
-      specs = find_specs.call
-    end
+    specs = dep.matching_specs(true)
 
     specs = specs.find_all { |spec|
       spec.executables.include? exec_name

data/lib/rubygems/bundler_version_finder.rb

@@ -3,15 +3,6 @@
 require "rubygems/util"
 
 module Gem::BundlerVersionFinder
-  @without_filtering = false
-
-  def self.without_filtering
-    without_filtering, @without_filtering = true, @without_filtering
-    yield
-  ensure
-    @without_filtering = without_filtering
-  end
-
   def self.bundler_version
     version, _ = bundler_version_with_reason
 
@@ -21,8 +12,6 @@ module Gem::BundlerVersionFinder
   end
 
   def self.bundler_version_with_reason
-    return if @without_filtering
-
     if v = ENV["BUNDLER_VERSION"]
       return [v, "`$BUNDLER_VERSION`"]
     end
@@ -40,7 +29,7 @@ module Gem::BundlerVersionFinder
     return unless vr = bundler_version_with_reason
     <<-EOS
 Could not find 'bundler' (#{vr.first}) required by #{vr.last}.
-To update to the lastest version installed on your system, run `bundle update --bundler`.
+To update to the latest version installed on your system, run `bundle update --bundler`.
 To install the missing version, run `gem install bundler:#{vr.first}`
     EOS
   end
@@ -48,20 +37,14 @@ To install the missing version, run `gem install bundler:#{vr.first}`
   def self.compatible?(spec)
     return true unless spec.name == "bundler".freeze
     return true unless bundler_version = self.bundler_version
-    if bundler_version.segments.first >= 2
-      spec.version == bundler_version
-    else # 1.x
-      spec.version.segments.first < 2
-    end
+
+    spec.version.segments.first == bundler_version.segments.first
   end
 
   def self.filter!(specs)
     return unless bundler_version = self.bundler_version
-    if bundler_version.segments.first >= 2
-      specs.reject! { |spec| spec.version != bundler_version }
-    else # 1.x
-      specs.reject! { |spec| spec.version.segments.first >= 2}
-    end
+
+    specs.reject! { |spec| spec.version.segments.first != bundler_version.segments.first }
   end
 
   def self.bundle_update_bundler_version

data/lib/rubygems/test_case.rb

@@ -86,7 +86,7 @@ end
 #
 # Tests are always run at a safe level of 1.
 
-class Gem::TestCase < MiniTest::Unit::TestCase
+class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase)
 
   extend Gem::Deprecate
 

data/test/rubygems/test_gem.rb

@@ -209,6 +209,41 @@ class TestGem < Gem::TestCase
     assert_equal %w(a-1 b-2 c-1), loaded_spec_names
   end
 
+  def test_activate_bin_path_gives_proper_error_for_bundler
+    bundler = util_spec 'bundler', '2' do |s|
+      s.executables = ['bundle']
+    end
+
+    install_specs bundler
+
+    File.open("Gemfile.lock", "w") do |f|
+      f.write <<-L.gsub(/ {8}/, "")
+        GEM
+          remote: https://rubygems.org/
+          specs:
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+
+        BUNDLED WITH
+          9999
+      L
+    end
+
+    File.open("Gemfile", "w") { |f| f.puts('source "https://rubygems.org"') }
+
+    e = assert_raises Gem::GemNotFoundException do
+      load Gem.activate_bin_path("bundler", "bundle", ">= 0.a")
+    end
+
+    assert_includes e.message, "Could not find 'bundler' (9999) required by your #{File.expand_path("Gemfile.lock")}."
+    assert_includes e.message, "To update to the latest version installed on your system, run `bundle update --bundler`."
+    assert_includes e.message, "To install the missing version, run `gem install bundler:9999`"
+    refute_includes e.message, "can't find gem bundler (>= 0.a) with executable bundle"
+  end
+
   def test_self_bin_path_no_exec_name
     e = assert_raises ArgumentError do
       Gem.bin_path 'a'
@@ -1590,7 +1625,7 @@ class TestGem < Gem::TestCase
 
     assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb")
     assert_equal old_style, Gem.find_unresolved_default_spec("bar.rb")
-    assert_equal nil, Gem.find_unresolved_default_spec("baz.rb")
+    assert_nil              Gem.find_unresolved_default_spec("baz.rb")
 
     Gem.clear_default_specs
 
@@ -1603,8 +1638,8 @@ class TestGem < Gem::TestCase
 
     assert_equal new_style, Gem.find_unresolved_default_spec("foo.rb")
     assert_equal new_style, Gem.find_unresolved_default_spec("bar.rb")
-    assert_equal nil, Gem.find_unresolved_default_spec("exec")
-    assert_equal nil, Gem.find_unresolved_default_spec("README")
+    assert_nil              Gem.find_unresolved_default_spec("exec")
+    assert_nil              Gem.find_unresolved_default_spec("README")
   end
 
   def test_default_gems_use_full_paths

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -88,20 +88,21 @@ class TestGemBundlerVersionFinder < Gem::TestCase
     bvf.stub(:bundler_version, v("2.1.1.1")) do
       assert bvf.compatible?(util_spec("foo"))
       assert bvf.compatible?(util_spec("bundler", "2.1.1.1"))
-      refute bvf.compatible?(util_spec("bundler", "2.1.1.a"))
+      assert bvf.compatible?(util_spec("bundler", "2.1.1.a"))
+      assert bvf.compatible?(util_spec("bundler", "2.999"))
       refute bvf.compatible?(util_spec("bundler", "1.999"))
-      refute bvf.compatible?(util_spec("bundler", "2.999"))
+      refute bvf.compatible?(util_spec("bundler", "3.0.0"))
     end
   end
 
   def test_filter
-    versions = %w[1 1.0 1.0.1.1 2.a 3 3.0]
+    versions = %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1]
     specs = versions.map { |v| util_spec("bundler", v) }
 
-    assert_equal %w[1 1.0 1.0.1.1 2.a 3 3.0], util_filter_specs(specs).map(&:version).map(&:to_s)
+    assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
 
     bvf.stub(:bundler_version, v("2.1.1.1")) do
-      assert_empty util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[2 2.a 2.0 2.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
     bvf.stub(:bundler_version, v("1.1.1.1")) do
       assert_equal %w[1 1.0 1.0.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
@@ -110,10 +111,10 @@ class TestGemBundlerVersionFinder < Gem::TestCase
       assert_equal %w[1 1.0 1.0.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
     bvf.stub(:bundler_version, v("2.a")) do
-      assert_equal %w[2.a], util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[2 2.a 2.0 2.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
     bvf.stub(:bundler_version, v("3")) do
-      assert_equal %w[3 3.0], util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[3 3.a 3.0 3.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
   end
 

data/test/rubygems/test_gem_command_manager.rb

@@ -114,8 +114,8 @@ class TestGemCommandManager < Gem::TestCase
       assert_equal :both, check_options[:domain]
       assert_equal true, check_options[:wrappers]
       assert_equal Gem::Requirement.default, check_options[:version]
-      assert_equal nil, check_options[:install_dir]
-      assert_equal nil, check_options[:bin_dir]
+      assert_nil   check_options[:install_dir]
+      assert_nil   check_options[:bin_dir]
 
       #check settings
       check_options = nil

data/test/rubygems/test_gem_commands_signin_command.rb

@@ -48,7 +48,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     assert_equal credentials[:rubygems_api_key], api_key
 
-    assert_equal credentials[host], nil
+    assert_nil credentials[host]
   end
 
   def test_execute_with_host_supplied

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -238,7 +238,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     @cmd.handle_options %w[]
 
     assert_equal false,                    @cmd.options[:check_dev]
-    assert_equal nil,                      @cmd.options[:install_dir]
+    assert_nil                             @cmd.options[:install_dir]
     assert_equal true,                     @cmd.options[:user_install]
     assert_equal Gem::Requirement.default, @cmd.options[:version]
     assert_equal false,                    @cmd.options[:vendor]

data/test/rubygems/test_gem_dependency.rb

@@ -358,7 +358,7 @@ class TestGemDependency < Gem::TestCase
         dep.to_specs
       end
 
-      assert_match "Could not find 'bundler' (3.5) required by reason.\nTo update to the lastest version installed on your system, run `bundle update --bundler`.\nTo install the missing version, run `gem install bundler:3.5`\n", e.message
+      assert_match "Could not find 'bundler' (3.5) required by reason.\nTo update to the latest version installed on your system, run `bundle update --bundler`.\nTo install the missing version, run `gem install bundler:3.5`\n", e.message
     end
 
     Gem::BundlerVersionFinder.stub(:bundler_version_with_reason, ["2.0.0.pre.1", "reason"]) do

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -16,11 +16,9 @@ class TestGemExtRakeBuilder < Gem::TestCase
   def test_class_build
     create_temp_mkrf_file('task :default')
     output = []
-    realdir = nil # HACK /tmp vs. /private/tmp
 
     build_rake_in do |rake|
       Dir.chdir @ext do
-        realdir = Dir.pwd
         Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output
       end
 
@@ -38,11 +36,9 @@ class TestGemExtRakeBuilder < Gem::TestCase
   def test_class_build_with_args
     create_temp_mkrf_file('task :default')
     output = []
-    realdir = nil # HACK /tmp vs. /private/tmp
 
     build_rake_in do |rake|
       Dir.chdir @ext do
-        realdir = Dir.pwd
         non_empty_args_list = ['']
         Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output, non_empty_args_list
       end

data/test/rubygems/test_gem_installer.rb

@@ -21,7 +21,7 @@ class TestGemInstaller < Gem::InstallerTestCase
     super
     common_installer_setup
 
-    if __name__ =~ /^test_install(_|$)/ then
+    if (self.class.method_defined?(:__name__) ? __name__ : name) =~ /\Atest_install(_|\Z)/
       FileUtils.rm_r @spec.gem_dir
       FileUtils.rm_r @user_spec.gem_dir
     end
@@ -34,7 +34,7 @@ class TestGemInstaller < Gem::InstallerTestCase
 
     super
 
-    Gem.configuration = @config
+    Gem.configuration = instance_variable_defined?(:@config) ? @config : nil
   end
 
   def test_app_script_text
@@ -663,7 +663,7 @@ gem 'other', version
     assert_path_exists installed_exec
 
     if symlink_supported?
-      assert_send([File, :symlink?, installed_exec])
+      assert File.symlink?(installed_exec)
       return
     end
 

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -197,7 +197,7 @@ class TestGemResolverInstallerSet < Gem::TestCase
     def (set.remote_set).prefetch(_)
       raise "called"
     end
-    assert_equal nil, set.prefetch(nil)
+    assert_nil set.prefetch(nil)
   end
 
   def test_prerelease_equals

data/test/rubygems/test_gem_specification.rb

@@ -1135,7 +1135,7 @@ dependencies: []
 
     data = Marshal.load Gem::Util.inflate(Gem.read_binary(path))
 
-    assert_equal nil, data.rubyforge_project
+    assert_nil data.rubyforge_project
   end
 
   def test_emits_zulu_timestamps_properly
@@ -1156,7 +1156,7 @@ dependencies: []
     assert_equal "blah", spec.name
     assert_equal "1.3.5", spec.version.to_s
     assert_equal Gem::Platform::RUBY, spec.platform
-    assert_equal nil, spec.summary
+    assert_nil       spec.summary
     assert_equal [], spec.files
 
     assert_equal [], spec.test_files
@@ -1333,31 +1333,31 @@ dependencies: []
     @a2.bindir = nil
     @a2.executable = 'app'
 
-    assert_equal nil, @a2.bindir
+    assert_nil                             @a2.bindir
     assert_equal %w[app lib/code.rb].sort, @a2.files
   end
 
   def test_extensions_equals_nil
     @a2.instance_variable_set(:@extensions, nil)
-    assert_equal nil, @a2.instance_variable_get(:@extensions)
+    assert_nil                    @a2.instance_variable_get(:@extensions)
     assert_equal %w[lib/code.rb], @a2.files
   end
 
   def test_test_files_equals_nil
     @a2.instance_variable_set(:@test_files, nil)
-    assert_equal nil, @a2.instance_variable_get(:@test_files)
+    assert_nil                    @a2.instance_variable_get(:@test_files)
     assert_equal %w[lib/code.rb], @a2.files
   end
 
   def test_executables_equals_nil
     @a2.instance_variable_set(:@executables, nil)
-    assert_equal nil, @a2.instance_variable_get(:@executables)
+    assert_nil                    @a2.instance_variable_get(:@executables)
     assert_equal %w[lib/code.rb], @a2.files
   end
 
   def test_extra_rdoc_files_equals_nil
     @a2.instance_variable_set(:@extra_rdoc_files, nil)
-    assert_equal nil, @a2.instance_variable_get(:@extra_rdoc_files)
+    assert_nil                    @a2.instance_variable_get(:@extra_rdoc_files)
     assert_equal %w[lib/code.rb], @a2.files
   end
 
@@ -2210,7 +2210,7 @@ dependencies: []
   end
 
   def test_allowed_push_host
-    assert_equal nil, @a1.metadata['allowed_push_host']
+    assert_nil                                   @a1.metadata['allowed_push_host']
     assert_equal 'https://privategemserver.com', @a3.metadata['allowed_push_host']
   end
 
@@ -3567,7 +3567,7 @@ end
 
     assert_equal a, Gem::Specification.find_inactive_by_path('foo')
     a.activate
-    assert_equal nil, Gem::Specification.find_inactive_by_path('foo')
+    assert_nil Gem::Specification.find_inactive_by_path('foo')
   end
 
   def test_load_default_gem

data/test/rubygems/test_gem_stream_ui.rb

@@ -55,7 +55,7 @@ class TestGemStreamUI < Gem::TestCase
 
     Timeout.timeout(0.1) do
       answer = @sui.ask("what is your favorite color?")
-      assert_equal nil, answer
+      assert_nil answer
     end
   end
 
@@ -79,7 +79,7 @@ class TestGemStreamUI < Gem::TestCase
 
     Timeout.timeout(0.1) do
       answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?")
-      assert_equal nil, answer
+      assert_nil answer
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.7.10
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
 description: ''
 email:
 - rubygems-developers@rubyforge.org
@@ -804,8 +804,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ''