Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Fix typos #7374

Merged
3 commits merged into from Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions UPGRADING.md
Expand Up @@ -31,23 +31,23 @@ The CLI defines a set of commands and options that can be used by our users to
create command lines that bundler can understand. There's a number of changes
that we plan to make to this set of commands and options.

* Flags passed to `bundle install` that relied on being remembered across invokations have been deprecated.
* Flags passed to `bundle install` that relied on being remembered across invocations have been deprecated.

In particular, the `--clean`, `--deployment`, `--frozen`, `--no-cache`,
`--no-prune`, `--path`, `--shebang`, `--system`, `--without`, and `--with`
options to `bundle install`.

Remembering CLI options has been a source of historical confusion and bug
reports, not only for beginners but also for experienced users. A CLI tool
should not behave differently accross exactly the same invokations _unless_
should not behave differently across exactly the same invocations _unless_
explicitly configured to do so. This is what configuration is about after all,
and things should never be silently configured without the user knowing about
it.

The problem with changing this behavior is that very common workflows are
relying on it. For example, when you run `bundle install --without
development:test` in production, those flags are persisted in the app's
configuration file and further `bundle` invokations will happily ignore
configuration file and further `bundle` invocations will happily ignore
development and test gems. This magic will disappear from bundler 3, and
you will explicitly need to configure it, either through environment
variables, application configuration, or machine configuration. For example,
Expand Down Expand Up @@ -78,7 +78,7 @@ that we plan to make to this set of commands and options.
* The `bundle console` will be removed and replaced with `bin/console`.

Over time we found `bundle console` hard to maintain because every user would
want to add her own specific tweaks to it. In order to ease maintainance and
want to add her own specific tweaks to it. In order to ease maintenance and
reduce bikeshedding discussions, we're removing the `bundle console` command
in favor of a `bin/console` script created by `bundle gem` on gem generation
that users can tweak to their needs.
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/cli.rb
Expand Up @@ -790,7 +790,7 @@ def remembered_flag_deprecation(name)

Bundler::SharedHelpers.major_deprecation 2,\
"The `#{flag_name}` flag is deprecated because it relies on being " \
"remembered accross bundler invokations, which bundler will no longer " \
"remembered across bundler invocations, which bundler will no longer " \
"do in future versions. Instead please use `bundle config set #{name} " \
"'#{value}'`, and stop using this flag"
end
Expand Down
4 changes: 2 additions & 2 deletions spec/other/major_deprecation_spec.rb
Expand Up @@ -112,7 +112,7 @@
it "should print a deprecation warning", :bundler => "2" do
expect(deprecations).to include(
"The `--path` flag is deprecated because it relies on being " \
"remembered accross bundler invokations, which bundler will no " \
"remembered across bundler invocations, which bundler will no " \
"longer do in future versions. Instead please use `bundle config set " \
"path 'vendor/bundle'`, and stop using this flag"
)
Expand Down Expand Up @@ -314,7 +314,7 @@
it "should print a deprecation warning", :bundler => "2" do
expect(deprecations).to include(
"The `#{flag_name}` flag is deprecated because it relies on " \
"being remembered accross bundler invokations, which bundler " \
"being remembered across bundler invocations, which bundler " \
"will no longer do in future versions. Instead please use " \
"`bundle config set #{name} '#{value}'`, and stop using this flag"
)
Expand Down