vagrant-unbundled 1.9.5.1 → 1.9.7.1

data/test/unit/plugins/provisioners/docker/provisioner_test.rb

@@ -0,0 +1,79 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/provisioners/docker/provisioner")
+
+describe VagrantPlugins::DockerProvisioner::Provisioner do
+  include_context "unit"
+  subject { described_class.new(machine, config, installer, client) }
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
+  let(:config)       { double("config") }
+  let(:communicator) { double("comm") }
+  let(:guest)        { double("guest") }
+  let(:client)       { double("client") }
+  let(:installer)    { double("installer") }
+  let(:hook)         { double("hook") }
+
+  before do
+    machine.stub(communicate: communicator)
+    machine.stub(guest: guest)
+
+    communicator.stub(execute: true)
+    communicator.stub(upload: true)
+
+    guest.stub(capability?: false)
+    guest.stub(capability: false)
+
+    client.stub(start_service: true)
+    client.stub(daemon_running?: true)
+
+    config.stub(images: Set.new)
+    config.stub(build_images: Set.new)
+    config.stub(containers: Hash.new)
+  end
+
+  describe "#provision" do
+    let(:provisioner) do
+      prov = VagrantPlugins::Kernel_V2::VagrantConfigProvisioner.new("spec-test", :shell)
+      prov.config = {}
+      prov
+    end
+
+    it "invokes a post_install_provisioner if defined and docker is installed" do
+      installer.stub(ensure_installed: true)
+      allow(config).to receive(:post_install_provisioner).and_return(provisioner)
+      allow(machine).to receive(:env).and_return(iso_env)
+      allow(machine.env).to receive(:hook).and_return(true)
+
+      expect(machine.env).to receive(:hook).with(:run_provisioner, anything)
+      subject.provision()
+    end
+
+    it "does not invoke post_install_provisioner if not defined" do
+      installer.stub(ensure_installed: true)
+      allow(config).to receive(:post_install_provisioner).and_return(nil)
+      allow(machine).to receive(:env).and_return(iso_env)
+      allow(machine.env).to receive(:hook).and_return(true)
+
+      expect(machine.env).not_to receive(:hook).with(:run_provisioner, anything)
+      subject.provision()
+    end
+
+    it "raises an error if docker daemon isn't running" do
+      allow(installer).to receive(:ensure_installed).and_return(false)
+      allow(client).to receive(:start_service).and_return(false)
+      allow(client).to receive(:daemon_running?).and_return(false)
+
+      expect { subject.provision() }.
+        to raise_error(VagrantPlugins::DockerProvisioner::DockerError)
+    end
+  end
+
+end

data/test/unit/plugins/synced_folders/rsync/command/rsync_auto_test.rb

@@ -13,31 +13,77 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
     env.create_vagrant_env
   end
 
-  let(:synced_folders) { {} }
+  let(:synced_folders_empty) { {} }
+  let(:synced_folders_dupe) { {"1234":
+                               {type: "rsync",
+                                exclude: false,
+                                hostpath: "/Users/brian/code/vagrant-sandbox"},
+                               "5678":
+                               {type: "rsync",
+                                exclude: false,
+                                hostpath: "/Not/The/Same/Path"}} }
 
   let(:helper_class) { VagrantPlugins::SyncedFolderRSync::RsyncHelper }
 
-  subject do
-    described_class.new(argv, iso_env).tap do |s|
-      s.stub(synced_folders: synced_folders)
+  let(:paths) { {} }
+  let(:ssh_info) {{}}
+
+  def machine_stub(name)
+    double(name).tap do |m|
+      m.stub(id: "foo")
+      m.stub(reload: nil)
+      m.stub(ssh_info: ssh_info)
+      m.stub(ui: iso_env.ui)
+      m.stub(provider: double("provider"))
+      m.stub(state: double("state", id: :not_created))
+      m.stub(env: iso_env)
+
+      m.ui.stub(error: nil)
     end
   end
 
