Update Vagrant behavior outside of installers

Remove customized require behaviors and modify the bin executable
to check for missing tools that Vagrant expects to exist when
running outside of an installer.

Author: chrisroberts

bin/vagrant

@@ -187,12 +187,6 @@ begin
     argv += argv_extra
   end
 
-  sub_cmd = Class.new(Vagrant.plugin("2", :command)) {
-    def sub_command
-      split_main_and_subcommand(@argv)[1]
-    end
-  }.new(argv.dup, nil).sub_command
-
   # Create the environment, which is the cwd of wherever the
   # `vagrant` command was invoked from
   logger.debug("Creating Vagrant environment")
@@ -209,9 +203,17 @@ begin
     end
   end
 
-  if !Vagrant.in_installer? && !Vagrant.very_quiet?
-    # If we're not in the installer, warn.
-    env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
+  # If not being run from the installer, check if expected tools
+  # are available.
+  if !Vagrant.in_installer?
+    missing_tools = Vagrant.detect_missing_tools
+
+    if !missing_tools.empty?
+      env.ui.warn(
+        I18n.t("vagrant.general.not_in_installer", tools: missing_tools.sort.join(", ")) + "\n",
+        prefix: false
+      )
+    end
   end
 
   # Acceptable experimental flag values include:

lib/vagrant.rb

@@ -5,16 +5,16 @@
 # require helper available.
 require "vagrant/shared_helpers"
 
-Vagrant.require "log4r"
+require "log4r"
 
 # Add patches to log4r to support trace level
-Vagrant.require "vagrant/patches/log4r"
-Vagrant.require "vagrant/patches/net-ssh"
-Vagrant.require "vagrant/patches/rubygems"
-Vagrant.require "vagrant/patches/timeout_error"
+require "vagrant/patches/log4r"
+require "vagrant/patches/net-ssh"
+require "vagrant/patches/rubygems"
+require "vagrant/patches/timeout_error"
 
 # Set our log levels and include trace
-Vagrant.require 'log4r/configurator'
+require 'log4r/configurator'
 Log4r::Configurator.custom_levels(*(["TRACE"] + Log4r::Log4rConfig::LogLevels))
 
 # Update the default formatter within the log4r library to ensure
@@ -26,7 +26,7 @@ def format_object(obj)
   end
 end
 
-Vagrant.require "optparse"
+require "optparse"
 
 module Vagrant
   # This is a customized OptionParser for Vagrant plugins. It
@@ -51,9 +51,9 @@ module VagrantPlugins
 end
 
 # Load in our helpers and utilities
-Vagrant.require "rubygems"
-Vagrant.require "vagrant/util"
-Vagrant.require "vagrant/plugin/manager"
+require "rubygems"
+require "vagrant/util"
+require "vagrant/plugin/manager"
 
 # Enable logging if it is requested. We do this before
 # anything else so that we can setup the output before
@@ -110,19 +110,19 @@ def << msg
   end
 end
 
-Vagrant.require 'json'
-Vagrant.require 'pathname'
-Vagrant.require 'stringio'
+require 'json'
+require 'pathname'
+require 'stringio'
 
-Vagrant.require 'childprocess'
-Vagrant.require 'i18n'
+require 'childprocess'
+require 'i18n'
 
 # OpenSSL must be loaded here since when it is loaded via `autoload`
 # there are issues with ciphers not being properly loaded.
-Vagrant.require 'openssl'
+require 'openssl'
 
 # Always make the version available
-Vagrant.require 'vagrant/version'
+require 'vagrant/version'
 global_logger = Log4r::Logger.new("vagrant::global")
 Vagrant.global_logger = global_logger
 global_logger.info("Vagrant version: #{Vagrant::VERSION}")
@@ -143,7 +143,7 @@ def << msg
 if vagrant_ssl_locations.any? { |f| File.exist?(f) }
   global_logger.debug("vagrant ssl helper found for loading ssl providers")
   begin
-    Vagrant.require "vagrant/vagrant_ssl"
+    require "vagrant/vagrant_ssl"
     Vagrant.vagrant_ssl_load
     global_logger.debug("ssl providers successfully loaded")
   rescue LoadError => err
@@ -157,8 +157,8 @@ def << msg
 
 # We need these components always so instead of an autoload we
 # just require them explicitly here.
-Vagrant.require "vagrant/plugin"
-Vagrant.require "vagrant/registry"
+require "vagrant/plugin"
+require "vagrant/registry"
 
 module Vagrant
   autoload :Action,         'vagrant/action'
@@ -235,7 +235,7 @@ def self.has_plugin?(name, version=nil)
     end
 
     # Now check the plugin gem names
-    Vagrant.require "vagrant/plugin/manager"
+    require "vagrant/plugin/manager"
     Plugin::Manager.instance.plugin_installed?(name, version)
   end
 
@@ -273,7 +273,7 @@ def self.plugin(version, component=nil)
 
   # @deprecated
   def self.require_plugin(name)
-    puts "Vagrant.require_plugin is deprecated and has no effect any longer."
+    puts "require_plugin is deprecated and has no effect any longer."
     puts "Use `vagrant plugin` commands to manage plugins. This warning will"
     puts "be removed in the next version of Vagrant."
   end
