vagrant-unbundled 1.8.1.2 → 1.8.4.1

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

@@ -10,13 +10,17 @@ describe VagrantPlugins::DockerProvider::Config do
   let(:machine) { double("machine") }
 
   let(:build_dir) do
-    temporary_dir.tap do |dir|
-      dir.join("Dockerfile").open("w") do |f|
+    Dir.mktmpdir("vagrant-test-docker-provider-build-dir").tap do |dir|
+      File.open(File.join(dir, "Dockerfile"), "wb+") do |f|
         f.write("Hello")
       end
     end
   end
 
+  after do
+    FileUtils.rm_rf(build_dir)
+  end
+
   def assert_invalid
     errors = subject.validate(machine)
     if !errors.values.any? { |v| !v.empty? }
@@ -60,6 +64,7 @@ describe VagrantPlugins::DockerProvider::Config do
   before do
     # By default lets be Linux for validations
     Vagrant::Util::Platform.stub(linux: true)
+    Vagrant::Util::Platform.stub(linux?: true)
   end
 
   it "should be invalid if both build dir and image are set" do

data/test/unit/plugins/providers/virtualbox/action/prepare_nfs_settings_test.rb

@@ -116,5 +116,23 @@ describe VagrantPlugins::ProviderVirtualBox::Action::PrepareNFSSettings do
       expect(env[:nfs_host_ip]).to    eq("1.2.3.4")
       expect(env[:nfs_machine_ip]).to eq(["11.12.13.14"])
     end
+
+    it "allows statically configured guest IPs to co-exist with dynamic host only IPs for NFS" do
+      env[:machine].config.vm.network :private_network, ip: "11.12.13.14"
+
+      subject.call(env)
+
+      expect(env[:nfs_host_ip]).to    eq("1.2.3.4")
+      expect(env[:nfs_machine_ip]).to eq(["11.12.13.14", "2.3.4.5"])
+    end
+
+    it "allows the use of scoped hash overrides as options" do
+      env[:machine].config.vm.network :private_network, virtualbox__ip: "11.12.13.14"
+
+      subject.call(env)
+
+      expect(env[:nfs_host_ip]).to    eq("1.2.3.4")
+      expect(env[:nfs_machine_ip]).to eq(["11.12.13.14", "2.3.4.5"])
+    end
   end
 end

data/test/unit/plugins/provisioners/ansible/config/guest_test.rb

@@ -0,0 +1,83 @@
+require_relative "../../../../base"
+require_relative "../../support/shared/config"
+require_relative "shared"
+
+require Vagrant.source_root.join("plugins/provisioners/ansible/config/guest")
+
+describe VagrantPlugins::Ansible::Config::Guest do
+  include_context "unit"
+
+  subject { described_class.new }
+
+  # FIXME: machine.ui.warn stub is not working as expected...
+  let(:machine) { double("machine", env: Vagrant::Environment.new) }
+
+  let(:communicator) { double("communicator") }
+  let(:existing_file) { "this/path/is/a/stub" }
+
+  it "supports a list of options" do
+    supported_options = %w( extra_vars
+                            galaxy_command
+                            galaxy_role_file
+                            galaxy_roles_path
+                            groups
+                            host_vars
+                            install
+                            install_mode
+                            inventory_path
+                            limit
+                            playbook
+                            provisioning_path
+                            raw_arguments
+                            skip_tags
+                            start_at_task
+                            sudo
+                            sudo_user
+                            tags
+                            tmp_path
+                            vault_password_file
+                            verbose
+                            version )
+
+    expect(get_provisioner_option_names(described_class)).to eql(supported_options)
+  end
+
+  describe "default options handling" do
+    it_behaves_like "options shared by both Ansible provisioners"
+
+    it "assigns default values to unset guest-specific options" do
+      subject.finalize!
+
+      expect(subject.install).to be_true
+      expect(subject.install_mode).to eql(:default)
+      expect(subject.provisioning_path).to eql("/vagrant")
+      expect(subject.tmp_path).to eql("/tmp/vagrant-ansible")
+      expect(subject.version).to be_empty
+    end
+  end
+
+  describe "#validate" do
+    before do
+      subject.playbook = existing_file
+    end
+
+    it_behaves_like "an Ansible provisioner", "/vagrant", "local"
+
+    it "falls back to :default install_mode for any invalid setting" do
+      subject.install_mode = "from_source"
+      subject.finalize!
+
+      result = subject.validate(machine)
+      expect(subject.install_mode).to eql(:default)
+    end
+
+    it "supports :pip install_mode" do
+      subject.install_mode = "pip"
+      subject.finalize!
+
+      result = subject.validate(machine)
+      expect(subject.install_mode).to eql(:pip)
+    end
+  end
+
+end

