rubygems-update 3.3.18 → 3.4.19

data/test/rubygems/test_gem_stream_ui.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/user_interaction'
-require 'timeout'
+
+require_relative "helper"
+require "rubygems/user_interaction"
+require "timeout"
 
 class TestGemStreamUI < Gem::TestCase
-  # increase timeout with MJIT for --jit-wait testing
-  mjit_enabled = defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
-  SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !mjit_enabled) ? 0.1 : 1.0
+  # increase timeout with RJIT for --jit-wait testing
+  rjit_enabled = defined?(RubyVM::RJIT) && RubyVM::RJIT.enabled?
+  SHORT_TIMEOUT = (RUBY_ENGINE == "ruby" && !rjit_enabled) ? 0.1 : 1.0
 
   module IsTty
     attr_accessor :tty
@@ -100,14 +101,44 @@ class TestGemStreamUI < Gem::TestCase
     @in.puts "1"
     @in.rewind
 
-    result = @sui.choose_from_list 'which one?', %w[foo bar]
+    result = @sui.choose_from_list "which one?", %w[foo bar]
 
-    assert_equal ['foo', 0], result
+    assert_equal ["foo", 0], result
     assert_equal "which one?\n 1. foo\n 2. bar\n> ", @out.string
   end
 
   def test_choose_from_list_EOF
-    result = @sui.choose_from_list 'which one?', %w[foo bar]
+    result = @sui.choose_from_list "which one?", %w[foo bar]
+
+    assert_equal [nil, nil], result
+    assert_equal "which one?\n 1. foo\n 2. bar\n> ", @out.string
+  end
+
+  def test_choose_from_list_0
+    @in.puts "0"
+    @in.rewind
+
+    result = @sui.choose_from_list "which one?", %w[foo bar]
+
+    assert_equal [nil, nil], result
+    assert_equal "which one?\n 1. foo\n 2. bar\n> ", @out.string
+  end
+
+  def test_choose_from_list_over
+    @in.puts "3"
+    @in.rewind
+
+    result = @sui.choose_from_list "which one?", %w[foo bar]
+
+    assert_equal [nil, nil], result
+    assert_equal "which one?\n 1. foo\n 2. bar\n> ", @out.string
+  end
+
+  def test_choose_from_list_negative
+    @in.puts "-1"
+    @in.rewind
+
+    result = @sui.choose_from_list "which one?", %w[foo bar]
 
     assert_equal [nil, nil], result
     assert_equal "which one?\n 1. foo\n 2. bar\n> ", @out.string
@@ -115,27 +146,27 @@ class TestGemStreamUI < Gem::TestCase
 
   def test_progress_reporter_silent_nil
     @cfg.verbose = nil
-    reporter = @sui.progress_reporter 10, 'hi'
+    reporter = @sui.progress_reporter 10, "hi"
     assert_kind_of Gem::StreamUI::SilentProgressReporter, reporter
   end
 
   def test_progress_reporter_silent_false
     @cfg.verbose = false
-    reporter = @sui.progress_reporter 10, 'hi'
+    reporter = @sui.progress_reporter 10, "hi"
     assert_kind_of Gem::StreamUI::SilentProgressReporter, reporter
     assert_equal "", @out.string
   end
 
   def test_progress_reporter_simple
     @cfg.verbose = true
-    reporter = @sui.progress_reporter 10, 'hi'
+    reporter = @sui.progress_reporter 10, "hi"
     assert_kind_of Gem::StreamUI::SimpleProgressReporter, reporter
     assert_equal "hi\n", @out.string
   end
 
   def test_progress_reporter_verbose
     @cfg.verbose = 0
-    reporter = @sui.progress_reporter 10, 'hi'
+    reporter = @sui.progress_reporter 10, "hi"
     assert_kind_of Gem::StreamUI::VerboseProgressReporter, reporter
     assert_equal "hi\n", @out.string
   end
@@ -143,7 +174,7 @@ class TestGemStreamUI < Gem::TestCase
   def test_download_reporter_silent_nil
     @cfg.verbose = nil
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     assert_kind_of Gem::StreamUI::SilentDownloadReporter, reporter
     assert_equal "", @out.string
   end
@@ -151,7 +182,7 @@ class TestGemStreamUI < Gem::TestCase
   def test_download_reporter_silent_false
     @cfg.verbose = false
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     assert_kind_of Gem::StreamUI::SilentDownloadReporter, reporter
     assert_equal "", @out.string
   end
@@ -165,14 +196,14 @@ class TestGemStreamUI < Gem::TestCase
   def test_threaded_download_reporter
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_progress
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     reporter.update 512
     assert_equal "Fetching a.gem\n", @out.string
   end
