vagrant-unbundled 1.8.4.2 → 1.8.5.1

data/plugins/providers/virtualbox/plugin.rb

@@ -56,6 +56,7 @@ module VagrantPlugins
       autoload :Version_4_2, File.expand_path("../driver/version_4_2", __FILE__)
       autoload :Version_4_3, File.expand_path("../driver/version_4_3", __FILE__)
       autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
+      autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
     end
 
     module Model

data/plugins/synced_folders/nfs/synced_folder.rb

@@ -101,8 +101,16 @@ module VagrantPlugins
         end
 
         # Mount them!
-        machine.guest.capability(
-          :mount_nfs_folder, nfsopts[:nfs_host_ip], mount_folders)
+        if machine.guest.capability?(:nfs_pre)
+          machine.guest.capability(:nfs_pre)
+        end
+
+        machine.guest.capability(:mount_nfs_folder,
+          nfsopts[:nfs_host_ip], mount_folders)
+
+        if machine.guest.capability?(:nfs_post)
+          machine.guest.capability(:nfs_post)
+        end
       end
 
       def cleanup(machine, opts)

data/plugins/synced_folders/rsync/helper.rb

@@ -1,3 +1,5 @@
+require "shellwords"
+
 require "vagrant/util/platform"
 require "vagrant/util/subprocess"
 
@@ -43,6 +45,9 @@ module VagrantPlugins
           guestpath = machine.guest.capability(:rsync_scrub_guestpath, opts)
         end
 
+        # Shellescape
+        guestpath = Shellwords.escape(guestpath)
+
         if Vagrant::Util::Platform.windows?
           # rsync for Windows expects cygwin style paths, always.
           hostpath = Vagrant::Util::Platform.cygwin_path(hostpath)
@@ -69,14 +74,16 @@ module VagrantPlugins
         # Create the path for the control sockets. We used to do this
         # in the machine data dir but this can result in paths that are
         # too long for unix domain sockets.
