vagrant-unbundled 2.1.4.0 → 2.2.0.0

data/plugins/guests/windows/cap/file_system.rb

@@ -0,0 +1,65 @@
+module VagrantPlugins
+  module GuestWindows
+    module Cap
+      class FileSystem
+        # Create a temporary file or directory on the guest
+        #
+        # @param [Vagrant::Machine] machine Vagrant guest machine
+        # @param [Hash] opts Path options
+        # @return [String] path to temporary file or directory
+        def self.create_tmp_path(machine, opts)
+          comm = machine.communicate
+          path = ""
+          cmd = "Write-Output ([System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), " \
+            "[System.IO.Path]::GetRandomFileName())) | Out-String -Width 2048"
+          comm.execute(cmd, shell: :powershell) do |type, data|
+            if type == :stdout
+              path << data
+            end
+          end
+          path.strip!
+          if opts[:extension]
+            path << opts[:extension].to_s
+          end
+          if opts[:type] == :directory
+            comm.execute("[System.IO.Directory]::CreateDirectory('#{path}')")
+          end
+          path
+        end
+
+        # Decompress zip file on guest to given location
+        #
+        # @param [Vagrant::Machine] machine Vagrant guest machine
+        # @param [String] compressed_file Path to compressed file on guest
+        # @param [String] destination Path for decompressed files on guest
+        def self.decompress_zip(machine, compressed_file, destination, opts={})
+          comm = machine.communicate
+          extract_dir = create_tmp_path(machine, type: :directory)
+          cmds = []
+          destination = destination.tr("/", "\\")
+          if opts[:type] == :directory
+            cmds << "New-Item -ItemType Directory -Force -Path \"#{destination}\""
+          else
+            d_parts = destination.split("\\")
+            d_parts.pop
+            parent_dir = d_parts.join("\\") + "\\"
+            cmds << "New-Item -ItemType Directory -Force -Path \"#{parent_dir}\""
+          end
+          cmd = "$f = \"#{compressed_file}\"; $d = \"#{extract_dir}\"; "
+          cmd << '$s = New-Object -ComObject "Shell.Application"; $z = $s.NameSpace($f); '
+          cmd << 'foreach($i in $z.items()){ $s.Namespace($d).copyhere($i); }'
+          cmds << cmd
+          cmds += [
+            "Move-Item -Force -Path \"#{extract_dir}\\*\" -Destination \"#{destination}\\\"",
+            "Remove-Item -Path \"#{compressed_file}\" -Force",
+            "Remove-Item -Path \"#{extract_dir}\" -Recurse -Force"
+          ]
+          cmds.each do |cmd|
+            comm.execute(cmd, shell: :powershell)
+          end
+          true
+        end
+      end
+    end
+  end
+end

data/plugins/guests/windows/cap/mount_shared_folder.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
             # Ensure password is scrubbed
             Vagrant::Util::CredentialScrubber.sensitive(options[:smb_password])
           end
-          machine.communicate.execute("cmdkey /add:#{options[:smb_host]} /user:#{options[:smb_username]} /pass:#{options[:smb_password]}", {shell: :powershell, elevated: true})
+          machine.communicate.execute("cmdkey /add:#{options[:smb_host]} /user:#{options[:smb_username]} /pass:\"#{options[:smb_password]}\"", {shell: :powershell, elevated: true})
           mount_shared_folder(machine, name, guestpath, "\\\\#{options[:smb_host]}\\")
         end
 

data/plugins/guests/windows/plugin.rb

@@ -34,6 +34,16 @@ module VagrantPlugins
         Cap::Halt
       end
 
+      guest_capability(:windows, :create_tmp_path) do
+        require_relative "cap/file_system"
+        Cap::FileSystem
+      end
+
+      guest_capability(:windows, :decompress_zip) do
+        require_relative "cap/file_system"
+        Cap::FileSystem
+      end
+
       guest_capability(:windows, :mount_virtualbox_shared_folder) do
         require_relative "cap/mount_shared_folder"
         Cap::MountSharedFolder

