rubygems-update 3.0.3 → 3.4.12

data/test/rubygems/test_gem_dependency_list.rb

@@ -1,28 +1,35 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/dependency_list'
+require_relative "helper"
+require "rubygems/dependency_list"
 
 class TestGemDependencyList < Gem::TestCase
-
   def setup
     super
 
-    util_clear_gems
-
     @deplist = Gem::DependencyList.new
 
     # TODO: switch to util_spec
-    @a1 = util_spec 'a', '1'
-    @a2 = util_spec 'a', '2'
-    @a3 = util_spec 'a', '3'
+    @a1 = util_spec "a", "1"
+    @a2 = util_spec "a", "2"
+    @a3 = util_spec "a", "3"
+
+    @b1 = util_spec "b", "1" do |s|
+      s.add_dependency "a", ">= 1"
+    end
 
-    @b1 = util_spec 'b', '1' do |s| s.add_dependency 'a', '>= 1' end
-    @b2 = util_spec 'b', '2' do |s| s.add_dependency 'a', '>= 1' end
+    @b2 = util_spec "b", "2" do |s|
+      s.add_dependency "a", ">= 1"
+    end
+
+    @c1 = util_spec "c", "1" do |s|
+      s.add_dependency "b", ">= 1"
+    end
 
-    @c1 = util_spec 'c', '1' do |s| s.add_dependency 'b', '>= 1' end
-    @c2 = util_spec 'c', '2'
+    @c2 = util_spec "c", "2"
 
-    @d1 = util_spec 'd', '1' do |s| s.add_dependency 'c', '>= 1' end
+    @d1 = util_spec "d", "1" do |s|
+      s.add_dependency "c", ">= 1"
+    end
   end
 
   def test_active_count
@@ -45,55 +52,55 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[d-1 c-1 b-1 a-1], order.map { |s| s.full_name }
+    assert_equal %w[d-1 c-1 b-1 a-1], order.map {|s| s.full_name }
   end
 
   def test_dependency_order_circle
-    @a1.add_dependency 'c', '>= 1'
+    @a1.add_dependency "c", ">= 1"
     @deplist.add @a1, @b1, @c1
 
     order = @deplist.dependency_order
 
-    assert_equal %w[b-1 c-1 a-1], order.map { |s| s.full_name }
+    assert_equal %w[b-1 c-1 a-1], order.map {|s| s.full_name }
   end
 
   def test_dependency_order_development
-    e1 = util_spec 'e', '1'
-    f1 = util_spec 'f', '1'
-    g1 = util_spec 'g', '1'
+    e1 = util_spec "e", "1"
+    f1 = util_spec "f", "1"
+    g1 = util_spec "g", "1"
 
-    @a1.add_dependency 'e'
-    @a1.add_dependency 'f'
-    @a1.add_dependency 'g'
-    g1.add_development_dependency 'a'
+    @a1.add_dependency "e"
+    @a1.add_dependency "f"
+    @a1.add_dependency "g"
+    g1.add_development_dependency "a"
 
     deplist = Gem::DependencyList.new true
     deplist.add @a1, e1, f1, g1
 
     order = deplist.dependency_order
 
-    assert_equal %w[g-1 a-1 f-1 e-1], order.map { |s| s.full_name },
-                 'development on'
+    assert_equal %w[g-1 a-1 f-1 e-1], order.map {|s| s.full_name },
+                 "development on"
 
     deplist2 = Gem::DependencyList.new
     deplist2.add @a1, e1, f1, g1
 
     order = deplist2.dependency_order
 
-    assert_equal %w[a-1 g-1 f-1 e-1], order.map { |s| s.full_name },
-                 'development off'
+    assert_equal %w[a-1 g-1 f-1 e-1], order.map {|s| s.full_name },
+                 "development off"
   end
 
   def test_dependency_order_diamond
     util_diamond
-    e1 = util_spec 'e', '1'
+    e1 = util_spec "e", "1"
     @deplist.add e1
-    @a1.add_dependency 'e', '>= 1'
+    @a1.add_dependency "e", ">= 1"
 
     order = @deplist.dependency_order
 
-    assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map { |s| s.full_name },
-                 'deps of trimmed specs not included'
+    assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map {|s| s.full_name },
+                 "deps of trimmed specs not included"
   end
 
   def test_dependency_order_no_dependencies
@@ -101,7 +108,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[c-2 a-1], order.map { |s| s.full_name }
+    assert_equal %w[c-2 a-1], order.map {|s| s.full_name }
   end
 
   def test_find_name
@@ -114,43 +121,39 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_ok_eh
-    util_clear_gems
-
-    assert @deplist.ok?, 'no dependencies'
+    assert @deplist.ok?, "no dependencies"
 
     @deplist.add @b2
 
-    refute @deplist.ok?, 'unsatisfied dependency'
+    refute @deplist.ok?, "unsatisfied dependency"
 
     @deplist.add @a1
 
-    assert @deplist.ok?, 'satisfied dependency'
+    assert @deplist.ok?, "satisfied dependency"
   end
 
   def test_why_not_ok_eh