data/test/unit/plugins/provisioners/ansible/config/host_test.rb

@@ -0,0 +1,98 @@
+require_relative "../../../../base"
+require_relative "../../support/shared/config"
+require_relative "shared"
+
+require Vagrant.source_root.join("plugins/provisioners/ansible/config/host")
+
+describe VagrantPlugins::Ansible::Config::Host, :skip_windows => true do
+  include_context "unit"
+
+  subject { described_class.new }
+
+  let(:machine) { double("machine", env: Vagrant::Environment.new) }
+  let(:existing_file) { File.expand_path(__FILE__) }
+
+  it "supports a list of options" do
+    supported_options = %w( ask_sudo_pass
+                            ask_vault_pass
+                            extra_vars
+                            force_remote_user
+                            galaxy_command
+                            galaxy_role_file
+                            galaxy_roles_path
+                            groups
+                            host_key_checking
+                            host_vars
+                            inventory_path
+                            limit
+                            playbook
+                            raw_arguments
+                            raw_ssh_args
+                            skip_tags
+                            start_at_task
+                            sudo
+                            sudo_user
+                            tags
+                            vault_password_file
+                            verbose )
+
+    expect(get_provisioner_option_names(described_class)).to eql(supported_options)
+  end
+
+  describe "default options handling" do
+    it_behaves_like "options shared by both Ansible provisioners"
+
+    it "assigns default values to unset host-specific options" do
+      subject.finalize!
+
+      expect(subject.ask_sudo_pass).to be_false
+      expect(subject.ask_vault_pass).to be_false
+      expect(subject.force_remote_user).to be_true
+      expect(subject.host_key_checking).to be_false
+      expect(subject.raw_ssh_args).to be_nil
+    end
+  end
+
+  describe "force_remote_user option" do
+    it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :force_remote_user, true
+  end
+  describe "host_key_checking option" do
+    it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :host_key_checking, false
+  end
+  describe "ask_sudo_pass option" do
+    it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :ask_sudo_pass, false
+  end
+  describe "ask_vault_pass option" do
+    it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :ask_sudo_pass, false
+  end
+
+  describe "#validate" do
+    before do
+      subject.playbook = existing_file
+    end
+
+    it_behaves_like "an Ansible provisioner", "", "remote"
+
+    it "returns an error if the raw_ssh_args is of the wrong data type" do
+      subject.raw_ssh_args = { arg1: 1, arg2: "foo" }
+      subject.finalize!
+
+      result = subject.validate(machine)
+      expect(result["ansible remote provisioner"]).to eql([
+        I18n.t("vagrant.provisioners.ansible.errors.raw_ssh_args_invalid",
+               type:  subject.raw_ssh_args.class.to_s,
+               value: subject.raw_ssh_args.to_s)
+      ])
+    end
+
+    it "converts a raw_ssh_args option defined as a String into an Array" do
+      subject.raw_arguments = "-o ControlMaster=no"
+      subject.finalize!
+
+      result = subject.validate(machine)
+      expect(subject.raw_arguments).to eql(["-o ControlMaster=no"])
+    end
+
+  end
+
+end

