vagrant-unbundled 1.9.1.1 → 1.9.5.1

data/plugins/pushes/local-exec/config.rb

@@ -63,10 +63,10 @@ module VagrantPlugins
       def args_valid?
         return true if !args
         return true if args.is_a?(String)
-        return true if args.is_a?(Fixnum)
+        return true if args.is_a?(Integer)
         if args.is_a?(Array)
           args.each do |a|
-            return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
+            return false if !a.kind_of?(String) && !a.kind_of?(Integer)
           end
 
           return true

data/plugins/synced_folders/unix_mount_helpers.rb

@@ -0,0 +1,105 @@
+require "shellwords"
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module SyncedFolder
+    module UnixMountHelpers
+
+      def self.extended(klass)
+        if !klass.class_variable_defined?(:@@logger)
+          klass.class_variable_set(:@@logger, Log4r::Logger.new(klass.name.downcase))
+        end
+        klass.extend Vagrant::Util::Retryable
+      end
+
+      def detect_owner_group_ids(machine, guest_path, mount_options, options)
+        mount_uid = find_mount_options_id("uid", mount_options)
+        mount_gid = find_mount_options_id("gid", mount_options)
+
+        if mount_uid.nil?
+          if options[:owner].to_i.to_s == options[:owner].to_s
+            mount_uid = options[:owner]
+            self.class_variable_get(:@@logger).debug("Owner user ID (provided): #{mount_uid}")
+          else
+            output = {stdout: '', stderr: ''}
+            uid_command = "id -u #{options[:owner]}"
+            machine.communicate.execute(uid_command,
+              error_class: Vagrant::Errors::VirtualBoxMountFailed,
+              error_key: :virtualbox_mount_failed,
+              command: uid_command,
+              output: output[:stderr]
+            ) { |type, data| output[type] << data if output[type] }
+            mount_uid = output[:stdout].chomp
+            self.class_variable_get(:@@logger).debug("Owner user ID (lookup): #{options[:owner]} -> #{mount_uid}")
+          end
+        else
+          machine.ui.warn "Detected mount owner ID within mount options. (uid: #{mount_uid} guestpath: #{guest_path})"
+        end
+
+        if mount_gid.nil?
+          if options[:group].to_i.to_s == options[:group].to_s
+            mount_gid = options[:group]
+            self.class_variable_get(:@@logger).debug("Owner group ID (provided): #{mount_gid}")
+          else
+            begin
+              output = {stdout: '', stderr: ''}
+              gid_command = "getent group #{options[:group]}"
+              machine.communicate.execute(gid_command,
+                error_class: Vagrant::Errors::VirtualBoxMountFailed,
+                error_key: :virtualbox_mount_failed,
+                command: gid_command,
+                output: output[:stderr]
+              ) { |type, data| output[type] << data if output[type] }
+              mount_gid = output[:stdout].split(':').at(2)
+              self.class_variable_get(:@@logger).debug("Owner group ID (lookup): #{options[:group]} -> #{mount_gid}")
+            rescue Vagrant::Errors::VirtualBoxMountFailed
+              if options[:owner] == options[:group]
+                self.class_variable_get(:@@logger).debug("Failed to locate group `#{options[:group]}`. Group name matches owner. Fetching effective group ID.")
+                output = {stdout: ''}
+                result = machine.communicate.execute("id -g #{options[:owner]}",
+                  error_check: false
+                ) { |type, data| output[type] << data if output[type] }
+                mount_gid = output[:stdout].chomp if result == 0
+                self.class_variable_get(:@@logger).debug("Owner group ID (effective): #{mount_gid}")
+              end
+              raise unless mount_gid
+            end
+          end
+        else
+          machine.ui.warn "Detected mount group ID within mount options. (gid: #{mount_gid} guestpath: #{guest_path})"
+        end
+        {:gid => mount_gid, :uid => mount_uid}
+      end
+
+      def find_mount_options_id(id_name, mount_options)
+        id_line = mount_options.detect{|line| line.include?("#{id_name}=")}
+        if id_line
+          match = id_line.match(/,?#{Regexp.escape(id_name)}=(?<option_id>\d+),?/)
+          found_id = match["option_id"]
+          updated_id_line = [
+            match.pre_match,
+            match.post_match
+          ].find_all{|string| !string.empty?}.join(',')
+          if updated_id_line.empty?
+            mount_options.delete(id_line)
+          else
+            idx = mount_options.index(id_line)
+            mount_options.delete(idx)
+            mount_options.insert(idx, updated_id_line)
+          end
+        end
+        found_id
+      end
+
+      def emit_upstart_notification(machine, guest_path)
+        # Emit an upstart event if we can
+        machine.communicate.sudo <<-EOH.gsub(/^ {12}/, "")
+            if command -v /sbin/init && /sbin/init 2>/dev/null --version | grep upstart; then
+              /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guest_path}
+            fi
+          EOH
+      end
+
+    end
+  end
+end