-    util_clear_gems
-
-    assert_equal({},  @deplist.why_not_ok?)
+    assert_equal({}, @deplist.why_not_ok?)
 
     @deplist.add @b2
 
     exp = {
       "b" => [
-        Gem::Dependency.new("a", ">= 1")
-      ]
+        Gem::Dependency.new("a", ">= 1"),
+      ],
     }
 
     assert_equal exp, @deplist.why_not_ok?
   end
 
   def test_why_not_ok_eh_old_dependency
-    a  = util_spec 'a', '1',
-                  'b' => '~> 1.0'
+    a  = util_spec "a", "1",
+                  "b" => "~> 1.0"
 
-    b0 = util_spec 'b', '1.0',
-                  'd' => '>= 0'
+    b0 = util_spec "b", "1.0",
+                  "d" => ">= 0"
 
-    b1 = util_spec 'b', '1.1'
+    b1 = util_spec "b", "1.1"
 
     util_clear_gems
 
@@ -158,24 +161,29 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist.add a, b0, b1
 
-    assert_equal({},  @deplist.why_not_ok?)
+    assert_equal({}, @deplist.why_not_ok?)
   end
 
   def test_ok_eh_mismatch
-    a1 = util_spec 'a', '1'
-    a2 = util_spec 'a', '2'
+    a1 = util_spec "a", "1"
+    a2 = util_spec "a", "2"
 
-    b = util_spec 'b', '1' do |s| s.add_dependency 'a', '= 1' end
-    c = util_spec 'c', '1' do |s| s.add_dependency 'a', '= 2' end
+    b = util_spec "b", "1" do |s|
+      s.add_dependency "a", "= 1"
+    end
 
-    d = util_spec 'd', '1' do |s|
-      s.add_dependency 'b'
-      s.add_dependency 'c'
+    c = util_spec "c", "1" do |s|
+      s.add_dependency "a", "= 2"
+    end
+
+    d = util_spec "d", "1" do |s|
+      s.add_dependency "b"
+      s.add_dependency "c"
     end
 
     @deplist.add a1, a2, b, c, d
 
-    assert @deplist.ok?, 'this will break on require'
+    assert @deplist.ok?, "this will break on require"
   end
 
   def test_ok_eh_redundant
@@ -214,8 +222,6 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_remove_by_name
-    util_clear_gems
-
     @deplist.add @a1, @b2
 
     @deplist.remove_by_name "a-1"
@@ -250,10 +256,9 @@ class TestGemDependencyList < Gem::TestCase
   # d1 -> b1 -> a1
   # d1 -> c2 -> a2
   def util_diamond
-    @c2.add_dependency 'a', '>= 2'
-    @d1.add_dependency 'b'
+    @c2.add_dependency "a", ">= 2"
+    @d1.add_dependency "b"
 
     @deplist.add @a1, @a2, @b1, @c2, @d1
   end
-
 end

data/test/rubygems/test_gem_dependency_resolution_error.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemDependencyResolutionError < Gem::TestCase
-
   def setup
     super
 
     @DR = Gem::Resolver
 
-    @spec = util_spec 'a', 2
+    @spec = util_spec "a", 2
 
-    @a1_req = @DR::DependencyRequest.new dep('a', '= 1'), nil
-    @a2_req = @DR::DependencyRequest.new dep('a', '= 2'), nil
+    @a1_req = @DR::DependencyRequest.new dep("a", "= 1"), nil
+    @a2_req = @DR::DependencyRequest.new dep("a", "= 2"), nil
 
     @activated = @DR::ActivationRequest.new @spec, @a2_req
 
@@ -21,8 +20,7 @@ class TestGemDependencyResolutionError < Gem::TestCase
   end
 
   def test_message
-    assert_match %r%^conflicting dependencies a \(= 1\) and a \(= 2\)$%,
+    assert_match %r{^conflicting dependencies a \(= 1\) and a \(= 2\)$},
                  @error.message
   end
-
 end

data/test/rubygems/test_gem_doctor.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/doctor'
+require_relative "helper"
+require "rubygems/doctor"
 
 class TestGemDoctor < Gem::TestCase
-
   def gem(name)
     spec = quick_gem name do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
@@ -16,43 +15,43 @@ class TestGemDoctor < Gem::TestCase
   end
 
   def test_doctor
-    a = gem 'a'
-    b = gem 'b'
-    c = gem 'c'
+    a = gem "a"
+    b = gem "b"
+    c = gem "c"
 
     Gem.use_paths @userhome, @gemhome
 
     FileUtils.rm b.spec_file
 
-    File.open c.spec_file, 'w' do |io|
-      io.write 'this will raise an exception when evaluated.'
+    File.open c.spec_file, "w" do |io|
+      io.write "this will raise an exception when evaluated."
     end
 
-    assert_path_exists File.join(a.gem_dir, 'Rakefile')
-    assert_path_exists File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
-    assert_path_exists b.gem_dir
-    refute_path_exists b.spec_file
+    assert_path_exist b.gem_dir
+    assert_path_not_exist b.spec_file
 
