vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/guests/ubuntu/guest.rb

@@ -1,5 +1,3 @@
-require "vagrant"
-
 module VagrantPlugins
   module GuestUbuntu
     class Guest < Vagrant.plugin("2", :guest)

data/plugins/guests/ubuntu/plugin.rb

@@ -7,13 +7,11 @@ module VagrantPlugins
       description "Ubuntu guest support."
 
       guest("ubuntu", "debian") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 
       guest_capability("ubuntu", "change_host_name") do
-        # ubuntu is just just a specialization of the debian code for this capability
-        require_relative "../debian/cap/change_host_name"
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end

data/plugins/guests/windows/guest_network.rb

@@ -92,7 +92,7 @@ module VagrantPlugins
         @logger.debug("querying network adapters")
 
         # Get all NICs that have a MAC address
-        # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
+        # https://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
         adapters = @communicator.execute(WQL_NET_ADAPTERS_V2, { shell: :wql } )[:win32_network_adapter]
         @logger.debug("#{adapters.inspect}")
         return adapters

data/plugins/hosts/arch/cap/nfs.rb

@@ -3,31 +3,15 @@ module VagrantPlugins
     module Cap
       class NFS
         def self.nfs_check_command(env)
-          if systemd?
-            return "/usr/sbin/systemctl status nfs-server.service"
-          else
-            return "/etc/rc.d/nfs-server status"
-          end
+          return "/usr/sbin/systemctl status --no-pager nfs-server.service"
         end
 
         def self.nfs_start_command(env)
-          if systemd?
-            return "/usr/sbin/systemctl start nfs-server.service"
-          else
-            return "sh -c 'for s in {rpcbind,nfs-common,nfs-server}; do /etc/rc.d/$s start; done'"
-          end
+          return "/usr/sbin/systemctl start nfs-server.service"
         end
 
         def self.nfs_installed(environment)
-          Kernel.system("grep -Fq nfs /proc/filesystems")
-        end
-
-        protected
-
-        # This tests to see if systemd is used on the system. This is used
-        # in newer versions of Arch, and requires a change in behavior.
-        def self.systemd?
-          `ps -o comm= 1`.chomp == 'systemd'
+          Kernel.system("grep -Fq nfsd /proc/filesystems")
         end
       end
     end

data/plugins/hosts/darwin/cap/provider_install_virtualbox.rb

@@ -16,8 +16,7 @@ module VagrantPlugins
         SHA256SUM = "62f933115498e51ddf5f2dab47dc1eebb42eb78ea1a7665cb91c53edacc847c6".freeze
 
         def self.provider_install_virtualbox(env)
-          tf = Tempfile.new("vagrant")
-          tf.close
+          path = Dir::Tmpname.create("vagrant-provider-install-virtualbox") {}
 
           # Prefixed UI for prettiness
           ui = Vagrant::UI::Prefixed.new(env.ui, "")
@@ -28,11 +27,11 @@ module VagrantPlugins
             version: VERSION))
           ui.detail(I18n.t(
             "vagrant.hosts.darwin.virtualbox_install_detail"))
-          dl = Vagrant::Util::Downloader.new(URL, tf.path, ui: ui)
+          dl = Vagrant::Util::Downloader.new(URL, path, ui: ui)
           dl.download!
 
           # Validate that the file checksum matches
-          actual = FileChecksum.new(tf.path, Digest::SHA2).checksum
+          actual = FileChecksum.new(path, Digest::SHA2).checksum
           if actual != SHA256SUM
             raise Vagrant::Errors::ProviderChecksumMismatch,
               provider: "virtualbox",
@@ -46,7 +45,7 @@ module VagrantPlugins
           ui.detail(I18n.t(
             "vagrant.hosts.darwin.virtualbox_install_install_detail"))
           script = File.expand_path("../../scripts/install_virtualbox.sh", __FILE__)
-          result = Vagrant::Util::Subprocess.execute("bash", script, tf.path)
+          result = Vagrant::Util::Subprocess.execute("bash", script, path)
           if result.exit_code != 0
             raise Vagrant::Errors::ProviderInstallFailed,
               provider: "virtualbox",

data/plugins/hosts/darwin/cap/rdp.rb

@@ -8,6 +8,26 @@ module VagrantPlugins
     module Cap
       class RDP
         def self.rdp_client(env, rdp_info)
