vagrant-unbundled 1.8.4.2 → 1.8.5.1

data/test/unit/plugins/guests/{freebsd → bsd}/cap/halt_test.rb

@@ -1,11 +1,10 @@
 require_relative "../../../../base"
 
-describe "VagrantPlugins::GuestFreeBSD::Cap::Halt" do
-  let(:described_class) do
-    VagrantPlugins::GuestFreeBSD::Plugin
+describe "VagrantPlugins::GuestBSD::Cap::Halt" do
+  let(:caps) do
+    VagrantPlugins::GuestBSD::Plugin
       .components
-      .guest_capabilities[:freebsd]
-      .get(:halt)
+      .guest_capabilities[:bsd]
   end
 
   let(:machine) { double("machine") }
@@ -20,15 +19,17 @@ describe "VagrantPlugins::GuestFreeBSD::Cap::Halt" do
   end
 
   describe ".halt" do
+    let(:cap) { caps.get(:halt) }
+
     it "runs the shutdown command" do
-      comm.expect_command("shutdown -p now")
-      described_class.halt(machine)
+      comm.expect_command("/sbin/shutdown -p now")
+      cap.halt(machine)
     end
 
-    it "does not raise an IOError" do
-      comm.stub_command("shutdown -p now", raise: IOError)
+    it "ignores an IOError" do
+      comm.stub_command("/sbin/shutdown -p now", raise: IOError)
       expect {
-        described_class.halt(machine)
+        cap.halt(machine)
       }.to_not raise_error
     end
   end

data/test/unit/plugins/guests/{freebsd → bsd}/cap/insert_public_key_test.rb

@@ -1,11 +1,10 @@
 require_relative "../../../../base"
 
-describe "VagrantPlugins::GuestFreeBSD::Cap::InsertPublicKey" do
-  let(:described_class) do
-    VagrantPlugins::GuestFreeBSD::Plugin
+describe "VagrantPlugins::GuestBSD::Cap::InsertPublicKey" do
+  let(:caps) do
+    VagrantPlugins::GuestBSD::Plugin
       .components
-      .guest_capabilities[:freebsd]
-      .get(:insert_public_key)
+      .guest_capabilities[:bsd]
   end
 
   let(:machine) { double("machine") }
@@ -20,8 +19,10 @@ describe "VagrantPlugins::GuestFreeBSD::Cap::InsertPublicKey" do
   end
 
   describe ".insert_public_key" do
+    let(:cap) { caps.get(:insert_public_key) }
+
     it "inserts the public key" do
-      described_class.insert_public_key(machine, "ssh-rsa ...")
+      cap.insert_public_key(machine, "ssh-rsa ...")
       expect(comm.received_commands[0]).to match(/mkdir -p ~\/.ssh/)
       expect(comm.received_commands[0]).to match(/chmod 0700 ~\/.ssh/)
       expect(comm.received_commands[0]).to match(/cat '\/tmp\/vagrant-(.+)' >> ~\/.ssh\/authorized_keys/)

data/test/unit/plugins/guests/bsd/cap/nfs_test.rb

@@ -0,0 +1,68 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestBSD::Cap::NFS" do
+  let(:caps) do
+    VagrantPlugins::GuestBSD::Plugin
+      .components
+      .guest_capabilities[:bsd]
+  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 ".mount_nfs_folder" do
+    let(:cap) { caps.get(:mount_nfs_folder) }
+    let(:ip) { "1.2.3.4" }
+
+    it "mounts the folder" do
+      folders = {
+        "/vagrant-nfs" => {
+          guestpath: "/guest",
+          hostpath: "/host",
+        }
+      }
+      cap.mount_nfs_folder(machine, ip, folders)
+
+      expect(comm.received_commands[0]).to match(/set -e/)
+      expect(comm.received_commands[0]).to match(/mkdir -p \/guest/)
+      expect(comm.received_commands[0]).to match(/mount -t nfs/)
+      expect(comm.received_commands[0]).to match(/1.2.3.4:\/host \/guest/)
+    end
+
+    it "mounts with options" do
+      folders = {
+        "/vagrant-nfs" => {
+          guestpath: "/guest",
+          hostpath: "/host",
+          nfs_version: 2,
+          nfs_udp: true,
+          mount_options: ["banana"]
+        }
+      }
+      cap.mount_nfs_folder(machine, ip, folders)
+
+      expect(comm.received_commands[0]).to match(/mount -t nfs -o 'nfsv2,mntudp,banana'/)
+    end
+
+    it "escapes host and guest paths" do
+      folders = {
+        "/vagrant-nfs" => {
+          guestpath: "/guest with spaces",
+          hostpath: "/host's",
+        }
+      }
+      cap.mount_nfs_folder(machine, ip, folders)
+
+      expect(comm.received_commands[0]).to match(/host\\\'s/)
+      expect(comm.received_commands[0]).to match(/guest\\\ with\\\ spaces/)
+    end
+  end
+end

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

@@ -20,17 +20,17 @@ describe "VagrantPlugins::GuestCoreOS::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 --fqdn | grep -w '#{hostname}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
       comm.expect_command("hostname 'banana-rama'")
-      described_class.change_host_name(machine, hostname)
+      described_class.change_host_name(machine, name)
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname --fqdn | 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/darwin/cap/change_host_name_test.rb

@@ -20,11 +20,11 @@ describe "VagrantPlugins::GuestDarwin::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 -f | grep -w '#{hostname}' || hostname -s | grep -w '#{hostname}'", exit_code: 1)
-      described_class.change_host_name(machine, hostname)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
+      described_class.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/scutil --set ComputerName 'banana-rama.example.com'/)
       expect(comm.received_commands[1]).to match(/scutil --set HostName 'banana-rama.example.com'/)
       expect(comm.received_commands[1]).to match(/scutil --set LocalHostName 'banana-rama'/)
