vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/plugins/provisioners/chef/command_builder_test.rb

@@ -20,8 +20,8 @@ describe VagrantPlugins::Chef::CommandBuilder do
 
   describe ".initialize" do
     it "raises an error when chef type is not client or solo" do
-      expect { VagrantPlugins::Chef::CommandBuilder.new(chef_config, :client_bad) }.
-        to raise_error
+      expect { VagrantPlugins::Chef::CommandBuilder.new(:client_bad, chef_config) }.
+        to raise_error(RuntimeError)
     end
 
     it "does not raise an error for :client" do

data/test/unit/plugins/provisioners/chef/config/base_test.rb

@@ -82,4 +82,17 @@ describe VagrantPlugins::Chef::Config::Base do
       expect(subject.installer_download_path).to be(nil)
     end
   end
+
+  describe "#omnibus_url" do
+    it "defaults to https://omnitruck.chef.io" do
+      subject.finalize!
+      expect(subject.omnibus_url).to eq("https://omnitruck.chef.io")
+    end
+
+    it "makes use of the configured url" do
+      subject.omnibus_url = "https://omnitruck.example.com"
+      subject.finalize!
+      expect(subject.omnibus_url).to eq("https://omnitruck.example.com")
+    end
+  end
 end

data/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb

@@ -110,6 +110,17 @@ describe VagrantPlugins::Chef::Config::ChefZero do
       end
     end
 
+    context "when an element of nodes_path does not exist on disk" do
+      it "returns an error" do
+        nodes_path = ["/path/to/nodes/that/will/never/exist"]
+        subject.nodes_path = nodes_path
+        subject.finalize!
+        expect(errors).to include(I18n.t("vagrant.config.chef.nodes_path_missing",
+          path: nodes_path
+        ))
+      end
+    end
+
     context "when the nodes_path is an empty array" do
       it "returns an error" do
         subject.nodes_path = []

data/test/unit/plugins/provisioners/chef/omnibus_test.rb

@@ -5,22 +5,27 @@ require Vagrant.source_root.join("plugins/provisioners/chef/omnibus")
 describe VagrantPlugins::Chef::Omnibus do
   describe "#sh_command" do
     it "includes the project name" do
-      command = described_class.sh_command("chef", nil, "stable")
+      command = described_class.sh_command("chef", nil, "stable", "https://omnitruck.chef.io")
       expect(command).to include %|-P "chef"|
     end
 
     it "includes the channel" do
-      command = described_class.sh_command("chef", nil, "stable")
+      command = described_class.sh_command("chef", nil, "stable", "https://omnitruck.chef.io")
       expect(command).to include %|-c "stable"|
     end
 
     it "includes the version" do
-      command = described_class.sh_command("chef", "1.2.3", "stable")
+      command = described_class.sh_command("chef", "1.2.3", "stable", "https://omnitruck.chef.io")
       expect(command).to include %|-v "1.2.3"|
     end
 
+    it "includes the Omnibus installation URL" do
+      command = described_class.sh_command("chef", "1.2.3", "stable", "https://omnitruck.chef.io")
+      expect(command).to include %|https://omnitruck.chef.io/install.sh|
+    end
+
     it "includes the download path" do
