vagrant-unbundled 1.9.7.1 → 1.9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff8f1193fe95e18ecda858827bf0504a153d45f
-  data.tar.gz: a77b2accdc05f28604ff50abfee172861fa46f6f
+  metadata.gz: cbfc0426952400e2cf50440f9e33da65b96de1bf
+  data.tar.gz: 6b5376cf7c8971923fa2da01b9e5cb5597cf98b2
 SHA512:
-  metadata.gz: 9d8d35c3f4dfe559ef0bdea8ca8597399685f6bb8d5845c4e8055cb69b170017a55dd0f6761c641183a370e54750b3de1f433286681d9392f5c506ba9e0c1acd
-  data.tar.gz: 7d0fa5d7ffd7e6b7150b5cc48fbda454a1f5fbfa8caf6a0dd83c63f9ea3a90da972b3e98c862ec93b9cf03e13235b31677fb75267b262906d3c02449a4231648
+  metadata.gz: 3ffe827d8f83715f2f085a458acd2b6052f34691922ba71468cc9cca2794e5217471493a2c4d02b8b0becb17d060e07637de7ecb1ce63674808fb19d1a557272
+  data.tar.gz: b0033fcd286a3445ee1acb2344e34e41419fe8551dc5ceef615eabcad07f70478f392f51ef1a950500879f621b0ced555a1a8bd63844aca79ca7630ca61afd48

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## 1.9.8 (August 23, 2017)
+
+IMPROVEMENTS:
+
+  - bash: Add box prune to contrib bash completion [GH-8806]
+  - commands/login: Ask for description of Vagrant Cloud token [GH-8876]
+  - commands/validate: Improve functionality of the validate command [GH-8889]n
+  - core: Updated Vagrants rspec gem to 3.5.0 [GH-8850]
+  - core: Validate powershell availability and version before use [GH-8839]
+  - core: Introduce extra_args setting for ssh configs [GH-8895]
+  - docs: Align contrib/sudoers file for ubuntu linux with docs [GH-8842]
+  - provider/hyperv: Prefer IPv4 guest address [GH-8831, GH-8759]
+  - provisioners/chef: Add config option omnibus_url for chef provisioners [GH-8682]
+  - provisioners/chef: Improve exception handling around missing folder paths [GH-8775]
+
+BUG FIXES:
+
+  - box/update: Add force flag for box upgrade command [GH-8871]
+  - commands/rsync-auto: Ensure relative dirs are still rsync'd if defined [GH-8781]
+  - commands/up: Disable install providers when using global id on vagrant up [GH-8910]
+  - communicators/winssh: Fix public key insertion to retain ACL [GH-8790]
+  - core: Update util/ssh to use `-o` for identity files [GH-8786]
+  - guests/freebsd: Fix regex for listing network devices on some FreeBSD boxes. [GH-8760]
+  - hosts/windows: Prevent control characters in version check for WSL [GH-8902, GH-8901]
+  - providers/docker: Split String type links into Array when using compose [GH-8837, GH-8821]
+  - providers/docker: Expand relative volume paths correctly [GH-8838, GH-8822]
+  - providers/docker: Error when compose option enabled with force_host_vm [GH-8911]
+  - provisioners/ansible: Update to use `-o` for identity files [GH-8786]
+  - provisioners/file: Ensure remote folder exists prior to scp file or folder [GH-8880]
+  - provisioners/salt: Fix error case when github is unreachable for installer [GH-8864]
+  - provisioners/shell: Allow frozen string scripts [GH-8875]
+  - provisioners/puppet: Remove `--manifestdir` flag from puppet apply in provisioner [GH-8797]
+  - synced_folders/rsync: Correctly format IPv6 host [GH-8840, GH-8809]
+
 ## 1.9.7 (July 7, 2017)
 
 FEATURES:
@@ -9,6 +43,8 @@ IMPROVEMENTS:
   - guests/bsd: Invoke `tee` with explicit path [GH-8740]
   - guests/smartos: Guest updates for host name and nfs capabilities [GH-8695]
   - guests/windows: Add public key capabilities for WinSSH communicator [GH-8761]
+  - hosts/windows: Log command exec encoding failures and use original string on failure [GH-8820]
+  - providers/virtualbox: Filter machine IPs when preparing NFS settings [GH-8819]
 
 BUG FIXES:
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (1.9.7.1)
+    vagrant-unbundled (1.9.8.1)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
@@ -43,7 +43,7 @@ GEM
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    fake_ftp (0.3.0)
+    fake_ftp (0.1.1)
     ffi (1.9.18)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -76,7 +76,7 @@ GEM
     netrc (0.11.0)
     nori (2.6.0)
     public_suffix (2.0.5)
