haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Allow insecure RubyGems for plugins [GH-3610]

This commit is contained in:
Mitchell Hashimoto 2014-05-01 21:14:26 -07:00
parent c7d23c70f0
commit 4a53b138a0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -67,6 +67,8 @@ BUG FIXES:
- core: Adding a box from a network share on Windows works again. [GH-3279] - core: Adding a box from a network share on Windows works again. [GH-3279]
- commands/plugin/install: Specific versions are now locked in. - commands/plugin/install: Specific versions are now locked in.
- commands/plugin/install: If insecure RubyGems.org is specified as a
source, use that. [GH-3610]
- commands/rsync-auto: Interrupt exits properly. [GH-3552] - commands/rsync-auto: Interrupt exits properly. [GH-3552]
- commands/rsync-auto: Run properly on Windows. [GH-3547] - commands/rsync-auto: Run properly on Windows. [GH-3547]
- providers/virtualbox: VirtalBox detection works properly again on - providers/virtualbox: VirtalBox detection works properly again on

6
lib/vagrant/bundler.rb
View File

@ -167,11 +167,15 @@ module Vagrant
# #
# @return [Tempfile] # @return [Tempfile]
def build_gemfile(plugins) def build_gemfile(plugins)
sources = plugins.values.map { |p| p["sources"] }.flatten.compact.uniq
f = File.open(Tempfile.new("vagrant").path + "2", "w+") f = File.open(Tempfile.new("vagrant").path + "2", "w+")
f.tap do |gemfile| f.tap do |gemfile|
if !sources.include?("http://rubygems.org")
gemfile.puts(%Q[source "https://rubygems.org"]) gemfile.puts(%Q[source "https://rubygems.org"])
end
gemfile.puts(%Q[source "http://gems.hashicorp.com"]) gemfile.puts(%Q[source "http://gems.hashicorp.com"])
sources = plugins.values.map { |p| p["sources"] }.flatten.compact.uniq
sources.each do |source| sources.each do |source|
next if source == "" next if source == ""
gemfile.puts(%Q[source "#{source}"]) gemfile.puts(%Q[source "#{source}"])