data/test/unit/plugins/provisioners/ansible/config/shared.rb

@@ -0,0 +1,107 @@
+shared_examples_for 'options shared by both Ansible provisioners' do
+
+  it "assigns default values to unset common options" do
+    subject.finalize!
+
+    expect(subject.extra_vars).to be_nil
+    expect(subject.galaxy_command).to eql("ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force")
+    expect(subject.galaxy_role_file).to be_nil
+    expect(subject.galaxy_roles_path).to be_nil
+    expect(subject.groups).to eq({})
+    expect(subject.host_vars).to eq({})
+    expect(subject.inventory_path).to be_nil
+    expect(subject.limit).to be_nil
+    expect(subject.playbook).to be_nil
+    expect(subject.raw_arguments).to be_nil
+    expect(subject.skip_tags).to be_nil
+    expect(subject.start_at_task).to be_nil
+    expect(subject.sudo).to be_false
+    expect(subject.sudo_user).to be_nil
+    expect(subject.tags).to be_nil
+    expect(subject.vault_password_file).to be_nil
+    expect(subject.verbose).to be_false
+  end
+
+end
+
+shared_examples_for 'an Ansible provisioner' do | path_prefix, ansible_setup |
+
+  provisioner_label  = "ansible #{ansible_setup} provisioner"
+  provisioner_system = ansible_setup == "local" ? "guest" : "host"
+
+  it "returns an error if the playbook option is undefined" do
+    subject.playbook = nil
+    subject.finalize!
+
+    result = subject.validate(machine)
+    expect(result[provisioner_label]).to eql([
+      I18n.t("vagrant.provisioners.ansible.errors.no_playbook")
+    ])
+  end
+
+  it "passes if the extra_vars option is a hash" do
+    subject.extra_vars = { var1: 1, var2: "foo" }
+    subject.finalize!
+
+    result = subject.validate(machine)
+    expect(result[provisioner_label]).to eql([])
+  end
+
+  it "returns an error if the extra_vars option is of wrong data type" do
+    subject.extra_vars = ["var1", 3, "var2", 5]
+    subject.finalize!
+
+    result = subject.validate(machine)
+    expect(result[provisioner_label]).to eql([
+      I18n.t("vagrant.provisioners.ansible.errors.extra_vars_invalid",
+             type:  subject.extra_vars.class.to_s,
+             value: subject.extra_vars.to_s)
+    ])
+  end
+
+  it "converts a raw_arguments option defined as a String into an Array" do
+    subject.raw_arguments = "--foo=bar"
+    subject.finalize!
+
+    result = subject.validate(machine)
+    expect(subject.raw_arguments).to eql(%w(--foo=bar))
+  end
+
+  it "returns an error if the raw_arguments is of the wrong data type" do
+    subject.raw_arguments = { arg1: 1, arg2: "foo" }
+    subject.finalize!
+
+    result = subject.validate(machine)
+    expect(result[provisioner_label]).to eql([
+      I18n.t("vagrant.provisioners.ansible.errors.raw_arguments_invalid",
+             type:  subject.raw_arguments.class.to_s,
+             value: subject.raw_arguments.to_s)
+    ])
+  end
+
+  it "it collects and returns all detected errors" do
+    subject.playbook = nil
+    subject.extra_vars = ["var1", 3, "var2", 5]
+    subject.raw_arguments = { arg1: 1, arg2: "foo" }
+    subject.finalize!
+
+    result = subject.validate(machine)
+
+    expect(result[provisioner_label].size).to eql(3)
+    expect(result[provisioner_label]).to include(
+      I18n.t("vagrant.provisioners.ansible.errors.no_playbook"))
+    expect(result[provisioner_label]).to include(
+      I18n.t("vagrant.provisioners.ansible.errors.extra_vars_invalid",
+             type:  subject.extra_vars.class.to_s,
+             value: subject.extra_vars.to_s))
+    expect(result[provisioner_label]).to include(
+      I18n.t("vagrant.provisioners.ansible.errors.raw_arguments_invalid",
+             type:  subject.raw_arguments.class.to_s,
+             value: subject.raw_arguments.to_s))
+  end
+
+  describe "sudo option" do
+    it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :sudo, false
+  end
+
+end

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

