rubygems-update 2.6.0 → 3.4.22

data/test/rubygems/test_gem_stream_ui.rb

@@ -1,16 +1,20 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/user_interaction'
-require 'timeout'
+
+require_relative "helper"
+require "rubygems/user_interaction"
+require "timeout"
 
 class TestGemStreamUI < Gem::TestCase
+  # 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
 
     def tty?
       @tty = true unless defined? @tty
-      return @tty
+      @tty
     end
 
     alias_method :isatty, :tty?
@@ -36,10 +40,7 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask
-    skip 'TTY detection broken on windows' if
-      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
-
-    Timeout.timeout(1) do
+    Timeout.timeout(5) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask("What is your name?")
@@ -48,22 +49,16 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_no_tty
-    skip 'TTY detection broken on windows' if
-      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask("what is your favorite color?")
-      assert_equal nil, answer
+      assert_nil answer
     end
   end
 
   def test_ask_for_password
-    skip 'Always uses $stdin on windows' if
-      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
-
-    Timeout.timeout(1) do
+    Timeout.timeout(5) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
       actual_answer = @sui.ask_for_password("What is your name?")
@@ -72,24 +67,18 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password_no_tty
-    skip 'TTY handling is broken on windows' if
-      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?")
-      assert_equal nil, answer
+      assert_nil answer
     end
   end
 
   def test_ask_yes_no_no_tty_with_default
-    skip 'TTY handling is broken on windows' if
-      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
+    Timeout.timeout(SHORT_TIMEOUT) do
       answer = @sui.ask_yes_no("do coconuts migrate?", false)
       assert_equal false, answer
 
@@ -99,13 +88,10 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_yes_no_no_tty_without_default
-    skip 'TTY handling is broken on windows' if
-      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
-
     @in.tty = false
 
-    Timeout.timeout(0.1) do
-      assert_raises(Gem::OperationNotSupportedError) do
+    Timeout.timeout(SHORT_TIMEOUT) do
+      assert_raise(Gem::OperationNotSupportedError) do
         @sui.ask_yes_no("do coconuts migrate?")
       end
     end
@@ -115,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
@@ -130,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
@@ -158,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
@@ -166,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
@@ -174,58 +190,58 @@ class TestGemStreamUI < Gem::TestCase
   def test_download_reporter_anything
     @cfg.verbose = 0
     reporter = @sui.download_reporter
-    assert_kind_of Gem::StreamUI::VerboseDownloadReporter, reporter
+    assert_kind_of Gem::StreamUI::ThreadedDownloadReporter, reporter
   end
 
-  def test_verbose_download_reporter
+  def test_threaded_download_reporter
     @cfg.verbose = true
     reporter = @sui.download_reporter
-    reporter.fetch 'a.gem', 1024
-    assert_equal "Fetching: a.gem", @out.string
+    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\rFetching: a.gem ( 50%)", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   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\rFetching: a.gem ( 50%)", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   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\rFetching: a.gem ( 50%)\rFetching: a.gem (100%)\n", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   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\rFetching: a.gem (1024B)\rFetching: a.gem (1024B)\n", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   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\rFetching: a.gem (1024B)\rFetching: a.gem (1024B)\n", @out.string
+    assert_equal "Fetching a.gem\n", @out.string
   end
 
   def test_verbose_download_reporter_no_tty
@@ -233,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,17 +1,17 @@
 # frozen_string_literal: true
-require "rubygems/test_case"
+
+require_relative "helper"
 require "rubygems/stub_specification"
 
 class TestStubSpecification < Gem::TestCase
-  SPECIFICATIONS = File.expand_path(File.join("..", "specifications"), __FILE__)
-  FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec"
-  BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec"
+  FOO = File.expand_path File.join("specifications", "foo-0.0.1-x86-mswin32.gemspec"), __dir__
+  BAR = File.expand_path File.join("specifications", "bar-0.0.2.gemspec"), __dir__
 
   def setup
     super
 
-    @base_dir = File.dirname(SPECIFICATIONS)
-    @gems_dir = File.join File.dirname(SPECIFICATIONS), 'gem'
+    @base_dir = __dir__
+    @gems_dir = File.join __dir__, "gem"
     @foo = Gem::StubSpecification.gemspec_stub FOO, @base_dir, @gems_dir
   end
 
@@ -26,13 +26,27 @@ 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 v(2),                        stub.version
+  end
+
+  def test_initialize_with_empty_version
+    stub = stub_without_version
+
+    assert_equal "stub_v",                    stub.name
+    assert_equal v(0),                        stub.version
+  end
+
   def test_initialize_missing_stubline
     stub = Gem::StubSpecification.gemspec_stub(BAR, @base_dir, @gems_dir)
     assert_equal "bar", stub.name
@@ -44,20 +58,21 @@ 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_io do
-        refute stub.contains_requirable_file? 'nonexistent'
+      _, err = capture_output do
+        refute stub.contains_requirable_file? "nonexistent"
       end
 
