vagrant-unbundled 2.2.9.0 → 2.2.10.0

data/plugins/commands/autocomplete/command/root.rb

@@ -0,0 +1,64 @@
+require "optparse"
+require 'vagrant/util/install_cli_autocomplete'
+
+module VagrantPlugins
+  module CommandAutocomplete
+    module Command
+      class Root < Vagrant.plugin("2", :command)
+        def self.synopsis
+          "manages autocomplete installation on host"
+        end
+
+        def initialize(argv, env)
+          super
+
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:install) do
+            require File.expand_path("../install", __FILE__)
+            Install
+          end
+        end
+
+        def execute
+          if @main_args.include?("-h") || @main_args.include?("--help")
+            # Print the help for all the box commands.
+            return help
+          end
+
+          # If we reached this far then we must have a subcommand. If not,
+          # then we also just print the help and exit.
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        def help
+          opts = OptionParser.new do |opts|
+            opts.banner = "Usage: vagrant autocomplete <subcommand>"
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            keys = @subcommands.keys.map(&:to_s)
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
+            end
+
+            opts.separator ""
+            opts.separator "For help on any individual subcommand run `vagrant autocomplete <subcommand> -h`"
+          end
+
+          @env.ui.info(opts.help, prefix: false)
+        end
+      end
+    end
+  end
+end

data/plugins/commands/autocomplete/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+
+module VagrantPlugins
+  module CommandAutocomplete
+    class Plugin < Vagrant.plugin("2")
+      name "autocomplete command"
+      description <<-DESC
+      The `autocomplete` manipulates Vagrant the autocomplete feature.
+      DESC
+
+      command("autocomplete") do
+        require File.expand_path("../command/root", __FILE__)
+        Command::Root
+      end
+    end
+  end
+end

data/plugins/commands/destroy/command.rb

@@ -8,6 +8,7 @@ module VagrantPlugins
       def execute
         options = {}
         options[:force] = false
+        options[:force_halt] = true
 
         opts = OptionParser.new do |o|
           o.banner = "Usage: vagrant destroy [options] [name|id]"
@@ -23,6 +24,10 @@ module VagrantPlugins
                "Enable or disable parallelism if provider supports it (automatically enables force)") do |p|
             options[:parallel] = p
           end
+
+          o.on("-g", "--graceful", "Gracefully poweroff of VM") do |f|
+            options[:force_halt] = false
+          end
         end
 
         # Parse the options
@@ -46,8 +51,7 @@ module VagrantPlugins
             # gather states to be checked after destroy
             init_states[vm.name] = vm.state.id
             machines << vm
-
-            batch.action(vm, :destroy, force_confirm_destroy: options[:force])
+            batch.action(vm, :destroy, force_confirm_destroy: options[:force], force_halt: options[:force_halt])
           end
         end
 

data/plugins/communicators/ssh/communicator.rb

@@ -307,10 +307,11 @@ module VagrantPlugins
         scp_connect do |scp|
           uploader = lambda do |path, remote_dest=nil|
             if File.directory?(path)