-  describe "#callback" do
-    let(:paths) { {} }
-    let(:ssh_info) {{}}
+  subject do
+    described_class.new(argv, iso_env).tap
+  end
 
-    def machine_stub(name)
-      double(name).tap do |m|
-        m.stub(id: "foo")
-        m.stub(reload: nil)
-        m.stub(ssh_info: ssh_info)
-        m.stub(ui: double("ui"))
 
-        m.ui.stub(error: nil)
-      end
+  describe "#execute" do
+    let (:machine) { machine_stub("m") }
+    let (:cached_folders) { { rsync: synced_folders_dupe } }
+
+    before do
+        allow(subject).to receive(:with_target_vms) { |&block| block.call machine }
+    end
+
+    it "does not sync folders outside of the cwd" do
+      allow(machine.ui).to receive(:info)
+      allow(machine.state).to receive(:id).and_return(:created)
+      allow(machine.env).to receive(:cwd).
+        and_return("/Users/brian/code/vagrant-sandbox")
+      allow(machine.provider).to receive(:capability?).and_return(false)
+
+      allow(subject).to receive(:synced_folders).
+        with(machine, cached: true).and_return(cached_folders)
+      allow(helper_class).to receive(:rsync_single).and_return(true)
+      allow(Vagrant::Util::Busy).to receive(:busy).and_return(true)
+      allow(Listen).to receive(:to).and_return(true)
+
+
+      expect(machine.ui).to receive(:info).
+        with("Not syncing /Not/The/Same/Path as it is not part of the current working directory.")
+      expect(helper_class).to receive(:rsync_single)
+
+      subject.execute()
     end
+  end
 
+  subject do
+    described_class.new(argv, iso_env).tap do |s|
+      s.stub(synced_folders: synced_folders_empty)
+    end
+  end
+
+  describe "#callback" do
     it "syncs modified folders to the proper path" do
       paths["/foo"] = [
         { machine: machine_stub("m1"), opts: double("opts_m1") },

data/test/unit/vagrant/action/builtin/box_add_test.rb

@@ -280,6 +280,53 @@ describe Vagrant::Action::Builtin::BoxAdd, :skip_windows do
       subject.call(env)
     end
 
+    context "with a box name accidentally set as a URL" do
+      it "displays a warning to the user" do
+        box_path = iso_env.box2_file(:virtualbox)
+        with_web_server(box_path) do |port|
+
+          box_url_name = "http://127.0.0.1:#{port}/#{box_path.basename}"
+          env[:box_name] = box_url_name
+
+          expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+            expect(name).to eq(box_url_name)
+            expect(version).to eq("0")
+            expect(opts[:metadata_url]).to be_nil
+            true
+          }.and_return(box)
+
+          expect(app).to receive(:call).with(env)
+
+          expect(env[:ui]).to receive(:warn)
+            .with(/It looks like you attempted to add a box with a URL for the name/)
+
+          subject.call(env)
+        end
+      end
+    end
+
+    context "with a box name containing invalid URI characters" do
+      it "should not raise an error" do
+        box_path = iso_env.box2_file(:virtualbox)
+        with_web_server(box_path) do |port|
+
+          box_url_name = "box name with spaces"
+          env[:box_name] = box_url_name
+
+          expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+            expect(name).to eq(box_url_name)
+            expect(version).to eq("0")
+            expect(opts[:metadata_url]).to be_nil
+            true
+          }.and_return(box)
+
+          expect(app).to receive(:call).with(env)
+
+          subject.call(env)
+        end
+      end
+    end
+
     context "with URL containing credentials" do
       let(:username){ "box-username" }
       let(:password){ "box-password" }

data/test/unit/vagrant/action/builtin/ssh_run_test.rb

