diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-29 18:00:16 +0100 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-04-12 10:14:10 +0200 |
| commit | bb9b4bf9ed4449307dcec3a3a60f8662de3ad6b0 (patch) | |
| tree | 5001a567f55a5261e75559a8b09868711f3fb91c | |
| parent | 3db5ad26c8125cf332d66f9582eee1e2a5d7d94f (diff) | |
| download | bundler-bb9b4bf9ed4449307dcec3a3a60f8662de3ad6b0.tar.gz | |
Improve wording
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 2 | ||||
| -rw-r--r-- | spec/install/binstubs_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 120ed1017c..4c8155b2b4 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -467,7 +467,7 @@ module Bundler warn \ "The `#{exec_name}` executable in the `#{spec.name}` gem is being loaded, but it's also present in other gems (#{conflicting_names}).\n" \ "If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).\n" \ - "If you plan to actually use _both_ conflicting executables, generate binstubs for both and disambiguate their names." + "If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names." end spec diff --git a/spec/install/binstubs_spec.rb b/spec/install/binstubs_spec.rb index 6c7a8639f8..4f96cec65f 100644 --- a/spec/install/binstubs_spec.rb +++ b/spec/install/binstubs_spec.rb @@ -41,11 +41,11 @@ RSpec.describe "bundle install" do expect(last_command.stderr).to include( "The `rackup` executable in the `fake` gem is being loaded, but it's also present in other gems (rack).\n" \ "If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).\n" \ - "If you plan to actually use _both_ conflicting executables, generate binstubs for both and disambiguate their names." + "If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names." ).or include( "The `rackup` executable in the `rack` gem is being loaded, but it's also present in other gems (fake).\n" \ "If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).\n" \ - "If you plan to actually use _both_ conflicting executables, generate binstubs for both and disambiguate their names." + "If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names." ) end end |