vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/templates/locales/providers_docker.yml

@@ -153,6 +153,14 @@ en:
         Stderr: %{stderr}
 
         Stdout: %{stdout}
+      exec_command_required: |-
+        The "docker-exec" command requires a command to execute. This command
+        must be specified after a "--" in the command line. This is used to
+        separate machine name and options from the actual command to execute.
+        An example is show below:
+
+          $ vagrant docker-exec -t nginx -- bash
+
       host_vm_communicator_not_ready: |-
         The Docker provider was able to bring up the host VM successfully
         but the host VM is still reporting that SSH is unavailable. This

data/templates/provisioners/chef_solo/solo.erb

@@ -4,15 +4,15 @@ node_name "<%= node_name %>"
 file_cache_path    "<%= file_cache_path %>"
 file_backup_path   "<%= file_backup_path %>"
 cookbook_path <%= cookbooks_path.inspect %>
-<% if roles_path %>
+<% if roles_path && !roles_path.empty? -%>
 role_path <%= roles_path.size == 1 ? roles_path.first.inspect : roles_path.inspect %>
-<% end %>
+<% end -%>
 log_level <%= log_level.inspect %>
 verbose_logging <%= verbose_logging.inspect %>
 
 encrypted_data_bag_secret <%= encrypted_data_bag_secret.inspect %>
 
-<% if data_bags_path -%>
+<% if data_bags_path && !data_bags_path.empty? -%>
 data_bag_path <%= data_bags_path.size == 1 ? data_bags_path.first.inspect : data_bags_path.inspect %>
 <% end %>
 
@@ -20,18 +20,18 @@ data_bag_path <%= data_bags_path.size == 1 ? data_bags_path.first.inspect : data
 recipe_url "<%= recipe_url %>"
 <% end -%>
 
-<% if environments_path %>
+<% if environments_path && !environments_path.empty? -%>
 environment_path <%= environments_path.inspect %>
 <% end -%>
 
-<% if environment %>
+<% if environment -%>
 environment "<%= environment %>"
 <% end -%>
 
 <% if local_mode -%>
 local_mode true
 <% end -%>
-<% if nodes_path -%>
+<% if nodes_path && !nodes_path.empty? -%>
 node_path <%= nodes_path.inspect %>
 <% end -%>
 
@@ -43,7 +43,7 @@ https_proxy_user <%= https_proxy_user.inspect %>
 https_proxy_pass <%= https_proxy_pass.inspect %>
 no_proxy <%= no_proxy.inspect %>
 
-<% if formatter %>
+<% if formatter -%>
 add_formatter "<%= formatter %>"
 <% end %>
 

data/test/support/isolated_environment.rb

@@ -28,7 +28,7 @@ class IsolatedEnvironment
     @logger = Log4r::Logger.new("test::isolated_environment")
 
     # Create a temporary directory for our work
-    @tempdir = Vagrant::Util::Platform.fs_real_path(Dir.mktmpdir("vagrant"))
+    @tempdir = Vagrant::Util::Platform.fs_real_path(Dir.mktmpdir("vagrant-iso-env"))
     @logger.info("Initialize isolated environment: #{@tempdir}")
 
     # Setup the home and working directories

data/test/unit/base.rb

@@ -27,6 +27,10 @@ require "unit/support/shared/virtualbox_context"
 $stdout.sync = true
 $stderr.sync = true
 
+# Create a temporary directory where test vagrant will run. The reason we save
+# this to a constant is so we can clean it up later.
+VAGRANT_TEST_CWD = Dir.mktmpdir("vagrant-test-cwd")
+
 # Configure RSpec
 RSpec.configure do |c|
   c.treat_symbols_as_metadata_keys_with_true_values = true
@@ -36,11 +40,15 @@ RSpec.configure do |c|
   else
     c.filter_run_excluding :windows
   end
+
+  c.after(:suite) do
+    FileUtils.rm_rf(VAGRANT_TEST_CWD)
+  end
 end
 
 # Configure VAGRANT_CWD so that the tests never find an actual
 # Vagrantfile anywhere, or at least this minimizes those chances.
