vagrant-unbundled 1.8.4.2 → 1.8.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d507d2e4b219a6853d5d83575589d96d3eaf2551
-  data.tar.gz: dcca47b8d0815009c69813d06309b83ce6e432c1
+  metadata.gz: 3399ced63f71497def36fc66752c7ec363d56237
+  data.tar.gz: ad00037be9e832842a11df1442b49dc6e3fbbf57
 SHA512:
-  metadata.gz: 25a8121f366e573bca596d2decd443644f0a577d68d357afa025d864c3fb90e696d074822814bfb257eb13ba1a4d0805458768db4f6c1e8d06310dbf8bc2dcac
-  data.tar.gz: 2ef93aabcc4b793ed3b9c215da8db839dda402885832a066f2d7571e16ed7868e09f0797ecb4bdac70e6ad088969e2938abdecc24e00c63f48e60e50b135924f
+  metadata.gz: f0a9015078be01b016a32aedb81c2f673dfcd8872e6b51960765da7441a850141b0ff7854e71046e5111a12ad60fde5ff41ec4a2d657866e4ed7658d33018f62
+  data.tar.gz: 3850bb5a10928494e7dcd3a5bc727b2d0c67b88e31ea127cde5a53bea5ff13f52422e6225fc6615ae04a49034809170c8106d4536cd3d19b9e89b6e4bc601413

data/.travis.yml

@@ -13,7 +13,7 @@ addons:
     - bsdtar
 
 rvm:
-  - 2.0.0
+  - 2.2.3
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,3 +1,55 @@
+## 1.8.5 (July 18, 2016)
+
+FEATURES:
+
+  - core: Provide a way to globally disable box update checks with the
+      environment variable `VAGRANT_BOX_UPDATE_CHECK_DISABLE`. Setting this
+      to any non-empty value will instruct Vagrant to not look for box updates
+      when running `vagrant up`. Setting this environment variable has no
+      effect on the `vagrant box` commands.
+
+IMPROVEMENTS:
+
+  - guests/arch: Support installing synced folder clients [GH-7519]
+  - guests/darwin: Allow ipv6 static networks [GH-7491]
+  - providers/virtualbox: Add support for 5.1 [GH-7574]
+
+BUG FIXES:
+
+  - core: Bump listen gem and Ruby version to improve rsync performance
+      [GH-7453, GH-7441]
+  - core: Check process stdout when detecting if a hyperv admin
+      [GH-7465, GH-7467]
+  - core: Ensure removal of temporary directory when box download fails
+      [GH-7496, GH-7499]
+  - core: Fix regression for installing plugins from path [GH-7505, GH-7493]
+  - core: Skip checking conflicts on disabled ports [GH-7587]
+  - core: Idempotent write-out for state file [GH-7550]
+  - core/guests: Create common BSD guest for shared logic
+  - core/guests: Ignore empty output from `/sbin/ip`
+      [GH-7539, GH-7537, GH-7533, GH-7605]
+  - synced_folders/nfs: Shellescape rsync paths
+      [GH-7540, GH-7605]
+  - synced_folders/nfs: Ensure retries take place [GH-6360, GH-7605]
+  - synced_folders/rsync: Shellescape rsync paths
+      [GH-7580, GH-6690, GH-7579, GH-7605]
+  - synced_folders/rsync: Translate Windows paths
+      [GH-7012, GH-6702, GH-6568, GH-7046]
+  - guests/bsd: Consolidate core logic for mounting NFS folders
+      [GH-7480, GH-7474, GH-7466]
+  - guests/bsd: Consolidate core logic for public key management [GH-7481]
+  - guests/bsd: Consolidate core logic for halting [GH-7484]
+  - guests/centos: Use `ip` instead of `ifconfig` to detect network interfaces
+      [GH-7460]
+  - guests/debian: Ensure newline when inserting public key [GH-7456]
+  - guests/linux: Ensure NFS retries during mounting [GH-7492]
+  - guests/redhat: Use `/sbin/ip` to list and configure networks for
+      compatability with older versions of CentOS [GH-7482]
+  - guests/redhat: Ensure newline when inserting public key [GH-7598, GH-7605]
+  - guests/ubuntu: Use /etc/os-release to detech [GH-7524]
+  - guests/ubuntu: Use short hostname [GH-7488, GH-7605]
+  - providers/hyperv: Fix version check and catch statement [GH-7447, GH-7487]
+
 ## 1.8.4 (June 13, 2016)
 
 BUG FIXES:

