vagrant-unbundled 2.0.0.1 → 2.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab94e193c0cacc1e2503a53fc9cf56ebbacc8ca6
-  data.tar.gz: e9dff8cd516a995f503ed4e482c30bf788fb864a
+  metadata.gz: 1c7d005eabc6f4b45c7fc7a5bdb72c1ffbd7cc78
+  data.tar.gz: 537e0346b858fce81472efe59508069bec997639
 SHA512:
-  metadata.gz: 7513bbf956fd58b41f9581ed285f799c5f26735a85d04de738aeab51261f75314840b6380e5659d4ae7a1aacc52bcf9cb0a8967d1dd071f9a75b2538efcef3e8
-  data.tar.gz: dddc399868eab9071a5c3db492680ca0896d49f66ce0a44937a2ddc0ae4ec63ee8034fa8d6cebcf05dd0c74e3fc53946175dc14d864614c4d46478168e2c708c
+  metadata.gz: 1c5ee050f855e7ba0b80bd3c3c87d4a16eb62618c6358aefdb67e2c39933585da643b51e300e6c7efc509cc0446bbbc2d88425a706dc2c1272b0811ffdfc3053
+  data.tar.gz: acd7e431abc74f1b2233ca2c8840e017650808b0a12e2f326d5519b993651d82f1abaae77f71033cf6dbfbbf81e47dd6ab9e8d51db192cde9166a61bb6b0c696

data/.travis.yml

@@ -10,8 +10,8 @@ addons:
     - bsdtar
 
 rvm:
-  - 2.2.5
-  - 2.3.3
+  - 2.3.5
+  - 2.4.2
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## 2.0.1 (November 2, 2017)
+
+FEATURES:
+
+  - core: Introduce Ruby 2.4 to Vagrant [GH-9102]
+  - providers/virtualbox: Virtualbox 5.2 support [GH-8955]
+
+IMPROVEMENTS:
+
+  - command/destroy: Introduce parallel destroy for certain providers [GH-9127]
+  - communicators/winrm: Include APIPA check within ready check [GH-8997]
+  - core: Clear POSIXLY_CORRECT when using optparse [GH-8685]
+  - docs: Add auto_start_action and auto_stop_action to docs. [GH-9029]
+  - docs: Fix typo in box format doc [GH-9100]
+  - provisioners/chef: Handle chef provisioner reboot request [GH-8874]
+  - providers/salt: Support Windows Salt Minions greater than 2016.x.x [GH-8926]
+  - provisioners/salt: Add wget to bootstrap_salt options when fetching installer file [GH-9112]
+  - provisioners/shell: Use ui.detail for displaying output [GH-8983]
+  - util/downloader: Use CURL_CA_BUNDLE environment variable [GH-9135]
+
+BUG FIXES:
+
+  - communicators/ssh: Retry on Errno::EPIPE exceptions [GH-9065]
+  - core: Rescue more exceptions when checking if port is open [GH-8517]
+  - guests/solaris11: Inherit from Solaris guest and keep solaris11 specific methods [GH-9034]
+  - guests/windows: Split out cygwin path helper for msys2/cygwin paths and ensure cygpath exists [GH-8972]
+  - guests/windows: Specify expected shell when executing on guest (fixes winssh communicator usage) [GH-9012]
+  - guests/windows: Include WinSSH Communicator when using insert_public_key [GH-9105]
+  - hosts/windows: Check for vagrant.exe when validating versions within WSL [GH-9107, GH-8962]
+  - providers/docker: Isolate windows check within executor to handle running through VM [GH-8921]
+  - providers/hyper-v: Properly invoke Auto stop action [GH-9000]
+  - provisioners/puppet: Fix winssh communicator support in puppet provisioner [GH-9014]
+  - virtualbox/synced_folders: Allow synced folders to contain spaces in the guest path [GH-8995]
+
 ## 2.0.0 (September 7, 2017)
 
 IMPROVEMENTS:

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.0.0.1)
+    vagrant-unbundled (2.0.1.0)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
@@ -32,8 +32,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
@@ -49,7 +49,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.3.5)
+    hashdiff (0.3.7)
     hashicorp-checkpoint (0.1.4)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -67,7 +67,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -75,7 +75,7 @@ GEM
     net-ssh (4.1.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (2.0.5)
+    public_suffix (3.0.1)
     rake (12.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -111,7 +111,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.4)
     wdm (0.1.1)
-    webmock (1.24.6)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -127,7 +127,7 @@ GEM
     winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.0.1)