@@ -297,9 +297,9 @@ def self.version?(*requirements)
   #
   # Examples are shown below:
   #
-  #   Vagrant.require_version(">= 1.3.5")
-  #   Vagrant.require_version(">= 1.3.5", "< 1.4.0")
-  #   Vagrant.require_version("~> 1.3.5")
+  #   require_version(">= 1.3.5")
+  #   require_version(">= 1.3.5", "< 1.4.0")
+  #   require_version("~> 1.3.5")
   #
   def self.require_version(*requirements)
     logger = Log4r::Logger.new("vagrant::root")

lib/vagrant/action.rb

@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-Vagrant.require 'vagrant/action/builder'
+require 'vagrant/action/builder'
 
 module Vagrant
   module Action

lib/vagrant/action/builtin/box_add.rb

@@ -1,16 +1,16 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-Vagrant.require "digest/sha1"
-Vagrant.require "log4r"
-Vagrant.require "pathname"
-Vagrant.require "uri"
-
-Vagrant.require "vagrant/box_metadata"
-Vagrant.require "vagrant/util/downloader"
-Vagrant.require "vagrant/util/file_checksum"
-Vagrant.require "vagrant/util/file_mutex"
-Vagrant.require "vagrant/util/platform"
+require "digest/sha1"
+require "log4r"
+require "pathname"
+require "uri"
+
+require "vagrant/box_metadata"
+require "vagrant/util/downloader"
+require "vagrant/util/file_checksum"
+require "vagrant/util/file_mutex"
+require "vagrant/util/platform"
 
 module Vagrant
   module Action

lib/vagrant/action/builtin/box_check_outdated.rb

@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-Vagrant.require "log4r"
+require "log4r"
 
 module Vagrant
   module Action

lib/vagrant/action/builtin/box_remove.rb

@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-Vagrant.require "log4r"
+require "log4r"
 
 module Vagrant
   module Action

lib/vagrant/action/builtin/box_update.rb

@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-Vagrant.require "log4r"
+require "log4r"
 
 module Vagrant
   module Action

lib/vagrant/action/builtin/cleanup_disks.rb

@@ -1,59 +1,59 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
-Vagrant.require "json"
-
-module Vagrant
-  module Action
-    module Builtin
-      class CleanupDisks
-        # Removes any attached disks no longer defined in a Vagrantfile config
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant::action::builtin::disk")
-        end
-
-        def call(env)
-          machine = env[:machine]
-          defined_disks = get_disks(machine, env)
-
-          # Call into providers machine implementation for disk management
-          disk_meta_file = read_disk_metadata(machine)
-
-          if !disk_meta_file.empty?
-            if machine.provider.capability?(:cleanup_disks)
-              machine.provider.capability(:cleanup_disks, defined_disks, disk_meta_file)
-            else
-              env[:ui].warn(I18n.t("vagrant.actions.disk.provider_unsupported",
-                                   provider: machine.provider_name))
-            end
-          end
-
-          # Continue On
-          @app.call(env)
-        end
-
-        def read_disk_metadata(machine)
-          meta_file = machine.data_dir.join("disk_meta")
-          if File.file?(meta_file)
-            disk_meta = JSON.parse(meta_file.read)
-          else
-            @logger.info("No previous disk_meta file defined for guest #{machine.name}")
-            disk_meta = {}
-          end
-
-          return disk_meta
-        end
-
-        def get_disks(machine, env)
-          return @_disks if @_disks
-
-          @_disks = []
-          @_disks = machine.config.vm.disks
-
-          @_disks
-        end
-      end
-    end
-  end
-end
+require "json"
+
+module Vagrant
+  module Action
+    module Builtin
+      class CleanupDisks
+        # Removes any attached disks no longer defined in a Vagrantfile config
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::action::builtin::disk")
+        end
+
+        def call(env)
+          machine = env[:machine]
+          defined_disks = get_disks(machine, env)
+
+          # Call into providers machine implementation for disk management
+          disk_meta_file = read_disk_metadata(machine)
+
+          if !disk_meta_file.empty?
+            if machine.provider.capability?(:cleanup_disks)
+              machine.provider.capability(:cleanup_disks, defined_disks, disk_meta_file)
+            else
+              env[:ui].warn(I18n.t("vagrant.actions.disk.provider_unsupported",
+                                   provider: machine.provider_name))
+            end
+          end
+
+          # Continue On
+          @app.call(env)
+        end
+
+        def read_disk_metadata(machine)
+          meta_file = machine.data_dir.join("disk_meta")
+          if File.file?(meta_file)
+            disk_meta = JSON.parse(meta_file.read)
+          else
+            @logger.info("No previous disk_meta file defined for guest #{machine.name}")
+            disk_meta = {}
+          end
+
+          return disk_meta
+        end
+
+        def get_disks(machine, env)
+          return @_disks if @_disks
+
+          @_disks = []
+          @_disks = machine.config.vm.disks
+
+          @_disks
+        end
+      end
+    end
+  end
+end