data/templates/commands/init/Vagrantfile.erb

@@ -31,8 +31,14 @@ Vagrant.configure("2") do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
   # config.vm.network "forwarded_port", guest: 80, host: 8080
 
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
   # config.vm.network "private_network", ip: "192.168.33.10"

data/templates/commands/init/Vagrantfile.min.erb

@@ -1,5 +1,8 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "<%= box_name %>"
+  <% if box_version -%>
+  config.vm.box_version = "<%= box_version %>"
+  <% end -%>
   <% if box_url -%>
   config.vm.box_url = "<%= box_url %>"
   <% end -%>

data/templates/guests/debian/network_dhcp.erb

@@ -6,8 +6,8 @@ iface <%= options[:device] %> inet dhcp
     post-up route del default dev $IFACE || true
 <% else %>
     # We need to disable eth0, see GH-2648
-    post-up route del default dev eth0 || true
+    post-up route del default dev <%= options[:root_device] %> || true
     post-up dhclient $IFACE
-    pre-down route add default dev eth0
+    pre-down route add default dev <%= options[:root_device] %>
 <% end %>
 #VAGRANT-END

data/templates/guests/gentoo/network_systemd.erb

@@ -0,0 +1,16 @@
+[Match]
+Name=<%= networks[0][:device] %>
+
+[Network]
+<%- gateway = nil %>
+<%- networks.each do |net| %>
+<%-   if net[:type] == 'dhcp' %>
+DHCP=yes
+<%-   elsif net[:ip] %>
+Address=<%= net[:ip] %>/<%= net[:netmask] %>
+<%-   end %>
+<%-   gateway ||= net[:gateway] %>
+<%- end %>
+<%- if gateway %>
+Gateway=<%= gateway %>
+<%- end %>

data/templates/guests/redhat/network_dhcp.erb

@@ -3,4 +3,5 @@
 BOOTPROTO=dhcp
 ONBOOT=yes
 DEVICE=<%= options[:device] %>
+NM_CONTROLLED=<%= options.fetch(:nm_controlled, "no") %>
 #VAGRANT-END

data/templates/guests/redhat/network_static.erb

@@ -1,6 +1,6 @@
 #VAGRANT-BEGIN
 # The contents below are automatically generated by Vagrant. Do not modify.
-NM_CONTROLLED=no
+NM_CONTROLLED=<%= options.fetch(:nm_controlled, "no") %>
 BOOTPROTO=none
 ONBOOT=yes
 IPADDR=<%= options[:ip] %>

data/templates/guests/redhat/network_static6.erb

@@ -1,6 +1,6 @@
 #VAGRANT-BEGIN
 # The contents below are automatically generated by Vagrant. Do not modify.
-NM_CONTROLLED=no
+NM_CONTROLLED=<%= options.fetch(:nm_controlled, "no") %>
 BOOTPROTO=static
 ONBOOT=yes
 DEVICE=<%= options[:device] %>

data/templates/locales/en.yml

@@ -664,6 +664,9 @@ en:
         Additionally, the created environment must be started with a provider
         matching this provider. For example, if you're using VirtualBox,
         the clone environment must also be using VirtualBox.
+      command_deprecated: |-
+        The command 'vagrant %{name}' has been deprecated and is no longer functional
+        within Vagrant.
       command_unavailable: |-
         The executable '%{file}' Vagrant is trying to run was not
         found in the PATH variable. This is an error. Please verify
@@ -879,6 +882,13 @@ en:
         %{message}
       network_type_not_supported: |-
         The %{type} network type is not supported for this box or guest.
+      network_manager_not_installed: |-
+        Vagrant was instructed to configure the %{device} network device to
+        be managed by NetworkManager. However, the configured guest VM does
+        not have NetworkManager installed. To fix this error please remove
+        the `nm_controlled` setting from local Vagantfile. If NetworkManager
+        is required to manage the network devices, please use a box with
+        NetworkManager installed.
       nfs_bad_exports: |-
         NFS is reporting that your exports file is invalid. Vagrant does
         this check before making any changes to the file. Please correct
