From b11cfed4c4fae51f7111c6cc0a3ec436a9c8faa3 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Wed, 21 Aug 2019 23:35:39 -0600 Subject: [PATCH] [rubygems/rubygems] Error out if there are multiple gemspecs and no gemspec is specified https://github.com/rubygems/rubygems/commit/547947bbf0 --- lib/rubygems/commands/build_command.rb | 13 +++++-- .../test_gem_commands_build_command.rb | 38 ++++--------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb index 69203d3ebc..c7d5fd31f5 100644 --- a/lib/rubygems/commands/build_command.rb +++ b/lib/rubygems/commands/build_command.rb @@ -63,11 +63,18 @@ Gems can be saved to a specified filename with the output option: private def gem_name - get_one_optional_argument || find_gemspecs.first + get_one_optional_argument || find_gemspec end - def find_gemspecs - Dir.glob("*.gemspec").sort + def find_gemspec + gemspecs = Dir.glob("*.gemspec").sort + + if gemspecs.size > 1 + alert_error "Multiple gemspecs found: #{gemspecs}, please specify one" + terminate_interaction(1) + end + + gemspecs.first end def build_gem(gem_name = get_one_optional_argument) diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb index 19575dcd9b..7540a0536e 100644 --- a/test/rubygems/test_gem_commands_build_command.rb +++ b/test/rubygems/test_gem_commands_build_command.rb @@ -293,19 +293,18 @@ class TestGemCommandsBuildCommand < Gem::TestCase use_ui @ui do Dir.chdir(gemspec_dir) do - @cmd.execute + assert_raises Gem::MockGemUi::TermError do + @cmd.execute + end end end - output = @ui.output.split("\n") - assert_equal " Successfully built RubyGem", output.shift - assert_equal " Name: another_gem", output.shift - assert_equal " Version: 2", output.shift - assert_equal " File: another_gem-2.gem", output.shift - assert_equal [], output + gemspecs = ["another_gem-2.gemspec", "some_gem-2.gemspec"] + assert_equal "", @ui.output + assert_equal @ui.error, "ERROR: Multiple gemspecs found: #{gemspecs}, please specify one\n" expected_gem = File.join(gemspec_dir, File.basename(another_gem.cache_file)) - assert File.exist?(expected_gem) + refute File.exist?(expected_gem) end def util_test_build_gem(gem) @@ -331,29 +330,6 @@ class TestGemCommandsBuildCommand < Gem::TestCase assert_equal "this is a summary", spec.summary end - def util_test_build_gem(gem) - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end - - output = @ui.output.split "\n" - assert_equal " Successfully built RubyGem", output.shift - assert_equal " Name: some_gem", output.shift - assert_equal " Version: 2", output.shift - assert_equal " File: some_gem-2.gem", output.shift - assert_equal [], output - - gem_file = File.join @tempdir, File.basename(gem.cache_file) - assert File.exist?(gem_file) - - spec = Gem::Package.new(gem_file).spec - - assert_equal "some_gem", spec.name - assert_equal "this is a summary", spec.summary - end - def test_execute_force gemspec_file = File.join(@tempdir, @gem.spec_name)