data/plugins/kernel_v2/config/vm.rb

@@ -22,6 +22,7 @@ module VagrantPlugins
       attr_accessor :base_mac
       attr_accessor :boot_timeout
       attr_accessor :box
+      attr_accessor :ignore_box_vagrantfile
       attr_accessor :box_check_update
       attr_accessor :box_url
       attr_accessor :box_server_url
@@ -51,6 +52,7 @@ module VagrantPlugins
         @base_mac                      = UNSET_VALUE
         @boot_timeout                  = UNSET_VALUE
         @box                           = UNSET_VALUE
+        @ignore_box_vagrantfile        = UNSET_VALUE
         @box_check_update              = UNSET_VALUE
         @box_download_ca_cert          = UNSET_VALUE
         @box_download_ca_path          = UNSET_VALUE
@@ -377,6 +379,7 @@ module VagrantPlugins
         @base_mac = nil if @base_mac == UNSET_VALUE
         @boot_timeout = 300 if @boot_timeout == UNSET_VALUE
         @box = nil if @box == UNSET_VALUE
+        @ignore_box_vagrantfile = false if @ignore_box_vagrantfile == UNSET_VALUE
 
         if @box_check_update == UNSET_VALUE
           @box_check_update = !present?(ENV["VAGRANT_BOX_UPDATE_CHECK_DISABLE"])

data/plugins/kernel_v2/config/vm_trigger.rb

@@ -72,6 +72,23 @@ module VagrantPlugins
       # @return [Integer, Array]
       attr_accessor :exit_codes
 
+      # If set to true, trigger will halt Vagrant immediately and exit 0
+      # Can also be configured to have a custom exit code
+      #
+      # @return [Integer]
+      attr_accessor :abort
+
+      # Internal reader for the internal variable ruby_block
+      #
+      # @return [Proc]
+      attr_reader :ruby_block
+
+      # Variable used to store ruby proc when defining a ruby trigger
+      # with the "hash" syntax
+      #
+      # @return [Proc]
+      attr_accessor :ruby
+
       def initialize(command)
         @logger = Log4r::Logger.new("vagrant::config::vm::trigger::config")
 
@@ -84,14 +101,27 @@ module VagrantPlugins
         @run = UNSET_VALUE
         @run_remote = UNSET_VALUE
         @exit_codes = UNSET_VALUE
+        @abort = UNSET_VALUE
+        @ruby = UNSET_VALUE
 
         # Internal options
         @id = SecureRandom.uuid
         @command = command.to_sym
+        @ruby_block = UNSET_VALUE
 
         @logger.debug("Trigger defined for command: #{command}")
       end
 
+      # Config option `ruby` for a trigger which reads in a ruby block and sets
+      # it to be evaluated when the configured trigger fires. This method is only
+      # invoked when the regular "block" syntax is used. Otherwise the proc is
+      # set through the attr_accessor if the hash syntax is used.
+      #
+      # @param [Proc] block
+      def ruby(&block)
+        @ruby_block = block
+      end
+
       def finalize!
         # Ensure all config options are set to nil or default value if untouched
         # by user
@@ -104,8 +134,13 @@ module VagrantPlugins
         @run_remote = nil if @run_remote == UNSET_VALUE
         @only_on = nil if @only_on == UNSET_VALUE
         @exit_codes = DEFAULT_EXIT_CODE if @exit_codes == UNSET_VALUE
+        @abort = nil if @abort == UNSET_VALUE
+
+        @ruby_block = nil if @ruby_block == UNSET_VALUE
+        @ruby = nil if @ruby == UNSET_VALUE
+        @ruby_block = @ruby if @ruby
 
-        # these values are expected to always be an Array internally,
+        # These values are expected to always be an Array internally,
         # but can be set as a single String or Symbol
         #
         # Guests are stored internally as strings
@@ -149,6 +184,9 @@ module VagrantPlugins
           @run_remote = new_run
         end
 