+          config_path = self.generate_config_file(rdp_info)
+          begin
+            Vagrant::Util::Subprocess.execute("open", config_path.to_s)
+          ensure
+            # Note: this technically will never get run; neither would an
+            # at_exit call. The reason is that `exec` replaces this process,
+            # effectively the same as `kill -9`. This is solely here to prove
+            # that and so that future developers do not waste a ton of time
+            # try to identify why Vagrant is leaking RDP connection files.
+            # There is a catch-22 here in that we can't delete the file before
+            # we exec, and we can't delete the file after we exec :(.
+            File.unlink(config_path) if File.file?(config_path)
+          end
+        end
+
+        protected
+
+        # Generates an RDP connection file and returns the resulting path.
+        # @return [String]
+        def self.generate_config_file(rdp_info)
           opts   = {
             "drivestoredirect:s"       => "*",
             "full address:s"           => "#{rdp_info[:host]}:#{rdp_info[:port]}",
@@ -16,16 +36,24 @@ module VagrantPlugins
           }
 
           # Create the ".rdp" file
-          config_path = Pathname.new(Dir.tmpdir).join(
-            "vagrant-rdp-#{Time.now.to_i}-#{rand(10000)}.rdp")
-          config_path.open("w+") do |f|
+          t = ::Tempfile.new(["vagrant-rdp", ".rdp"]).tap do |f|
+            f.binmode
+
             opts.each do |k, v|
-              f.puts("#{k}:#{v}")
+              f.write("#{k}:#{v}")
+            end
+
+            if rdp_info[:extra_args]
+              rdp_info[:extra_args].each do |arg|
+                f.write("#{arg}")
+              end
             end
+
+            f.fsync
+            f.close
           end
 
-          # Launch it
-          Vagrant::Util::Subprocess.execute("open", config_path.to_s)
+          return t.path
         end
       end
     end

data/plugins/hosts/gentoo/cap/nfs.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       class NFS
         def self.nfs_check_command(env)
           if systemd?
-            return "#{systemctl_path} status nfs-server.service"
+            return "#{systemctl_path} status --no-pager nfs-server.service"
           else
             return "/etc/init.d/nfs status"
           end

data/plugins/hosts/windows/cap/provider_install_virtualbox.rb

@@ -17,8 +17,7 @@ module VagrantPlugins
         SHA256SUM = "3e5ed8fe4ada6eef8dfb4fe6fd79fcab4b242acf799f7d3ab4a17b43838b1e04".freeze
 
         def self.provider_install_virtualbox(env)
-          tf = Tempfile.new("vagrant")
-          tf.close
+          path = Dir::Tmpname.create("vagrant-provider-install-virtualbox") {}
 
           # Prefixed UI for prettiness
           ui = Vagrant::UI::Prefixed.new(env.ui, "")
@@ -29,11 +28,11 @@ module VagrantPlugins
             version: VERSION))
           ui.detail(I18n.t(
             "vagrant.hosts.windows.virtualbox_install_detail"))
-          dl = Vagrant::Util::Downloader.new(URL, tf.path, ui: ui)
+          dl = Vagrant::Util::Downloader.new(URL, path, ui: ui)
           dl.download!
 
           # Validate that the file checksum matches
-          actual = FileChecksum.new(tf.path, Digest::SHA2).checksum
+          actual = FileChecksum.new(path, Digest::SHA2).checksum
           if actual != SHA256SUM
             raise Vagrant::Errors::ProviderChecksumMismatch,
               provider: "virtualbox",
@@ -47,7 +46,7 @@ module VagrantPlugins
           ui.detail(I18n.t(
             "vagrant.hosts.windows.virtualbox_install_install_detail"))
           script = File.expand_path("../../scripts/install_virtualbox.ps1", __FILE__)
-          result = Vagrant::Util::PowerShell.execute(script, tf.path)
+          result = Vagrant::Util::PowerShell.execute(script, path)
           if result.exit_code != 0
             raise Vagrant::Errors::ProviderInstallFailed,
               provider: "virtualbox",

data/plugins/hosts/windows/cap/ps.rb

@@ -1,7 +1,7 @@
 require "pathname"
 require "tmpdir"
 