+              dest = File.join(to, path.sub(/^#{Regexp.escape(from)}/, ""))
+              create_remote_directory(dest)
               Dir.new(path).each do |entry|
                 next if entry == "." || entry == ".."
                 full_path = File.join(path, entry)
-                dest = File.join(to, path.sub(/^#{Regexp.escape(from)}/, ""))
                 create_remote_directory(dest)
                 uploader.call(full_path, dest)
               end
@@ -729,6 +730,11 @@ module VagrantPlugins
           yield :stdout, data if block_given?
         end
 
+        if !exit_status
+          @logger.debug("Exit status: #{exit_status.inspect}")
+          raise Vagrant::Errors::SSHNoExitStatus
+        end
+
         # Return the final exit status
         return exit_status
       end

data/plugins/communicators/winrm/helper.rb

@@ -58,7 +58,7 @@ module VagrantPlugins
           # ports.
           port = nil
           if machine.provider.capability?(:forwarded_ports)
-            machine.provider.capability(:forwarded_ports).each do |host, guest|
+            Array(machine.provider.capability(:forwarded_ports)).each do |host, guest|
               if guest == machine.config.winrm.guest_port
                 port = host
                 break

data/plugins/communicators/winssh/communicator.rb

@@ -217,7 +217,7 @@ module VagrantPlugins
       # The WinSSH communicator connection provides isolated modification
       # to the generated connection instances. This modification forces
       # all provided commands to run within powershell
-      def connect(*args)
+      def connect(**opts)
         connection = nil
         super { |c| connection = c }
 

data/plugins/guests/alpine/cap/change_host_name.rb

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestAlpine
     module Cap
       class ChangeHostName
+        include Vagrant::Util::GuestHosts::Linux
+
         def self.change_host_name(machine, name)
           new(machine, name).change!
         end
@@ -14,10 +18,10 @@ module VagrantPlugins
         end
 
         def change!
+          update_etc_hosts
           return unless should_change?
 
           update_etc_hostname
-          update_etc_hosts
           refresh_hostname_service
           update_mailname
           renew_dhcp
@@ -48,17 +52,12 @@ module VagrantPlugins
         # 127.0.0.1   localhost
         # 127.0.1.1   host.fqdn.com host.fqdn host
         def update_etc_hosts
-          if machine.communicate.test("grep '#{current_hostname}' /etc/hosts")
-            # Current hostname entry is in /etc/hosts
-            ip_address = '([0-9]{1,3}\.){3}[0-9]{1,3}'
-            search     = "^(#{ip_address})\\s+#{Regexp.escape(current_hostname)}(\\s.*)?$"
-            replace    = "\\1 #{new_hostname} #{short_hostname}"
-            expression = ['s', search, replace, 'g'].join('@')
-
-            machine.communicate.sudo("sed -ri '#{expression}' /etc/hosts")
+          comm = machine.communicate
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, new_hostname, network_with_hostname[:ip])
           else
-            # Current hostname entry isn't in /etc/hosts, just append it
-            machine.communicate.sudo("echo '127.0.1.1 #{new_hostname} #{short_hostname}' >>/etc/hosts")
+            add_hostname_to_loopback_interface(comm, new_hostname)
           end
         end
 

data/plugins/guests/alt/cap/change_host_name.rb

@@ -1,63 +1,50 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestALT
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split('.', 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, '')
-              # Save current hostname saved in /etc/hosts
-              CURRENT_HOSTNAME_FULL="$(hostname -f)"
-              CURRENT_HOSTNAME_SHORT="$(hostname -s)"
-
-              # New hostname to be saved in /etc/hosts
-              NEW_HOSTNAME_FULL='#{name}'
-              NEW_HOSTNAME_SHORT="${NEW_HOSTNAME_FULL%%.*}"
-
-              # Set the hostname - use hostnamectl if available
-              if command -v hostnamectl; then
-                hostnamectl set-hostname --static '#{name}'
-                hostnamectl set-hostname --transient '#{name}'
-              else
-                hostname '#{name}'
-              fi
-
-              # Update ourselves in /etc/hosts
-              if grep -w "$CURRENT_HOSTNAME_FULL" /etc/hosts; then
-                sed -i -e "s/\(\s\)$CURRENT_HOSTNAME_FULL\(\s\)/\1$NEW_HOSTNAME_FULL\2/g" -e "s/\(\s\)$CURRENT_HOSTNAME_FULL$/\1$NEW_HOSTNAME_FULL/g" /etc/hosts
-              fi
-              if grep -w "$CURRENT_HOSTNAME_SHORT" /etc/hosts; then
-                sed -i -e "s/\(\s\)$CURRENT_HOSTNAME_SHORT\(\s\)/\1$NEW_HOSTNAME_SHORT\2/g" -e "s/\(\s\)$CURRENT_HOSTNAME_SHORT$/\1$NEW_HOSTNAME_SHORT/g" /etc/hosts
-              fi
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
+        
+        def self.change_name_command(name)
+          basename = name.split(".", 2)[0]
+          return <<-EOH.gsub(/^ {14}/, '')
+          # Save current hostname saved in /etc/hosts
+          CURRENT_HOSTNAME_FULL="$(hostname -f)"
+          CURRENT_HOSTNAME_SHORT="$(hostname -s)"
 
-              # Persist hostname change across reboots
-              if [ -f /etc/sysconfig/network ]; then
-                sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
-              elif [ -f /etc/hostname ]; then
-                sed -i 's/.*/#{name}/' /etc/hostname
-              else
-                echo 'Unrecognized system. Hostname change may not persist across reboots.'
-                exit 0
-              fi
+          # Set the hostname - use hostnamectl if available
+          if command -v hostnamectl; then
+            hostnamectl set-hostname --static '#{name}'
+            hostnamectl set-hostname --transient '#{name}'
+          else
+            hostname '#{name}'
+          fi
 
-              # Restart the network if we find a recognized SYS V init script
-              if command -v service; then
-                if [ -f /etc/init.d/network ]; then
-                  service network restart
-                elif [ -f /etc/init.d/networking ]; then
-                  service networking restart
-                elif [ -f /etc/init.d/NetworkManager ]; then
-                  service NetworkManager restart
-                else
-                  echo 'Unrecognized system. Networking was not restarted following hostname change.'
-                  exit 0
-                fi
-              fi
+          # Persist hostname change across reboots
+          if [ -f /etc/sysconfig/network ]; then
+            sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network
+          elif [ -f /etc/hostname ]; then
+            sed -i 's/.*/#{name}/' /etc/hostname
+          else
+            echo 'Unrecognized system. Hostname change may not persist across reboots.'
+            exit 0
+          fi
 
-            EOH
-          end
+          # Restart the network if we find a recognized SYS V init script
+          if command -v service; then
+            if [ -f /etc/init.d/network ]; then
+              service network restart
+            elif [ -f /etc/init.d/networking ]; then
+              service networking restart
+            elif [ -f /etc/init.d/NetworkManager ]; then
+              service NetworkManager restart
+            else
+              echo 'Unrecognized system. Networking was not restarted following hostname change.'
+              exit 0
+            fi
+          fi
+          EOH
         end
       end
     end

data/plugins/guests/arch/cap/change_host_name.rb

@@ -1,22 +1,13 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestArch
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, "")
-              # Set hostname
-              hostnamectl set-hostname '#{basename}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              test $? -eq 0 && (grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              })
-            EOH
-          end
+        def self.change_name_command(name)
+          "hostnamectl set-hostname '#{name.split(".", 2).first}'"
         end
       end
     end

data/plugins/guests/arch/cap/configure_networks.rb

@@ -9,10 +9,12 @@ module VagrantPlugins
     module Cap
       class ConfigureNetworks
         include Vagrant::Util
+        extend Vagrant::Util::GuestInspection::Linux
 
         def self.configure_networks(machine, networks)
           comm = machine.communicate
           commands = []
+          uses_systemd_networkd = systemd_networkd?(comm)
 
           interfaces = machine.guest.capability(:network_interfaces)
           networks.each.with_index do |network, i|
@@ -25,9 +27,15 @@ module VagrantPlugins
               network[:netmask] = (32-Math.log2((IPAddr.new(network[:netmask], Socket::AF_INET).to_i^0xffffffff)+1)).to_i
             end
 
-            entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
-              options: network,
-            )
+            if uses_systemd_networkd
+              entry = TemplateRenderer.render("guests/arch/systemd_networkd/network_#{network[:type]}",
+                options: network,
+              )
+            else
+              entry = TemplateRenderer.render("guests/arch/default_network/network_#{network[:type]}",
+                options: network,
+              )
+            end
 
             remote_path = "/tmp/vagrant-network-#{network[:device]}-#{Time.now.to_i}-#{i}"
 
@@ -39,13 +47,22 @@ module VagrantPlugins
               comm.upload(f.path, remote_path)
             end
 
-            commands << <<-EOH.gsub(/^ {14}/, '').rstrip
-              # Configure #{network[:device]}
-              mv '#{remote_path}' '/etc/netctl/#{network[:device]}' &&
-              ip link set '#{network[:device]}' down &&
-              netctl restart '#{network[:device]}' &&
-              netctl enable '#{network[:device]}'
-            EOH
+            if uses_systemd_networkd
+              commands << <<-EOH.gsub(/^ {16}/, '').rstrip
+                # Configure #{network[:device]}
+                chmod 0644 '#{remote_path}' &&
+                mv '#{remote_path}' '/etc/systemd/network/#{network[:device]}.network' &&
+                networkctl reload
+              EOH
+            else
+              commands << <<-EOH.gsub(/^ {16}/, '').rstrip
+                # Configure #{network[:device]}
+                mv '#{remote_path}' '/etc/netctl/#{network[:device]}' &&
+                ip link set '#{network[:device]}' down &&
+                netctl restart '#{network[:device]}' &&
+                netctl enable '#{network[:device]}'
+              EOH
+            end
           end
 
           # Run all the network modification commands in one communicator call.

data/plugins/guests/atomic/cap/change_host_name.rb

@@ -1,22 +1,13 @@
+require_relative '../../linux/cap/change_host_name'
+
 module VagrantPlugins
   module GuestAtomic
     module Cap
       class ChangeHostName
-        def self.change_host_name(machine, name)
-          comm = machine.communicate
-
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH.gsub(/^ {14}/, "")
-              # Set hostname
-              hostnamectl set-hostname '#{basename}'
+        extend VagrantPlugins::GuestLinux::Cap::ChangeHostName
 
-              # Prepend ourselves to /etc/hosts
-              test $? -eq 0 && (grep -w '#{name}' /etc/hosts || {
-                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-              })
-            EOH
-          end
+        def self.change_name_command(name)
+          "hostnamectl set-hostname '#{name.split(".", 2).first}'"
         end
       end
     end

data/plugins/guests/darwin/cap/change_host_name.rb

@@ -1,7 +1,11 @@
+require 'vagrant/util/guest_hosts'
+
 module VagrantPlugins
   module GuestDarwin
     module Cap
       class ChangeHostName
+        extend Vagrant::Util::GuestHosts::BSD
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
@@ -21,14 +25,14 @@ module VagrantPlugins
               fi
 
               hostname '#{name}'
-
-              # Prepend ourselves to /etc/hosts - sed on bsd is sad
-              grep -w '#{name}' /etc/hosts || {
-                echo -e '127.0.0.1\\t#{name}\\t#{basename}' | cat - /etc/hosts > /tmp/tmp-hosts &&
-                  mv /tmp/tmp-hosts /etc/hosts
-              }
             EOH
           end
+          network_with_hostname = machine.config.vm.networks.map {|_, c| c if c[:hostname] }.compact[0]
+          if network_with_hostname
+            replace_host(comm, name, network_with_hostname[:ip])
+          else
+            add_hostname_to_loopback_interface(comm, name)
+          end
         end
       end
     end