@@ -59,6 +59,8 @@ VF
     stubbed_ui.stub(detail: "")
     machine.env.stub(ui: stubbed_ui)
 
+    subject.stub(:check_path)
+
     config.playbook = 'playbook.yml'
   end
 
@@ -203,6 +205,43 @@ VF
       end
     end
 
+    describe 'checking existence of Ansible configuration files' do
+
+      describe 'when the playbook file does not exist' do
+        it "raises an error", skip_before: true, skip_after: true do
+
+          subject.stub(:check_path).and_raise(VagrantPlugins::Ansible::Errors::AnsibleError,
+            _key: :config_file_not_found,
+            config_option: "playbook",
+            path: "/home/wip/test/invalid_path.yml",
+            system: "host")
+
+          config.playbook = "/home/wip/test/invalid_path.yml"
+          config.finalize!
+
+          expect {subject.provision}.to raise_error(VagrantPlugins::Ansible::Errors::AnsibleError,
+            "`playbook` does not exist on the host: /home/wip/test/invalid_path.yml")
+        end
+      end
+
+      describe 'when the inventory path does not exist' do
+        it "raises an error"
+      end
+
+      describe 'when the extra_vars file does not exist' do
+        it "raises an error"
+      end
+
+      describe 'when the galaxy_role_file does not exist' do
+        it "raises an error"
+      end
+
+      describe 'when the vault_password_file does not exist' do
+        it "raises an error"
+      end
+
+    end
+
     describe 'when ansible-playbook fails' do
       it "raises an error", skip_before: true, skip_after: true do
         config.finalize!
@@ -639,7 +678,7 @@ VF
 
           it "shows the ansible-playbook command and set verbosity to '-#{verbose_option}' level" do
             expect(machine.env.ui).to receive(:detail).with { |full_command|
-              expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -#{verbose_option} playbook.yml")
+              expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit=\"machine1\" --inventory-file=#{generated_inventory_dir} -#{verbose_option} playbook.yml")
             }
           end
         end
@@ -654,7 +693,7 @@ VF
 
           it "shows the ansible-playbook command and set verbosity to '-#{verbose_option}' level" do
             expect(machine.env.ui).to receive(:detail).with { |full_command|
-              expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -#{verbose_option} playbook.yml")
+              expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit=\"machine1\" --inventory-file=#{generated_inventory_dir} -#{verbose_option} playbook.yml")
             }
           end
         end
@@ -670,7 +709,7 @@ VF
 
         it "shows the ansible-playbook command and set verbosity to '-v' level" do
           expect(machine.env.ui).to receive(:detail).with { |full_command|
-            expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
+            expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit=\"machine1\" --inventory-file=#{generated_inventory_dir} -v playbook.yml")
           }
         end
       end
@@ -732,6 +771,38 @@ VF
       end
     end
 
