From 7ab5476093c45a9824128ad6ba55f085024af6e3 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 3 Oct 2019 04:18:44 +0300 Subject: [PATCH 1/3] Fix typo --- UPGRADING.md | 2 +- lib/bundler/cli.rb | 2 +- spec/other/major_deprecation_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index 30d326795e9..9cb2ae6e471 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -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 accross exactly the same invokations _unless_ + should not behave differently across exactly the same invokations _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. diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index f2735fb654d..45db2a32007 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -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 invokations, 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 ec2cdbf99e2..9fe76183ba1 100644 --- a/spec/other/major_deprecation_spec.rb +++ b/spec/other/major_deprecation_spec.rb @@ -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 invokations, 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 @@ 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 invokations, which bundler " \ "will no longer do in future versions. Instead please use " \ "`bundle config set #{name} '#{value}'`, and stop using this flag" ) From 99c08b614ea97a022cc67212a7d18c5f71aa08c3 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 3 Oct 2019 04:20:51 +0300 Subject: [PATCH 2/3] Fix typo --- UPGRADING.md | 6 +++--- lib/bundler/cli.rb | 2 +- spec/other/major_deprecation_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index 9cb2ae6e471..a6b7de0e090 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 45db2a32007..0083f7e7de7 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -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 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 9fe76183ba1..52fb532a4a1 100644 --- a/spec/other/major_deprecation_spec.rb +++ b/spec/other/major_deprecation_spec.rb @@ -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 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 @@ 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" ) From e8f261882397f7e8a6c74760f8fe1a4955c9e980 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Thu, 3 Oct 2019 04:25:36 +0300 Subject: [PATCH 3/3] Fix typo --- UPGRADING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADING.md b/UPGRADING.md index a6b7de0e090..d11372dbb1a 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -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.