summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Zubkov <igor.zubkov@ag-force.com>2019-10-03 04:20:51 +0300
committerIgor Zubkov <igor.zubkov@ag-force.com>2019-10-03 04:20:51 +0300
commit99c08b614ea97a022cc67212a7d18c5f71aa08c3 (patch)
treeb4a85b5e02ca8b05457cb140fe57954abf1b6edf
parent7ab5476093c45a9824128ad6ba55f085024af6e3 (diff)
downloadbundler-99c08b614ea97a022cc67212a7d18c5f71aa08c3.tar.gz
Fix typo
-rw-r--r--UPGRADING.md6
-rw-r--r--lib/bundler/cli.rb2
-rw-r--r--spec/other/major_deprecation_spec.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/UPGRADING.md b/UPGRADING.md
index 9cb2ae6e47..a6b7de0e09 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -31,7 +31,7 @@ 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`
@@ -39,7 +39,7 @@ that we plan to make to this set of commands and options.
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 across 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.
@@ -47,7 +47,7 @@ that we plan to make to this set of commands and options.
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,
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 45db2a3200..0083f7e7de 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -790,7 +790,7 @@ module Bundler
Bundler::SharedHelpers.major_deprecation 2,\
"The `#{flag_name}` flag is deprecated because it relies on being " \
- "remembered across 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
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb
index 9fe76183ba..52fb532a4a 100644
--- a/spec/other/major_deprecation_spec.rb
+++ b/spec/other/major_deprecation_spec.rb
@@ -112,7 +112,7 @@ RSpec.describe "major deprecations" do
it "should print a deprecation warning", :bundler => "2" do
expect(deprecations).to include(
"The `--path` flag is deprecated because it relies on being " \
- "remembered across 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"
)
@@ -314,7 +314,7 @@ RSpec.describe "major deprecations" do
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 across 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"
)