rubygems-update 3.1.2 → 3.2.3

data/test/rubygems/test_gem_stream_ui.rb

@@ -4,8 +4,9 @@ require 'rubygems/user_interaction'
 require 'timeout'
 
 class TestGemStreamUI < Gem::TestCase
-
-  SHORT_TIMEOUT = (defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?) ? 1.0 : 0.1 # increase timeout with MJIT for --jit-wait testing
+  # 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
 
   module IsTty
     attr_accessor :tty
@@ -220,5 +221,4 @@ class TestGemStreamUI < Gem::TestCase
     reporter.fetch 'a.gem', 1024
     assert_equal "", @out.string
   end
-
 end

data/test/rubygems/test_gem_stub_specification.rb

@@ -3,16 +3,14 @@ require "rubygems/test_case"
 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
 
@@ -292,5 +290,4 @@ end
       return stub
     end
   end
-
 end

data/test/rubygems/test_gem_text.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require "rubygems/text"
 
 class TestGemText < Gem::TestCase
-
   include Gem::Text
 
   def test_format_text
@@ -23,7 +22,7 @@ class TestGemText < Gem::TestCase
   end
 
   def test_format_text_no_space
-    assert_equal "texttowr\nap",     format_text("texttowrap", 8)
+    assert_equal "texttowr\nap", format_text("texttowrap", 8)
   end
 
   def test_format_text_trailing # for two spaces after .
@@ -94,5 +93,4 @@ Without the wrapping, the text might not look good in the RSS feed.
   def test_clean_text
     assert_equal ".]2;nyan.", clean_text("\e]2;nyan\a")
   end
-
 end

data/test/rubygems/test_gem_uninstaller.rb

@@ -3,7 +3,6 @@ require 'rubygems/installer_test_case'
 require 'rubygems/uninstaller'
 
 class TestGemUninstaller < Gem::InstallerTestCase
-
   def setup
     super
     @installer = setup_base_installer
@@ -27,7 +26,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
     FileUtils.mkdir_p 'foo/bar'
     uninstaller = Gem::Uninstaller.new nil, :install_dir => 'foo//bar'
 
-    assert_match %r|foo/bar$|, uninstaller.instance_variable_get(:@gem_home)
+    assert_match %r{foo/bar$}, uninstaller.instance_variable_get(:@gem_home)
   end
 
   def test_ask_if_ok
@@ -154,6 +153,8 @@ class TestGemUninstaller < Gem::InstallerTestCase
   end
 
   def test_remove_symlinked_gem_home
+    skip "Symlinks not supported or not enabled" unless symlink_supported?
+
     Dir.mktmpdir("gem_home") do |dir|
       symlinked_gem_home = "#{dir}/#{File.basename(@gemhome)}"
 
@@ -169,6 +170,59 @@ class TestGemUninstaller < Gem::InstallerTestCase
     end
   end
 
+  def test_remove_plugins
+    write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+      io.write "puts __FILE__"
+    end
+
+    @spec.files += %w[lib/rubygems_plugin.rb]
+
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+
+    plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+    assert File.exist?(plugin_path), 'plugin not written'
+
+    Gem::Uninstaller.new(nil).remove_plugins @spec
+
+    refute File.exist?(plugin_path), 'plugin not removed'
+  end
+
+  def test_remove_plugins_with_install_dir
+    write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+      io.write "puts __FILE__"
+    end
+
+    @spec.files += %w[lib/rubygems_plugin.rb]
+
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+
+    plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+    assert File.exist?(plugin_path), 'plugin not written'
+
+    Dir.mkdir "#{@gemhome}2"
+    Gem::Uninstaller.new(nil, :install_dir => "#{@gemhome}2").remove_plugins @spec
+
+    assert File.exist?(plugin_path), 'plugin unintentionally removed'
+  end
+
+  def test_regenerate_plugins_for
+    write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+      io.write "puts __FILE__"
+    end
+
+    @spec.files += %w[lib/rubygems_plugin.rb]
+
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+
+    plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+    assert File.exist?(plugin_path), 'plugin not written'
+
+    FileUtils.rm plugin_path
+    Gem::Uninstaller.new(nil).regenerate_plugins_for @spec, Gem.plugindir
+
+    assert File.exist?(plugin_path), 'plugin not regenerated'
+  end
+
   def test_path_ok_eh
     uninstaller = Gem::Uninstaller.new nil
 
