зеркало из https://github.com/github/ruby.git
[rubygems/rubygems] Ignore commented out keys in config file
https://github.com/rubygems/rubygems/commit/c4a8d2a930
This commit is contained in:
Родитель
5fd6b461c7
Коммит
dc06375c4f
|
@ -492,16 +492,19 @@ module Bundler
|
|||
valid_file = file.exist? && !file.size.zero?
|
||||
return {} unless valid_file
|
||||
serializer_class.load(file.read).inject({}) do |config, (k, v)|
|
||||
if k.include?("-")
|
||||
Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
|
||||
"This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
|
||||
"Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
|
||||
unless k.start_with?("#")
|
||||
if k.include?("-")
|
||||
Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
|
||||
"This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
|
||||
"Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
|
||||
|
||||
# string hash keys are frozen
|
||||
k = k.gsub("-", "___")
|
||||
# string hash keys are frozen
|
||||
k = k.gsub("-", "___")
|
||||
end
|
||||
|
||||
config[k] = v
|
||||
end
|
||||
|
||||
config[k] = v
|
||||
config
|
||||
end
|
||||
end
|
||||
|
|
|
@ -319,6 +319,15 @@ that would suck --ehhh=oh geez it looks like i might have broken bundler somehow
|
|||
expect(settings["mirror.https://rubygems.org/"]).to eq("http://rubygems-mirror.org")
|
||||
end
|
||||
|
||||
it "ignores commented out keys" do
|
||||
create_file bundled_app(".bundle/config"), <<~C
|
||||
# BUNDLE_MY-PERSONAL-SERVER__ORG: my-personal-server.org
|
||||
C
|
||||
|
||||
expect(Bundler.ui).not_to receive(:warn)
|
||||
expect(settings.all).to be_empty
|
||||
end
|
||||
|
||||
it "converts older keys with dashes" do
|
||||
config("BUNDLE_MY-PERSONAL-SERVER__ORG" => "my-personal-server.org")
|
||||
expect(Bundler.ui).to receive(:warn).with(
|
||||
|
|
Загрузка…
Ссылка в новой задаче