@@ -1017,6 +1027,16 @@ en:
         You can however, install a plugin with the same name to replace
         these plugins. User-installed plugins take priority over
         system-installed plugins.
+      plugin_source_error: |-
+        Vagrant failed to load a configured plugin source. This can be caused
+        by a variety of issues including: transient connectivity issues, proxy
+        filtering rejecting access to a configured plugin source, or a configured
+        plugin source not responding correctly. Please review the error message
+        below to help resolve the issue:
+
+          %{error_msg}
+
+        Source: %{source}
       pushes_not_defined: |-
         The Vagrantfile does not define any 'push' strategies. In order to use
         `vagrant push`, you must define at least one push strategy:
@@ -1176,6 +1196,13 @@ en:
         If that doesn't work, destroy your VM and recreate it with a `vagrant destroy`
         followed by a `vagrant up`. If that doesn't work, contact a Vagrant
         maintainer (support channels listed on the website) for more assistance.
+      ssh_connection_aborted: |-
+        SSH connection was aborted! This usually happens when the machine is taking
+        too long to reboot or the SSH daemon is not properly configured on the VM.
+        First, try reloading your machine with `vagrant reload`, since a simple
+        restart sometimes fixes things. If that doesn't work, destroy your machine
+        and recreate it with a `vagrant destroy` followed by a `vagrant up`. If that
+        doesn't work, contact support.
       ssh_connection_reset: |-
         SSH connection was reset! This usually happens when the machine is
         taking too long to reboot. First, try reloading your machine with
@@ -1354,6 +1381,16 @@ en:
         log out and log back in for the new environmental variables to take
         effect. If you're on Linux or Mac, verify your PATH contains the folder
         that has VBoxManage in it.
+      vboxmanage_not_found_wsl_error: |-
+        The "VBoxManage.exe" command or one of its dependencies could not
+        be found. Please verify VirtualBox is properly installed. You can verify
+        everything is okay by running "VBoxManage.exe --version" and verifying
+        that the VirtualBox version is outputted.
+
+        If you just installed VirtualBox, you have to log out and log back in for
+        the new environmental variables to take effect. Using the VirtualBox
+        provider within the WSL requires VirtualBox executables to be available
+        on the system PATH.
       virtualbox_broken_version_040214: |-
         Vagrant detected you have VirtualBox 4.2.14 installed. VirtualBox
         4.2.14 contains a critical bug which prevents it from working with
@@ -1483,7 +1520,32 @@ en:
         VM must be running to open SSH connection. Run `vagrant up`
         to start the virtual machine.
       test_key: "test value"
-
+      wsl_vagrant_version_mismatch: |-
+        Vagrant cannot currently enable access to manage machines within the Windows
+        environment because the version of Vagrant installed on Windows does not
+        match this version of Vagrant running within the Windows Subsystem for Linux.
+        Please ensure both installation of Vagrant are the same. If you do not want
+        update your Vagrant installations you can disable Windows access by unsetting
+        the `VAGRANT_WSL_ACCESS_WINDOWS_USER` environment variable.
+
+          Windows Vagrant version: %{windows_version}
+          Windows Subsystem for Linux Vagrant version: %{wsl_version}
+      wsl_vagrant_access_error: |-
+        Vagrant will not operate outside the Windows Subsystem for Linux unless explicitly
+        instructed. Due to the inability to enforce expected Linux file ownership and
+        permissions on the Windows system, Vagrant will not make modifications to prevent
+        unexpected errors. To learn more about this, and the options that are available,
+        please refer to the Vagrant documentation:
+
+          https://www.vagrantup.com/docs/other/wsl
+      wsl_virtualbox_windows_access: |-
+        Vagrant is unable to use the VirtualBox provider from the Windows Subsystem for
+        Linux without access to the Windows environment. Enabling this access must be
+        done with caution and an understanding of the implications. For more information
+        on enabing Windows access and using VirtualBox from the Windows Subsystem for
+        Linux, please refer to the Vagrant documentation:
+
+          https://www.vagrantup.com/docs/other/wsl
 #-------------------------------------------------------------------------------
 # Translations for config validation errors
 #-------------------------------------------------------------------------------
@@ -1568,6 +1630,9 @@ en:
 # Translations for commands. e.g. `vagrant x`
 #-------------------------------------------------------------------------------
     commands:
+      deprecated: |-
+        [DEPRECATION WARNING]: The Vagrant command 'vagrant %{name}' is scheduled be
+        deprecated in an upcoming Vagrant release.
       common:
         vm_already_running: |-
           VirtualBox VM is already running.