@@ -260,7 +314,7 @@ create_makefile '#{@spec.name}'
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path
+      installer = Gem::Installer.at path, :force => true
       installer.install
     end
 
@@ -405,12 +459,12 @@ create_makefile '#{@spec.name}'
     lines = ui.output.split("\n")
     lines.shift
 
-    assert_match %r!You have requested to uninstall the gem:!, lines.shift
+    assert_match %r{You have requested to uninstall the gem:}, lines.shift
     lines.shift
     lines.shift
 
-    assert_match %r!r-1 depends on q \(= 1\)!, lines.shift
-    assert_match %r!Successfully uninstalled q-1!, lines.last
+    assert_match %r{r-1 depends on q \(= 1\)}, lines.shift
+    assert_match %r{Successfully uninstalled q-1}, lines.last
   end
 
   def test_uninstall_only_lists_unsatisfied_deps
@@ -435,12 +489,12 @@ create_makefile '#{@spec.name}'
     lines = ui.output.split("\n")
     lines.shift
 
-    assert_match %r!You have requested to uninstall the gem:!, lines.shift
+    assert_match %r{You have requested to uninstall the gem:}, lines.shift
     lines.shift
     lines.shift
 
-    assert_match %r!x-1 depends on q \(= 1.0\)!, lines.shift
-    assert_match %r!Successfully uninstalled q-1.0!, lines.last
+    assert_match %r{x-1 depends on q \(= 1.0\)}, lines.shift
+    assert_match %r{Successfully uninstalled q-1.0}, lines.last
   end
 
   def test_uninstall_doesnt_prompt_when_other_gem_satisfies_requirement
@@ -516,12 +570,41 @@ create_makefile '#{@spec.name}'
     lines = ui.output.split("\n")
     lines.shift
 
-    assert_match %r!You have requested to uninstall the gem:!, lines.shift
+    assert_match %r{You have requested to uninstall the gem:}, lines.shift
     lines.shift
     lines.shift
 
-    assert_match %r!r-1 depends on q \(= 1, development\)!, lines.shift
-    assert_match %r!Successfully uninstalled q-1!, lines.last
+    assert_match %r{r-1 depends on q \(= 1, development\)}, lines.shift
+    assert_match %r{Successfully uninstalled q-1}, lines.last
+  end
+
+  def test_uninstall_prompt_only_lists_the_dependents_that_prevented_uninstallation
+    quick_gem 'r', '1' do |s|
+      s.add_development_dependency 'q', '= 1'
+    end
+
+    quick_gem 's', '1' do |s|
+      s.add_dependency 'q', '= 1'
+    end
+
+    quick_gem 'q', '1'
+
+    un = Gem::Uninstaller.new('q', :check_dev => false)
+    ui = Gem::MockGemUi.new("y\n")
+
+    use_ui ui do
+      un.uninstall
+    end
+
+    lines = ui.output.split("\n")
+    lines.shift
+
+    assert_match %r{You have requested to uninstall the gem:}, lines.shift
+    lines.shift
+    lines.shift
+
+    assert_match %r{s-1 depends on q \(= 1\)}, lines.shift
+    assert_match %r{Successfully uninstalled q-1}, lines.last
   end
 
   def test_uninstall_no_permission
@@ -542,4 +625,43 @@ create_makefile '#{@spec.name}'
     end
   end
 
+  def test_uninstall_keeps_plugins_up_to_date
+    write_file File.join(@tempdir, 'lib', 'rubygems_plugin.rb') do |io|
+      io.write "puts __FILE__"
+    end
+
+    plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
+
+    @spec.version = '1'
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+
+    refute File.exist?(plugin_path), 'version without plugin installed, but plugin written'
+
+    @spec.files += %w[lib/rubygems_plugin.rb]
+    @spec.version = '2'
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+
+    assert File.exist?(plugin_path), 'version with plugin installed, but plugin not written'
+    assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content'
+
+    @spec.version = '3'
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
+
+    assert File.exist?(plugin_path), 'version with plugin installed, but plugin removed'
+    assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version installed, but plugin updated'
+
+    Gem::Uninstaller.new('a', :version => '1', :executables => true).uninstall
+
+    assert File.exist?(plugin_path), 'plugin removed when old version uninstalled'
+    assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version uninstalled, but plugin updated'
+
+    Gem::Uninstaller.new('a', version: '3', :executables => true).uninstall
+
+    assert File.exist?(plugin_path), 'plugin removed when old version uninstalled and another version with plugin still present'
+    assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'latest version uninstalled, but plugin not updated to previous version'
+
+    Gem::Uninstaller.new('a', version: '2', :executables => true).uninstall
+
+    refute File.exist?(plugin_path), 'last version uninstalled, but plugin still present'
+  end
 end

