diff options
author | Homu <homu@barosl.com> | 2016-11-17 04:56:25 +0900 |
---|---|---|
committer | Homu <homu@barosl.com> | 2016-11-17 04:56:25 +0900 |
commit | ca7b2ae0f7ed0b48af7a93cd6e22d4feea5c3f03 (patch) | |
tree | eab83cc7abb2ce15ed18c462729058a081888cc8 /lib/bundler/cli | |
parent | 6e0dcf48ee70314e42a65dcfd1f81c1494646d91 (diff) | |
parent | bba3f57db42dd0cf064dbcb55e4fb1818d82a415 (diff) | |
download | bundler-ca7b2ae0f7ed0b48af7a93cd6e22d4feea5c3f03.tar.gz |
Auto merge of #5168 - colby-swandale:documentation-and-error-improvements, r=segiddins
Documentation and error improvements
This PR is just making a few small improvements to error messages, documentation and code indentation.
Let me know what you think.
Thanks!
Diffstat (limited to 'lib/bundler/cli')
-rw-r--r-- | lib/bundler/cli/install.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index f66716b39d..b5a54ae8b5 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -57,7 +57,7 @@ module Bundler if options["binstubs"] Bundler::SharedHelpers.major_deprecation \ - "the --binstubs option will be removed in favor of `bundle binstubs`" + "The --binstubs option will be removed in favor of `bundle binstubs`" end Plugin.gemfile_install(Bundler.default_gemfile) if Bundler.feature_flag.plugins? @@ -167,8 +167,8 @@ module Bundler def check_for_options_conflicts if (options[:path] || options[:deployment]) && options[:system] error_message = String.new - error_message << "You have specified both a path to install your gems to as well as --system. Please choose.\n" if options[:path] - error_message << "You have specified both --deployment as well as --system. Please choose.\n" if options[:deployment] + error_message << "You have specified both --path as well as --system. Please choose only one option.\n" if options[:path] + error_message << "You have specified both --deployment as well as --system. Please choose only one option.\n" if options[:deployment] raise InvalidOption.new(error_message) end end |