@@ -0,0 +1,83 @@
+require File.expand_path("../../../../base", __FILE__)
+
+describe Vagrant::Action::Builtin::SSHRun do
+  let(:app) { lambda { |env| } }
+  let(:env) { { machine: machine, tty: true } }
+
+  # SSH configuration information mock
+  let(:ssh) do
+    double("ssh",
+      timeout: 1,
+      host: nil,
+      port: 5986,
+      guest_port: 5986,
+      pty: false,
+      keep_alive: false,
+      insert_key: false,
+      shell: 'bash -l'
+    )
+  end
+
+  # Configuration mock
+  let(:config) { double("config", ssh: ssh) }
+
+  let(:machine) do
+    double("machine",
+      config: config,)
+  end
+
+  let(:machine_ssh_info) { {} }
+  let(:ssh_klass) { Vagrant::Util::SSH }
+
+  before(:each) do
+    # Stub the methods so that even if we test incorrectly, no side
+    # effects actually happen.
+    allow(ssh_klass).to receive(:exec)
+    allow(machine).to receive(:ssh_info).and_return(machine_ssh_info)
+  end
+
+  it "should raise an exception if SSH is not ready" do
+    not_ready_machine = double("machine")
+    allow(not_ready_machine).to receive(:ssh_info).and_return(nil)
+
+    env[:machine] = not_ready_machine
+    expect { described_class.new(app, env).call(env) }.
+      to raise_error(Vagrant::Errors::SSHNotReady)
+  end
+
+  it "should exec with the SSH info in the env if given" do
+    ssh_info = { foo: :bar }
+    opts = {:extra_args=>["-t", "bash -l -c 'echo test'"], :subprocess=>true}
+
+    expect(ssh_klass).to receive(:exec).
+      with(ssh_info, opts)
+
+    env[:ssh_info] = ssh_info
+    env[:ssh_run_command] = "echo test"
+    described_class.new(app, env).call(env)
+  end
+
+  it "should exec with the SSH info in the env if given and disable tty" do
+    ssh_info = { foo: :bar }
+    opts = {:extra_args=>["bash -l -c 'echo test'"], :subprocess=>true}
+    env[:tty] = false
+
+    expect(ssh_klass).to receive(:exec).
+      with(ssh_info, opts)
+
+    env[:ssh_info] = ssh_info
+    env[:ssh_run_command] = "echo test"
+    described_class.new(app, env).call(env)
+  end
+
+  it "should exec with the options given in `ssh_opts`" do
+    ssh_opts = { foo: :bar }
+
+    expect(ssh_klass).to receive(:exec).
+      with(machine_ssh_info, ssh_opts)
+
+    env[:ssh_opts] = ssh_opts
+    env[:ssh_run_command] = "echo test"
+    described_class.new(app, env).call(env)
+  end
+end

data/test/unit/vagrant/config/loader_test.rb

@@ -23,7 +23,7 @@ describe Vagrant::Config::Loader do
       end
 
       def self.merge(old, new)
-        old.merge(new)
+        old.merge(new) {|key, oldval, newval| oldval.concat(newval)}
       end
     end
   end
@@ -177,6 +177,25 @@ describe Vagrant::Config::Loader do
       end
     end
 
+    it "should discard duplicate configs if :home and :root are the same" do
+      proc = Proc.new do |config|
+        config[:foo] = ["yep"]
+      end
+
+      order = [:root, :home]
+
+      instance.set(:root, [[current_version, proc]])
+      instance.set(:home, [[current_version, proc]])
+
+      result, warnings, errors = instance.load(order)
+
+      # Verify the config result
+      expect(result[:foo]).to eq(["yep"])
+      expect(result[:foo].size).to eq(1)
+      expect(warnings).to eq([])
+      expect(errors).to eq([])
+    end
+
     it "should only load configuration files once" do
       $_config_data = 0
 

data/test/unit/vagrant/environment_test.rb

@@ -768,7 +768,8 @@ VF
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
       plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:bar)
       end
     end
@@ -779,7 +780,8 @@ VF
         provider_usable_class(true), { defaultable: false, priority: 7 }]
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:foo)
       end
     end