data/test/rubygems/test_gem_unsatisfiable_dependency_error.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemUnsatisfiableDependencyError < Gem::TestCase
-
   def setup
     super
 
@@ -28,5 +27,4 @@ class TestGemUnsatisfiableDependencyError < Gem::TestCase
   def test_version
     assert_equal @a_dep.requirement, @e.version
   end
-
 end

data/test/rubygems/test_gem_uri_formatter.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/uri_formatter'
 
 class TestGemUriFormatter < Gem::TestCase
-
   def test_normalize_uri
     assert_equal 'FILE://example/',
       Gem::UriFormatter.new('FILE://example/').normalize
@@ -24,5 +23,4 @@ class TestGemUriFormatter < Gem::TestCase
   def test_unescape
     assert_equal 'a@b\c', Gem::UriFormatter.new('a%40b%5Cc').unescape
   end
-
 end

data/test/rubygems/test_gem_util.rb

@@ -3,10 +3,9 @@ require 'rubygems/test_case'
 require 'rubygems/util'
 
 class TestGemUtil < Gem::TestCase
-
   def test_class_popen
     skip "popen with a block does not behave well on jruby" if Gem.java_platform?
-    assert_equal "0\n", Gem::Util.popen(Gem.ruby, '-I', File.expand_path('../../../lib', __FILE__), '-e', 'p 0')
+    assert_equal "0\n", Gem::Util.popen(*ruby_with_rubygems_in_load_path, '-e', 'p 0')
 
     assert_raises Errno::ECHILD do
       Process.wait(-1)
@@ -15,8 +14,10 @@ class TestGemUtil < Gem::TestCase
 
   def test_silent_system
     skip if Gem.java_platform?
-    assert_silent do
-      Gem::Util.silent_system Gem.ruby, '-I', File.expand_path('../../../lib', __FILE__), '-e', 'puts "hello"; warn "hello"'
+    Gem::Deprecate.skip_during do
+      assert_silent do
+        Gem::Util.silent_system(*ruby_with_rubygems_in_load_path, '-e', 'puts "hello"; warn "hello"')
+      end
     end
   end
 
@@ -56,8 +57,8 @@ class TestGemUtil < Gem::TestCase
     list = [1,2,3,4,5].inject(Gem::List.new(0)) do |m,o|
       Gem::List.new o, m
     end
-    assert_equal 5, list.find { |x| x == 5 }
-    assert_equal 4, list.find { |x| x == 4 }
+    assert_equal 5, list.find {|x| x == 5 }
+    assert_equal 4, list.find {|x| x == 4 }
   end
 
   def test_glob_files_in_dir
@@ -84,5 +85,4 @@ class TestGemUtil < Gem::TestCase
     path = "/home/skillet"
     assert_equal "/home/skillet", Gem::Util.correct_for_windows_path(path)
   end
-
 end

data/test/rubygems/test_gem_validator.rb

@@ -4,7 +4,6 @@ require "rubygems/test_case"
 require "rubygems/validator"
 
 class TestGemValidator < Gem::TestCase
-
   def setup
     super
 
@@ -27,7 +26,7 @@ class TestGemValidator < Gem::TestCase
       @spec.file_name => [
         Gem::Validator::ErrorData.new('lib/b.rb', 'Missing file'),
         Gem::Validator::ErrorData.new('lib/c.rb', 'Extra file'),
-      ]
+      ],
     }
 
     assert_equal expected, alien
@@ -40,5 +39,4 @@ class TestGemValidator < Gem::TestCase
 
     assert_empty alien
   end
-
 end

data/test/rubygems/test_gem_version.rb

@@ -5,7 +5,6 @@ require "rubygems/version"
 require "minitest/benchmark"
 
 class TestGemVersion < Gem::TestCase
-
   class V < ::Gem::Version
   end
 
