summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <colby@taplaboratories.com>2017-05-17 07:58:19 +1000
committerColby Swandale <colby@taplaboratories.com>2017-05-17 07:58:19 +1000
commit0be134195bcb1b79b598def4333e36d7eac9b35e (patch)
treed4b5e84c4436b96d5c0aadd8d524323ae2e2b883
parent7a47ace072df309b7fd8020bce1ef56548ba2cce (diff)
downloadbundler-0be134195bcb1b79b598def4333e36d7eac9b35e.tar.gz
stderr feature flag is notw error_on_stderr
-rw-r--r--lib/bundler/feature_flag.rb2
-rw-r--r--lib/bundler/settings.rb2
-rw-r--r--lib/bundler/ui/shell.rb2
-rw-r--r--man/bundle-config.ronn2
-rw-r--r--spec/bundler/ui/shell_spec.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index 3bbc7de5d9..5ee69f538c 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -17,7 +17,7 @@ module Bundler
settings_flag(:allow_offline_install) { bundler_2_mode? }
settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
- settings_flag(:stderr) { bundler_2_mode? }
+ settings_flag(:error_on_stderr) { bundler_2_mode? }
def initialize(bundler_version)
@bundler_version = Gem::Version.create(bundler_version)
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index a43e40366f..9a93eebf83 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -27,7 +27,7 @@ module Bundler
only_update_to_newer_versions
plugins
silence_root_warning
- stderr
+ error_on_stderr
).freeze
NUMBER_KEYS = %w(
diff --git a/lib/bundler/ui/shell.rb b/lib/bundler/ui/shell.rb
index 98c3206337..24429d1229 100644
--- a/lib/bundler/ui/shell.rb
+++ b/lib/bundler/ui/shell.rb
@@ -37,7 +37,7 @@ module Bundler
def error(msg, newline = nil)
return unless level("error")
- return tell_err(msg, :red, newline) if Bundler.feature_flag.stderr?
+ return tell_err(msg, :red, newline) if Bundler.feature_flag.error_on_stderr?
tell_me(msg, :red, newline)
end
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index d91d3f9292..b7ae07698c 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -222,7 +222,7 @@ learn more about their operation in [bundle install(1)][bundle-install].
* `gem.push_key` (`BUNDLE_GEM__PUSH_KEY`):
Sets the `--key` parameter for `gem push` when using the `rake release`
command with a private gemstash server.
-* `stderr` (`BUNDLE_STDERR`)
+* `error_on_stderr` (`BUNDLE_ERROR_ON_STDERR`)
Print Bundler errors to stderr
In general, you should set these settings per-application by using the applicable
diff --git a/spec/bundler/ui/shell_spec.rb b/spec/bundler/ui/shell_spec.rb
index 022fa22a9c..b33cddab86 100644
--- a/spec/bundler/ui/shell_spec.rb
+++ b/spec/bundler/ui/shell_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe Bundler::UI::Shell do
end
context "when stderr flag is enabled" do
- before { bundle "config stderr true" }
+ before { bundle "config error_on_stderr true" }
it "prints to stderr" do
expect { subject.error("error!!!") }.to output("\e[31merror!!!\e[0m").to_stderr
end