-      expected = "Ignoring stub_e-2 because its extensions are not built.  " +
+      expected = "Ignoring stub_e-2 because its extensions are not built. " +
                  "Try: gem pristine stub_e --version 2\n"
 
       assert_equal expected, err
@@ -68,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,
     ]
 
@@ -78,26 +93,44 @@ 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
   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"
+    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
+    end
   end
 
   def test_missing_extensions_eh
+    pend "I guess making the stub match the running platform should work" if Gem.java_platform?
     stub = stub_with_extension do |s|
       extconf_rb = File.join s.gem_dir, s.extensions.first
       FileUtils.mkdir_p File.dirname extconf_rb
 
-      open extconf_rb, 'w' do |f|
+      File.open extconf_rb, "w" do |f|
         f.write <<-'RUBY'
-        open 'Makefile', 'w' do |f|
+        File.open 'Makefile', 'w' do |f|
           f.puts "clean:\n\techo clean"
           f.puts "default:\n\techo built"
           f.puts "install:\n\techo installed"
@@ -114,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"
 
-    open spec.loaded_from, 'w' do |io|
+    File.open spec.loaded_from, "w" do |io|
       io.write spec.to_ruby_for_cache
     end
 
@@ -135,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
@@ -148,25 +181,55 @@ class TestStubSpecification < Gem::TestCase
     assert bar.to_spec
   end
 
-  def test_to_spec_activated
-    assert @foo.to_spec.is_a?(Gem::Specification)
-    assert_equal "foo", @foo.to_spec.name
-    refute @foo.to_spec.instance_variable_get :@ignored
-  end
+  def stub_with_version
+    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
 
-  def test_to_spec_missing_extensions
-    stub = stub_with_extension
+Gem::Specification.new do |s|
+  s.name = 'stub_v'
+  s.version = Gem::Version.new '2'
+end
+      STUB
+
+      io.flush
+
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, "gems")
+
+      yield stub if block_given?
 
-    capture_io do
-      stub.contains_requirable_file? 'nonexistent'
+      return stub
     end
+  end
+
+  def stub_without_version
+    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
 
-    assert stub.to_spec.instance_variable_get :@ignored
+Gem::Specification.new do |s|
+  s.name = 'stub_v'
+  s.version = ""
+end
+      STUB
+
+      io.flush
+
+      stub = Gem::StubSpecification.gemspec_stub io.path, @gemhome, File.join(@gemhome, "gems")
+
+      yield stub if block_given?
+
+      return stub
+    end
   end
 
   def stub_with_extension
-    spec = File.join @gemhome, 'specifications', 'stub_e-2.gemspec'
-    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
@@ -182,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?
 
@@ -191,8 +254,8 @@ end
   end
 
   def stub_without_extension
-    spec = File.join @gemhome, 'specifications', 'stub-2.gemspec'
-    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
@@ -205,13 +268,11 @@ 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?
 
       return stub
     end
   end
-
 end
-

data/test/rubygems/test_gem_text.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+
+require_relative "helper"
 require "rubygems/text"
 
 class TestGemText < Gem::TestCase
@@ -21,6 +22,10 @@ class TestGemText < Gem::TestCase
     assert_equal "  text to wrap",    format_text("text to wrap", 40, 2)
   end
 
+  def test_format_text_no_space
+    assert_equal "texttowr\nap", format_text("texttowrap", 8)
+  end
+
   def test_format_text_trailing # for two spaces after .
     text = <<-TEXT
 This line is really, really long.  So long, in fact, that it is more than eighty characters long!  The purpose of this line is for testing wrapping behavior because sometimes people don't wrap their text to eighty characters.  Without the wrapping, the text might not look good in the RSS feed.
@@ -36,6 +41,10 @@ Without the wrapping, the text might not look good in the RSS feed.
     assert_equal expected, format_text(text, 78)
   end
 
+  def test_format_removes_nonprintable_characters
+    assert_equal "text with weird .. stuff .", format_text("text with weird \x1b\x02 stuff \x7f", 40)
+  end
+
   def test_min3
     assert_equal 1, min3(1, 1, 1)
     assert_equal 1, min3(1, 1, 2)
@@ -74,4 +83,21 @@ Without the wrapping, the text might not look good in the RSS feed.
     assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest")
     assert_equal 7, levenshtein_distance("zentest", "xxxxxxx")
   end
+
+  def test_levenshtein_distance_all
+    assert_equal 6, levenshtein_distance("algorithm", "altruistic")
+    assert_equal 3, levenshtein_distance("saturday", "sunday")
+    assert_equal 3, levenshtein_distance("kitten", "sitting")
+  end
+
+  def test_truncate_text
+    assert_equal "abc", truncate_text("abc", "desc")
+    assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2)
+    s = "ab" * 500_001
+    assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000)
+  end
+
+  def test_clean_text
+    assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a")
+  end
 end