@@ -32,8 +32,8 @@ describe "VagrantPlugins::GuestDarwin::Cap::ChangeHostName" do
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname -f | grep -w '#{hostname}' || hostname -s | 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/darwin/cap/halt_test.rb

@@ -0,0 +1,36 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestDarwin::Cap::Halt" do
+  let(:caps) do
+    VagrantPlugins::GuestDarwin::Plugin
+      .components
+      .guest_capabilities[:darwin]
+  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 ".halt" do
+    let(:cap) { caps.get(:halt) }
+
+    it "runs the shutdown command" do
+      comm.expect_command("/sbin/shutdown -h now")
+      cap.halt(machine)
+    end
+
+    it "ignores an IOError" do
+      comm.stub_command("/sbin/shutdown -h now", raise: IOError)
+      expect {
+        cap.halt(machine)
+      }.to_not raise_error
+    end
+  end
+end

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

@@ -24,16 +24,14 @@ describe "VagrantPlugins::GuestDebian::Cap::ChangeHostName" do
     let(:name) { 'banana-rama.example.com' }
 
     it "sets the hostname if not set" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
       cap.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/hostname -F \/etc\/hostname/)
-      expect(comm.received_commands[1]).to match(/invoke-rc.d hostname.sh start/)
-      expect(comm.received_commands[1]).to match(/invoke-rc.d networking force-reload/)
-      expect(comm.received_commands[1]).to match(/invoke-rc.d network-manager force-reload/)
+      expect(comm.received_commands[1]).to match(/hostname.sh start/)
     end
 
     it "does not set the hostname if unset" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 0)
+      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

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

@@ -7,13 +7,12 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
       .guest_capabilities[:debian]
   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
