ruby-changes:71341
From: Alex <ko1@a...>
Date: Tue, 8 Mar 2022 03:40:46 +0900 (JST)
Subject: [ruby-changes:71341] 943efa8ca6 (master): [rubygems/rubygems] Add newline to validate_platforms! message when platform is missing
https://git.ruby-lang.org/ruby.git/commit/?id=943efa8ca6 From 943efa8ca6a5ac43e98265c0606a28d45103b393 Mon Sep 17 00:00:00 2001 From: Alex Gittemeier <me@a...> Date: Sat, 12 Feb 2022 01:04:13 -0600 Subject: [rubygems/rubygems] Add newline to validate_platforms! message when platform is missing When I run bundle install with BUNDLE_DEPLOYMENT=true in the environment on a different platform than I usually do development, I get the following output to the console (wrapped exactly as shown): Your bundle only supports platforms ["x86_64-darwin-19"] but your local platform is x86_64-linux. Add the current platform to the lockfile with `bundle lock --add-platform x86_64-linux` and try again. Because the way the message wraps, its not as simple as copying the suggested command to the clipboard because it contains a newline: $ bundle lock Writing lockfile to [...]/Gemfile.lock $ --add-platform x86_64-linux Adding a newline right before the command forces the command in the error message to be on the same line, which facilitates copy-pasting the command in the message. https://github.com/rubygems/rubygems/commit/4cf6989b11 --- lib/bundler/definition.rb | 2 +- spec/bundler/commands/install_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 20b5340203..09be2db68c 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -433,7 +433,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L433 raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \ "but your local platform is #{Bundler.local_platform}. " \ - "Add the current platform to the lockfile with `bundle lock --add-platform #{Bundler.local_platform}` and try again." + "Add the current platform to the lockfile with\n`bundle lock --add-platform #{Bundler.local_platform}` and try again." end def add_platform(platform) diff --git a/spec/bundler/commands/install_spec.rb b/spec/bundler/commands/install_spec.rb index 56f657521f..9e06c51a08 100644 --- a/spec/bundler/commands/install_spec.rb +++ b/spec/bundler/commands/install_spec.rb @@ -856,7 +856,7 @@ RSpec.describe "bundle install with gem sources" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/commands/install_spec.rb#L856 expect(err).to eq( "Your bundle only supports platforms [\"x86_64-darwin-19\"] but your local platform is x86_64-linux. " \ - "Add the current platform to the lockfile with `bundle lock --add-platform x86_64-linux` and try again." + "Add the current platform to the lockfile with\n`bundle lock --add-platform x86_64-linux` and try again." ) end end -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/