Always setup plugins, but just don't always require them

lheinlen-os · Jan 6, 2014 · 36f64db · 36f64db
1 parent f7e4c4d
commit 36f64db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/bin/vagrant b/bin/vagrant
@@ -59,10 +59,8 @@ require "vagrant/shared_helpers"
 
 # Setup our dependencies by initializing Bundler. If we're using plugins,
 # then also initialize the paths to the plugins.
-groups = [:default]
-groups << :plugins if Vagrant.plugins_enabled?
 require "bundler"
-Bundler.setup(*groups)
+Bundler.setup
 
 require 'log4r'
 require 'vagrant'

diff --git a/lib/vagrant/pre-rubygems.rb b/lib/vagrant/pre-rubygems.rb
@@ -16,8 +16,7 @@
 require_relative "plugin/manager"
 require_relative "shared_helpers"
 
-plugins = []
-plugins = Vagrant::Plugin::Manager.instance.installed_plugins if Vagrant.plugins_enabled?
+plugins = Vagrant::Plugin::Manager.instance.installed_plugins
 Vagrant::Bundler.instance.init!(plugins)
 
 ENV["VAGRANT_INTERNAL_BUNDLERIZED"] = "1"