-    assert_path_exists c.gem_dir
-    assert_path_exists c.spec_file
+    assert_path_exist c.gem_dir
+    assert_path_exist c.spec_file
 
     doctor = Gem::Doctor.new @gemhome
 
-    capture_io do
+    capture_output do
       use_ui @ui do
         doctor.doctor
       end
     end
 
-    assert_path_exists File.join(a.gem_dir, 'Rakefile')
-    assert_path_exists File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
-    refute_path_exists b.gem_dir
-    refute_path_exists b.spec_file
+    assert_path_not_exist b.gem_dir
+    assert_path_not_exist b.spec_file
 
-    refute_path_exists c.gem_dir
-    refute_path_exists c.spec_file
+    assert_path_not_exist c.gem_dir
+    assert_path_not_exist c.spec_file
 
     expected = <<-OUTPUT
 Checking #{@gemhome}
@@ -69,43 +68,43 @@ Removed directory gems/c-2
   end
 
   def test_doctor_dry_run
-    a = gem 'a'
-    b = gem 'b'
-    c = gem 'c'
+    a = gem "a"
+    b = gem "b"
+    c = gem "c"
 
     Gem.use_paths @userhome, @gemhome
 
     FileUtils.rm b.spec_file
 
-    File.open c.spec_file, 'w' do |io|
-      io.write 'this will raise an exception when evaluated.'
+    File.open c.spec_file, "w" do |io|
+      io.write "this will raise an exception when evaluated."
     end
 
-    assert_path_exists File.join(a.gem_dir, 'Rakefile')
-    assert_path_exists File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
-    assert_path_exists b.gem_dir
-    refute_path_exists b.spec_file
+    assert_path_exist b.gem_dir
+    assert_path_not_exist b.spec_file
 
-    assert_path_exists c.gem_dir
-    assert_path_exists c.spec_file
+    assert_path_exist c.gem_dir
+    assert_path_exist c.spec_file
 
     doctor = Gem::Doctor.new @gemhome, true
 
-    capture_io do
+    capture_output do
       use_ui @ui do
         doctor.doctor
       end
     end
 
-    assert_path_exists File.join(a.gem_dir, 'Rakefile')
-    assert_path_exists File.join(a.gem_dir, 'lib', 'a.rb')
+    assert_path_exist File.join(a.gem_dir, "Rakefile")
+    assert_path_exist File.join(a.gem_dir, "lib", "a.rb")
 
-    assert_path_exists b.gem_dir
-    refute_path_exists b.spec_file
+    assert_path_exist b.gem_dir
+    assert_path_not_exist b.spec_file
 
-    assert_path_exists c.gem_dir
-    assert_path_exists c.spec_file
+    assert_path_exist c.gem_dir
+    assert_path_exist c.spec_file
 
     expected = <<-OUTPUT
 Checking #{@gemhome}
@@ -122,19 +121,19 @@ Extra directory gems/c-2
   end
 
   def test_doctor_non_gem_home
-    other_dir = File.join @tempdir, 'other', 'dir'
+    other_dir = File.join @tempdir, "other", "dir"
 
     FileUtils.mkdir_p other_dir
 
     doctor = Gem::Doctor.new @tempdir
 
-    capture_io do
+    capture_output do
       use_ui @ui do
         doctor.doctor
       end
     end
 
-    assert_path_exists other_dir
+    assert_path_exist other_dir
 
     expected = <<-OUTPUT
 Checking #{@tempdir}
@@ -148,21 +147,48 @@ This directory does not appear to be a RubyGems repository, skipping
   def test_doctor_child_missing
     doctor = Gem::Doctor.new @gemhome
 
-    doctor.doctor_child 'missing', ''
+    doctor.doctor_child "missing", ""
 
     assert true # count
   end
 
+  def test_doctor_badly_named_plugins
+    gem "a"
+
+    Gem.use_paths @gemhome.to_s
+
+    FileUtils.mkdir_p Gem.plugindir
+    bad_plugin = File.join(Gem.plugindir, "a_badly_named_file.rb")
+    write_file bad_plugin
+
+    doctor = Gem::Doctor.new @gemhome
+
+    capture_output do
+      use_ui @ui do
+        doctor.doctor
+      end
+    end
+
+    # assert_path_not_exist bad_plugin
+
+    expected = <<-OUTPUT
+Checking #{@gemhome}
+Removed file plugins/a_badly_named_file.rb
+
+    OUTPUT
+
+    assert_equal expected, @ui.output
+  end
+
   def test_gem_repository_eh
     doctor = Gem::Doctor.new @gemhome
 
-    refute doctor.gem_repository?, 'no gems installed'
+    refute doctor.gem_repository?, "no gems installed"
 
-    install_specs util_spec 'a'
+    install_specs util_spec "a"
 
     doctor = Gem::Doctor.new @gemhome
 
-    assert doctor.gem_repository?, 'gems installed'
+    assert doctor.gem_repository?, "gems installed"
   end
-
 end