+        if @abort == true
+          @abort = 1
+        end
       end
 
       # @return [Array] array of strings of error messages from config option validation
@@ -208,6 +246,16 @@ module VagrantPlugins
           end
         end
 
+        if @abort && !@abort.is_a?(Integer)
+          errors << I18n.t("vagrant.config.triggers.abort_bad_type", cmd: @command)
+        elsif @abort == false
+          machine.ui.warn(I18n.t("vagrant.config.triggers.abort_false_type"))
+        end
+
+        if @ruby_block && !ruby_block.is_a?(Proc)
+          errors << I18n.t("vagrant.config.triggers.ruby_bad_type", cmd: @command)
+        end
+
         errors
       end
 

data/plugins/providers/docker/action/build.rb

@@ -17,9 +17,11 @@ module VagrantPlugins
           machine   = env[:machine]
           build_dir = env[:build_dir]
           build_dir ||= machine.provider_config.build_dir
-
+          git_repo  = env[:git_repo]
+          git_repo  ||= machine.provider_config.git_repo
+          
           # If we're not building a container, then just skip this step
-          return @app.call(env) if !build_dir
+          return @app.call(env) if (!build_dir && !git_repo)
 
           # Try to read the image ID from the cache file if we've
           # already built it.
@@ -41,18 +43,31 @@ module VagrantPlugins
             args = machine.provider_config.build_args.clone
             if machine.provider_config.dockerfile
               dockerfile      = machine.provider_config.dockerfile
-              dockerfile_path = File.join(build_dir, dockerfile)
+              dockerfile_path = build_dir ? File.join(build_dir, dockerfile) : dockerfile
 
               args.push("--file").push(dockerfile_path)
-              machine.ui.output(
-                I18n.t("docker_provider.building_named_dockerfile",
-                file: machine.provider_config.dockerfile))
+              if build_dir
+                machine.ui.output(
+                  I18n.t("docker_provider.building_named_dockerfile",
+                  file: machine.provider_config.dockerfile))
+              else
+                machine.ui.output(
+                  I18n.t("docker_provider.building_git_repo_named_dockerfile",
+                  file: machine.provider_config.dockerfile,
+                  repo: git_repo))
+              end
             else
-              machine.ui.output(I18n.t("docker_provider.building"))
+              if build_dir
+                machine.ui.output(I18n.t("docker_provider.building"))
+              else
+                machine.ui.output(
+                  I18n.t("docker_provider.building_git_repo",
+                  repo: git_repo))
+              end
             end
 
             image = machine.provider.driver.build(
-              build_dir,
+              build_dir || git_repo,
               extra_args: args) do |type, data|
               data = remove_ansi_escape_codes(data.chomp).chomp
               env[:ui].detail(data) if data != ""

data/plugins/providers/docker/action/is_build.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:result] = !!env[:machine].provider_config.build_dir
+          env[:result] = (!!env[:machine].provider_config.build_dir || !!env[:machine].provider_config.git_repo)
           @app.call(env)
         end
       end

data/plugins/providers/docker/config.rb

@@ -14,11 +14,19 @@ module VagrantPlugins
       attr_accessor :build_args
 
       # The directory with a Dockerfile to build and use as the basis
-      # for this container. If this is set, "image" should not be set.
+      # for this container. If this is set, neither "image" nor "git_repo"
+      # should be set.
       #
       # @return [String]
       attr_accessor :build_dir
 
+      # The URL for a git repository with a Dockerfile to build and use
+      # as the basis for this container. If this is set, neither "image"
+      # nor "build_dir" should be set.
+      #
+      # @return [String]
+      attr_accessor :git_repo
+
       # Use docker-compose to manage the lifecycle and environment for
       # containers instead of using docker directly.
       #
@@ -149,6 +157,7 @@ module VagrantPlugins
       def initialize
         @build_args = []
         @build_dir  = UNSET_VALUE