-ENV["VAGRANT_CWD"] = Dir.mktmpdir("vagrant")
+ENV["VAGRANT_CWD"] = VAGRANT_TEST_CWD
 
 # Set the dummy provider to the default for tests
 ENV["VAGRANT_DEFAULT_PROVIDER"] = "dummy"

data/test/unit/plugins/commands/box/command/update_test.rb

@@ -35,7 +35,9 @@ describe VagrantPlugins::CommandBox::Command::Update do
     context "updating specific box" do
       let(:argv) { ["--box", "foo"] }
 
-      let(:metadata_url) { Pathname.new(Dir.mktmpdir).join("metadata.json") }
+      let(:scratch) { Dir.mktmpdir("vagrant-test-command-box-update-execute") }
+
+      let(:metadata_url) { Pathname.new(scratch).join("metadata.json") }
 
       before do
         metadata_url.open("w") do |f|
@@ -46,6 +48,10 @@ describe VagrantPlugins::CommandBox::Command::Update do
           "foo", "1.0", :virtualbox, metadata_url: metadata_url.to_s)
       end
 
+      after do
+        FileUtils.rm_rf(scratch)
+      end
+
       it "doesn't update if they're up to date" do
         called = false
         allow(action_runner).to receive(:run) do |callable, opts|

data/test/unit/plugins/commands/init/command_test.rb