-      command = described_class.sh_command("chef", "1.2.3", "stable",
+      command = described_class.sh_command("chef", "1.2.3", "stable", "https://omnitruck.chef.io",
         download_path: "/some/path",
       )
       expect(command).to include %|-d "/some/path"|
@@ -29,18 +34,23 @@ describe VagrantPlugins::Chef::Omnibus do
 
   describe "#ps_command" do
     it "includes the project name" do
-      command = described_class.ps_command("chef", nil, "stable")
+      command = described_class.ps_command("chef", nil, "stable", "https://omnitruck.chef.io")
       expect(command).to include %|-project 'chef'|
     end
 
     it "includes the channel" do
-      command = described_class.ps_command("chef", nil, "stable")
+      command = described_class.ps_command("chef", nil, "stable", "https://omnitruck.chef.io")
       expect(command).to include %|-channel 'stable'|
     end
 
     it "includes the version" do
-      command = described_class.ps_command("chef", "1.2.3", "stable")
+      command = described_class.ps_command("chef", "1.2.3", "stable", "https://omnitruck.chef.io")
       expect(command).to include %|-version '1.2.3'|
     end
+
+    it "includes the Omnibus installation URL" do
+      command = described_class.ps_command("chef", "1.2.3", "stable", "https://omnitruck.chef.io")
+      expect(command).to include %|https://omnitruck.chef.io/install.ps1|
+    end
   end
 end

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

@@ -1,6 +1,7 @@
 require File.expand_path("../../../../base", __FILE__)
 
 require Vagrant.source_root.join("plugins/provisioners/docker/config")
+require Vagrant.source_root.join("plugins/provisioners/docker/provisioner")
 require Vagrant.source_root.join("plugins/kernel_v2/config/vm")
 
 describe VagrantPlugins::DockerProvisioner::Config do
@@ -142,7 +143,7 @@ describe VagrantPlugins::DockerProvisioner::Config do
   describe "#post_install_provision" do
     it "raises an error if 'docker' provisioner was provided" do
       expect {subject.post_install_provision("myprov", :type=>"docker", :inline=>"echo 'hello'")}
-        .to raise_error()
+        .to raise_error(VagrantPlugins::DockerProvisioner::DockerError)
     end
 
     it "setups a basic provisioner" do

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

@@ -22,21 +22,21 @@ describe VagrantPlugins::DockerProvisioner::Provisioner do
   let(:hook)         { double("hook") }
 
   before do
-    machine.stub(communicate: communicator)
-    machine.stub(guest: guest)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(machine).to receive(:guest).and_return(guest)
 
-    communicator.stub(execute: true)
-    communicator.stub(upload: true)
+    allow(communicator).to receive(:execute).and_return(true)
+    allow(communicator).to receive(:upload).and_return(true)
 
-    guest.stub(capability?: false)
-    guest.stub(capability: false)
+    allow(guest).to receive(:capability?).and_return(false)
+    allow(guest).to receive(:capability).and_return(false)
 
-    client.stub(start_service: true)
-    client.stub(daemon_running?: true)
+    allow(client).to receive(:start_service).and_return(true)
+    allow(client).to receive(:daemon_running?).and_return(true)
 
-    config.stub(images: Set.new)
-    config.stub(build_images: Set.new)
-    config.stub(containers: Hash.new)
+    allow(config).to receive(:images).and_return(Set.new)
+    allow(config).to receive(:build_images).and_return(Set.new)
+    allow(config).to receive(:containers).and_return(Hash.new)
   end
 
   describe "#provision" do
@@ -47,7 +47,7 @@ describe VagrantPlugins::DockerProvisioner::Provisioner do
     end
 
     it "invokes a post_install_provisioner if defined and docker is installed" do
-      installer.stub(ensure_installed: true)
+      allow(installer).to receive(:ensure_installed).and_return(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)
@@ -57,7 +57,7 @@ describe VagrantPlugins::DockerProvisioner::Provisioner do
     end
 
     it "does not invoke post_install_provisioner if not defined" do
-      installer.stub(ensure_installed: true)
+      allow(installer).to receive(:ensure_installed).and_return(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)

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

@@ -20,28 +20,46 @@ describe VagrantPlugins::FileUpload::Provisioner do
   let(:guest)        { double("guest") }
 
   before do
-    machine.stub(communicate: communicator)
-    machine.stub(guest: guest)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(machine).to receive(:guest).and_return(guest)
 
-    communicator.stub(execute: true)
-    communicator.stub(upload: true)
+    allow(communicator).to receive(:execute).and_return(true)
+    allow(communicator).to receive(:upload).and_return(true)
 
-    guest.stub(capability?: false)
+    allow(guest).to receive(:capability?).and_return(false)
   end
 
   describe "#provision" do
     it "creates the destination directory" do
-      config.stub(source: "/source")
-      config.stub(destination: "/foo/bar")
+      allow(config).to receive(:source).and_return("/source")
+      allow(config).to receive(:destination).and_return("/foo/bar")
 
-      expect(communicator).to receive(:execute).with("mkdir -p /foo")
+      expect(communicator).to receive(:execute).with("mkdir -p \"/foo\"")
+
+      subject.provision
+    end
+
+    it "creates the destination directory with a space" do
+      allow(config).to receive(:source).and_return("/source")
+      allow(config).to receive(:destination).and_return("/foo bar/bar")
+
+      expect(communicator).to receive(:execute).with("mkdir -p \"/foo bar\"")
+
+      subject.provision
+    end
+
+    it "creates the destination directory above file" do
+      allow(config).to receive(:source).and_return("/source/file.sh")
+      allow(config).to receive(:destination).and_return("/foo/bar/file.sh")
+
+      expect(communicator).to receive(:execute).with("mkdir -p \"/foo/bar\"")
 
       subject.provision
     end
 
     it "uploads the file" do
-      config.stub(source: "/source")
-      config.stub(destination: "/foo/bar")
+      allow(config).to receive(:source).and_return("/source")
+      allow(config).to receive(:destination).and_return("/foo/bar")
 
       expect(communicator).to receive(:upload).with("/source", "/foo/bar")
 
@@ -49,8 +67,8 @@ describe VagrantPlugins::FileUpload::Provisioner do
     end
 
     it "expands the source file path" do
-      config.stub(source: "source")
-      config.stub(destination: "/foo/bar")
+      allow(config).to receive(:source).and_return("source")
+      allow(config).to receive(:destination).and_return("/foo/bar")
 
       expect(communicator).to receive(:upload).with(
         File.expand_path("source"), "/foo/bar")
@@ -59,8 +77,8 @@ describe VagrantPlugins::FileUpload::Provisioner do
     end
 
     it "expands the destination file path if capable" do
-      config.stub(source: "/source")
-      config.stub(destination: "$HOME/foo")
+      allow(config).to receive(:source).and_return("/source")
+      allow(config).to receive(:destination).and_return("$HOME/foo")
 
       expect(guest).to receive(:capability?).
         with(:shell_expand_guest_path).and_return(true)

data/test/unit/plugins/provisioners/puppet/provisioner/puppet_test.rb

@@ -0,0 +1,51 @@
+require File.expand_path("../../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/provisioners/puppet/provisioner/puppet")
+
+describe VagrantPlugins::Puppet::Provisioner::Puppet do
+  include_context "unit"
+
+  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(:facts)        { [] }
+  let(:communicator) { double("comm") }
+  let(:guest)        { double("guest") }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+  let(:module_paths) { ["etc/puppet/modules"] } # make this something real
+
+  subject { described_class.new(machine, config) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  describe "#run_puppet_apply" do
+    let(:options) { double("options") }
+    let(:binary_path) { "/opt/puppetlabs/bin" }
+    let(:manifest_file) { "default.pp" }
+
+    it "runs puppet on a manifest" do
+      allow(config).to receive(:options).and_return(options)
+      allow(config).to receive(:environment_path).and_return(false)
+      allow(config).to receive(:facter).and_return(facts)
+      allow(config).to receive(:binary_path).and_return(binary_path)
+      allow(config).to receive(:environment_variables).and_return(nil)
+      allow(config).to receive(:working_directory).and_return(false)
+      allow(config).to receive(:manifest_file).and_return(manifest_file)
+
+      allow_message_expectations_on_nil
+      allow(@module_paths).to receive(:map) { module_paths }
+      allow(@module_paths).to receive(:empty?).and_return(true)
+
+      expect(machine).to receive(:communicate).and_return(comm)
+      subject.run_puppet_apply()
+    end
+  end
+end

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

@@ -20,13 +20,13 @@ describe VagrantPlugins::Salt::Provisioner do
   let(:guest)        { double("guest") }
 
   before do
-    machine.stub(communicate: communicator)
-    machine.stub(guest: guest)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(machine).to receive(:guest).and_return(guest)
 
-    communicator.stub(execute: true)
-    communicator.stub(upload: true)
+    allow(communicator).to receive(:execute).and_return(true)
+    allow(communicator).to receive(:upload).and_return(true)
 
-    guest.stub(capability?: false)
+    allow(guest).to receive(:capability?).and_return(false)
   end
 
   describe "#provision" do

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

@@ -7,8 +7,8 @@ describe "Vagrant::Shell::Provisioner" do
   let(:env){ isolated_environment }
   let(:machine) {
     double(:machine, env: env, id: "ID").tap { |machine|
-      machine.stub_chain(:config, :vm, :communicator).and_return(:not_winrm)
-      machine.stub_chain(:communicate, :tap) {}
+      allow(machine).to receive_message_chain(:config, :vm, :communicator).and_return(:not_winrm)
+      allow(machine).to receive_message_chain(:communicate, :tap) {}
     }
   }
 
@@ -43,6 +43,37 @@ describe "Vagrant::Shell::Provisioner" do
     end
   end
 
+  context "with a script that was set to freeze the string" do
+    TEST_CONSTANT_VARIABLE = <<-TEST_CONSTANT_VARIABLE.freeze
+      echo test
+    TEST_CONSTANT_VARIABLE
+
+    let(:script) { TEST_CONSTANT_VARIABLE }
+    let(:config) {
+      double(
+        :config,
+        :args        => "doesn't matter",
+        :env         => {},
+        :upload_path => "arbitrary",
+        :remote?     => false,
+        :path        => nil,
+        :inline      => script,
+        :binary      => false,
+      )
+    }
+
+    it "does not raise an exception" do
+      vsp = VagrantPlugins::Shell::Provisioner.new(machine, config)
+
+      RSpec::Expectations.configuration.on_potential_false_positives = :nothing
+      # This test should be fine, since we are specifically looking for the
+      # string 'freeze' when RuntimeError is raised
+      expect {
+        vsp.provision
+      }.not_to raise_error(RuntimeError)
+    end
+  end
+
   context "with remote script" do
 
     context "that does not have matching sha1 checksum" do
@@ -62,7 +93,7 @@ describe "Vagrant::Shell::Provisioner" do
 
       let(:digest){ double("digest") }
       before do
-        Vagrant::Util::Downloader.any_instance.should_receive(:execute_curl).and_return(true)
+        allow_any_instance_of(Vagrant::Util::Downloader).to receive(:execute_curl).and_return(true)
         allow(digest).to receive(:file).and_return(digest)
         expect(Digest::SHA1).to receive(:new).and_return(digest)
         expect(digest).to receive(:hexdigest).and_return('INVALID_VALUE')
@@ -92,7 +123,7 @@ describe "Vagrant::Shell::Provisioner" do
 
       let(:digest){ double("digest") }
       before do
-        Vagrant::Util::Downloader.any_instance.should_receive(:execute_curl).and_return(true)
+        allow_any_instance_of(Vagrant::Util::Downloader).to receive(:execute_curl).and_return(true)
         allow(digest).to receive(:file).and_return(digest)
         expect(Digest::MD5).to receive(:new).and_return(digest)
         expect(digest).to receive(:hexdigest).and_return('INVALID_VALUE')

data/test/unit/plugins/pushes/ftp/adapter_test.rb

@@ -109,6 +109,7 @@ describe VagrantPlugins::FTPPush::SFTPAdapter do
   describe "#upload" do
     it "uploads the file" do
       pending "a way to mock an SFTP server"
+      test_with_mock_sftp_server
     end
   end
 end

data/test/unit/plugins/synced_folders/nfs/action_cleanup_test.rb

@@ -23,7 +23,7 @@ describe VagrantPlugins::SyncedFolderNFS::ActionCleanup do
   subject { described_class.new(app, env) }
 
   before do
-    machine.env.stub(host: host)
+    allow(machine.env).to receive(:host).and_return(host)
   end
 
   it "does nothing if there are no valid IDs" do

data/test/unit/plugins/synced_folders/nfs/config_test.rb

@@ -10,7 +10,7 @@ describe VagrantPlugins::SyncedFolderNFS::Config do
       subject.finalize!
     end
 
-    its(:functional) { should be_true }
+    its(:functional) { should be(true) }
     its(:map_gid) { should eq(:auto) }
     its(:map_uid) { should eq(:auto) }
   end

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

@@ -21,7 +21,11 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
                                "5678":
                                {type: "rsync",
                                 exclude: false,
-                                hostpath: "/Not/The/Same/Path"}} }
+                                hostpath: "/Not/The/Same/Path"},
+                               "0912":
+                               {type: "rsync",
+                                exclude: false,
+                                hostpath: "/Users/brian/code/relative-dir"}}}
 
   let(:helper_class) { VagrantPlugins::SyncedFolderRSync::RsyncHelper }
 