-        controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}")
+        control_options = ""
+        unless Vagrant::Util::Platform.windows?
+          controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}")
+          control_options = "-o ControlMaster=auto -o ControlPath=#{controlpath} -o ControlPersist=10m "
+        end
 
         rsh = [
           "ssh -p #{ssh_info[:port]} " +
           proxy_command +
-          "-o ControlMaster=auto " +
-          "-o ControlPath=#{controlpath} " +
-          "-o ControlPersist=10m " +
+          control_options +
           "-o StrictHostKeyChecking=no " +
           "-o IdentitiesOnly=true " +
           "-o UserKnownHostsFile=/dev/null",

data/templates/guests/arch/network_static.erb

@@ -2,7 +2,7 @@ Connection=ethernet
 Description='A basic static ethernet connection'
 Interface=<%= options[:device] %>
 IP=static
-Address=('<%= options[:ip]%>/24')
-<% if options[:gateway] %>
+Address=('<%= options[:ip]%>/<%= options[:netmask] %>')
+<% if options[:gateway] -%>
 Gateway='<%= options[:gateway] %>'
-<% end %>
+<% end -%>

data/templates/guests/arch/network_static6.erb

@@ -0,0 +1,8 @@
+Connection=ethernet
+Description='A basic IPv6 ethernet connection'
+Interface=<%= options[:device] %>
+IP6=static
+Address6=('<%= options[:ip]%>/<%= options[:netmask] %>')
+<% if options[:gateway] -%>
+Gateway6='<%= options[:gateway] %>'
+<% end -%>

data/templates/guests/freebsd/network_static6.erb

@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+ifconfig_<%= options[:device] %>_ipv6="inet6 <%= options[:ip] %> prefixlen <%= options[:netmask] %>"
+<% if options[:gateway] %>
+ipv6_default_router="<%= options[:gateway] %>"
+<% end %>
+#VAGRANT-END

data/templates/guests/funtoo/network_static6.erb

@@ -0,0 +1,9 @@
+#VAGRANT-BEGIN
+template='interface'
+ipaddr='<%= options[:ip] %>/<%= options[:netmask] %>'
+<% [:gateway, :nameservers, :domain, :route, :gateway6, :route6, :mtu].each do |key| %>
+<% if options[key] %>
+<%= key %>='<%= options[key] %>'
+<% end %>
+<% end %>
+#VAGRANT-END

data/templates/guests/gentoo/network_dhcp.erb

@@ -1,4 +1,4 @@
 #VAGRANT-BEGIN
 # The contents below are automatically generated by Vagrant. Do not modify.
-config_eth<%= options[:interface] %>="dhcp"
+config_<%= options[:device] %>="dhcp"
 #VAGRANT-END

data/templates/guests/gentoo/network_static.erb

@@ -1,7 +1,7 @@
 #VAGRANT-BEGIN
 # The contents below are automatically generated by Vagrant. Do not modify.
-config_eth<%= options[:interface] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>")
-<% if options[:gateway] %>
-gateways_eth<%= options[:interface] %>="<%= options[:gateway] %>"
-<% end %>
+config_<%= options[:device] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>")
+<% if options[:gateway] -%>
+gateways_<%= options[:device] %>="<%= options[:gateway] %>"
+<% end -%>
 #VAGRANT-END

data/templates/guests/gentoo/network_static6.erb

@@ -0,0 +1,7 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+config_<%= options[:device] %>="<%= options[:ip] %>/<%= options[:netmask] %>"
+<% if options[:gateway] -%>
+gateways_<%= options[:device] %>="<%= options[:gateway] %>"
+<% end -%>
+#VAGRANT-END

data/templates/guests/redhat/network_dhcp.erb

@@ -2,5 +2,5 @@
 # The contents below are automatically generated by Vagrant. Do not modify.
 BOOTPROTO=dhcp
 ONBOOT=yes
-DEVICE=eth<%= options[:interface] %>
+DEVICE=<%= options[:device] %>
 #VAGRANT-END

data/templates/guests/redhat/network_static.erb

@@ -5,9 +5,12 @@ BOOTPROTO=none
 ONBOOT=yes
 IPADDR=<%= options[:ip] %>
 NETMASK=<%= options[:netmask] %>
-DEVICE=eth<%= options[:interface] %>
+DEVICE=<%= options[:device] %>
 <% if options[:gateway] %>
 GATEWAY=<%= options[:gateway] %>
 <% end %>
+<% if options[:mac_address] %>
+HWADDR=<%= options[:mac_address] %>
+<% end %>
 PEERDNS=no
 #VAGRANT-END

data/templates/guests/{fedora → redhat}/network_static6.erb

@@ -3,7 +3,10 @@
 NM_CONTROLLED=no
 BOOTPROTO=static
 ONBOOT=yes
-IPV6INIT=yes
-IPV6ADDR=<%= options[:ip] %>
 DEVICE=<%= options[:device] %>
+IPV6INIT=yes
+IPV6ADDR=<%= options[:ip] %>/<%= options[:netmask] %>
+<% if options[:gateway] -%>
+IPV6_DEFAULTGW=<%= options[:gateway] %>
+<% end %>
 #VAGRANT-END

data/templates/locales/en.yml

@@ -822,12 +822,6 @@ en:
         The error output from the last command was:
 
         %{output}
-      linux_nfs_mount_failed: |-
-        Mounting NFS shared folders failed. This is most often caused by the NFS
-        client software not being installed on the guest machine. Please verify
-        that the NFS client software is properly installed, and consult any resources
-        specific to the linux distro you're using for more information on how to
-        do this.
       linux_rdp_client_not_found: |-
         An appropriate RDP client was not found. Vagrant requires either
         `xfreerdp` or `rdesktop` in order to connect via RDP to the Vagrant
@@ -875,6 +869,8 @@ en:
         If the problem persists, please report a bug to the net-ssh project.
 
         %{message}
+      network_type_not_supported: |-
+        The %{type} network type is not supported for this box or guest.
       nfs_bad_exports: |-
         NFS is reporting that your exports file is invalid. Vagrant does
         this check before making any changes to the file. Please correct
@@ -885,6 +881,12 @@ en:
         Vagrant can't read your current NFS exports! The exports file should be
         readable by any user. This is usually caused by invalid permissions
         on your NFS exports file. Please fix them and try again.
+      nfs_mount_failed: |-
+        Mounting NFS shared folders failed. This is most often caused by the NFS
+        client software not being installed on the guest machine. Please verify
+        that the NFS client software is properly installed, and consult any resources
+        specific to the linux distro you're using for more information on how to
+        do this.
       nfs_no_guest_ip: |-
         No guest IP was given to the Vagrant core NFS helper. This is an
         internal error that should be reported as a bug.
@@ -1340,6 +1342,38 @@ en:
         VirtualBox is complaining that the installation is incomplete. Please
         run `VBoxManage --version` to see the error message which should contain
         instructions on how to fix this error.
+      virtualbox_mount_failed: |-
+        Vagrant was unable to mount VirtualBox shared folders. This is usually
+        because the filesystem "vboxsf" is not available. This filesystem is
+        made available via the VirtualBox Guest Additions and kernel module.
+        Please verify that these guest additions are properly installed in the
+        guest. This is not a bug in Vagrant and is usually caused by a faulty
+        Vagrant box. For context, the command attemped was:
+
+        %{command}
+
+        The error output from the command was:
+
+        %{output}
+      virtualbox_mount_not_supported_bsd: |-
+        Vagrant is not able to mount VirtualBox shared folders on BSD-based
+        guests. BSD-based guests do not support the VirtualBox filesystem at
+        this time.
+
+        To change the type of the default synced folder, specify the type as
+        rsync or nfs:
+
+            config.vm.synced_folder ".", "/vagrant", type: "nfs" # or "rsync"
+
+        Alternatively, if you do not need to mount the default synced folder,
+        you can also disable it entirely:
+
+            config.vm.synced_folder ".", "/vagrant", disabled: true
+
+        You can read more about Vagrant's synced folder types and the various
+        configuration options on the Vagrant website.
+
+        This is not a bug in Vagrant.
       virtualbox_name_exists: |-
         The name of your virtual machine couldn't be set because VirtualBox
         is reporting another VM with that name already exists. Most of the

data/test/unit/plugins/guests/arch/cap/change_host_name_test.rb

@@ -20,18 +20,18 @@ describe "VagrantPlugins::GuestArch::Cap::ChangeHostName" do
   end
 
   describe ".change_host_name" do
-    let(:hostname) { "banana-rama.example.com" }
+    let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname | grep -w '#{hostname}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
-      described_class.change_host_name(machine, hostname)
-      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname '#{hostname}'/)
+      described_class.change_host_name(machine, name)
+      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname 'banana-rama'/)
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname | grep -w '#{hostname}'", exit_code: 0)
-      described_class.change_host_name(machine, hostname)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
+      described_class.change_host_name(machine, name)
       expect(comm.received_commands.size).to eq(1)
     end
   end