+    winrm-fs (1.1.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -143,7 +143,7 @@ DEPENDENCIES
   rspec-its (~> 1.2.0)
   vagrant-spec!
   vagrant-unbundled!
-  webmock (~> 1.20)
+  webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/README.md

@@ -1,7 +1,7 @@
 # Vagrant
 
 * Website: [https://www.vagrantup.com/](https://www.vagrantup.com/)
-* Source: [https://github.com/mitchellh/vagrant](https://github.com/mitchellh/vagrant)
+* Source: [https://github.com/hashicorp/vagrant](https://github.com/hashicorp/vagrant)
 * [![Gitter chat](https://badges.gitter.im/mitchellh/vagrant.png)](https://gitter.im/mitchellh/vagrant)
 * Mailing list: [Google Groups](https://groups.google.com/group/vagrant-up)
 
@@ -49,7 +49,7 @@ and you're welcome to give it a shot. Please review the installation page [here]
 
 ## Contributing to Vagrant
 
-To install Vagrant from source, please [follow the guide in the Wiki](https://github.com/mitchellh/vagrant/wiki/Installing-Vagrant-from-Source).
+To install Vagrant from source, please [follow the guide in the Wiki](https://github.com/hashicorp/vagrant/wiki/Installing-Vagrant-from-Source).
 
 You can run the test suite with:
 

data/contrib/sudoers/linux-suse

@@ -1,7 +1,6 @@
-Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
-Cmnd_Alias VAGRANT_NFSD_CHECK = /sbin/service nfsserver status
-Cmnd_Alias VAGRANT_NFSD_START = /sbin/service nfsserver start
-Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /usr/bin/sed -r -e * d -ibak /*/exports
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE_2 = /usr/bin/cp /*/exports /etc/exports
-%vagrant ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE, VAGRANT_EXPORTS_REMOVE_2
+Cmnd_Alias VAGRANT_CHOWN = /usr/bin/chown 0\:0 /tmp/vagrant[a-z0-9-]*
+Cmnd_Alias VAGRANT_MV = /usr/bin/mv -f /tmp/vagrant[a-z0-9-]* /etc/exports
+Cmnd_Alias VAGRANT_START = /sbin/service nfsserver start
+Cmnd_Alias VAGRANT_STATUS = /sbin/service nfsserver status
+Cmnd_Alias VAGRANT_APPLY = /usr/sbin/exportfs -ar
+%vagrant ALL=(root) NOPASSWD: VAGRANT_CHOWN, VAGRANT_MV, VAGRANT_START, VAGRANT_STATUS, VAGRANT_APPLY

data/lib/vagrant/plugin/v2/command.rb

@@ -43,6 +43,9 @@ module Vagrant
         # If this method returns `nil`, then you should assume that help
         # was printed and parsing failed.
         def parse_options(opts=nil)
+          # make sure optparse doesn't use POSIXLY_CORRECT parsing
+          ENV["POSIXLY_CORRECT"] = nil
+          
           # Creating a shallow copy of the arguments so the OptionParser
           # doesn't destroy the originals.
           argv = @argv.dup

data/lib/vagrant/plugin/v2/communicator.rb

@@ -50,7 +50,7 @@ module Vagrant
         # until then. It will wait up to the given duration or raise an
         # exception if something goes wrong.
         #
-        # @param [Fixnum] duration Timeout in seconds.
+        # @param [Integer] duration Timeout in seconds.
         # @return [Boolean] Will return true on successful connection
         #   or false on timeout.
         def wait_for_ready(duration)

data/lib/vagrant/registry.rb

@@ -52,7 +52,7 @@ module Vagrant
 
     # Return the number of elements in this registry.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def length
       @items.keys.length
     end

data/lib/vagrant/util/downloader.rb

@@ -297,8 +297,7 @@ module Vagrant
         # If we're in Vagrant, then we use the packaged CA bundle
         if Vagrant.in_installer?
           subprocess_options[:env] ||= {}
-          subprocess_options[:env]["CURL_CA_BUNDLE"] =
-            File.expand_path("cacert.pem", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
+          subprocess_options[:env]["CURL_CA_BUNDLE"] = ENV["CURL_CA_BUNDLE"]
         end
 
         return [options, subprocess_options]

data/lib/vagrant/util/is_port_open.rb

@@ -30,7 +30,8 @@ module Vagrant
           return true
         end
       rescue Timeout::Error, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, \
-             Errno::ENETUNREACH, Errno::EACCES, Errno::ENOTCONN
+             Errno::ENETUNREACH, Errno::EACCES, Errno::ENOTCONN, \
+             Errno::EADDRNOTAVAIL
         # Any of the above exceptions signal that the port is closed.
         return false
       end

data/lib/vagrant/util/keypair.rb

@@ -26,7 +26,7 @@ module Vagrant
         private_key = rsa_key.to_pem
 
         if password
-          cipher      = OpenSSL::Cipher::Cipher.new('des3')
+          cipher      = OpenSSL::Cipher.new('des3')
           private_key = rsa_key.to_pem(cipher, password)
         end
 

data/lib/vagrant/util/platform.rb

@@ -98,21 +98,20 @@ module Vagrant
         end
 
         # This takes any path and converts it from a Windows path to a
-        # Cygwin or msys style path.
+        # Cygwin style path.
         #
         # @param [String] path
         # @return [String]
         def cygwin_path(path)
           begin
-            # We have to revert to the old env
-            # path here, otherwise it looks like
-            # msys2 ends up using the wrong cygpath
-            # binary and ends up with a `/cygdrive`
-            # when it doesn't exist in msys2
-            original_path_env = ENV['PATH']
-            ENV['PATH'] = ENV['VAGRANT_OLD_ENV_PATH']
             cygpath = Vagrant::Util::Which.which("cygpath")
-            cygpath.gsub!("/", '\\')
+            if cygpath.nil?
+              # If Which can't find it, just attempt to invoke it directly
+              cygpath = "cygpath"
+            else
+              cygpath.gsub!("/", '\\')
+            end
+
             process = Subprocess.execute(
               cygpath, "-u", "-a", path.to_s)
             return process.stdout.chomp
@@ -125,14 +124,29 @@ module Vagrant
               "--norc",
               "-c", "cd #{Shellwords.escape(path)} && pwd")
             return process.stdout.chomp
+          end
+        end
+
+        # This takes any path and converts it from a Windows path to a
+        # msys style path.
+        #
+        # @param [String] path
+        # @return [String]
+        def msys_path(path)
+          begin
+            # We have to revert to the old env
+            # path here, otherwise it looks like
+            # msys2 ends up using the wrong cygpath
+            # binary and ends up with a `/cygdrive`
+            # when it doesn't exist in msys2
+            original_path_env = ENV['PATH']
+            ENV['PATH'] = ENV['VAGRANT_OLD_ENV_PATH']
+            cygwin_path(path)
           ensure
             ENV['PATH'] = original_path_env
           end
         end
 
-        # Identical to cygwin_path for now
-        alias_method :msys_path, :cygwin_path
-
         # This takes any path and converts it to a full-length Windows
         # path on Windows machines in Cygwin.
         #
@@ -433,18 +447,20 @@ module Vagrant
         # are the same. Raise error if they do not match.
         def wsl_validate_matching_vagrant_versions!
           valid = false
-          result = Util::Subprocess.execute("vagrant.exe", "version")
-          if result.exit_code == 0
-            windows_version = result.stdout.match(/Installed Version: (?<version>[\w.-]+)/)
-            if windows_version
-              windows_version = windows_version[:version].strip
-              valid = windows_version == Vagrant::VERSION
+          if Util::Which.which("vagrant.exe")
+            result = Util::Subprocess.execute("vagrant.exe", "version")
+            if result.exit_code == 0
+              windows_version = result.stdout.match(/Installed Version: (?<version>[\w.-]+)/)
+              if windows_version
+                windows_version = windows_version[:version].strip
+                valid = windows_version == Vagrant::VERSION
+              end
+            end
+            if !valid
+              raise Vagrant::Errors::WSLVagrantVersionMismatch,
+                wsl_version: Vagrant::VERSION,
+                windows_version: windows_version || "unknown"
             end
-          end
-          if !valid
-            raise Vagrant::Errors::WSLVagrantVersionMismatch,
-              wsl_version: Vagrant::VERSION,
-              windows_version: windows_version || "unknown"
           end
         end
 

data/plugins/commands/destroy/command.rb

@@ -18,29 +18,50 @@ module VagrantPlugins
           o.on("-f", "--force", "Destroy without confirmation.") do |f|
             options[:force] = f
           end
+
+          o.on("--[no-]parallel",
+               "Enable or disable parallelism if provider supports it (automatically enables force)") do |p|
+            options[:parallel] = p
+          end
         end
 
         # Parse the options
         argv = parse_options(opts)
         return if !argv
 
+        if options[:parallel] && !options[:force]
+          @env.ui.warn(I18n.t("vagrant.commands.destroy.warning"))
+          sleep(5)
+          options[:force] = true
+        end
+
         @logger.debug("'Destroy' each target VM...")
+
+        machines = []
+        init_states = {}
         declined = 0
-        total    = 0
-        with_target_vms(argv, reverse: true) do |vm|
-          action_env = vm.action(
-            :destroy, force_confirm_destroy: options[:force])
-
-          total    += 1
-          declined += 1 if action_env.key?(:force_confirm_destroy_result) &&
-            action_env[:force_confirm_destroy_result] == false
+
+        @env.batch(options[:parallel]) do |batch|
+          with_target_vms(argv, reverse: true) do |vm|
+            # gather states to be checked after destroy
+            init_states[vm.name] = vm.state.id
+            machines << vm
+
+            batch.action(vm, :destroy, force_confirm_destroy: options[:force])
+          end
+        end
+
+        machines.each do |m|
+          if m.state.id == init_states[m.name]
+            declined += 1
+          end
         end
 
         # Nothing was declined
         return 0 if declined == 0
 
-        # Everything was declined
-        return 1 if declined == total
+        # Everything was declined, state was not changed
+        return 1 if declined == machines.length
 
         # Some was declined
         return 2

data/plugins/communicators/ssh/communicator.rb

@@ -36,6 +36,7 @@ module VagrantPlugins
         Errno::ECONNRESET,
         Errno::ENETUNREACH,
         Errno::EHOSTUNREACH,
+        Errno::EPIPE,
         Net::SSH::Disconnect,
         Timeout::Error
       ]

data/plugins/communicators/winrm/helper.rb

@@ -33,10 +33,15 @@ module VagrantPlugins
         return addr if addr
 
         ssh_info = machine.ssh_info
-        raise Errors::WinRMNotReady if !ssh_info || ssh_info[:host].to_s.empty?
+        raise Errors::WinRMNotReady if winrm_info_invalid?(ssh_info)
         return ssh_info[:host]
       end
 
+      def self.winrm_info_invalid?(ssh_info)
+        invalid = (!ssh_info || ssh_info[:host].to_s.empty? || ssh_info[:host].start_with?("169.254"))
+        return invalid
+      end
+
       # Returns the port to access WinRM.
       #
       # @param [Vagrant::Machine] machine

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

@@ -11,8 +11,6 @@ module VagrantPlugins
 
           # Only do this if the hostname is not already set
           if !machine.communicate.test("/usr/sbin/svccfg -s system/identity:node listprop config/nodename | /usr/bin/grep '#{name}'")
-            #machine.communicate.execute("#{su_cmd} sh -c \"echo '#{name}' > /etc/nodename\"")
-            #machine.communicate.execute("#{su_cmd} uname -S #{name}")
             machine.communicate.execute("#{su_cmd} /usr/sbin/svccfg -s system/identity:node setprop config/nodename=\"#{name}\"")
             machine.communicate.execute("#{su_cmd} /usr/sbin/svccfg -s system/identity:node setprop config/loopback=\"#{name}\"")
             machine.communicate.execute("#{su_cmd} /usr/sbin/svccfg -s system/identity:node refresh ")

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

@@ -12,19 +12,13 @@ module VagrantPlugins
             su_cmd = machine.config.solaris11.suexec_cmd
             mask = "#{network[:netmask]}"
             cidr = mask.split(".").map { |e| e.to_i.to_s(2).rjust(8, "0") }.join.count("1").to_s
-            #ifconfig_cmd = "#{su_cmd} /sbin/ifconfig #{device}"
-            #machine.communicate.execute("#{ifconfig_cmd} plumb")
+
             if network[:type].to_sym == :static
-              #machine.communicate.execute("#{ifconfig_cmd} inet #{network[:ip]} netmask #{network[:netmask]}")
-              #machine.communicate.execute("#{ifconfig_cmd} up")
-              #machine.communicate.execute("#{su_cmd} sh -c \"echo '#{network[:ip]}' > /etc/hostname.#{device}\"")
-              # ipadm create-addr -T static -a local=172.16.10.15/24 net2/v4
               if machine.communicate.test("ipadm | grep #{device}/v4")
                 machine.communicate.execute("#{su_cmd} ipadm delete-addr #{device}/v4")
               end
               machine.communicate.execute("#{su_cmd} ipadm create-addr -T static -a #{network[:ip]}/#{cidr} #{device}/v4")
             elsif network[:type].to_sym == :dhcp
-              #machine.communicate.execute("#{ifconfig_cmd} dhcp start")
               if machine.communicate.test("ipadm show-if -o all | grep #{device} | tr -s ' ' | cut -d ' ' -f 6  | grep '4\|6'")
                 machine.communicate.execute("#{su_cmd} ipadm create-addr -T addrconf #{device}/v4")
               end