diff options
| author | David RodrÃguez <[email protected]> | 2024-09-06 11:55:02 +0200 |
|---|---|---|
| committer | git <[email protected]> | 2024-09-09 08:44:27 +0000 |
| commit | a304fe00f3db3719f7dbb6942e7e65e49d760c48 (patch) | |
| tree | c73b60af24598f8f2beae3e1a20a0010ea2d5ff5 | |
| parent | a2ae7450d75bafbbbbd1cf9c1b5ada09038d7cf6 (diff) | |
[rubygems/rubygems] Fix `gem fetch` always exiting with zero status code
https://github.com/rubygems/rubygems/commit/5887e6dfa1
| -rw-r--r-- | lib/rubygems/commands/fetch_command.rb | 14 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_fetch_command.rb | 82 |
2 files changed, 45 insertions, 51 deletions
diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb index f7f5b62306..c524cf7922 100644 --- a/lib/rubygems/commands/fetch_command.rb +++ b/lib/rubygems/commands/fetch_command.rb @@ -63,6 +63,17 @@ then repackaging it. def execute check_version + + exit_code = fetch_gems + + terminate_interaction exit_code + end + + private + + def fetch_gems + exit_code = 0 + version = options[:version] platform = Gem.platforms.last @@ -86,10 +97,13 @@ then repackaging it. if spec.nil? show_lookup_failure gem_name, gem_version, errors, suppress_suggestions, options[:domain] + exit_code |= 2 next end source.download spec say "Downloaded #{spec.full_name}" end + + exit_code end end diff --git a/test/rubygems/test_gem_commands_fetch_command.rb b/test/rubygems/test_gem_commands_fetch_command.rb index e8710d3cd1..bd8f8aa4f9 100644 --- a/test/rubygems/test_gem_commands_fetch_command.rb +++ b/test/rubygems/test_gem_commands_fetch_command.rb @@ -21,11 +21,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a] - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a2 = specs["a-2"] @@ -46,11 +42,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a] @cmd.options[:version] = req(">= 0.1") - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a2 = specs["a-2"] assert_path_exist(File.join(@tempdir, a2.file_name), @@ -68,11 +60,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a] @cmd.options[:prerelease] = true - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a2 = specs["a-2"] @@ -105,11 +93,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase FileUtils.cp a2_universal_darwin, a2_universal_darwin_spec.cache_file util_set_arch "arm64-darwin20" do - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code end assert_path_exist(File.join(@tempdir, a2_universal_darwin_spec.file_name), @@ -126,11 +110,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:prerelease] = true @cmd.options[:version] = "2.a" - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a2_pre = specs["a-2.a"] @@ -147,11 +127,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a] @cmd.options[:version] = Gem::Requirement.new "1" - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a1 = specs["a-1"] @@ -166,11 +142,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a:1] - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a1 = specs["a-1"] @@ -182,11 +154,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a b] @cmd.options[:version] = Gem::Requirement.new "1" - use_ui @ui do - assert_raise Gem::MockGemUi::TermError, @ui.error do - @cmd.execute - end - end + execute_with_term_error msg = "ERROR: Can't use --version with multiple gems. You can specify multiple gems with" \ " version requirements using `gem fetch 'my_gem:1.0.0' 'my_other_gem:~>2.0.0'`" @@ -203,11 +171,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[a:1 b:1] - use_ui @ui do - Dir.chdir @tempdir do - @cmd.execute - end - end + execute_with_exit_code a1 = specs["a-1"] b1 = specs["b-1"] @@ -225,9 +189,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase @cmd.options[:args] = %w[foo:2] - use_ui @ui do - @cmd.execute - end + execute_with_term_error expected = <<-EXPECTED ERROR: Could not find a valid gem 'foo' (2) in any repository @@ -245,9 +207,7 @@ ERROR: Possible alternatives: foo @cmd.options[:args] = %w[foo:2] @cmd.options[:suggest_alternate] = false - use_ui @ui do - @cmd.execute - end + execute_with_term_error expected = <<-EXPECTED ERROR: Could not find a valid gem 'foo' (2) in any repository @@ -255,4 +215,24 @@ ERROR: Could not find a valid gem 'foo' (2) in any repository assert_equal expected, @ui.error end + + private + + def execute_with_term_error + use_ui @ui do + assert_raise Gem::MockGemUi::TermError, @ui.error do + @cmd.execute + end + end + end + + def execute_with_exit_code + use_ui @ui do + Dir.chdir @tempdir do + assert_raise Gem::MockGemUi::SystemExitException, @ui.error do + @cmd.execute + end + end + end + end end |