+    context "with galaxy_roles_path option defined" do
+      before do
+        config.galaxy_roles_path = "my-roles"
+      end
+
+      it "sets ANSIBLE_ROLES_PATH with corresponding absolute path" do
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          cmd_opts = args.last
+          expect(cmd_opts[:env]).to include("ANSIBLE_ROLES_PATH")
+          expect(cmd_opts[:env]['ANSIBLE_ROLES_PATH']).to eql(File.join(machine.env.root_path, "my-roles"))
+        }
+      end
+    end
+
+    context "with extra_vars option defined" do
+      describe "with a hash value" do
+        before do
+          config.extra_vars = { var1: %Q(string with 'apostrophes', \\, " and =), var2: { x: 42 } }
+        end
+
+        it_should_set_optional_arguments({ "extra_vars" => "--extra-vars={\"var1\":\"string with 'apostrophes', \\\\, \\\" and =\",\"var2\":{\"x\":42}}" })
+      end
+
+      describe "with a string value referring to file path (with the '@' prefix)" do
+        before do
+          config.extra_vars = "@#{existing_file}"
+        end
+
+        it_should_set_optional_arguments({ "extra_vars" => "--extra-vars=@#{File.expand_path(__FILE__)}" })
+      end
+    end
+
     # The Vagrant Ansible provisioner does not validate the coherency of
     # argument combinations, and let ansible-playbook complain.
     describe "with a maximum of options" do
@@ -741,7 +812,8 @@ VF
         ssh_info[:private_key_path] = ['/my/key1', '/my/key2']
 
         # command line arguments
-        config.extra_vars = "@#{existing_file}"
+        config.galaxy_roles_path = "/up/to the stars"
+        config.extra_vars = { var1: %Q(string with 'apostrophes', \\, " and =), var2: { x: 42 } }
         config.sudo = true
         config.sudo_user = 'deployer'
         config.verbose = "vvv"
@@ -751,17 +823,17 @@ VF
         config.tags = %w(db www)
         config.skip_tags = %w(foo bar)
         config.limit = 'machine*:&vagrant:!that_one'
-        config.start_at_task = 'an awesome task'
-        config.raw_arguments = ["--why-not", "--su-user=foot", "--ask-su-pass", "--limit=all", "--private-key=./myself.key"]
+        config.start_at_task = "joe's awesome task"
+        config.raw_arguments = ["--why-not", "--su-user=foot", "--ask-su-pass", "--limit=all", "--private-key=./myself.key", "--extra-vars='{\"var3\":\"foo\"}'"]
 
         # environment variables
         config.host_key_checking = true
         config.raw_ssh_args = ['-o ControlMaster=no']
       end
 
-      it_should_set_arguments_and_environment_variables 20, 4, true
+      it_should_set_arguments_and_environment_variables 21, 5, true
       it_should_explicitly_enable_ansible_ssh_control_persist_defaults
-      it_should_set_optional_arguments({  "extra_vars"          => "--extra-vars=@#{File.expand_path(__FILE__)}",
+      it_should_set_optional_arguments({  "extra_vars"          => "--extra-vars={\"var1\":\"string with 'apostrophes', \\\\, \\\" and =\",\"var2\":{\"x\":42}}",
                                           "sudo"                => "--sudo",
                                           "sudo_user"           => "--sudo-user=deployer",
                                           "verbose"             => "-vvv",
@@ -771,7 +843,7 @@ VF
                                           "tags"                => "--tags=db,www",
                                           "skip_tags"           => "--skip-tags=foo,bar",
                                           "limit"               => "--limit=machine*:&vagrant:!that_one",
-                                          "start_at_task"       => "--start-at-task=an awesome task",
+                                          "start_at_task"       => "--start-at-task=joe's awesome task",
                                         })
 
       it "also includes given raw arguments" do
@@ -786,7 +858,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -i '/my/key1' -i '/my/key2' -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
+          expect(full_command).to eq(%Q(PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_ROLES_PATH='/up/to the stars' ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -i '/my/key1' -i '/my/key2' -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit="machine*:&vagrant:!that_one" --inventory-file=#{generated_inventory_dir} --extra-vars="{\\"var1\\":\\"string with 'apostrophes', \\\\\\\\, \\\\\\" and =\\",\\"var2\\":{\\"x\\":42}}" --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task="joe's awesome task" --why-not --su-user=foot --ask-su-pass --limit=all --private-key=./myself.key --extra-vars='{\"var3\":\"foo\"}' playbook.yml))
         }
       end
     end