+        @git_repo   = UNSET_VALUE
         @cmd        = UNSET_VALUE
         @compose    = UNSET_VALUE
         @compose_configuration = {}
@@ -185,14 +194,39 @@ module VagrantPlugins
         super.tap do |result|
           # This is a bit confusing. The tests explain the purpose of this
           # better than the code lets on, I believe.
-          if (other.image != UNSET_VALUE || other.build_dir != UNSET_VALUE) &&
-            (other.image == UNSET_VALUE || other.build_dir == UNSET_VALUE)
-            if other.image != UNSET_VALUE && @build_dir != UNSET_VALUE
-              result.build_dir = nil
+          has_image     = (other.image != UNSET_VALUE)
+          has_build_dir = (other.build_dir != UNSET_VALUE)
+          has_git_repo  = (other.git_repo != UNSET_VALUE)
+
+          if (has_image ^ has_build_dir ^ has_git_repo) && !(has_image && has_build_dir && has_git_repo)
+            # image
+            if has_image
+              if @build_dir != UNSET_VALUE
+                result.build_dir = nil
+              end
+              if @git_repo != UNSET_VALUE
+                result.git_repo = nil
+              end
             end
 
-            if other.build_dir != UNSET_VALUE && @image != UNSET_VALUE
-              result.image = nil
+            # build_dir
+            if has_build_dir
+              if @image != UNSET_VALUE
+                result.image = nil
+              end
+              if @git_repo != UNSET_VALUE
+                result.git_repo = nil
+              end
+            end
+
+            # git_repo
+            if has_git_repo
+              if @build_dir != UNSET_VALUE
+                result.build_dir = nil
+              end
+              if @image != UNSET_VALUE
+                result.image = nil
+              end
             end
           end
 
@@ -214,6 +248,7 @@ module VagrantPlugins
       def finalize!
         @build_args = [] if @build_args == UNSET_VALUE
         @build_dir  = nil if @build_dir == UNSET_VALUE
+        @git_repo   = nil if @git_repo == UNSET_VALUE
         @cmd        = [] if @cmd == UNSET_VALUE
         @compose    = false if @compose == UNSET_VALUE
         @create_args = [] if @create_args == UNSET_VALUE
@@ -262,11 +297,11 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        if @build_dir && @image
-          errors << I18n.t("docker_provider.errors.config.both_build_and_image")
+        if [@build_dir, @git_repo, @image].compact.size > 1
+          errors << I18n.t("docker_provider.errors.config.both_build_and_image_and_git")
         end
 
-        if !@build_dir && !@image
+        if !@build_dir && !@git_repo && !@image
           errors << I18n.t("docker_provider.errors.config.build_dir_or_image")
         end
 
@@ -277,6 +312,11 @@ module VagrantPlugins
           end
         end
 