@@ -23,6 +22,11 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
   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_0) do
       {
         interface: 0,
@@ -43,12 +47,12 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
     it "creates and starts the networks" do
       cap.configure_networks(machine, [network_0, network_1])
 
-      expect(comm.received_commands[1]).to match("/sbin/ifdown 'eth1' || true")
-      expect(comm.received_commands[1]).to match("/sbin/ip addr flush dev 'eth1'")
-      expect(comm.received_commands[1]).to match("/sbin/ifdown 'eth2' || true")
-      expect(comm.received_commands[1]).to match("/sbin/ip addr flush dev 'eth2'")
-      expect(comm.received_commands[1]).to match("/sbin/ifup 'eth1'")
-      expect(comm.received_commands[1]).to match("/sbin/ifup 'eth2'")
+      expect(comm.received_commands[0]).to match("/sbin/ifdown 'eth1' || true")
+      expect(comm.received_commands[0]).to match("/sbin/ip addr flush dev 'eth1'")
+      expect(comm.received_commands[0]).to match("/sbin/ifdown 'eth2' || true")
+      expect(comm.received_commands[0]).to match("/sbin/ip addr flush dev 'eth2'")
+      expect(comm.received_commands[0]).to match("/sbin/ifup 'eth1'")
+      expect(comm.received_commands[0]).to match("/sbin/ifup 'eth2'")
     end
   end
 end

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

@@ -20,19 +20,11 @@ describe "VagrantPlugins::GuestDebian::Cap:RSync" do
   end
 
   describe ".rsync_install" do
-    it "installs rsync when not installed" do
-      comm.stub_command("command -v rsync", exit_code: 1)
+    it "installs rsync" do
       described_class.rsync_install(machine)
 
-      expect(comm.received_commands[1]).to match(/apt-get -yqq update/)
-      expect(comm.received_commands[1]).to match(/apt-get -yqq install rsync/)
-    end
-
-    it "does not install rsync when installed" do
-      comm.stub_command("command -v rsync", exit_code: 0)
-      described_class.rsync_install(machine)
-
-      expect(comm.received_commands.join("")).to_not match(/update/)
+      expect(comm.received_commands[0]).to match(/apt-get -yqq update/)
+      expect(comm.received_commands[0]).to match(/apt-get -yqq install rsync/)
     end
   end
 end

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

@@ -23,7 +23,7 @@ describe "VagrantPlugins::GuestFreeBSD::Cap::ChangeHostName" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname and /etc/hosts" do
-      comm.stub_command("hostname -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
       described_class.change_host_name(machine, name)
 
       expect(comm.received_commands[1]).to match(/hostname '#{name}'/)
@@ -32,7 +32,7 @@ describe "VagrantPlugins::GuestFreeBSD::Cap::ChangeHostName" do
     end
 
     it "does nothing if the hostname is already set" do
-      comm.stub_command("hostname -f | grep -w '#{name}' || hostname -s | grep -w '#{name}'", exit_code: 0)
+      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

data/test/unit/plugins/guests/linux/cap/mount_nfs_test.rb

@@ -42,8 +42,8 @@ describe "VagrantPlugins::GuestLinux::Cap::MountNFS" do
       }
       cap.mount_nfs_folder(machine, ip, folders)
 
-      expect(comm.received_commands[0]).to match(/mkdir -p '#{guestpath}'/)
-      expect(comm.received_commands[0]).to match(/'1.2.3.4:#{hostpath}' '#{guestpath}'/)
+      expect(comm.received_commands[0]).to match(/mkdir -p #{guestpath}/)
+      expect(comm.received_commands[0]).to match(/1.2.3.4:#{hostpath} #{guestpath}/)
     end
 
     it "mounts with options" do
@@ -72,7 +72,20 @@ describe "VagrantPlugins::GuestLinux::Cap::MountNFS" do
       cap.mount_nfs_folder(machine, ip, folders)
 
       expect(comm.received_commands[0]).to include(
-        "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{guestpath}'")
+        "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guestpath}")
+    end
+
+    it "escapes host and guest paths" do
+      folders = {
+        "/vagrant-nfs" => {
+          guestpath: "/guest with spaces",
+          hostpath: "/host's",
+        }
+      }
+      cap.mount_nfs_folder(machine, ip, folders)
+
+      expect(comm.received_commands[0]).to match(/host\\\'s/)
+      expect(comm.received_commands[0]).to match(/guest\\\ with\\\ spaces/)
     end
   end
 end

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

@@ -24,7 +24,7 @@ describe "VagrantPlugins::GuestOmniOS::Cap:RSync" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname if unset" do
-      comm.stub_command("hostname | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
       cap.change_host_name(machine, name)
 
       expect(comm.received_commands[1]).to match(/echo '#{name}' > \/etc\/nodename/)
@@ -32,7 +32,7 @@ describe "VagrantPlugins::GuestOmniOS::Cap:RSync" do
     end
 
     it "does not set the hostname if set" do
-      comm.stub_command("hostname | grep -w '#{name}'", exit_code: 0)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
       cap.change_host_name(machine, name)
 
       expect(comm.received_commands.size).to eq(1)

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

@@ -26,7 +26,7 @@ describe "VagrantPlugins::GuestPhoton::Cap::ChangeHostName" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
       cap.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/echo '#{name}' > \/etc\/hostname/)
@@ -34,7 +34,7 @@ describe "VagrantPlugins::GuestPhoton::Cap::ChangeHostName" do
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 0)
+      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

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

@@ -24,14 +24,14 @@ describe "VagrantPlugins::GuestPld::Cap::ChangeHostName" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
       cap.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/hostname '#{name}'/)
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname | grep -w '#{name}'", exit_code: 0)
+      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

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

@@ -24,17 +24,18 @@ describe "VagrantPlugins::GuestRedHat::Cap::ChangeHostName" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
       cap.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/\/etc\/sysconfig\/network/)
       expect(comm.received_commands[1]).to match(/\/etc\/sysconfig\/network-scripts\/ifcfg/)
-      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname '#{name}'/)
+      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname --static '#{name}'/)
+      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname --transient '#{name}'/)
       expect(comm.received_commands[1]).to match(/service network restart/)
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 0)
+      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