@@ -180,7 +211,7 @@ class TestGemStreamUI < Gem::TestCase
   def test_verbose_download_reporter_progress_once
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     reporter.update 510
     reporter.update 512
     assert_equal "Fetching a.gem\n", @out.string
@@ -189,7 +220,7 @@ class TestGemStreamUI < Gem::TestCase
   def test_verbose_download_reporter_progress_complete
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     reporter.update 510
     reporter.done
     assert_equal "Fetching a.gem\n", @out.string
@@ -198,7 +229,7 @@ class TestGemStreamUI < Gem::TestCase
   def test_verbose_download_reporter_progress_nil_length
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', nil
+    reporter.fetch "a.gem", nil
     reporter.update 1024
     reporter.done
     assert_equal "Fetching a.gem\n", @out.string
@@ -207,7 +238,7 @@ class TestGemStreamUI < Gem::TestCase
   def test_verbose_download_reporter_progress_zero_length
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 0
+    reporter.fetch "a.gem", 0
     reporter.update 1024
     reporter.done
     assert_equal "Fetching a.gem\n", @out.string
@@ -218,7 +249,7 @@ class TestGemStreamUI < Gem::TestCase
 
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
+    reporter.fetch "a.gem", 1024
     assert_equal "", @out.string
   end
 end

data/test/rubygems/test_gem_stub_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/stub_specification"
 
@@ -10,7 +11,7 @@ class TestStubSpecification < Gem::TestCase
     super
 
     @base_dir = __dir__
-    @gems_dir = File.join __dir__, 'gem'
+    @gems_dir = File.join __dir__, "gem"
     @foo = Gem::StubSpecification.gemspec_stub FOO, @base_dir, @gems_dir
   end
 
@@ -25,24 +26,24 @@ class TestStubSpecification < Gem::TestCase
   def test_initialize_extension
     stub = stub_with_extension
 
-    assert_equal 'stub_e',                    stub.name
+    assert_equal "stub_e",                    stub.name
     assert_equal v(2),                        stub.version
     assert_equal Gem::Platform::RUBY,         stub.platform
-    assert_equal [stub.extension_dir, 'lib'], stub.require_paths
+    assert_equal [stub.extension_dir, "lib"], stub.require_paths
     assert_equal %w[ext/stub_e/extconf.rb],   stub.extensions
   end
 
   def test_initialize_version
     stub = stub_with_version
 
-    assert_equal 'stub_v',                    stub.name
+    assert_equal "stub_v",                    stub.name
     assert_equal v(2),                        stub.version
   end
 
   def test_initialize_with_empty_version
     stub = stub_without_version
 
-    assert_equal 'stub_v',                    stub.name
+    assert_equal "stub_v",                    stub.name
     assert_equal v(0),                        stub.version
   end
 
@@ -57,18 +58,18 @@ class TestStubSpecification < Gem::TestCase
 
   def test_contains_requirable_file_eh
     stub = stub_without_extension
-    code_rb = File.join stub.gem_dir, 'lib', 'code.rb'
+    code_rb = File.join stub.gem_dir, "lib", "code.rb"
     FileUtils.mkdir_p File.dirname code_rb
     FileUtils.touch code_rb
 
-    assert stub.contains_requirable_file? 'code'
+    assert stub.contains_requirable_file? "code"
   end
 
   def test_contains_requirable_file_eh_extension
     pend "I guess making the stub match the running platform should work" if Gem.java_platform?
     stub_with_extension do |stub|
       _, err = capture_output do
-        refute stub.contains_requirable_file? 'nonexistent'
+        refute stub.contains_requirable_file? "nonexistent"
       end
 
       expected = "Ignoring stub_e-2 because its extensions are not built. " +
@@ -82,7 +83,7 @@ class TestStubSpecification < Gem::TestCase
     stub = stub_with_extension
 
     expected = [
-      File.join(stub.full_gem_path, 'lib'),
+      File.join(stub.full_gem_path, "lib"),
       stub.extension_dir,
     ]
 
@@ -92,32 +93,32 @@ class TestStubSpecification < Gem::TestCase
   def test_lib_dirs_glob
     stub = stub_without_extension
 
-    assert_equal File.join(stub.full_gem_path, 'lib'), stub.lib_dirs_glob
+    assert_equal File.join(stub.full_gem_path, "lib"), stub.lib_dirs_glob
   end
 
   def test_lib_dirs_glob_with_extension
     stub = stub_with_extension
 
-    assert_equal File.join(stub.full_gem_path, 'lib'), stub.lib_dirs_glob
+    assert_equal File.join(stub.full_gem_path, "lib"), stub.lib_dirs_glob
   end
 
   def test_matches_for_glob
     stub = stub_without_extension
