rubygems-update 3.3.26 → 3.4.6

data/test/rubygems/test_gem.rb

@@ -616,27 +616,6 @@ class TestGem < Gem::TestCase
     assert_equal %w[https://rubygems.org/], Gem.default_sources
   end
 
-  def test_self_use_gemdeps
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("-") do
-        FileUtils.mkdir_p "detect/a/b"
-        FileUtils.mkdir_p "detect/a/Isolate"
-
-        FileUtils.touch "detect/Isolate"
-
-        begin
-          Dir.chdir "detect/a/b"
-
-          Gem.use_gemdeps
-
-          assert_equal add_bundler_full_name([]), loaded_spec_names
-        ensure
-          Dir.chdir @tempdir
-        end
-      end
-    end
-  end
-
   def test_self_dir
     assert_equal @gemhome, Gem.dir
   end
@@ -776,43 +755,6 @@ class TestGem < Gem::TestCase
     assert_equal cwd, $LOAD_PATH.shift
   end
 
-  def test_self_find_files_with_gemfile
-    with_local_bundler_at(Gem.dir) do
-      cwd = File.expand_path("test/rubygems", PROJECT_DIR)
-      actual_load_path = $LOAD_PATH.unshift(cwd).dup
-
-      discover_path = File.join "lib", "sff", "discover.rb"
-
-      foo1, _ = %w[1 2].map do |version|
-        spec = quick_gem "sff", version do |s|
-          s.files << discover_path
-        end
-
-        write_file(File.join "gems", spec.full_name, discover_path) do |fp|
-          fp.puts "# #{spec.full_name}"
-        end
-
-        spec
-      end
-      Gem.refresh
-
-      write_file(File.join Dir.pwd, "Gemfile") do |fp|
-        fp.puts "source 'https://rubygems.org'"
-        fp.puts "gem '#{foo1.name}', '#{foo1.version}'"
-      end
-      Gem.use_gemdeps(File.join Dir.pwd, "Gemfile")
-
-      expected = [
-        File.expand_path("test/rubygems/sff/discover.rb", PROJECT_DIR),
-        File.join(foo1.full_gem_path, discover_path),
-      ].sort
-
-      assert_equal expected, Gem.find_files("sff/discover").sort
-      assert_equal expected, Gem.find_files("sff/**.rb").sort, "[ruby-core:31730]"
-      assert_equal cwd, actual_load_path.shift
-    end
-  end
-
   def test_self_find_latest_files
     cwd = File.expand_path("test/rubygems", PROJECT_DIR)
     $LOAD_PATH.unshift cwd
@@ -1358,8 +1300,8 @@ class TestGem < Gem::TestCase
 
   def test_setting_paths_does_not_warn_about_unknown_keys
     stdout, stderr = capture_output do
-      Gem.paths = { "foo"      => [],
-                    "bar"      => Object.new,
+      Gem.paths = { "foo" => [],
+                    "bar" => Object.new,
                     "GEM_HOME" => Gem.paths.home,
                     "GEM_PATH" => "foo" }
     end
@@ -1640,168 +1582,6 @@ class TestGem < Gem::TestCase
       "Wrong spec selected"
   end
 
-  def test_auto_activation_of_specific_gemdeps_file
-    with_local_bundler_at(Gem.dir) do
-      a = util_spec "a", "1", nil, "lib/a.rb"
-      b = util_spec "b", "1", nil, "lib/b.rb"
-      c = util_spec "c", "1", nil, "lib/c.rb"
-
-      install_specs a, b, c
-
-      path = File.join @tempdir, "gem.deps.rb"
-
-      File.open path, "w" do |f|
-        f.puts "gem 'a'"
-        f.puts "gem 'b'"
-        f.puts "gem 'c'"
-      end
-
-      with_rubygems_gemdeps(path) do
-        Gem.use_gemdeps
-
-        assert_equal add_bundler_full_name(%W[a-1 b-1 c-1]), loaded_spec_names
-      end
-    end
-  end
-
-  def test_auto_activation_of_used_gemdeps_file
-    with_local_bundler_at(Gem.dir) do
-      a = util_spec "a", "1", nil, "lib/a.rb"
-      b = util_spec "b", "1", nil, "lib/b.rb"
-      c = util_spec "c", "1", nil, "lib/c.rb"
-
-      install_specs a, b, c
-
-      path = File.join @tempdir, "gem.deps.rb"
-
-      File.open path, "w" do |f|
-        f.puts "gem 'a'"
-        f.puts "gem 'b'"
-        f.puts "gem 'c'"
-      end
-
-      with_rubygems_gemdeps("-") do
-        expected_specs = [a, b, util_spec("bundler", Bundler::VERSION), c].compact.map(&:full_name)
-
-        Gem.use_gemdeps
-
-        assert_equal expected_specs, loaded_spec_names
-      end
-    end
-  end
-
-  def add_bundler_full_name(names)
-    names << "bundler-#{Bundler::VERSION}".freeze
-    names.sort!
-    names
-  end
-
-  def test_looks_for_gemdeps_files_automatically_from_binstubs
-    path = File.join(@tempdir, "gd-tmp")
-
-    with_local_bundler_at(path) do
-      a = util_spec "a", "1" do |s|
-        s.executables = %w[foo]
-        s.bindir = "exe"
-      end
-
-      write_file File.join(@tempdir, "exe", "foo") do |fp|
-        fp.puts "puts Gem.loaded_specs.values.map(&:full_name).sort"
-      end
-
-      b = util_spec "b", "1", nil, "lib/b.rb"
-      c = util_spec "c", "1", nil, "lib/c.rb"
-
-      install_specs a, b, c
-
-      install_gem a, :install_dir => path
-      install_gem b, :install_dir => path
-      install_gem c, :install_dir => path
-
-      ENV["GEM_PATH"] = path
-
-      with_rubygems_gemdeps("-") do
-        new_PATH = [File.join(path, "bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
-        new_RUBYOPT = "-I#{rubygems_path} -I#{bundler_path}"
-
-        path = File.join @tempdir, "gem.deps.rb"
-
-        File.open path, "w" do |f|
-          f.puts "gem 'a'"
-        end
-        out0 = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
-          IO.popen("foo", &:read).split(/\n/)
-        end
-
-        File.open path, "a" do |f|
-          f.puts "gem 'b'"
-          f.puts "gem 'c'"
-        end
-        out = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
-          IO.popen("foo", &:read).split(/\n/)
-        end
-
-        assert_equal ["b-1", "c-1"], out - out0
-      end
-    end
-  end
-
-  def test_looks_for_gemdeps_files_automatically_from_binstubs_in_parent_dir
-    path = File.join(@tempdir, "gd-tmp")
-
-    with_local_bundler_at(path) do
-      pend "IO.popen has issues on JRuby when passed :chdir" if Gem.java_platform?
-
-      a = util_spec "a", "1" do |s|
-        s.executables = %w[foo]
-        s.bindir = "exe"
-      end
-
-      write_file File.join(@tempdir, "exe", "foo") do |fp|
-        fp.puts "puts Gem.loaded_specs.values.map(&:full_name).sort"
-      end
-
-      b = util_spec "b", "1", nil, "lib/b.rb"
-      c = util_spec "c", "1", nil, "lib/c.rb"
-
-      install_specs a, b, c
-
-      install_gem a, :install_dir => path
-      install_gem b, :install_dir => path
-      install_gem c, :install_dir => path
-
-      ENV["GEM_PATH"] = path
-
-      with_rubygems_gemdeps("-") do
-        Dir.mkdir "sub1"
-
-        new_PATH = [File.join(path, "bin"), ENV["PATH"]].join(File::PATH_SEPARATOR)
-        new_RUBYOPT = "-I#{rubygems_path} -I#{bundler_path}"
-
-        path = File.join @tempdir, "gem.deps.rb"
-
-        File.open path, "w" do |f|
-          f.puts "gem 'a'"
-        end
-        out0 = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
-          IO.popen("foo", :chdir => "sub1", &:read).split(/\n/)
-        end
-
-        File.open path, "a" do |f|
-          f.puts "gem 'b'"
-          f.puts "gem 'c'"
-        end
-        out = with_path_and_rubyopt(new_PATH, new_RUBYOPT) do
-          IO.popen("foo", :chdir => "sub1", &:read).split(/\n/)
-        end
-
-        Dir.rmdir "sub1"
-
-        assert_equal ["b-1", "c-1"], out - out0
-      end
-    end
-  end
-
   def test_register_default_spec
     Gem.clear_default_specs
 
@@ -1842,162 +1622,6 @@ class TestGem < Gem::TestCase
     assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb")
   end
 
-  def test_use_gemdeps
-    with_local_bundler_at(Gem.dir) do
-      gem_deps_file = "gem.deps.rb".tap(&Gem::UNTAINT)
-      spec = util_spec "a", 1
-      install_specs spec
-
-      spec = Gem::Specification.find {|s| s == spec }
-      refute spec.activated?
-
-      File.open gem_deps_file, "w" do |io|
-        io.write 'gem "a"'
-      end
-
-      assert_nil Gem.gemdeps
-
-      Gem.use_gemdeps gem_deps_file
-
-      assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
-      refute_nil Gem.gemdeps
-    end
-  end
-
-  def test_use_gemdeps_ENV
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps(nil) do
-        spec = util_spec "a", 1
-
-        refute spec.activated?
-
-        File.open "gem.deps.rb", "w" do |io|
-          io.write 'gem "a"'
-        end
-
-        Gem.use_gemdeps
-
-        refute spec.activated?
-      end
-    end
-  end
-
-  def test_use_gemdeps_argument_missing
-    with_local_bundler_at(Gem.dir) do
-      e = assert_raise ArgumentError do
-        Gem.use_gemdeps "gem.deps.rb"
-      end
-
-      assert_equal "Unable to find gem dependencies file at gem.deps.rb",
-                   e.message
-    end
-  end
-
-  def test_use_gemdeps_argument_missing_match_ENV
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("gem.deps.rb") do
-        e = assert_raise ArgumentError do
-          Gem.use_gemdeps "gem.deps.rb"
-        end
-
-        assert_equal "Unable to find gem dependencies file at gem.deps.rb",
-                     e.message
-      end
-    end
-  end
-
-  def test_use_gemdeps_automatic
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("-") do
-        spec = util_spec "a", 1
-        install_specs spec
-        spec = Gem::Specification.find {|s| s == spec }
-
-        refute spec.activated?
-
-        File.open "Gemfile", "w" do |io|
-          io.write 'gem "a"'
-        end
-
-        Gem.use_gemdeps
-
-        assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
-      end
-    end
-  end
-
-  def test_use_gemdeps_automatic_missing
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("-") do
-        Gem.use_gemdeps
-
-        assert true # count
-      end
-    end
-  end
-
-  def test_use_gemdeps_disabled
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("") do
-        spec = util_spec "a", 1
-
-        refute spec.activated?
-
-        File.open "gem.deps.rb", "w" do |io|
-          io.write 'gem "a"'
-        end
-
-        Gem.use_gemdeps
-
-        refute spec.activated?
-      end
-    end
-  end
-
-  def test_use_gemdeps_missing_gem
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("x") do
-        File.open "x", "w" do |io|
-          io.write 'gem "a"'
-        end
-
-        expected = <<-EXPECTED
-Could not find gem 'a' in locally installed gems.
-You may need to `bundle install` to install missing gems
-
-      EXPECTED
-
-        Gem::Deprecate.skip_during do
-          actual_stdout, actual_stderr = capture_output do
-            Gem.use_gemdeps
-          end
-          assert_empty actual_stdout
-          assert_equal(expected, actual_stderr)
-        end
-      end
-    end
-  end
-
-  def test_use_gemdeps_specific
-    with_local_bundler_at(Gem.dir) do
-      with_rubygems_gemdeps("x") do
-        spec = util_spec "a", 1
-        install_specs spec
-
-        spec = Gem::Specification.find {|s| s == spec }
-        refute spec.activated?
-
-        File.open "x", "w" do |io|
-          io.write 'gem "a"'
-        end
-
-        Gem.use_gemdeps
-
-        assert_equal add_bundler_full_name(%W[a-1]), loaded_spec_names
-      end
-    end
-  end
-
   def test_operating_system_defaults
     operating_system_defaults = Gem.operating_system_defaults
 
@@ -2061,13 +1685,8 @@ You may need to `bundle install` to install missing gems
   end
 
   def redefine_method(base, method, new_result)
-    if RUBY_VERSION >= "2.5"
-      base.alias_method(method, method)
-      base.define_method(method) { new_result }
-    else
-      base.send(:alias_method, method, method)
-      base.send(:define_method, method) { new_result }
-    end
+    base.alias_method(method, method)
+    base.define_method(method) { new_result }
   end
 
   def with_plugin(path)
@@ -2115,40 +1734,4 @@ You may need to `bundle install` to install missing gems
   def util_cache_dir
     File.join Gem.dir, "cache"
   end
-
-  def with_path_and_rubyopt(path_value, rubyopt_value)
-    path, ENV["PATH"] = ENV["PATH"], path_value
-    rubyopt, ENV["RUBYOPT"] = ENV["RUBYOPT"], rubyopt_value
-
-    yield
-  ensure
-    ENV["PATH"] = path
-    ENV["RUBYOPT"] = rubyopt
-  end
-
-  def with_rubygems_gemdeps(value)
-    rubygems_gemdeps, ENV["RUBYGEMS_GEMDEPS"] = ENV["RUBYGEMS_GEMDEPS"], value
-
-    yield
-  ensure
-    ENV["RUBYGEMS_GEMDEPS"] = rubygems_gemdeps
-  end
-
-  def with_local_bundler_at(path)
-    require "bundler"
-
-    # If bundler gemspec exists, pretend it's installed
-    bundler_gemspec = File.expand_path("../../bundler/bundler.gemspec", __dir__)
-    if File.exist?(bundler_gemspec)
-      target_gemspec_location = "#{path}/specifications/bundler-#{Bundler::VERSION}.gemspec"
-
-      FileUtils.mkdir_p File.dirname(target_gemspec_location)
-
-      File.write target_gemspec_location, Gem::Specification.load(bundler_gemspec).to_ruby_for_cache
-    end
-
-    yield
-  ensure
-    Bundler.reset!
-  end
 end

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "helper"
+require "rubygems/bundler_version_finder"
 
 class TestGemBundlerVersionFinder < Gem::TestCase
   def setup
@@ -78,7 +79,7 @@ class TestGemBundlerVersionFinder < Gem::TestCase
 
   def test_deleted_directory
     pend "Cannot perform this test on windows" if win_platform?
-    pend "Cannot perform this test on Solaris" if /solaris/ =~ RUBY_PLATFORM
+    pend "Cannot perform this test on Solaris" if RUBY_PLATFORM.include?("solaris")
     require "tmpdir"
 
     orig_dir = Dir.pwd

data/test/rubygems/test_gem_command_manager.rb

@@ -76,7 +76,7 @@ class TestGemCommandManager < Gem::TestCase
 
     message = "Unknown command pish".dup
 
-    if RUBY_VERSION >= "2.4" && defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable)
+    if defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable)
       message << "\nDid you mean?  \"push\""
     end
 
@@ -126,6 +126,46 @@ class TestGemCommandManager < Gem::TestCase
     @command_manager.unregister_command :crash
   end
 
+  def test_process_args_with_c_flag
+    custom_start_point = File.join @tempdir, "nice_folder"
+    FileUtils.mkdir_p custom_start_point
+
+    execution_path = nil
+    use_ui @ui do
+      @command_manager[:install].when_invoked do
+        execution_path = Dir.pwd
+        true
+      end
+      @command_manager.process_args %W[-C #{custom_start_point} install net-scp-4.0.0.gem --local]
+    end
+
+    assert_equal custom_start_point, execution_path
+  end
+
+  def test_process_args_with_c_flag_without_path
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @command_manager.process_args %w[-C install net-scp-4.0.0.gem --local]
+      end
+    end
+
+    assert_match(/install isn't a directory./i, @ui.error)
+  end
+
+  def test_process_args_with_c_flag_path_not_found
+    custom_start_point = File.join @tempdir, "nice_folder"
+    FileUtils.mkdir_p custom_start_point
+    custom_start_point.tr!("_", "-")
+
+    use_ui @ui do
+      assert_raise Gem::MockGemUi::TermError do
+        @command_manager.process_args %W[-C #{custom_start_point} install net-scp-4.0.0.gem --local]
+      end
+    end
+
+    assert_match(/#{custom_start_point} isn't a directory./i, @ui.error)
+  end
+
   def test_process_args_bad_arg
     use_ui @ui do
       assert_raise Gem::MockGemUi::TermError do

data/test/rubygems/test_gem_commands_build_command.rb

@@ -41,6 +41,16 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_includes Gem.platforms, Gem::Platform.local
   end
 
+  def test_handle_deprecated_options
+    use_ui @ui do
+      @cmd.handle_options %w[-C ./test/dir]
+    end
+
+    assert_equal "WARNING:  The \"-C\" option has been deprecated and will be removed in Rubygems 4.0. " \
+                 "-C is a global flag now. Use `gem -C PATH build GEMSPEC_FILE [options]` instead\n",
+                 @ui.error
+  end
+
   def test_options_filename
     gemspec_file = File.join(@tempdir, @gem.spec_name)
 

data/test/rubygems/test_gem_commands_install_command.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "helper"
+require_relative "test_gem_update_suggestion"
 require "rubygems/commands/install_command"
 require "rubygems/request_set"
 require "rubygems/rdoc"
@@ -1550,4 +1551,22 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_equal "  a-3", out.shift
     assert_empty out
   end
+
+  def test_suggest_update_if_enabled
+    TestUpdateSuggestion.with_eglible_environment(cmd: @cmd) do
+      spec_fetcher do |fetcher|
+        fetcher.gem "a", 2
+      end
+
+      @cmd.options[:args] = %w[a]
+
+      use_ui @ui do
+        assert_raise Gem::MockGemUi::SystemExitException, @ui.error do
+          @cmd.execute
+        end
+      end
+
+      assert_includes @ui.output, "A new release of RubyGems is available: 1.2.3 → 2.0.0!"
+    end
+  end
 end

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -15,6 +15,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     super
 
     @cmd = Gem::Commands::SetupCommand.new
+    @cmd.options[:document] = []
 
     filelist = %w[
       bin/gem
@@ -66,7 +67,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.execute
 
     assert_match %r{\A#!}, File.read(gem_bin_path)
@@ -78,7 +78,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.options[:regenerate_binstubs] = false
     @cmd.execute
 
@@ -91,7 +90,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.execute
 
     assert_match %r{\Arequire}, File.read(gem_plugin_path)
@@ -103,7 +101,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.options[:regenerate_plugins] = false
     @cmd.execute
 
@@ -116,15 +113,12 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     # Simulate gem installed with an older rubygems without a plugins layout
     FileUtils.rm_rf Gem.plugindir
 
-    @cmd.options[:document] = []
     @cmd.execute
 
     assert_match %r{\Arequire}, File.read(gem_plugin_path)
   end
 
   def test_execute_informs_about_installed_executables
-    @cmd.options[:document] = []
-
     use_ui @ui do
       @cmd.execute
     end
@@ -143,7 +137,6 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts "I changed it!"
     end
 
-    @cmd.options[:document] = []
     @cmd.options[:env_shebang] = true
     @cmd.execute
 

data/test/rubygems/test_gem_commands_update_command.rb

@@ -669,10 +669,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.handle_options %w[--system]
 
     expected = {
-      :args     => [],
+      :args => [],
       :document => %w[ri],
-      :force    => false,
-      :system   => true,
+      :force => false,
+      :system => true,
     }
 
     assert_equal expected, @cmd.options
@@ -688,10 +688,10 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @cmd.handle_options %w[--system 1.3.7]
 
     expected = {
-      :args     => [],
+      :args => [],
       :document => %w[ri],
-      :force    => false,
-      :system   => "1.3.7",
+      :force => false,
+      :system => "1.3.7",
     }
 
     assert_equal expected, @cmd.options

data/test/rubygems/test_gem_config_file.rb

@@ -330,7 +330,7 @@ if you believe they were disclosed to a third party.
     util_config_file
 
     assert_equal({ :rubygems => "701229f217cdf23b1344c7b4b54ca97",
-                  :other => "a5fdbb6ba150cbb83aad2bb2fede64c" }, @cfg.api_keys)
+                   :other => "a5fdbb6ba150cbb83aad2bb2fede64c" }, @cfg.api_keys)
   end
 
   def test_load_api_keys_bad_permission

data/test/rubygems/test_gem_dependency.rb

@@ -358,6 +358,8 @@ class TestGemDependency < Gem::TestCase
 
     assert_equal [b, b_1], dep.to_specs
 
+    require "rubygems/bundler_version_finder"
+
     Gem::BundlerVersionFinder.stub(:bundler_version, Gem::Version.new("1")) do
       assert_equal [b_1, b], dep.to_specs
     end