-    rake (11.3.0)
+    rake (12.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -95,6 +95,9 @@ GEM
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
@@ -134,12 +137,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fake_ftp (~> 0.1)
-  rake (~> 11.3.0)
+  fake_ftp (~> 0.1.1)
+  rake (~> 12.0.0)
   rspec (~> 3.5.0)
+  rspec-its (~> 1.2.0)
   vagrant-spec!
   vagrant-unbundled!
   webmock (~> 1.20)
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

data/contrib/bash/completion.sh

@@ -91,7 +91,7 @@ _vagrant() {
               return 0
             ;;
             "box")
-              box_commands="add help list outdated remove repackage update"
+              box_commands="add help list outdated prune remove repackage update"
               COMPREPLY=($(compgen -W "${box_commands}" -- ${cur}))
               return 0
             ;;

data/contrib/sudoers/linux-ubuntu

@@ -1,9 +1,8 @@
 # These work with Ubuntu - they might need tweaking for other distributions
 
-Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
+Cmnd_Alias VAGRANT_EXPORTS_CHOWN = /bin/chown 0\:0 /tmp/*
+Cmnd_Alias VAGRANT_EXPORTS_MV = /bin/mv -f /tmp/* /etc/exports
 Cmnd_Alias VAGRANT_NFSD_CHECK = /etc/init.d/nfs-kernel-server status
 Cmnd_Alias VAGRANT_NFSD_START = /etc/init.d/nfs-kernel-server start
 Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /*/exports
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE_2 = /bin/cp /*/exports /etc/exports
-%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE, VAGRANT_EXPORTS_REMOVE_2
+%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_CHOWN, VAGRANT_EXPORTS_MV, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY

data/lib/vagrant/errors.rb

@@ -536,6 +536,14 @@ module Vagrant
       error_key(:requires_directory, "vagrant.actions.general.package")
     end
 
+    class PowerShellNotFound < VagrantError
+      error_key(:powershell_not_found)
+    end
+
+    class PowerShellInvalidVersion < VagrantError
+      error_key(:powershell_invalid_version)
+    end
+
     class ProviderCantInstall < VagrantError
       error_key(:provider_cant_install)
     end

data/lib/vagrant/machine.rb

@@ -442,6 +442,7 @@ module Vagrant
       info[:username] ||= @config.ssh.default.username
       info[:compression] ||= @config.ssh.default.compression
       info[:dsa_authentication] ||= @config.ssh.default.dsa_authentication
+      info[:extra_args] ||= @config.ssh.default.extra_args
 
       # We set overrides if they are set. These take precedence over
       # provider-returned data.
@@ -453,6 +454,7 @@ module Vagrant
       info[:dsa_authentication] = @config.ssh.dsa_authentication
       info[:username] = @config.ssh.username if @config.ssh.username
       info[:password] = @config.ssh.password if @config.ssh.password
+      info[:extra_args] = @config.ssh.extra_args if @config.ssh.extra_args
 
       # We also set some fields that are purely controlled by Varant
       info[:forward_agent] = @config.ssh.forward_agent

data/lib/vagrant/util/platform.rb

@@ -397,7 +397,7 @@ module Vagrant
           valid = false
           result = Util::Subprocess.execute("vagrant.exe", "version")
           if result.exit_code == 0
-            windows_version = result.stdout.match(/Installed Version: (?<version>.+$)/)
+            windows_version = result.stdout.match(/Installed Version: (?<version>[\w.-]+)/)
             if windows_version
               windows_version = windows_version[:version].strip
               valid = windows_version == Vagrant::VERSION

data/lib/vagrant/util/powershell.rb

@@ -8,8 +8,15 @@ module Vagrant
     # This is primarily a convenience wrapper around Subprocess that
     # properly sets powershell flags for you.
     class PowerShell
+      # NOTE: Version checks are only on Major
+      MINIMUM_REQUIRED_VERSION = 3
+
+      # @return [Boolean] powershell executable available on PATH
       def self.available?
-        !!Which.which("powershell")
+        if !defined?(@_powershell_available)
+          @_powershell_available = !!Which.which("powershell")
+        end
+        @_powershell_available
       end
 
       # Execute a powershell script.
@@ -17,6 +24,7 @@ module Vagrant
       # @param [String] path Path to the PowerShell script to execute.
       # @return [Subprocess::Result]
       def self.execute(path, *args, **opts, &block)
+        validate_install!
         command = [
           "powershell",
           "-NoLogo",
@@ -39,6 +47,7 @@ module Vagrant
       # @param [String] command PowerShell command to execute.
       # @return [Subprocess::Result]
       def self.execute_cmd(command)
+        validate_install!
         c = [
           "powershell",
           "-NoLogo",
@@ -58,19 +67,39 @@ module Vagrant
       #
       # @return [String]
       def self.version
-        command = [
-          "powershell",
-          "-NoLogo",
-          "-NoProfile",
-          "-NonInteractive",
-          "-ExecutionPolicy", "Bypass",
-          "-Command",
-          "$PSVersionTable.PSVersion.Major"
-        ].flatten
+        if !defined?(@_powershell_version)
+          command = [
+            "powershell",
+            "-NoLogo",
+            "-NoProfile",
+            "-NonInteractive",
+            "-ExecutionPolicy", "Bypass",
+            "-Command",
+            "$PSVersionTable.PSVersion.Major"
+          ].flatten
 
-        r = Subprocess.execute(*command)
-        return nil if r.exit_code != 0
-        return r.stdout.chomp
+          r = Subprocess.execute(*command)
+          @_powershell_version = r.exit_code != 0 ? nil : r.stdout.chomp
+        end
+        @_powershell_version
+      end
+
+      # Validates that powershell is installed, available, and
+      # at or above minimum required version
+      #
+      # @return [Boolean]
+      # @raises []
+      def self.validate_install!
+        if !defined?(@_powershell_validation)
+          raise Errors::PowerShellNotFound if !available?
+          if version.to_i < MINIMUM_REQUIRED_VERSION
+            raise Errors::PowerShellInvalidVersion,
+              minimum_version: MINIMUM_REQUIRED_VERSION,
+              installed_version: version ? version : "N/A"
+          end
+          @_powershell_validation = true
+        end
+        @_powershell_validation
       end
     end
   end

data/lib/vagrant/util/safe_exec.rb

@@ -44,8 +44,19 @@ module Vagrant
               # Re-generate strings to ensure common encoding
               @@logger.debug("Converting command and arguments to common UTF-8 encoding for exec.")
               @@logger.debug("Command: `#{command.inspect}` Args: `#{args.inspect}`")
-              command = "#{command}".force_encoding("UTF-8")
-              args = args.map{|arg| "#{arg}".force_encoding("UTF-8") }
+              begin
+                command = "#{command}".encode("UTF-8")
+              rescue Encoding::UndefinedConversionError => e
+                @@logger.warn("Failed to convert command - #{e.class}: #{e} (`#{command}`)")
+              end
+              args = args.map do |arg|
+                begin
+                  "#{arg}".encode("UTF-8")
+                rescue Encoding::UndefinedConversionError => e
+                  @@logger.warn("Failed to convert command argument - #{e.class}: #{e} (`#{arg}`)")
+                  arg
+                end
+              end
               @@logger.debug("Converted - Command: `#{command.inspect}` Args: `#{args.inspect}`")
             end
             Kernel.exec(command, *args)

data/lib/vagrant/util/ssh.rb

@@ -135,7 +135,11 @@ module Vagrant
         # If we're not in plain mode and :private_key_path is set attach the private key path(s).
         if !plain_mode && options[:private_key_path]
           options[:private_key_path].each do |path|
-            command_options += ["-i", path.to_s]
+
+            # Use '-o' instead of '-i' because '-i' does not call
+            # percent_expand in misc.c, but '-o' does. when passing the path,
+            # replace '%' in the path with '%%' to escape the '%'
+            command_options += ["-o", "IdentityFile=%s" % [path.to_s.gsub('%', '%%')]]
           end
         end
 
@@ -163,6 +167,12 @@ module Vagrant
         #
         # Without having extra_args be last, the user loses this ability
         command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]
+
+        # Note about :extra_args
+        #   ssh_info[:extra_args] comes from a machines ssh config in a Vagrantfile,
+        #   where as opts[:extra_args] comes from running the ssh command
+        command_options += Array(ssh_info[:extra_args]) if ssh_info[:extra_args]
+
         command_options.concat(opts[:extra_args]) if opts[:extra_args]
 
         # Build up the host string for connecting

data/plugins/commands/box/command/update.rb

@@ -33,6 +33,10 @@ module VagrantPlugins
               options[:provider] = p.to_sym
             end
 
+            o.on("-f", "--force", "Overwrite an existing box if it exists") do |f|
+              options[:force] = f
+            end
+
             build_download_options(o, download_options)
           end
 
@@ -40,15 +44,15 @@ module VagrantPlugins
           return if !argv
 
           if options[:box]
-            update_specific(options[:box], options[:provider], download_options)
+            update_specific(options[:box], options[:provider], download_options, options[:force])
           else
-            update_vms(argv, options[:provider], download_options)
+            update_vms(argv, options[:provider], download_options, options[:force])
           end
 
           0
         end
 
-        def update_specific(name, provider, download_options)
+        def update_specific(name, provider, download_options, force)
           boxes = {}
           @env.boxes.all.each do |n, v, p|
             boxes[n] ||= {}
@@ -81,11 +85,11 @@ module VagrantPlugins
 
           to_update.each do |n, p, v|
             box = @env.boxes.find(n, p, v)
-            box_update(box, "> #{v}", @env.ui, download_options)
+            box_update(box, "> #{v}", @env.ui, download_options, force)
           end
         end
 
-        def update_vms(argv, provider, download_options)
+        def update_vms(argv, provider, download_options, force)
           machines = {}
 
           with_target_vms(argv, provider: provider) do |machine|
@@ -120,11 +124,11 @@ module VagrantPlugins
             if download_options[:insecure].nil?
               download_options[:insecure] = machine.config.vm.box_download_insecure
             end
-            box_update(box, version, machine.ui, download_options)
+            box_update(box, version, machine.ui, download_options, force)
           end
         end
 
-        def box_update(box, version, ui, download_options)
+        def box_update(box, version, ui, download_options, force)
           ui.output(I18n.t("vagrant.box_update_checking", name: box.name))
           ui.detail("Latest installed version: #{box.version}")
           ui.detail("Version constraints: #{version}")
@@ -149,6 +153,7 @@ module VagrantPlugins
             box_provider: update[2].name,
             box_version: update[1].version,
             ui: ui,
+            box_force: force,
             box_client_cert: download_options[:client_cert],
             box_download_ca_cert: download_options[:ca_cert],
             box_download_ca_path: download_options[:ca_path],

data/plugins/commands/login/client.rb

@@ -40,15 +40,24 @@ module VagrantPlugins
       # Login logs a user in and returns the token for that user. The token
       # is _not_ stored unless {#store_token} is called.
       #
-      # @param [String] user
-      # @param [String] pass
+      # @param [String] username_or_email
+      # @param [String] password
+      # @param [String] description
       # @return [String] token The access token, or nil if auth failed.
-      def login(user, pass)
-        @logger.info("Logging in '#{user}'")
+      def login(username_or_email, password, description: nil)
+        @logger.info("Logging in '#{username_or_email}'")
 
         with_error_handling do
-          url      = "#{Vagrant.server_url}/api/v1/authenticate"
-          request  = { "user" => { "login" => user, "password" => pass } }
+          url = "#{Vagrant.server_url}/api/v1/authenticate"
+          request = {
+            user: {
+              login: username_or_email,
+              password: password
+            },
+            token: {
+              description: description
+            }
+          }
 
           proxy   = nil
           proxy ||= ENV["HTTPS_PROXY"] || ENV["https_proxy"]

data/plugins/commands/login/command.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 module VagrantPlugins
   module LoginCommand
     class Command < Vagrant.plugin("2", "command")
@@ -48,8 +50,9 @@ module VagrantPlugins
         end
 
         # Ask for the username
-        login    = nil
-        password = nil
+        login       = nil
+        password    = nil
+        description = nil
         while !login
           login = @env.ui.ask("Vagrant Cloud Username: ")
         end
@@ -58,7 +61,14 @@ module VagrantPlugins
           password = @env.ui.ask("Password (will be hidden): ", echo: false)
         end
 
-        token = @client.login(login, password)
+        description_default = "Vagrant login from #{Socket.gethostname}"
+        while !description
+          description =
+            @env.ui.ask("Token description (Defaults to #{description_default.inspect}): ")
+        end
+        description = description_default if description.empty?
+
+        token = @client.login(login, password, description: description)
         if !token
           @env.ui.error(I18n.t("login_command.invalid_login"))
           return 1

data/plugins/commands/up/command.rb

@@ -78,6 +78,15 @@ module VagrantPlugins
         # Build up the batch job of what we'll do
         machines = []
         if names
+          # To prevent vagrant from attempting to validate a global vms config
+          # (which doesn't exist within the local dir) when attempting to
+          # install a machines provider, this check below will disable the
+          # install_providers function if a user gives us a machine id instead
+          # of the machines name.
+          machine_names = []
+          with_target_vms(names, provider: options[:provider]){|m| machine_names << m.name }
+          options[:install_provider] = false if !(machine_names - names).empty?
+
           # If we're installing providers, then do that. We don't
           # parallelize this step because it is likely the same provider
           # anyways.