@@ -1726,6 +1791,9 @@ en:
       up:
         upping: |-
           Bringing machine '%{name}' up with '%{provider}' provider...
+      validate:
+        success: |-
+          Vagrantfile validated successfully.
 
 #-------------------------------------------------------------------------------
 # Translations for Vagrant middleware actions
@@ -1975,8 +2043,9 @@ en:
         unpackage:
           untar_failure: |-
             The box failed to unpackage properly. Please verify that the box
-            file you're trying to add is not corrupted and try again. The
-            output from attempting to unpackage (if any):
+            file you're trying to add is not corrupted and that enough disk space
+            is available and then try again.
+            The output from attempting to unpackage (if any):
 
             %{output}
         add:

data/templates/locales/providers_docker.yml

@@ -117,6 +117,19 @@ en:
         run exits and doesn't keep running.
 
     errors:
+      compose_lock_timeout: |-
+        Vagrant enountered a timeout waiting for the docker compose driver
+        to become available. Please try to run your command again. If you
+        continue to experience this error it may be resolved by disabling
+        parallel execution.
+      docker_compose_not_installed: |-
+        Vagrant has been instructed to use to use the Compose driver for the
+        Docker plugin but was unable to locate the `docker-compose` executable.
+        Ensure that `docker-compose` is installed and available on the PATH.
+      not_created: |-
+        The container hasn't been created yet.
+      not_running: |-
+        The container is not currently running.
       communicator_non_docker: |-
         The "docker_hostvm" communicator was specified on a machine that
         is not provided by the Docker provider. This is a bug with your
@@ -130,6 +143,8 @@ en:
           "build_dir" must exist and contain a Dockerfile
         build_dir_or_image: |-
           One of "build_dir" or "image" must be set
+        compose_configuration_hash: |-
+          "compose_configuration" must be a hash
         create_args_array: |-
           "create_args" must be an array
         invalid_link: |-

data/test/acceptance/provider-virtualbox/linked_clone_spec.rb

@@ -9,7 +9,7 @@ shared_examples 'provider/linked_clone' do |provider, options|
 
   before do
     environment.skeleton('linked_clone')
-    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
   end
 
   after do

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

@@ -78,6 +78,13 @@ describe VagrantPlugins::CommandInit::Command do
       expect(contents).to match(/config.vm.box_version = "1.2.3"/)
     end
 
+    it "creates a minimal Vagrantfile with a box and box version" do
+      described_class.new(["--minimal", "--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)

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

@@ -0,0 +1,65 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/commands/up/command")
+
+describe VagrantPlugins::CommandUp::Command do
+  include_context "unit"
+
+  let(:argv)     { [] }
+  let(:vagrantfile_content){ "" }
+  let(:iso_env) do
+    env = isolated_environment
+    env.vagrantfile(vagrantfile_content)
+    env.create_vagrant_env
+  end
+
+  subject { described_class.new(argv, iso_env) }
+
+  let(:action_runner) { double("action_runner") }
+
+  before do
+    iso_env.stub(action_runner: action_runner)
+  end
+
+  context "with no argument" do
+    let(:vagrantfile_content){ "Vagrant.configure(2){|config| config.vm.box = 'dummy'}" }
+
+    it "should bring up the default box" do
+      batch = double("environment_batch")
+      expect(iso_env).to receive(:batch).and_yield(batch)
+      expect(batch).to receive(:action).with(anything, :up, anything)
+      subject.execute
+    end
+
+    context "with VAGRANT_DEFAULT_PROVIDER set" do
+      before do
+        if ENV["VAGRANT_DEFAULT_PROVIDER"]
+          @original_default = ENV["VAGRANT_DEFAULT_PROVIDER"]
+        end
+        ENV["VAGRANT_DEFAULT_PROVIDER"] = "unknown"
+      end
+      after do
+        if @original_default
+          ENV["VAGRANT_DEFAULT_PROVIDER"] = @original_default
+        else
+          ENV.delete("VAGRANT_DEFAULT_PROVIDER")
+        end
+      end
+
+      it "should attempt to use dummy provider" do
+        expect{ subject.execute }.to raise_error
+      end
+
+      context "with --provider set" do
+        let(:argv){ ["--provider", "dummy"] }
+
+        it "should only use provider explicitly set" do
+          batch = double("environment_batch")
+          expect(iso_env).to receive(:batch).and_yield(batch)
+          expect(batch).to receive(:action).with(anything, :up, anything)
+          subject.execute
+        end
+      end
+    end
+  end
+end