-require "vagrant/util/subprocess"
+require "vagrant/util/safe_exec"
 
 module VagrantPlugins
   module HostWindows
@@ -34,7 +34,7 @@ module VagrantPlugins
           end
 
           # Launch it
-          Vagrant::Util::Subprocess.execute("powershell", *args)
+          Vagrant::Util::SafeExec.exec("powershell", *args)
         end
       end
     end

data/plugins/hosts/windows/cap/rdp.rb

@@ -8,28 +8,19 @@ module VagrantPlugins
     module Cap
       class RDP
         def self.rdp_client(env, rdp_info)
-          config = nil
-          opts   = {
-            "full address:s"           => "#{rdp_info[:host]}:#{rdp_info[:port]}",
-            "prompt for credentials:i" => "1",
-            "username:s"               => rdp_info[:username],
-          }
-
-          # Create the ".rdp" file
-          config_path = Pathname.new(Dir.tmpdir).join(
-            "vagrant-rdp-#{Time.now.to_i}-#{rand(10000)}.rdp")
-          config_path.open("w+") do |f|
-            opts.each do |k, v|
-              f.puts("#{k}:#{v}")
-            end
-          end
+          # Setup password
+          cmdKeyArgs = [
+            "/add:#{rdp_info[:host]}:#{rdp_info[:port]}",
+            "/user:#{rdp_info[:username]}",
+            "/pass:#{rdp_info[:password]}",
+          ]
+          Vagrant::Util::Subprocess.execute("cmdkey", *cmdKeyArgs)
 
           # Build up the args to mstsc
-          args = [config_path.to_s]
+          args = ["/v:#{rdp_info[:host]}:#{rdp_info[:port]}"]
           if rdp_info[:extra_args]
             args = rdp_info[:extra_args] + args
           end
-
           # Launch it
           Vagrant::Util::Subprocess.execute("mstsc", *args)
         end

data/plugins/kernel_v2/config/ssh_connect.rb

@@ -7,6 +7,8 @@ module VagrantPlugins
       attr_accessor :username
       attr_accessor :password
       attr_accessor :insert_key
+      attr_accessor :keys_only
+      attr_accessor :paranoid
 
       def initialize
         @host             = UNSET_VALUE
@@ -15,6 +17,8 @@ module VagrantPlugins
         @username         = UNSET_VALUE
         @password         = UNSET_VALUE
         @insert_key       = UNSET_VALUE
+        @keys_only        = UNSET_VALUE
+        @paranoid         = UNSET_VALUE
       end
 
       def finalize!
@@ -24,6 +28,8 @@ module VagrantPlugins
         @username         = nil if @username == UNSET_VALUE
         @password         = nil if @password == UNSET_VALUE
         @insert_key       = true if @insert_key == UNSET_VALUE
+        @keys_only        = true if @keys_only == UNSET_VALUE
+        @paranoid         = false if @paranoid == UNSET_VALUE
 
         if @private_key_path && !@private_key_path.is_a?(Array)
           @private_key_path = [@private_key_path]

data/plugins/kernel_v2/config/vm.rb

@@ -425,7 +425,9 @@ module VagrantPlugins
               id: "winrm-ssl",
               auto_correct: true
           end
-        elsif !@__networks["forwarded_port-ssh"]
+        end
+        # forward SSH ports regardless of communicator
+        if !@__networks["forwarded_port-ssh"]
           network :forwarded_port,
             guest: 22,
             host: 2222,

data/plugins/providers/docker/action.rb

@@ -217,9 +217,6 @@ module VagrantPlugins
       def self.action_start
         Vagrant::Action::Builder.new.tap do |b|
           b.use Call, IsState, :running do |env, b2|
-            # If the container is running and we're not doing a run, we're done
-            next if env[:result] && env[:machine_action] != :run_command
-
             if env[:machine_action] != :run_command
               b2.use Call, HasSSH do |env2, b3|
                 if env2[:result]
@@ -232,6 +229,9 @@ module VagrantPlugins
               end
             end
 
+            # If the container is running and we're doing a run, we're done
+            next if env[:result] && env[:machine_action] != :run_command
+
             b2.use Call, IsState, :not_created do |env2, b3|
               if env2[:result]
                 # First time making this thing, set to the "preparing" state

data/plugins/providers/docker/action/create.rb

