rubygems-update 2.6.0 → 3.4.22

data/test/rubygems/test_gem_available_set.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/available_set'
-require 'rubygems/security'
 
-class TestGemAvailableSet < Gem::TestCase
+require_relative "helper"
+require "rubygems/available_set"
+require "rubygems/security"
 
+class TestGemAvailableSet < Gem::TestCase
   def setup
     super
 
@@ -12,7 +12,7 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_add_and_empty
-    a1, _ = util_gem 'a', '1'
+    a1, _ = util_gem "a", "1"
 
     set = Gem::AvailableSet.new
     assert set.empty?
@@ -25,8 +25,8 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_find_all
-    a1,  a1_gem  = util_gem 'a', 1
-    a1a, a1a_gem = util_gem 'a', '1.a'
+    a1,  a1_gem  = util_gem "a", 1
+    a1a, a1a_gem = util_gem "a", "1.a"
 
     a1_source  = Gem::Source::SpecificFile.new a1_gem
     a1a_source = Gem::Source::SpecificFile.new a1a_gem
@@ -35,26 +35,26 @@ class TestGemAvailableSet < Gem::TestCase
     set.add a1,  a1_source
     set.add a1a, a1a_source
 
-    dep = Gem::Resolver::DependencyRequest.new dep('a'), nil
+    dep = Gem::Resolver::DependencyRequest.new dep("a"), nil
 
-    assert_equal %w[a-1], set.find_all(dep).map { |spec| spec.full_name }
+    assert_equal %w[a-1], set.find_all(dep).map {|spec| spec.full_name }
 
-    dep = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
+    dep = Gem::Resolver::DependencyRequest.new dep("a", ">= 0.a"), nil
 
     assert_equal %w[a-1 a-1.a],
-                 set.find_all(dep).map { |spec| spec.full_name }.sort
+                 set.find_all(dep).map {|spec| spec.full_name }.sort
   end
 
   def test_match_platform
-    a1, _ = util_gem 'a', '1' do |g|
+    a1, _ = util_gem "a", "1" do |g|
       g.platform = "something-weird-yep"
     end
 
-    a1c, _ = util_gem 'a', '2' do |g|
+    a1c, _ = util_gem "a", "2" do |g|
       g.platform = Gem::Platform.local
     end
 
-    a2, _ = util_gem 'a', '2'
+    a2, _ = util_gem "a", "2"
 
     set = Gem::AvailableSet.new
     set.add a1, @source
@@ -67,8 +67,8 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_best
-    a1, _ = util_gem 'a', '1'
-    a2, _  = util_gem 'a', '2'
+    a1, _ = util_gem "a", "1"
+    a2, _ = util_gem "a", "2"
 
     set = Gem::AvailableSet.new
     set.add a1, @source
@@ -80,7 +80,7 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_remove_installed_bang
-    a1, _ = util_spec 'a', '1'
+    a1, _ = util_spec "a", "1"
     install_specs a1
 
     a1.activate
@@ -96,8 +96,8 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_sorted_normal_versions
-    a1, _ = util_gem 'a', '1'
-    a2, _  = util_gem 'a', '2'
+    a1, _ = util_gem "a", "1"
+    a2, _ = util_gem "a", "2"
 
     set = Gem::AvailableSet.new
     set.add a1, @source
@@ -110,11 +110,11 @@ class TestGemAvailableSet < Gem::TestCase
   end
 
   def test_sorted_respect_pre
-    a1a, _ = util_gem 'a', '1.a'
-    a1,  _ = util_gem 'a', '1'
-    a2a, _ = util_gem 'a', '2.a'
-    a2,  _ = util_gem 'a', '2'
-    a3a, _ = util_gem 'a', '3.a'
+    a1a, _ = util_gem "a", "1.a"
+    a1,  _ = util_gem "a", "1"
+    a2a, _ = util_gem "a", "2.a"
+    a2,  _ = util_gem "a", "2"
+    a3a, _ = util_gem "a", "3.a"
 
     set = Gem::AvailableSet.new
     set.add a1, @source
@@ -123,7 +123,7 @@ class TestGemAvailableSet < Gem::TestCase
     set.add a2a, @source
     set.add a2, @source
 