+        # Comparison logic taken directly from docker's urlutil.go
+        if @git_repo && !( @git_repo =~ /^http(?:s)?:\/\/.*.git(?:#.+)?$/ || @git_repo =~ /^git(?:hub\.com|@|:\/\/)/)
+          errors << I18n.t("docker_provider.errors.config.git_repo_invalid")
+        end
+
         if !@compose_configuration.is_a?(Hash)
           errors << I18n.t("docker_provider.errors.config.compose_configuration_hash")
         end

data/plugins/providers/hyperv/scripts/configure_vm.ps1

@@ -91,7 +91,14 @@ if($EnableCheckpoints) {
 }
 
 try {
-    Hyper-V\Set-VM -VM $VM -CheckpointType $checkpoints
+    if((Get-Command Hyper-V\Set-VM).Parameters["CheckpointType"] -eq $null) {
+        if($CheckpointAction -eq "enable") {
+            Write-ErrorMessage "CheckpointType is not available. Cannot enable checkpoints."
+            exit 1
+        }
+    } else {
+        Hyper-V\Set-VM -VM $VM -CheckpointType $checkpoints
+    }
 } catch {
     Write-ErrorMessage "Failed to ${CheckpointAction} checkpoints on VM: ${PSItem}"
     exit 1
@@ -106,7 +113,14 @@ if($EnableAutomaticCheckpoints) {
 }
 
 try {
-    Hyper-V\Set-VM -VM $VM -AutomaticCheckpointsEnabled $autochecks
+    if((Get-Command Hyper-V\Set-VM).Parameters["AutomaticCheckpointsEnabled"] -eq $null) {
+        if($autochecks -eq 1) {
+            Write-ErrorMessage "AutomaticCheckpointsEnabled is not available"
+            exit 1
+        }
+    } else {
+        Hyper-V\Set-VM -VM $VM -AutomaticCheckpointsEnabled $autochecks
+    }
 } catch {
     Write-ErrorMessage "Failed to ${AutoAction} automatic checkpoints on VM: ${PSItem}"
     exit 1

data/plugins/providers/virtualbox/action/match_mac_address.rb

@@ -10,11 +10,14 @@ module VagrantPlugins
           # If we cloned, we don't need a base mac, it is already set!
           return @app.call(env) if env[:machine].config.vm.clone
 
-          raise Vagrant::Errors::VMBaseMacNotSpecified if !env[:machine].config.vm.base_mac
-
-          # Create the proc which we want to use to modify the virtual machine
-          env[:ui].info I18n.t("vagrant.actions.vm.match_mac.matching")
-          env[:machine].provider.driver.set_mac_address(env[:machine].config.vm.base_mac)
+          if env[:machine].config.vm.base_mac
+            # Create the proc which we want to use to modify the virtual machine
+            env[:ui].info I18n.t("vagrant.actions.vm.match_mac.matching")
+            env[:machine].provider.driver.set_mac_address(env[:machine].config.vm.base_mac)
+          else
+            env[:ui].info I18n.t("vagrant.actions.vm.match_mac.generating")
+            env[:machine].provider.driver.set_mac_address(nil)
+          end
 
           @app.call(env)
         end

data/plugins/providers/virtualbox/driver/version_5_0.rb

@@ -635,6 +635,7 @@ module VagrantPlugins
         end
 
         def set_mac_address(mac)
+          mac = "auto" if !mac
           execute("modifyvm", @uuid, "--macaddress1", mac, retryable: true)
         end
 

data/plugins/provisioners/ansible/provisioner/guest.rb

@@ -125,7 +125,8 @@ module VagrantPlugins
           inventory_basedir = File.join(config.tmp_path, "inventory")
           inventory_path = File.join(inventory_basedir, "vagrant_ansible_local_inventory")
 
-          create_and_chown_remote_folder(inventory_basedir)
+          @machine.communicate.sudo("mkdir -p #{inventory_basedir}")
+          @machine.communicate.sudo("chown -R -h #{@machine.ssh_info[:username]} #{config.tmp_path}")
           @machine.communicate.sudo("rm -f #{inventory_path}", error_check: false)
 
           Tempfile.open("vagrant-ansible-local-inventory-#{@machine.name}") do |f|
@@ -159,13 +160,6 @@ module VagrantPlugins
           return machines
         end
 
-        def create_and_chown_remote_folder(path)
-          @machine.communicate.tap do |comm|
-            comm.sudo("mkdir -p #{path}")
-            comm.sudo("chown -h #{@machine.ssh_info[:username]} #{path}")
-          end
-        end
-
         def check_path(path, test_args, option_name)
           # Checks for the existence of given file (or directory) on the guest system,
           # and error if it doesn't exist.

data/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -259,9 +259,11 @@ module VagrantPlugins
               env_vars.map! do |env_var_string|
                 "$env:#{env_var_string}"
               end
+              env_vars = env_vars.join("; ")
+              env_vars << ";"
+            else
+              env_vars = env_vars.join(" ")
             end
-
-            env_vars = env_vars.join(" ")
           end
 
           command = [

data/plugins/provisioners/salt/bootstrap-salt.sh

@@ -6,7 +6,7 @@ cd `mktemp -d`
 if [ -x /usr/bin/fetch ]; then
     /usr/bin/fetch -o bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 elif [ -x /usr/bin/curl ]; then
-    /usr/bin/curl -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
+    /usr/bin/curl --silent --show-error -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 elif [ -x /usr/bin/wget ]; then
     /usr/bin/wget -O bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 else

data/plugins/provisioners/salt/provisioner.rb

@@ -110,11 +110,11 @@ module VagrantPlugins
 
       # Generates option string for bootstrap script
       def bootstrap_options(install, configure, config_dir)
-        options = ""
-
         # Any extra options passed to bootstrap
         if @config.bootstrap_options
-          options = "%s %s" % [options, @config.bootstrap_options]
+          options = @config.bootstrap_options
+        else
+          options = ""
         end
 
         if @config.master_json_config && @machine.config.vm.communicator != :winrm
@@ -176,7 +176,19 @@ module VagrantPlugins
       ## Actions
       # Get pillar string to pass with the salt command
       def get_pillar
-        " pillar='#{@config.pillar_data.to_json}'" if !@config.pillar_data.empty?
+        if !@config.pillar_data.empty?
+          if @machine.config.vm.communicator == :winrm
+            # ' doesn't have any special behavior on the command prompt,
+            # so '{"x":"y"}' becomes '{x:y}' with literal single quotes.
+            # However, """ will become " , and \\""" will become \" .
+            # Use \\"" instead of \\""" for literal inner-value quotes
+            # to avoid issue with odd number of quotes.
+            # --% disables special PowerShell parsing on the rest of the line.
+            " --% pillar=#{@config.pillar_data.to_json.gsub(/(?<!\\)\"/, '"""').gsub(/\\\"/, %q(\\\\\""))}"
+          else
+            " pillar='#{@config.pillar_data.to_json}'"
+          end
+        end
       end
 
       # Get colorization option string to pass with the salt command
@@ -304,6 +316,9 @@ module VagrantPlugins
             end
             bootstrap_destination = File.join(config_dir, "bootstrap_salt.ps1")
           else
+            if @config.version
+              options += " %s" % @config.version
+            end
             bootstrap_destination = File.join(config_dir, "bootstrap_salt.sh")
           end
 

data/plugins/synced_folders/rsync/helper.rb

@@ -1,5 +1,6 @@
 require "ipaddr"
 require "shellwords"
+require "tmpdir"
 
 require "vagrant/util/platform"
 require "vagrant/util/subprocess"
@@ -81,7 +82,7 @@ module VagrantPlugins
         # too long for unix domain sockets.
         control_options = ""
         unless Vagrant::Util::Platform.windows?
-          controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}")
+          controlpath = Dir.mktmpdir("vagrant-rsync-")
           control_options = "-o ControlMaster=auto -o ControlPath=#{controlpath} -o ControlPersist=10m "
         end
 

data/templates/commands/ssh_config/config.erb

@@ -2,7 +2,7 @@ Host <%= host_key %>
   HostName <%= ssh_host %>
   User <%= ssh_user %>
   Port <%= ssh_port %>
-<% if ! verify_host_key -%>
+<% if ! verify_host_key || verify_host_key == :never -%>
   UserKnownHostsFile /dev/null
   StrictHostKeyChecking no
 <% end -%>

data/templates/commands/winrm_config/config.erb

@@ -0,0 +1,11 @@
+Host <%= host_key %>
+  HostName <%= winrm_host %>
+  User <%= winrm_user %>
+  Password <%= winrm_password %>
+  Port <%= winrm_port %>
+  <% if rdp_port -%>
+  RDPHostName <%= rdp_host %>
+  RDPPort <%= rdp_port %>
+  RDPUser <%= rdp_user %>
+  RDPPassword <%= rdp_pass %>
+  <% end -%>

data/templates/guests/openbsd/network_static6.erb

@@ -0,0 +1 @@
+inet6  <%= options[:ip] %> <%= options[:netmask] %> NONE