1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Improve grammar of some error messages

Browse Source 
https://github.com/rubygems/rubygems/commit/558a4765c7
This commit is contained in:
David Rodríguez 2025-03-12 18:38:10 +01:00 committed by Hiroshi SHIBATA
parent bb1b5877a7
commit 4e1df25b15
Notes: git 2025-03-24 04:25:32 +00:00 
Merged: https://github.com/ruby/ruby/pull/12968
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/bundler/definition.rb
View File

@ -539,8 +539,9 @@ module Bundler
reason = resolve_needed? ? change_reason : "some dependencies were deleted from your gemfile" reason = resolve_needed? ? change_reason : "some dependencies were deleted from your gemfile"
msg = String.new msg = String.new("#{reason.capitalize.strip}, but ")
msg << "#{reason.capitalize.strip}, but the lockfile can't be updated because #{update_refused_reason}" msg << "the lockfile " unless msg.start_with?("Your lockfile")
msg << "can't be updated because #{update_refused_reason}"
msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any? msg << "\n\nYou have added to the Gemfile:\n" << added.join("\n") if added.any?
msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any? msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any? msg << "\n\nYou have changed in the Gemfile:\n" << changed.join("\n") if changed.any?

4
spec/bundler/install/deploy_spec.rb
View File

@ -321,7 +321,7 @@ RSpec.describe "install in deployment or frozen mode" do
L L
bundle :install, env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false, artifice: "compact_index" bundle :install, env: { "BUNDLE_FROZEN" => "true" }, raise_on_error: false, artifice: "compact_index"
expect(err).to include("Your lockfile is missing \"bar\", but the lockfile can't be updated because frozen mode is set") expect(err).to include("Your lockfile is missing \"bar\", but can't be updated because frozen mode is set")
end end
it "explodes if a path gem is missing" do it "explodes if a path gem is missing" do
@ -550,7 +550,7 @@ RSpec.describe "install in deployment or frozen mode" do
pristine_system_gems :bundler pristine_system_gems :bundler
bundle "config set --local deployment true" bundle "config set --local deployment true"
bundle "install --verbose" bundle "install --verbose"
expect(out).not_to include("but the lockfile can't be updated because frozen mode is set") expect(out).not_to include("can't be updated because frozen mode is set")
expect(out).not_to include("You have added to the Gemfile") expect(out).not_to include("You have added to the Gemfile")
expect(out).not_to include("You have deleted from the Gemfile") expect(out).not_to include("You have deleted from the Gemfile")
expect(out).to include("vendor/cache/foo") expect(out).to include("vendor/cache/foo")

2
spec/bundler/runtime/setup_spec.rb
View File

@ -1683,7 +1683,7 @@ end
RUBY RUBY
end end
expect(err).to include("Your lockfile does not include the current platform, but the lockfile can't be updated because file system is read-only") expect(err).to include("Your lockfile does not include the current platform, but can't be updated because file system is read-only")
end end
end end
end end