@@ -790,7 +792,8 @@ VF
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
       plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider(exclude: [:bar, :foo])).to eq(:boom)
       end
     end
@@ -801,7 +804,8 @@ VF
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
       plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz") do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz",
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:baz)
       end
     end
@@ -811,7 +815,8 @@ VF
       plugin_providers[:foo] = [provider_usable_class(true), { priority: 5 }]
       plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz") do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz",
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:baz)
       end
     end
@@ -821,7 +826,8 @@ VF
       plugin_providers[:foo] = [provider_usable_class(true), { priority: 5 }]
       plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz") do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz",
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider(force_default: false)).to eq(:bar)
       end
     end
@@ -831,7 +837,8 @@ VF
       plugin_providers[:foo] = [provider_usable_class(true), { priority: 5 }]
       plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz") do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz",
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider(force_default: false)).to eq(:baz)
       end
     end
@@ -841,7 +848,8 @@ VF
       plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 8 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz") do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => "baz",
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider(
           exclude: [:baz], force_default: false)).to eq(:bar)
       end
@@ -852,12 +860,29 @@ VF
       plugin_providers[:bar] = [provider_usable_class(false), { priority: 5 }]
       plugin_providers[:baz] = [provider_usable_class(false), { priority: 5 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect { subject.default_provider }.to raise_error(
           Vagrant::Errors::NoDefaultProvider)
       end
     end
 
+    it "is the provider in the Vagrantfile that is preferred and usable" do
+      subject.vagrantfile.config.vm.provider "foo"
+      subject.vagrantfile.config.vm.provider "bar"
+      subject.vagrantfile.config.vm.finalize!
+
+      plugin_providers[:foo] = [provider_usable_class(true), { priority: 5 }]
+      plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
+      plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
+      plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
+
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => 'baz,bar') do
+        expect(subject.default_provider).to eq(:bar)
+      end
+    end
+
     it "is the provider in the Vagrantfile that is usable" do
       subject.vagrantfile.config.vm.provider "foo"
       subject.vagrantfile.config.vm.provider "bar"
@@ -868,7 +893,8 @@ VF
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
       plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:foo)
       end
     end
@@ -880,7 +906,8 @@ VF
       plugin_providers[:foo] = [provider_usable_class(true), { priority: 5 }]
       plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:foo)
       end
     end
@@ -892,11 +919,27 @@ VF
       plugin_providers[:foo] = [provider_usable_class(true), { priority: 7 }]
       plugin_providers[:bar] = [provider_usable_class(true), { priority: 5 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:bar)
       end
     end
 
+    it "is the preferred usable provider outside the Vagrantfile" do
+      subject.vagrantfile.config.vm.provider "foo"
+      subject.vagrantfile.config.vm.finalize!
+
+      plugin_providers[:foo] = [provider_usable_class(false), { priority: 5 }]
+      plugin_providers[:bar] = [provider_usable_class(true), { priority: 7 }]
+      plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
+      plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
+
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => 'boom,baz') do
+        expect(subject.default_provider).to eq(:boom)
+      end
+    end
+
     it "is the highest usable provider outside the Vagrantfile" do
       subject.vagrantfile.config.vm.provider "foo"
       subject.vagrantfile.config.vm.finalize!
@@ -906,7 +949,8 @@ VF
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
       plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider).to eq(:bar)
       end
     end
@@ -923,7 +967,8 @@ VF
       plugin_providers[:baz] = [provider_usable_class(true), { priority: 2 }]
       plugin_providers[:boom] = [provider_usable_class(true), { priority: 3 }]
 
-      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil) do
+      with_temp_env("VAGRANT_DEFAULT_PROVIDER" => nil,
+                    "VAGRANT_PREFERRED_PROVIDERS" => nil) do
         expect(subject.default_provider(machine: :sub)).to eq(:bar)
       end
     end