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

Merge pull request #3587 from aspiers/bundler-1.6 

add support for bundler >= 1.6.x
This commit is contained in:
Mitchell Hashimoto 2014-04-30 15:34:12 -07:00
parent f80fdfa32a 36e924b73e
commit ed908a5ed3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vagrant/bundler.rb
View File

@ -35,7 +35,14 @@ module Vagrant
# Set the Bundler UI to be a silent UI. We have to add the
# `silence` method to it because Bundler UI doesn't have it.
::Bundler.ui = ::Bundler::UI.new
::Bundler.ui =
if ::Bundler::UI.const_defined? :Silent
# bundler >= 1.6.0
::Bundler::UI::Silent.new
else
# bundler < 1.6.0
::Bundler::UI.new
end
if !::Bundler.ui.respond_to?(:silence)
ui = ::Bundler.ui
def ui.silence(*args)

2
vagrant.gemspec
View File

@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = ">= 1.3.6"
s.rubyforge_project = "vagrant"
s.add_dependency "bundler", "~> 1.5.2"
s.add_dependency "bundler", ">= 1.5.2", "< 1.7.0"
s.add_dependency "childprocess", "~> 0.5.0"
s.add_dependency "erubis", "~> 2.7.0"
s.add_dependency "i18n", "~> 0.6.0"