-    g = set.sorted.map { |t| t.spec }
+    g = set.sorted.map {|t| t.spec }
 
     assert_equal [a3a, a2, a2a, a1, a1a], g
   end

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require "rubygems/bundler_version_finder"
+
+class TestGemBundlerVersionFinder < Gem::TestCase
+  def setup
+    @argv = ARGV.dup
+    @dollar_0 = $0
+    super
+
+    without_any_upwards_gemfiles
+  end
+
+  def teardown
+    ARGV.replace @argv
+    $0 = @dollar_0
+
+    super
+  end
+
+  def bvf
+    Gem::BundlerVersionFinder
+  end
+
+  def test_bundler_version_defaults_to_nil
+    assert_nil bvf.bundler_version
+  end
+
+  def test_bundler_version_with_env_var
+    ENV["BUNDLER_VERSION"] = "1.1.1.1"
+    assert_equal v("1.1.1.1"), bvf.bundler_version
+  end
+
+  def test_bundler_version_with_bundle_update_bundler
+    ARGV.replace %w[update --bundler]
+    assert_nil bvf.bundler_version
+    $0 = "/foo/bar/bundle"
+    assert_nil bvf.bundler_version
+    ARGV.replace %w[update --bundler=1.1.1.1 gem_name]
+    assert_equal v("1.1.1.1"), bvf.bundler_version
+    ARGV.replace %w[update --bundler 1.1.1.1 gem_name]
+    assert_equal v("1.1.1.1"), bvf.bundler_version
+    ARGV.replace %w[update --bundler\ 1.1.1.1 gem_name]
+    assert_equal v("1.1.1.1"), bvf.bundler_version
+    ARGV.replace %w[update --bundler\ 1.1.1.2 --bundler --bundler 1.1.1.1 gem_name]
+    assert_equal v("1.1.1.1"), bvf.bundler_version
+    $0 = "other"
+    assert_nil bvf.bundler_version
+  end
+
+  def test_bundler_version_with_lockfile
+    bvf.stub(:lockfile_contents, "") do
+      assert_nil bvf.bundler_version
+    end
+    bvf.stub(:lockfile_contents, "\n\nBUNDLED WITH\n   1.1.1.1\n") do
+      assert_equal v("1.1.1.1"), bvf.bundler_version
+    end
+    bvf.stub(:lockfile_contents, "\n\nBUNDLED WITH\n   fjdkslfjdkslfjsldk\n") do
+      assert_nil bvf.bundler_version
+    end
+  end
+
+  def test_bundler_version
+    assert_nil bvf.bundler_version
+    bvf.stub(:lockfile_contents, "\n\nBUNDLED WITH\n   1.1.1.1\n") do
+      assert_equal "1.1.1.1", bvf.bundler_version.to_s
+
+      $0 = "bundle"
+      ARGV.replace %w[update --bundler]
+      assert_nil bvf.bundler_version
+
+      ARGV.replace %w[update --bundler=1.1.1.2]
+      assert_equal "1.1.1.2",  bvf.bundler_version.to_s
+
+      ENV["BUNDLER_VERSION"] = "1.1.1.3"
+      assert_equal "1.1.1.3", bvf.bundler_version.to_s
+    end
+  end
+
+  def test_deleted_directory
+    pend "Cannot perform this test on windows" if win_platform?
+    pend "Cannot perform this test on Solaris" if RUBY_PLATFORM.include?("solaris")
+    require "tmpdir"
+
+    orig_dir = Dir.pwd
+
+    begin
+      Dir.mktmpdir("some_dir") do |dir|
+        Dir.chdir(dir)
+      end
+    ensure
+      Dir.chdir(orig_dir)
+    end
+
+    assert_nil bvf.bundler_version
+  end
+
+  def test_prioritize
+    versions = %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1]
+    specs = versions.map {|v| util_spec("bundler", v) }
+
+    assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_prioritize_specs(specs)
+
+    bvf.stub(:bundler_version, v("2.1.1.1")) do
+      assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_prioritize_specs(specs)
+    end
+    bvf.stub(:bundler_version, v("1.1.1.1")) do
+      assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_prioritize_specs(specs)
+    end
+    bvf.stub(:bundler_version, v("1")) do
+      assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_prioritize_specs(specs)
+    end
+    bvf.stub(:bundler_version, v("2.a")) do
+      assert_equal %w[2.a 1 1.0 1.0.1.1 2 2.0 2.1.1 3 3.a 3.0 3.1.1], util_prioritize_specs(specs)
+    end
+    bvf.stub(:bundler_version, v("3")) do
+      assert_equal %w[3 1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3.a 3.0 3.1.1], util_prioritize_specs(specs)
+    end
+  end
+
+  def util_prioritize_specs(specs)
+    specs = specs.dup
+    bvf.prioritize!(specs)
+    specs.map(&:version).map(&:to_s)
+  end
+end