@@ -0,0 +1,86 @@
+require_relative "../../../base"
+require_relative "../../../../../plugins/commands/init/command"
+
+describe VagrantPlugins::CommandInit::Command do
+  include_context "unit"
+  include_context "command plugin helpers"
+
+  let(:iso_env) do
+    isolated_environment
+  end
+
+  let(:env) do
+    iso_env.create_vagrant_env
+  end
+
+  let(:vagrantfile_path) { File.join(env.cwd, "Vagrantfile") }
+
+  before do
+    Vagrant.plugin("2").manager.stub(commands: {})
+  end
+
+  after do
+    iso_env.close
+  end
+
+  describe "#execute" do
+    it "creates a Vagrantfile with no args" do
+      described_class.new([], env).execute
+      contents = File.read(vagrantfile_path)
+      expect(contents).to match(/config.vm.box = "base"/)
+    end
+
+    it "creates a minimal Vagrantfile" do
+      described_class.new(["-m"], env).execute
+      contents = File.read(vagrantfile_path)
+      expect(contents).to_not match(/#/)
+      expect(contents).to_not match(/provision/)
+    end
+
+    it "does not overwrite an existing Vagrantfile" do
+      # Create an existing Vagrantfile
+      File.open(File.join(env.cwd, "Vagrantfile"), "w+") { |f| f.write("") }
+
+      expect {
+        described_class.new([], env).execute
+      }.to raise_error(Vagrant::Errors::VagrantfileExistsError)
+    end
+
+    it "overwrites an existing Vagrantfile with force" do
+      # Create an existing Vagrantfile
+      File.open(File.join(env.cwd, "Vagrantfile"), "w+") { |f| f.write("") }
+
+      expect {
+        described_class.new(["-f"], env).execute
+      }.to_not raise_error
+
+      contents = File.read(vagrantfile_path)
+      expect(contents).to match(/config.vm.box = "base"/)
+    end
+
+    it "creates a Vagrantfile with a box" do
+      described_class.new(["hashicorp/precise64"], env).execute
+      contents = File.read(vagrantfile_path)
+      expect(contents).to match(/config.vm.box = "hashicorp\/precise64"/)
+    end
+
+    it "creates a Vagrantfile with a box and box_url" do
+      described_class.new(["hashicorp/precise64", "http://mybox.com"], env).execute
+      contents = File.read(vagrantfile_path)
+      expect(contents).to match(/config.vm.box = "hashicorp\/precise64"/)
+      expect(contents).to match(/config.vm.box_url = "http:\/\/mybox.com"/)
+    end
+
+    it "creates a Vagrantfile with a box and box version" do
+      described_class.new(["--box-version", "1.2.3", "hashicorp/precise64"], env).execute
+      contents = File.read(vagrantfile_path)
+      expect(contents).to match(/config.vm.box = "hashicorp\/precise64"/)
+      expect(contents).to match(/config.vm.box_version = "1.2.3"/)
+    end
+
+    it "creates a Vagrantfile at a custom path" do
+      described_class.new(["--output", "vf.rb"], env).execute
+      expect(File.exist?(File.join(env.cwd, "vf.rb"))).to be(true)
+    end
+  end
+end

data/test/unit/plugins/commands/login/client_test.rb

@@ -112,6 +112,13 @@ describe VagrantPlugins::LoginCommand::Client do
       expect(subject.token).to eq("ABCD1234")
     end
 
+    it "prints a warning if the envvar and stored file are both present" do
+      stub_env("ATLAS_TOKEN" => "ABCD1234")
+      subject.store_token("EFGH5678")
+      expect(env.ui).to receive(:warn).with(/detected both/)
+      subject.token
+    end
+
     it "returns nil if there's no token set" do
       expect(subject.token).to be(nil)
     end

data/test/unit/plugins/commands/ssh_config/command_test.rb

@@ -92,8 +92,8 @@ Host #{machine.name}
 
       subject.execute
 
-      expect(output).to include('IdentityFile "foo"')
-      expect(output).to include('IdentityFile "bar"')
+      expect(output).to include("IdentityFile foo")
+      expect(output).to include("IdentityFile bar")
     end
 
     it "puts quotes around an identityfile path if it has a space" do
@@ -107,17 +107,5 @@ Host #{machine.name}
 
       expect(output).to include('IdentityFile "with a space"')
     end
-
-    it "escapes special characters" do
-      allow(machine).to receive(:ssh_info) { ssh_info.merge(private_key_path: ['/private/tmp/test of "vagrant" plugin/']) }
-      output = ""
-      allow(subject).to receive(:safe_puts) do |data|
-        output += data if data
-      end
-
-      subject.execute
-
-      expect(output).to include('"/private/tmp/test of \"vagrant\" plugin/"')
-    end
   end
 end

data/test/unit/plugins/communicators/winrm/shell_test.rb

@@ -6,7 +6,8 @@ require Vagrant.source_root.join("plugins/communicators/winrm/config")
 describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
   include_context "unit"
 
-  let(:session) { double("winrm_session") }
+  let(:session) { double("winrm_session", create_executor: executor) }
+  let(:executor) { double("command_executor") }
   let(:port) { config.transport == :ssl ? 5986 : 5985 }
   let(:config)  {
     VagrantPlugins::CommunicatorWinRM::Config.new.tap do |c|
@@ -14,6 +15,9 @@ describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
       c.password = 'password'
       c.max_tries = 3
       c.retry_delay = 0
+      c.basic_auth_only = false
+      c.retry_delay = 1
+      c.max_tries = 2
       c.finalize!
     end
   }
@@ -26,23 +30,12 @@ describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
 
   describe ".powershell" do
     it "should call winrm powershell" do
-      expect(session).to receive(:powershell).with(/^dir.+/).and_return({ exitcode: 0 })
+      expect(executor).to receive(:run_powershell_script).with(/^dir.+/).and_return({ exitcode: 0 })
       expect(subject.powershell("dir")[:exitcode]).to eq(0)
     end
 
-    it "should retry when a WinRMAuthorizationError is received" do
-      expect(session).to receive(:powershell).with(/^dir.+/).exactly(3).times.and_raise(
-        # Note: The initialize for WinRMAuthorizationError may require a status_code as
-        # the second argument in a future WinRM release. Currently it doesn't track the
-        # status code.
-        WinRM::WinRMAuthorizationError.new("Oh no!! Unauthrorized")
-      )
-      expect { subject.powershell("dir") }.to raise_error(
-        VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed)
-    end
-
     it "should raise an execution error when an exception occurs" do
-      expect(session).to receive(:powershell).with(/^dir.+/).and_raise(
+      expect(executor).to receive(:run_powershell_script).with(/^dir.+/).and_raise(
         StandardError.new("Oh no! a 500 SOAP error!"))
       expect { subject.powershell("dir") }.to raise_error(
         VagrantPlugins::CommunicatorWinRM::Errors::ExecutionError)
@@ -51,11 +44,29 @@ describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
 
   describe ".cmd" do
     it "should call winrm cmd" do
-      expect(session).to receive(:cmd).with("dir").and_return({ exitcode: 0 })
+      expect(executor).to receive(:run_cmd).with("dir").and_return({ exitcode: 0 })
       expect(subject.cmd("dir")[:exitcode]).to eq(0)
     end
   end
 
+  describe ".wql" do
+    it "should call winrm wql" do
+      expect(session).to receive(:run_wql).with("select * from Win32_OperatingSystem").and_return({ exitcode: 0 })
+      expect(subject.wql("select * from Win32_OperatingSystem")[:exitcode]).to eq(0)
+    end
+
+    it "should retry when a WinRMAuthorizationError is received" do
+      expect(session).to receive(:run_wql).with("select * from Win32_OperatingSystem").exactly(2).times.and_raise(
+        # Note: The initialize for WinRMAuthorizationError may require a status_code as
+        # the second argument in a future WinRM release. Currently it doesn't track the
+        # status code.
+        WinRM::WinRMAuthorizationError.new("Oh no!! Unauthrorized")
+      )
+      expect { subject.wql("select * from Win32_OperatingSystem") }.to raise_error(
+        VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed)
+    end
+  end
+
   describe ".endpoint" do
     context 'when transport is :ssl' do
       let(:config)  {
@@ -69,7 +80,19 @@ describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
       end
     end
 
+    context "when transport is :negotiate" do
+      it "should create winrm endpoint address using http" do
+        expect(subject.send(:endpoint)).to eq("http://localhost:5985/wsman")
+      end
+    end
+
     context "when transport is :plaintext" do
+      let(:config)  {
+        VagrantPlugins::CommunicatorWinRM::Config.new.tap do |c|
+          c.transport = :plaintext
+          c.finalize!
+        end
+      }
       it "should create winrm endpoint address using http" do
         expect(subject.send(:endpoint)).to eq("http://localhost:5985/wsman")
       end
@@ -80,7 +103,8 @@ describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
     it "should create endpoint options" do
       expect(subject.send(:endpoint_options)).to eq(
         { user: "username", pass: "password", host: "localhost", port: 5985,
-          basic_auth_only: true, no_ssl_peer_verification: false })
+          basic_auth_only: false, no_ssl_peer_verification: false,
+          retry_delay: 1, retry_limit: 2 })
     end
   end
 

data/test/unit/plugins/guests/amazon/cap/flavor_test.rb

@@ -0,0 +1,19 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestAmazon::Cap::Flavor" do
+  let(:caps) do
+    VagrantPlugins::GuestAmazon::Plugin
+      .components
+      .guest_capabilities[:amazon]
+  end
+
+  let(:machine) { double("machine") }
+
+  describe ".flavor" do
+    let(:cap) { caps.get(:flavor) }
+
+    it "returns rhel" do
+      expect(cap.flavor(machine)).to be(:rhel)
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestArch::Cap::ChangeHostName" do
+  let(:described_class) do
+    VagrantPlugins::GuestArch::Plugin
+      .components
+      .guest_capabilities[:arch]
+      .get(:change_host_name)
+  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 ".change_host_name" do
+    let(:hostname) { "banana-rama.example.com" }
+
+    it "sets the hostname" do
+      comm.stub_command("hostname | grep -w '#{hostname}'", exit_code: 1)
+
+      described_class.change_host_name(machine, hostname)
+      expect(comm.received_commands[1]).to match(/hostnamectl set-hostname '#{hostname}'/)
+    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)
+      expect(comm.received_commands.size).to eq(1)
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestArch::Cap::ConfigureNetworks" do
+  let(:described_class) do
+    VagrantPlugins::GuestArch::Plugin
+      .components
+      .guest_capabilities[:arch]
+      .get(:configure_networks)
+  end
+
+  let(:machine) { double("machine") }
+  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
+    comm.verify_expectations!
+  end
+
+  describe ".configure_networks" do
+    let(:network_1) do
+      {
+        interface: 0,
+        type: "dhcp",
+      }
+    end
+
+    let(:network_2) do
+      {
+        interface: 1,
+        type: "static",
+        ip: "33.33.33.10",
+        netmask: "255.255.0.0",
+        gateway: "33.33.0.1",
+      }
+    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'/)
+    end
+  end
+end