data/Gemfile.lock

@@ -10,13 +10,13 @@ PATH
 PATH
   remote: .
   specs:
-    vagrant-unbundled (1.8.4.2)
+    vagrant-unbundled (1.8.5.1)
       bundler
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
       i18n (>= 0.6.0, <= 0.8.0)
-      listen (~> 3.0.2)
+      listen (~> 3.1.5)
       log4r (~> 1.1.9, < 1.1.11)
       logging (~> 2.0)
       mime-types (~> 2.99)
@@ -25,7 +25,7 @@ PATH
       net-ssh (~> 3.0.1)
       nokogiri (~> 1.6.8)
       rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 2.0)
+      rest-client (>= 1.6.0, < 3.0)
       wdm (~> 0.1.0)
       winrm (~> 1.6)
       winrm-fs (~> 0.3.0)
@@ -55,9 +55,10 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.0)
     i18n (0.7.0)
-    listen (3.0.8)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     little-plugger (1.1.4)
     log4r (1.1.10)
     logging (2.1.0)
@@ -83,10 +84,10 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
-    rest-client (1.8.0)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -95,6 +96,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    ruby_dep (1.4.0)
     rubyntlm (0.6.0)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)

data/RELEASE.md

@@ -4,25 +4,48 @@ This documents how to release Vagrant. Various steps in this document will
 require privileged access to private systems, so this document is only
 targetted at Vagrant core members who have the ability to cut a release.
 
-  1. Update `version.txt` to the version you want to release.
+1. Update `version.txt` to the version you want to release.
 
-  1. Update `CHANGELOG.md` to have a header with the release version and date.
+1. Update `CHANGELOG.md` to have a header with the release version and date.
 
-  1. Commit those changes and also tag the release with the version:
-     `git tag vX.Y.Z`. Push them.
+1. Commit those changes and also tag the release with the version:
 
-  1. Trigger an installer creation run within the HashiCorp Bamboo
-     installation. This will take around 45 minutes.
+    ```
+    $ git tag vX.Y.Z
+    $ git push --tags
+    ```
 
-  1. Download all the resulting artifacts into the `pkg/dist` folder
-     relative to the Vagrant repository.
+1. Trigger an installer creation run within the HashiCorp Bamboo installation.
+  This will take around 45 minutes.
 
-  1. Run the awkwardly-named `./scripts/bintray_upload.sh` with the version
-     that is being created. This must be run from the Vagrant repo root.
-     This will GPG sign and checksum the files.
+1. Download all the resulting artifacts into the `pkg/dist` folder relative to
+  the Vagrant repository on your local machine.
 
-  1. Run `hc-releases -upload pkg/dist` to upload the releases to S3.
+1. Run `./scripts/sign.sh` with the version that is being created. This must be
+    run from the Vagrant repo root. This will GPG sign and checksum the files.
 
-  1. Update `website/config.rb` to point to the latest version. Commit and push.
+1. Run the following command to upload the binaries to the releases site:
 