@@ -135,7 +135,7 @@ module VagrantPlugins
               next
             end
 
-            mappings[options[:host]] = options
+            mappings["#{options[:host]}/#{options[:protocol]}"] = options
           end
 
           # Build the results

data/plugins/providers/docker/command/exec.rb

@@ -0,0 +1,104 @@
+module VagrantPlugins
+  module DockerProvider
+    module Command
+      class Exec < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "attach to an already-running docker container"
+        end
+
+        def execute
+          options = {}
+          options[:detach] = false
+          options[:pty] = false
+          options[:interactive] = false
+          options[:prefix] = true
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant docker-exec [options] [name] -- <command> [args]"
+            o.separator ""
+            o.separator "Options:"
+            o.separator ""
+
+            o.on("--[no-]detach", "Run in the background") do |d|
+              options[:detach] = d
+            end
+
+            o.on("-i", "--[no-]interactive", "Keep STDIN open even if not attached") do |i|
+              options[:interactive] = i
+            end
+
+            o.on("-t", "--[no-]tty", "Allocate a pty") do |t|
+              options[:pty] = t
+            end
+
+            o.on("-u", "--user USER", "User or UID") do |u|
+              options[:user] = u
+            end
+
+            o.on("--[no-]prefix", "Prefix output with machine names") do |p|
+              options[:prefix] = p
+            end
+          end
+
+          # Parse out the extra args to send to SSH, which is everything
+          # after the "--"
+          command     = nil
+          split_index = @argv.index("--")
+          if split_index
+            command = @argv.drop(split_index + 1)
+            @argv   = @argv.take(split_index)
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+
+          # Show the error if we don't have "--" _after_ parse_options
+          # so that "-h" and "--help" work properly.
+          if !split_index
+            raise Errors::ExecCommandRequired
+          end
+
+          target_opts = { provider: :docker }
+          target_opts[:single_target] = options[:pty]
+
+          with_target_vms(argv, target_opts) do |machine|
+            if machine.state.id != :running
+              @env.ui.info("#{machine.id} is not running.")
+              next
+            end
+            exec_command(machine, command, options)
+          end
+
+          return 0
+        end
+
+        def exec_command(machine, command, options)
+          exec_cmd = %w(docker exec)
+          exec_cmd << "-i" if options[:interactive]
+          exec_cmd << "-t" if options[:pty]
+          exec_cmd << "-u" << options[:user] if options[:user]
+          exec_cmd << machine.id
+          exec_cmd += options[:extra_args] if options[:extra_args]
+          exec_cmd += command
+
+          # Run this interactively if asked.
+          exec_options = options
+          exec_options[:stdin] = true if options[:pty]
+
+          output = ""
+          machine.provider.driver.execute(*exec_cmd, exec_options) do |type, data|
+            output += data
+          end
+
+          output_options = {}
+          output_options[:prefix] = false if !options[:prefix]
+
+          if !output.empty?
+            machine.ui.output(output.chomp, **output_options)
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/providers/docker/config.rb

@@ -1,5 +1,7 @@
 require "pathname"
 
+require_relative "../../../lib/vagrant/util/platform"
+
 module VagrantPlugins
   module DockerProvider
     class Config < Vagrant.plugin("2", :config)
@@ -202,7 +204,6 @@ module VagrantPlugins
         @create_args = [] if @create_args == UNSET_VALUE
         @dockerfile = nil if @dockerfile == UNSET_VALUE
         @env       ||= {}
-        @force_host_vm = false if @force_host_vm == UNSET_VALUE
         @has_ssh    = false if @has_ssh == UNSET_VALUE
         @image      = nil if @image == UNSET_VALUE
         @name       = nil if @name == UNSET_VALUE
@@ -223,6 +224,13 @@ module VagrantPlugins
           @host_vm_build_dir_options = nil
         end
 
+        # On non-linux platforms (where there is no native docker), force the
+        # host VM. Other users can optionally disable this by setting the
+        # value explicitly to false in their Vagrantfile.
+        if @force_host_vm == UNSET_VALUE
+          @force_host_vm = !Vagrant::Util::Platform.linux?
+        end
+
         # The machine name must be a symbol
         @vagrant_machine = @vagrant_machine.to_sym if @vagrant_machine