@@ -236,7 +235,7 @@ class TestGemVersion < Gem::TestCase
     assert_equal expected, v(version).approximate_recommendation
   end
 
-  # Assert that the "approximate" recommendation for +version+ satifies +version+.
+  # Assert that the "approximate" recommendation for +version+ satisfies +version+.
 
   def assert_approximate_satisfies_itself(version)
     gem_version = v(version)
@@ -298,5 +297,4 @@ class TestGemVersion < Gem::TestCase
   def refute_version_equal(unexpected, actual)
     refute_equal v(unexpected), v(actual)
   end
-
 end

data/test/rubygems/test_gem_version_option.rb

@@ -4,7 +4,6 @@ require 'rubygems/command'
 require 'rubygems/version_option'
 
 class TestGemVersionOption < Gem::TestCase
-
   def setup
     super
 
@@ -57,7 +56,7 @@ class TestGemVersionOption < Gem::TestCase
     @cmd.handle_options %w[--platform ruby]
 
     expected = [
-      Gem::Platform::RUBY
+      Gem::Platform::RUBY,
     ]
 
     assert_equal expected, Gem.platforms
@@ -162,5 +161,4 @@ class TestGemVersionOption < Gem::TestCase
 
     assert_equal expected, @cmd.options
   end
-
 end

data/test/rubygems/test_kernel.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestKernel < Gem::TestCase
-
   def setup
     super
 
@@ -19,7 +18,7 @@ class TestKernel < Gem::TestCase
 
   def test_gem
     assert gem('a', '= 1'), "Should load"
-    assert $:.any? { |p| %r{a-1/lib} =~ p }
+    assert $:.any? {|p| %r{a-1/lib} =~ p }
   end
 
   def test_gem_default
@@ -49,13 +48,13 @@ class TestKernel < Gem::TestCase
   def test_gem_redundant
     assert gem('a', '= 1'), "Should load"
     refute gem('a', '= 1'), "Should not load"
-    assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
+    assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
   end
 
   def test_gem_overlapping
     assert gem('a', '= 1'), "Should load"
     refute gem('a', '>= 1'), "Should not load"
-    assert_equal 1, $:.select { |p| %r{a-1/lib} =~ p }.size
+    assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
   end
 
   def test_gem_prerelease
@@ -82,13 +81,30 @@ class TestKernel < Gem::TestCase
     assert_match(/activated a-1/, ex.message)
     assert_equal 'a', ex.name
 
-    assert $:.any? { |p| %r{a-1/lib} =~ p }
-    refute $:.any? { |p| %r{a-2/lib} =~ p }
+    assert $:.any? {|p| %r{a-1/lib} =~ p }
+    refute $:.any? {|p| %r{a-2/lib} =~ p }
   end
 
   def test_gem_not_adding_bin
     assert gem('a', '= 1'), "Should load"
-    refute $:.any? { |p| %r{a-1/bin} =~ p }
+    refute $:.any? {|p| %r{a-1/bin} =~ p }
+  end
+
+  def test_gem_failing_inside_require_doesnt_cause_double_exceptions
+    File.write("activate.rb", "gem('a', '= 999')\n")
+
+    require "open3"
+
+    output, _ = Open3.capture2e(
+      { "GEM_HOME" => Gem.paths.home },
+      *ruby_with_rubygems_in_load_path,
+      "-r",
+      "./activate.rb"
+    )
+
+    load_errors = output.split("\n").select {|line| line.include?("Could not find") }
+
+    assert_equal 1, load_errors.size
   end
 
   def test_gem_bundler
@@ -96,7 +112,7 @@ class TestKernel < Gem::TestCase
     quick_gem 'bundler', '2.a'
 
     assert gem('bundler')
-    assert $:.any? { |p| %r{bundler-1/lib} =~ p }
+    assert $:.any? {|p| %r{bundler-1/lib} =~ p }
   end
 
   def test_gem_bundler_missing_bundler_version
@@ -117,8 +133,7 @@ class TestKernel < Gem::TestCase
       quick_gem 'bundler', '2.a'
 
       assert gem('bundler', '>= 0.a')
-      assert $:.any? { |p| %r{bundler-1/lib} =~ p }
+      assert $:.any? {|p| %r{bundler-1/lib} =~ p }
     end
   end
-
 end