@@ -30,15 +34,17 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
 
   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)
+      allow(m).to receive(:id).and_return("foo")
+      allow(m).to receive(:reload).and_return(nil)
+      allow(m).to receive(:ssh_info).and_return(ssh_info)
+      allow(m).to receive(:ui).and_return(iso_env.ui)
+      allow(m).to receive(:provider).and_return(double("provider"))
+      allow(m).to receive(:state).and_return(double("state", id: :not_created))
+      allow(m).to receive(:env).and_return(iso_env)
+      allow(m).to receive(:config).and_return(double("config"))
+
+
+      allow(m.ui).to receive(:error).and_return(nil)
     end
   end
 
@@ -51,6 +57,26 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
     let (:machine) { machine_stub("m") }
     let (:cached_folders) { { rsync: synced_folders_dupe } }
 
+    # NOTE: `relative-dir` is not actually a "relative dir" in this data structure
+    # due to the fact that when vagrant stores synced folders, it path expands
+    # them with root_dir, and when you grab those synced_folders options from
+    # the machines config file, they end up being a full path rather than a
+    # relative path, and so these tests reflect that.
+    # For reference:
+    # https://github.com/mitchellh/vagrant/blob/9c1b014536e61b332cfaa00774a87a240cce8ed9/lib/vagrant/action/builtin/synced_folders.rb#L45-L46
+    let(:config_synced_folders)  { {"/vagrant":
+                                   {type: "rsync",
+                                    exclude: false,
+                                    hostpath: "/Users/brian/code/vagrant-sandbox"},
+                                  "/vagrant/other-dir":
+                                   {type: "rsync",
+                                    exclude: false,
+                                    hostpath: "/Users/brian/code/vagrant-sandbox/other-dir"},
+                                  "/vagrant/relative-dir":
+                                   {type: "rsync",
+                                    exclude: false,
+                                    hostpath: "/Users/brian/code/relative-dir"}}}
+
     before do
         allow(subject).to receive(:with_target_vms) { |&block| block.call machine }
     end