-  1. Use Atlas `hashicorp/vagrant-www` to deploy the site by queueing a build.
+    ```
+    $ hc-releases upload pkg/dist
+    ```
+
+1. Publish the new index files to the releases site:
+
+    ```
+    $ hc-releases publish
+    ```
+
+1. Update `website/config.rb` to point to the latest version, commit, and push.
+
+1. Tell HashiBot to deploy in ``#deploys`
+
+    ```
+    hashibot deploy vagrant
+    ```
+
+1. Update `version.txt` to append `.dev` and add a new blank entry in the
+  CHANGELOG, commit, and push.
+
+1. Update [Checkpoint](https://checkpoint.hashicorp.com/control) with the new
+  version.

data/lib/vagrant/action/builtin/box_add.rb

@@ -34,7 +34,7 @@ module Vagrant
             u = u.gsub("\\", "/")
             if Util::Platform.windows? && u =~ /^[a-z]:/i
               # On Windows, we need to be careful about drive letters
-              u = "file://#{URI.escape(u)}"
+              u = "file:///#{URI.escape(u)}"
             end
 
             if u =~ /^[a-z0-9]+:.*$/i && !u.start_with?("file://")
@@ -472,6 +472,8 @@ module Vagrant
           if uri.scheme == "file"
             url = uri.path
             url ||= uri.opaque
+            #7570 Strip leading slash left in front of drive letter by uri.path
+            Util::Platform.windows? && url.gsub!(/^\/([a-zA-Z]:)/, '\1')
 
             begin
               File.open(url, "r") do |f|

data/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb

@@ -93,6 +93,11 @@ module Vagrant
             guest_port = options[:guest]
             host_port  = options[:host]
 
+            if options[:disabled]
+              @logger.debug("Skipping disabled port #{host_port}.")
+              next
+            end
+
             if options[:protocol] && options[:protocol] != "tcp"
               @logger.debug("Skipping #{host_port} because UDP protocol.")
               next

data/lib/vagrant/box_collection.rb

@@ -1,4 +1,5 @@
 require "digest/sha1"
+require "fileutils"
 require "monitor"
 require "tmpdir"
 
@@ -447,7 +448,7 @@ module Vagrant
 
       yield dir
     ensure
-      dir.rmtree if dir.exist?
+      FileUtils.rm_rf(dir.to_s)
     end
 
     # Checks if a box with a given name exists.

data/lib/vagrant/bundler.rb

@@ -272,7 +272,11 @@ module Vagrant
       Gem.paths = ENV
 
       # Reset the all specs override that Bundler does
-      Gem::Specification.reset
+      old_all = Gem::Specification._all
+
+      # WARNING: Seriously don't touch this without reading the comment attached
+      # to the monkey-patch at the bottom of this file.
+      Gem::Specification.vagrant_reset!
 
       # /etc/gemrc and so on.
       old_config = nil
@@ -299,6 +303,7 @@ module Vagrant
 
       Gem.configuration = old_config
       Gem.paths = ENV
+      Gem::Specification.all = old_all
     end
 
     # This method returns a proper "tempfile" on disk. Ruby's Tempfile class
@@ -330,6 +335,36 @@ module Vagrant
       end
     end
 
+    # This monkey patches Gem::Specification from RubyGems to add a new method,
+    # `vagrant_reset!`. For some background, Vagrant needs to set the value
+    # of these variables to nil to force new specs to be loaded. Previously,
+    # this was accomplished by setting Gem::Specification.specs = nil. However,
+    # newer versions of Rubygems try to map across that nil using a group_by
+    # clause, breaking things.
+    #
+    # This generally never affected Vagrant users who were using the official
+    # Vagrant installers because we lock to an older version of Rubygems that
+    # does not have this issue. The users of the official debian packages,
+    # however, experienced this issue because they float on Rubygems.
+    #
+    # In GH-7073, a number of Debian users reported this issue, but it was not
+    # reproducible in the official installer for reasons described above. Commit
+    # ba77d4b switched to using Gem::Specification.reset, but this actually
+    # broke the ability to install gems locally (GH-7493) because it resets
+    # the complete local cache, which is already built.
+    #
+    # The only solution that works with both new and old versions of Rubygems
+    # is to provide our own function for JUST resetting all the stubs. Both
+    # @@all and @@stubs must be set to a falsey value, so some of the
+    # originally-suggested solutions of using an empty array do not work. Only
+    # setting these values to nil (without clearing the cache), allows Vagrant
+    # to install and manage plugins.
+    class Gem::Specification < Gem::BasicSpecification
+      def self.vagrant_reset!
+        @@all = @@stubs = nil
+      end
+    end
+
     if ::Bundler::UI.const_defined? :Silent
       class BundlerUI < ::Bundler::UI::Silent
         attr_reader :output

data/lib/vagrant/errors.rb

@@ -324,10 +324,6 @@ module Vagrant
       error_key(:darwin_mount_failed)
     end
 
-    class DarwinNFSMountFailed < VagrantError
-      error_key(:darwin_nfs_mount_failed)
-    end
-
     class DestroyRequiresForce < VagrantError
       error_key(:destroy_requires_force)
     end
@@ -404,10 +400,6 @@ module Vagrant
       error_key(:linux_mount_failed)
     end
 
-    class LinuxNFSMountFailed < VagrantError
-      error_key(:linux_nfs_mount_failed)
-    end
-
     class LinuxRDPClientNotFound < VagrantError
       error_key(:linux_rdp_client_not_found)
     end
@@ -456,6 +448,10 @@ module Vagrant
       error_key(:not_found, "vagrant.actions.vm.host_only_network")
     end
 
+    class NetworkTypeNotSupported < VagrantError
+      error_key(:network_type_not_supported)
+    end
+
     class NFSBadExports < VagrantError
       error_key(:nfs_bad_exports)
     end
@@ -464,6 +460,10 @@ module Vagrant
       error_key(:nfs_cant_read_exports)
     end
 
+    class NFSMountFailed < VagrantError
+      error_key(:nfs_mount_failed)
+    end
+
     class NFSNoGuestIP < VagrantError
       error_key(:nfs_no_guest_ip)
     end
@@ -780,6 +780,14 @@ module Vagrant
       error_key(:virtualbox_no_name)
     end
 
+    class VirtualBoxMountFailed < VagrantError
+      error_key(:virtualbox_mount_failed)
+    end
+
+    class VirtualBoxMountNotSupportedBSD < VagrantError
+      error_key(:virtualbox_mount_not_supported_bsd)
+    end
+
     class VirtualBoxNameExists < VagrantError
       error_key(:virtualbox_name_exists)
     end

data/lib/vagrant/plugin/state_file.rb

@@ -1,4 +1,6 @@
 require "json"
+require "fileutils"
+require "tempfile"
 
 module Vagrant
   module Plugin
@@ -91,8 +93,13 @@ module Vagrant
 
       # This saves the state back into the state file.
       def save!
-        @path.open("w+") do |f|
+        Tempfile.open(@path.basename.to_s, @path.dirname.to_s) do |f|
+          f.binmode
           f.write(JSON.dump(@data))
+          f.fsync
+          f.chmod(0644)
+          f.close
+          FileUtils.mv(f.path, @path)
         end
       end
 

data/lib/vagrant/util/platform.rb

@@ -82,7 +82,7 @@ module Vagrant
             begin
               username = ENV["USERNAME"]
               process = Subprocess.execute("net", "localgroup", "Hyper-V Administrators")
-              return process.include?(username)
+              return process.stdout.include?(username)
             rescue Errors::CommandUnavailableWindows
               return false
             end

data/plugins/guests/arch/cap/change_host_name.rb

@@ -5,19 +5,22 @@ module VagrantPlugins
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname | grep -w '#{name}'")
+          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
             basename = name.split(".", 2)[0]
-            comm.sudo <<-EOH
-hostnamectl set-hostname '#{name}'
+            comm.sudo <<-EOH.gsub(/^ {14}/, "")
+              set -e
 
-# Remove comments and blank lines from /etc/hosts
-sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+              # Set hostname
+              hostnamectl set-hostname '#{basename}'
 
-# Prepend ourselves to /etc/hosts
-grep -w '#{name}' /etc/hosts || {
-  sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
-}
-EOH
+              # Remove comments and blank lines from /etc/hosts
+              sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+              # Prepend ourselves to /etc/hosts
+              grep -w '#{name}' /etc/hosts || {
+                sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
+              }
+            EOH
           end
         end
       end

data/plugins/guests/arch/cap/configure_networks.rb

@@ -1,3 +1,5 @@
+require "ipaddr"
+require "socket"
 require "tempfile"
 
 require_relative "../../../../lib/vagrant/util/template_renderer"
@@ -11,18 +13,19 @@ module VagrantPlugins
         def self.configure_networks(machine, networks)
           comm = machine.communicate
 
-          commands   = []
-          interfaces = []
-
-          # The result will be something like:
-          #   eth0\nenp0s8\nenp0s9
-          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, stdout|
-            interfaces = stdout.split("\n")
-          end
+          commands   = ["set -e"]
+          interfaces = machine.guest.capability(:network_interfaces)
 
           networks.each.with_index do |network, i|
             network[:device] = interfaces[network[:interface]]
 
+            # Arch expects netmasks to be in the "24" or "64", but users may
+            # specify IPV4 netmasks like "255.255.255.0". This magic converts
+            # the netmask to the proper value.
+            if network[:netmask] && network[:netmask].to_s.include?(".")
+              network[:netmask] = (32-Math.log2((IPAddr.new(network[:netmask], Socket::AF_INET).to_i^0xffffffff)+1)).to_i
+            end
+
             entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
               options: network,
             )