core: Catch plugin load errors and show them to the user ina friendly way

bin/vagrant

@@ -54,72 +54,69 @@ if argv.include?("--debug")
   ENV["VAGRANT_LOG"] = "debug"
 end
 
-# Require some stuff that is NOT dependent on RubyGems
-require "vagrant/shared_helpers"
-
 # Setup our dependencies by initializing Bundler. If we're using plugins,
 # then also initialize the paths to the plugins.
 require "bundler"
 Bundler.setup
 
-require 'log4r'
-require 'vagrant'
-require 'vagrant/cli'
-require 'vagrant/util/platform'
-
-# Create a logger right away
-logger = Log4r::Logger.new("vagrant::bin::vagrant")
-logger.info("`vagrant` invoked: #{ARGV.inspect}")
-
 # Stdout/stderr should not buffer output
 $stdout.sync = true
 $stderr.sync = true
 
-# These will be the options that are passed to initialze the Vagrant
+env = nil
-# environment.
+begin
-opts = {}
+  require 'log4r'
+  require 'vagrant'
+  require 'vagrant/cli'
+  require 'vagrant/util/platform'
 
-# Disable color in a few cases:
+  # Create a logger right away
-#
+  logger = Log4r::Logger.new("vagrant::bin::vagrant")
-#   * --no-color is anywhere in our arguments
+  logger.info("`vagrant` invoked: #{ARGV.inspect}")
-#   * STDOUT is not a TTY
+
-#   * The terminal doesn't support colors (Windows)
+  # These will be the options that are passed to initialze the Vagrant
-#
+  # environment.
-if argv.include?("--no-color") || ENV["VAGRANT_NO_COLOR"]
+  opts = {}
+
+  # Disable color in a few cases:
+  #
+  #   * --no-color is anywhere in our arguments
+  #   * STDOUT is not a TTY
+  #   * The terminal doesn't support colors (Windows)
+  #
+  if argv.include?("--no-color") || ENV["VAGRANT_NO_COLOR"]
     # Delete the argument from the list so that it doesn't
     # cause any invalid arguments down the road.
     argv.delete("--no-color")
 
     opts[:ui_class] = Vagrant::UI::Basic
-elsif !Vagrant::Util::Platform.terminal_supports_colors?
+  elsif !Vagrant::Util::Platform.terminal_supports_colors?
     opts[:ui_class] = Vagrant::UI::Basic
-elsif !$stdout.tty? && !Vagrant::Util::Platform.cygwin?
+  elsif !$stdout.tty? && !Vagrant::Util::Platform.cygwin?
     # Cygwin always reports STDOUT is not a TTY, so we only disable
     # colors if its not a TTY AND its not Cygwin.
     opts[:ui_class] = Vagrant::UI::Basic
-end
+  end
 
-# Also allow users to force colors.
+  # Also allow users to force colors.
-if argv.include?("--color")
+  if argv.include?("--color")
     argv.delete("--color")
     opts[:ui_class] = Vagrant::UI::Colored
-end
+  end
 
-# Highest precedence is if we have enabled machine-readable output
+  # Highest precedence is if we have enabled machine-readable output
-if argv.include?("--machine-readable")
+  if argv.include?("--machine-readable")
     argv.delete("--machine-readable")
     opts[:ui_class] = Vagrant::UI::MachineReadable
-end
+  end
 
-# Default to colored output
+  # Default to colored output
-opts[:ui_class] ||= Vagrant::UI::Colored
+  opts[:ui_class] ||= Vagrant::UI::Colored
 
-# Recombine the arguments
+  # Recombine the arguments
-argv << "--"
+  argv << "--"
-argv += argv_extra
+  argv += argv_extra
 
-env = nil
-begin
   # Create the environment, which is the cwd of wherever the
   # `vagrant` command was invoked from
   logger.debug("Creating Vagrant environment")
@@ -141,6 +138,8 @@ begin
   # Exit with the exit status from our CLI command
   exit(exit_status)
 rescue Vagrant::Errors::VagrantError => e
+  require 'log4r'
+  logger = Log4r::Logger.new("vagrant::bin::vagrant")
   logger.error("Vagrant experienced an error! Details:")
   logger.error(e.inspect)
   logger.error(e.message)

lib/vagrant.rb

@@ -262,4 +262,10 @@ Vagrant.source_root.join("plugins").children(true).each do |directory|
 end
 
 # If we have plugins enabled, then load those
-Bundler.require(:plugins) if Vagrant.plugins_enabled?
+if Vagrant.plugins_enabled?
+  begin
+    Bundler.require(:plugins)
+  rescue Exception => e
+    raise Vagrant::Errors::PluginLoadError, message: e.to_s
+  end
+end

lib/vagrant/errors.rb

@@ -481,14 +481,6 @@ module Vagrant
       error_key(:plugin_load_error)
     end
 
-    class PluginLoadFailed < VagrantError
-      error_key(:plugin_load_failed)
-    end
-
-    class PluginLoadFailedWithOutput < VagrantError
-      error_key(:plugin_load_failed_with_output)
-    end
-
     class PluginNotFound < VagrantError
       error_key(:plugin_not_found)
     end

templates/locales/en.yml

@@ -531,19 +531,10 @@ en:
 
         %{conflicts}
       plugin_load_error: |-
-        The plugin "%{plugin}" could not be found. Please make sure that it is
+        The plugins failed to load properly. The error message given is
-        properly installed via `vagrant plugin`. Note that plugins made for
+        shown below.
-        Vagrant 1.0.x are not compatible with 1.1+ and this error will likely
-        continue to show when you use `plugin install` with a 1.0.x plugin.
-      plugin_load_failed: |-
-        Failed to load the "%{plugin}" plugin. View logs for more details.
-      plugin_load_failed_with_output: |-
-        Failed to load the "%{plugin}" plugin. The output from loading
-        the plugin is shown below. View the logs for complete details.
 
-        stdout: %{stdout}
+        %{message}
-
-        stderr: %{stderr}
       plugin_not_found: |-
         The plugin '%{name}' could not be found. Please install this plugin
         prior to attempting to do anything with it.