data/test/rubygems/test_gem_command.rb

@@ -1,32 +1,38 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/command'
+
+require_relative "helper"
+require "rubygems/command"
 
 class Gem::Command
   public :parser
 end
 
 class TestGemCommand < Gem::TestCase
-
   def setup
     super
 
     @xopt = nil
 
+    @common_options = Gem::Command.common_options.dup
     Gem::Command.common_options.clear
-    Gem::Command.common_options <<  [
-      ['-x', '--exe', 'Execute'], lambda do |*a|
+    Gem::Command.common_options << [
+      ["-x", "--exe", "Execute"], lambda do |*a|
         @xopt = true
       end
     ]
 
-    @cmd_name = 'doit'
-    @cmd = Gem::Command.new @cmd_name, 'summary'
+    @cmd_name = "doit"
+    @cmd = Gem::Command.new @cmd_name, "summary"
+  end
+
+  def teardown
+    super
+    Gem::Command.common_options.replace @common_options
   end
 
   def test_self_add_specific_extra_args
     added_args = %w[--all]
-    @cmd.add_option '--all' do |v,o| end
+    @cmd.add_option("--all") {|v,o| }
 
     Gem::Command.add_specific_extra_args @cmd_name, added_args
 
@@ -49,6 +55,29 @@ class TestGemCommand < Gem::TestCase
     assert_equal [], h
   end
 
+  def test_self_extra_args
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    separator = $;
+    extra_args = Gem::Command.extra_args
+
+    Gem::Command.extra_args = %w[--all]
+    assert_equal %w[--all], Gem::Command.extra_args
+
+    Gem::Command.extra_args = "--file --help"
+    assert_equal %w[--file --help], Gem::Command.extra_args
+
+    $; = "="
+
+    Gem::Command.extra_args = "--awesome=true --verbose"
+    assert_equal %w[--awesome=true --verbose], Gem::Command.extra_args
+
+  ensure
+    Gem::Command.extra_args = extra_args
+    $; = separator
+    $VERBOSE = verbose
+  end
+
   def test_basic_accessors
     assert_equal "doit", @cmd.command
     assert_equal "gem doit", @cmd.program_name
@@ -60,7 +89,7 @@ class TestGemCommand < Gem::TestCase
   end
 
   def test_defaults
-    @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
+    @cmd.add_option("-h", "--help [COMMAND]", "Get help on COMMAND") do |value, options|
       options[:help] = value
     end
 
@@ -74,7 +103,7 @@ class TestGemCommand < Gem::TestCase
       @cmd.invoke
     end
 
-    assert_match %r|Usage: gem doit|, @ui.output
+    assert_match %r{Usage: gem doit}, @ui.output
   end
 
   def test_invoke
@@ -90,10 +119,10 @@ class TestGemCommand < Gem::TestCase
 
   def test_invoke_with_bad_options
     use_ui @ui do
-      @cmd.when_invoked do true end
+      @cmd.when_invoked { true }
 
-      ex = assert_raises OptionParser::InvalidOption do
-        @cmd.invoke('-zzz')
+      ex = assert_raise Gem::OptionParser::InvalidOption do
+        @cmd.invoke("-zzz")
       end
 
       assert_match(/invalid option:/, ex.message)
@@ -101,7 +130,7 @@ class TestGemCommand < Gem::TestCase
   end
 
   def test_invoke_with_common_options
-    @cmd.when_invoked do true end
+    @cmd.when_invoked { true }
 
     use_ui @ui do
       @cmd.invoke "-x"
@@ -125,12 +154,12 @@ class TestGemCommand < Gem::TestCase
     done = false
 
     use_ui @ui do
-      @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
+      @cmd.add_option("-h", "--help [COMMAND]", "Get help on COMMAND") do |value, options|
         options[:help] = true
         done = true
       end
 
-      @cmd.invoke('--help')
+      @cmd.invoke("--help")
 
       assert done
     end
@@ -148,7 +177,7 @@ class TestGemCommand < Gem::TestCase
   end
 
   def test_invoke_with_options
-    @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
+    @cmd.add_option("-h", "--help [COMMAND]", "Get help on COMMAND") do |value, options|
       options[:help] = true
     end
 
@@ -157,36 +186,164 @@ class TestGemCommand < Gem::TestCase
     end
 
     use_ui @ui do
-      @cmd.invoke '-h'
+      @cmd.invoke "-h"
+    end
+
+    assert_match %r{Usage: gem doit}, @ui.output
+  end
+
+  def test_add_option
+    assert_nothing_raised RuntimeError do
+      @cmd.add_option("--force", "skip validation of the spec") {|v,o| }
     end
+  end
 
-    assert_match %r|Usage: gem doit|, @ui.output
+  def test_add_option_with_empty
+    assert_raise RuntimeError, "Do not pass an empty string in opts" do
+      @cmd.add_option("", "skip validation of the spec") {|v,o| }
+    end
   end
 
   def test_option_recognition
-    @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
+    @cmd.add_option("-h", "--help [COMMAND]", "Get help on COMMAND") do |value, options|
       options[:help] = true
     end
-    @cmd.add_option('-f', '--file FILE', 'File option') do |value, options|
+    @cmd.add_option("-f", "--file FILE", "File option") do |value, options|
       options[:help] = true
     end
-    @cmd.add_option('--silent', 'Silence rubygems output') do |value, options|
+    @cmd.add_option("--silent", "Silence RubyGems output") do |value, options|
       options[:silent] = true
     end
-    assert @cmd.handles?(['-x'])
-    assert @cmd.handles?(['-h'])
-    assert @cmd.handles?(['-h', 'command'])
-    assert @cmd.handles?(['--help', 'command'])
-    assert @cmd.handles?(['-f', 'filename'])
-    assert @cmd.handles?(['--file=filename'])
-    assert @cmd.handles?(['--silent'])
-    refute @cmd.handles?(['-z'])
-    refute @cmd.handles?(['-f'])
-    refute @cmd.handles?(['--toothpaste'])
-
-    args = ['-h', 'command']
+    assert @cmd.handles?(["-x"])
+    assert @cmd.handles?(["-h"])
+    assert @cmd.handles?(["-h", "command"])
+    assert @cmd.handles?(["--help", "command"])
+    assert @cmd.handles?(["-f", "filename"])
+    assert @cmd.handles?(["--file=filename"])
+    assert @cmd.handles?(["--silent"])
+    refute @cmd.handles?(["-z"])
+    refute @cmd.handles?(["-f"])
+    refute @cmd.handles?(["--toothpaste"])
+
+    args = ["-h", "command"]
     @cmd.handles?(args)
-    assert_equal ['-h', 'command'], args
+    assert_equal ["-h", "command"], args
+  end
+
+  def test_deprecate_option
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in Rubygems 3.1.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super("test", "Gem::Command instance for testing")
+
+        add_option("-t", "--test", "Test command") do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option("--test", version: "3.1")
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
+  def test_deprecate_option_no_version
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in future versions of Rubygems.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super("test", "Gem::Command instance for testing")
+
+        add_option("-t", "--test", "Test command") do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option("--test")
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
+  def test_deprecate_option_extra_message
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in Rubygems 3.1. Whether you set `--test` mode or not, this dummy app always runs in test mode.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super("test", "Gem::Command instance for testing")
+
+        add_option("-t", "--test", "Test command") do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option("--test", version: "3.1", extra_msg: "Whether you set `--test` mode or not, this dummy app always runs in test mode.")
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
+  def test_deprecate_option_extra_message_and_no_version
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in future versions of Rubygems. Whether you set `--test` mode or not, this dummy app always runs in test mode.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super("test", "Gem::Command instance for testing")
+
+        add_option("-t", "--test", "Test command") do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option("--test", extra_msg: "Whether you set `--test` mode or not, this dummy app always runs in test mode.")
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
   end
 
   def test_show_lookup_failure_suggestions_local
@@ -210,11 +367,11 @@ ERROR:  Could not find a valid gem 'nonexistent_with_hint' (>= 0) in any reposit
 
   def test_show_lookup_failure_suggestions_none
     spec_fetcher do |fetcher|
-      fetcher.spec 'correct', 2
+      fetcher.spec "correct", 2
     end
 
     use_ui @ui do
-      @cmd.show_lookup_failure 'other', Gem::Requirement.default, [], :remote
+      @cmd.show_lookup_failure "other", Gem::Requirement.default, [], :remote
     end
 
     expected = <<-EXPECTED
@@ -233,7 +390,7 @@ ERROR:  Could not find a valid gem 'other' (>= 0) in any repository
     end
 
     use_ui @ui do
-      @cmd.show_lookup_failure misspelled, Gem::Requirement.default, [], :remote
+      @cmd.show_lookup_failure misspelled, Gem::Requirement.default, []
     end
 
     expected = <<-EXPECTED
@@ -243,6 +400,4 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
     assert_equal expected, @ui.error
   end
-
 end
-