@@ -61,6 +87,8 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
       allow(machine.env).to receive(:cwd).
         and_return("/Users/brian/code/vagrant-sandbox")
       allow(machine.provider).to receive(:capability?).and_return(false)
+      allow(machine.config).to receive(:vm).and_return(true)
+      allow(machine.config.vm).to receive(:synced_folders).and_return(config_synced_folders)
 
       allow(subject).to receive(:synced_folders).
         with(machine, cached: true).and_return(cached_folders)
@@ -71,6 +99,10 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
 
       expect(machine.ui).to receive(:info).
         with("Not syncing /Not/The/Same/Path as it is not part of the current working directory.")
+      expect(machine.ui).to receive(:info).
+        with("Watching: /Users/brian/code/vagrant-sandbox")
+      expect(machine.ui).to receive(:info).
+        with("Watching: /Users/brian/code/relative-dir")
       expect(helper_class).to receive(:rsync_single)
 
       subject.execute()
@@ -79,7 +111,7 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
 
   subject do
     described_class.new(argv, iso_env).tap do |s|
-      s.stub(synced_folders: synced_folders_empty)
+      allow(s).to receive(:synced_folders).and_return(synced_folders_empty)
     end
   end
 
@@ -175,7 +207,7 @@ describe VagrantPlugins::SyncedFolderRSync::Command::RsyncAuto do
       ]
 
       paths["/foo"].each do |data|
-        data[:machine].stub(id: nil)
+        allow(data[:machine]).to receive(:id).and_return(nil)
         expect(helper_class).to_not receive(:rsync_single)
       end