-    code_rb = File.join stub.gem_dir, 'lib', 'code.rb'
+    code_rb = File.join stub.gem_dir, "lib", "code.rb"
     FileUtils.mkdir_p File.dirname code_rb
     FileUtils.touch code_rb
 
-    assert_equal code_rb, stub.matches_for_glob('code*').first
+    assert_equal code_rb, stub.matches_for_glob("code*").first
   end
 
   def test_matches_for_glob_with_bundler_inline
     stub = stub_with_extension
-    code_rb = File.join stub.gem_dir, 'lib', 'code.rb'
+    code_rb = File.join stub.gem_dir, "lib", "code.rb"
     FileUtils.mkdir_p File.dirname code_rb
     FileUtils.touch code_rb
 
     stub.stub(:raw_require_paths, nil) do
-      assert_equal code_rb, stub.matches_for_glob('code*').first
+      assert_equal code_rb, stub.matches_for_glob("code*").first
     end
   end
 
@@ -127,7 +128,7 @@ class TestStubSpecification < Gem::TestCase
       extconf_rb = File.join s.gem_dir, s.extensions.first
       FileUtils.mkdir_p File.dirname extconf_rb
 
-      File.open extconf_rb, 'w' do |f|
+      File.open extconf_rb, "w" do |f|
         f.write <<-'RUBY'
         File.open 'Makefile', 'w' do |f|
           f.puts "clean:\n\techo clean"
@@ -146,10 +147,10 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def test_missing_extensions_eh_default_gem
-    spec = new_default_spec 'default', 1
-    spec.extensions << 'extconf.rb'
+    spec = new_default_spec "default", 1
+    spec.extensions << "extconf.rb"
 
-    File.open spec.loaded_from, 'w' do |io|
+    File.open spec.loaded_from, "w" do |io|
       io.write spec.to_ruby_for_cache
     end
 
@@ -167,7 +168,7 @@ class TestStubSpecification < Gem::TestCase
     real_foo.activate
 
     assert_equal @foo.version, Gem.loaded_specs[@foo.name].version,
-                 'sanity check'
+                 "sanity check"
 
     assert_same real_foo, @foo.to_spec
   end
@@ -181,8 +182,8 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def stub_with_version
-    spec = File.join @gemhome, 'specifications', 'stub_e-2.gemspec'
-    File.open spec, 'w' do |io|
+    spec = File.join @gemhome, "specifications", "stub_e-2.gemspec"
+    File.open spec, "w" do |io|
       io.write <<-STUB
 # -*- encoding: utf-8 -*-
 # stub: stub_v 2 ruby lib
@@ -195,7 +196,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, 'gems')
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, "gems")
 
       yield stub if block_given?
 
@@ -204,8 +205,8 @@ end
   end
 
   def stub_without_version
-    spec = File.join @gemhome, 'specifications', 'stub-2.gemspec'
-    File.open spec, 'w' do |io|
+    spec = File.join @gemhome, "specifications", "stub-2.gemspec"
+    File.open spec, "w" do |io|
       io.write <<-STUB
 # -*- encoding: utf-8 -*-
 # stub: stub_v ruby lib
@@ -218,7 +219,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, 'gems')
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, "gems")
 
       yield stub if block_given?
 
@@ -227,8 +228,8 @@ end
   end
 
   def stub_with_extension
-    spec = File.join @gemhome, 'specifications', 'stub_e-2.gemspec'
-    File.open spec, 'w' do |io|
+    spec = File.join @gemhome, "specifications", "stub_e-2.gemspec"
+    File.open spec, "w" do |io|
       io.write <<-STUB
 # -*- encoding: utf-8 -*-
 # stub: stub_e 2 ruby lib
@@ -244,7 +245,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, 'gems')
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, "gems")
 
       yield stub if block_given?
 
@@ -253,8 +254,8 @@ end
   end
 
   def stub_without_extension
-    spec = File.join @gemhome, 'specifications', 'stub-2.gemspec'
-    File.open spec, 'w' do |io|
+    spec = File.join @gemhome, "specifications", "stub-2.gemspec"
+    File.open spec, "w" do |io|
       io.write <<-STUB
 # -*- encoding: utf-8 -*-
 # stub: stub 2 ruby lib
@@ -267,7 +268,7 @@ end
 
       io.flush
 
-      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, 'gems')
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, "gems")
 
       yield stub if block_given?
 

data/test/rubygems/test_gem_text.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require_relative 'helper'
+
+require_relative "helper"
 require "rubygems/text"
 
 class TestGemText < Gem::TestCase