data/test/unit/plugins/guests/arch/cap/configure_networks_test.rb

@@ -1,20 +1,18 @@
 require_relative "../../../../base"
 
 describe "VagrantPlugins::GuestArch::Cap::ConfigureNetworks" do
-  let(:described_class) do
+  let(:caps) do
     VagrantPlugins::GuestArch::Plugin
       .components
       .guest_capabilities[:arch]
-      .get(:configure_networks)
   end
 
-  let(:machine) { double("machine") }
+  let(:guest) { double("guest") }
+  let(:machine) { double("machine", guest: guest) }
   let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
     allow(machine).to receive(:communicate).and_return(comm)
-    comm.stub_command("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'",
-      stdout: "eth1\neth2")
   end
 
   after do
@@ -22,6 +20,13 @@ describe "VagrantPlugins::GuestArch::Cap::ConfigureNetworks" do
   end
 
   describe ".configure_networks" do
+    let(:cap) { caps.get(:configure_networks) }
+
+    before do
+      allow(guest).to receive(:capability).with(:network_interfaces)
+        .and_return(["eth1", "eth2"])
+    end
+
     let(:network_1) do
       {
         interface: 0,
@@ -40,16 +45,16 @@ describe "VagrantPlugins::GuestArch::Cap::ConfigureNetworks" do
     end
 
     it "creates and starts the networks" do
-      described_class.configure_networks(machine, [network_1, network_2])
-      expect(comm.received_commands[1]).to match(/mv (.+) '\/etc\/netctl\/eth1'/)
-      expect(comm.received_commands[1]).to match(/ip link set 'eth1' down/)
-      expect(comm.received_commands[1]).to match(/netctl restart 'eth1'/)
-      expect(comm.received_commands[1]).to match(/netctl enable 'eth1'/)
-
-      expect(comm.received_commands[1]).to match(/mv (.+) '\/etc\/netctl\/eth2'/)
-      expect(comm.received_commands[1]).to match(/ip link set 'eth2' down/)
-      expect(comm.received_commands[1]).to match(/netctl restart 'eth2'/)
-      expect(comm.received_commands[1]).to match(/netctl enable 'eth2'/)
+      cap.configure_networks(machine, [network_1, network_2])
+      expect(comm.received_commands[0]).to match(/mv (.+) '\/etc\/netctl\/eth1'/)
+      expect(comm.received_commands[0]).to match(/ip link set 'eth1' down/)
+      expect(comm.received_commands[0]).to match(/netctl restart 'eth1'/)
+      expect(comm.received_commands[0]).to match(/netctl enable 'eth1'/)
+
+      expect(comm.received_commands[0]).to match(/mv (.+) '\/etc\/netctl\/eth2'/)
+      expect(comm.received_commands[0]).to match(/ip link set 'eth2' down/)
+      expect(comm.received_commands[0]).to match(/netctl restart 'eth2'/)
+      expect(comm.received_commands[0]).to match(/netctl enable 'eth2'/)
     end
   end
 end

data/test/unit/plugins/guests/arch/cap/rsync_test.rb

@@ -0,0 +1,30 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestArch::Cap:RSync" do
+  let(:described_class) do
+    VagrantPlugins::GuestArch::Plugin
+      .components
+      .guest_capabilities[:arch]
+      .get(:rsync_install)
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  after do
+    comm.verify_expectations!
+  end
+
+  describe ".rsync_install" do
+    it "installs rsync=" do
+      described_class.rsync_install(machine)
+
+      expect(comm.received_commands[0]).to match(/pacman -Sy --noconfirm/)
+      expect(comm.received_commands[0]).to match(/pacman -S --noconfirm rsync/)
+    end
+  end
+end

data/test/unit/plugins/guests/arch/cap/smb_test.rb

@@ -0,0 +1,38 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestArch::Cap::SMB" do
+  let(:described_class) do
+    VagrantPlugins::GuestArch::Plugin
+      .components
+      .guest_capabilities[:arch]
+      .get(:smb_install)
+  end
+
+  let(:machine) { double("machine") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  after do
+    comm.verify_expectations!
+  end
+
+  describe ".smb_install" do
+    it "installs smb when /usr/bin/mount.cifs does not exist" do
+      comm.stub_command("test -f /usr/bin/mount.cifs", exit_code: 1)
+      described_class.smb_install(machine)
+
+      expect(comm.received_commands[1]).to match(/pacman -Sy --noconfirm/)
+      expect(comm.received_commands[1]).to match(/pacman -S --noconfirm cifs-utils/)
+    end
+
+    it "does not install smb when /usr/bin/mount.cifs exists" do
+      comm.stub_command("test -f /usr/bin/mount.cifs", exit_code: 0)
+      described_class.smb_install(machine)
+
+      expect(comm.received_commands.join("")).to_not match(/-S/)
+    end
+  end
+end

data/test/unit/plugins/guests/atomic/cap/change_host_name_test.rb

@@ -1,11 +1,10 @@
 require_relative "../../../../base"
 
 describe "VagrantPlugins::GuestAtomic::Cap::ChangeHostName" do
-  let(:described_class) do
+  let(:caps) do
     VagrantPlugins::GuestAtomic::Plugin
       .components
       .guest_capabilities[:atomic]
-      .get(:change_host_name)
   end
 
   let(:machine) { double("machine") }
@@ -20,18 +19,20 @@ describe "VagrantPlugins::GuestAtomic::Cap::ChangeHostName" do
   end
 
   describe ".change_host_name" do
-    let(:hostname) { "banana-rama.example.com" }
+    let(:cap) { caps.get(:change_host_name) }
+
+    let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname | grep -w '#{hostname}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
-      described_class.change_host_name(machine, hostname)
-      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname '#{hostname}'/)
+      cap.change_host_name(machine, name)
+      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname 'banana-rama'/)
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname | grep -w '#{hostname}'", exit_code: 0)
-      described_class.change_host_name(machine, hostname)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
+      cap.change_host_name(machine, name)
       expect(comm.received_commands.size).to eq(1)
     end
   end