vagrant-unbundled 2.0.0.1 → 2.0.1.0

data/plugins/guests/solaris11/plugin.rb

@@ -10,16 +10,16 @@ module VagrantPlugins
       name "Solaris 11 guest."
       description "Solaris 11 guest support."
 
+      guest(:solaris11, :solaris) do
+        require_relative "guest"
+        Guest
+      end
+
       config(:solaris11) do
         require_relative "config"
         Config
       end
 
-      guest(:solaris11) do
-        require_relative "guest"
-        Guest
-      end
-
       guest_capability(:solaris11, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
@@ -29,36 +29,6 @@ module VagrantPlugins
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
-
-      guest_capability(:solaris11, :halt) do
-        require_relative "cap/halt"
-        Cap::Halt
-      end
-
-      guest_capability(:solaris11, :mount_virtualbox_shared_folder) do
-        require_relative "cap/mount_virtualbox_shared_folder"
-        Cap::MountVirtualBoxSharedFolder
-      end
-
-      guest_capability(:solaris11, :rsync_installed) do
-        require_relative "cap/rsync"
-        Cap::RSync
-      end
-
-      guest_capability(:solaris11, :rsync_pre) do
-        require_relative "cap/rsync"
-        Cap::RSync
-      end
-
-      guest_capability(:solaris11, :insert_public_key) do
-        require_relative "cap/insert_public_key"
-        Cap::InsertPublicKey
-      end
-
-      guest_capability(:solaris11, :remove_public_key) do
-        require_relative "cap/remove_public_key"
-        Cap::RemovePublicKey
-      end
     end
   end
 end

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

@@ -1,5 +1,7 @@
 require "tempfile"
 
+require_relative '../../../communicators/winssh/communicator'
+
 module VagrantPlugins
   module GuestWindows
     module Cap

data/plugins/guests/windows/guest_network.rb

@@ -64,7 +64,7 @@ module VagrantPlugins
       def set_all_networks_to_work
         @logger.info("Setting all networks to 'Work Network'")
         command = File.read(File.expand_path("../scripts/set_work_network.ps1", __FILE__))
-        @communicator.execute(command)
+        @communicator.execute(command, { shell: :powershell })
       end
 
       protected
@@ -76,7 +76,7 @@ module VagrantPlugins
       def wsman_version
         @logger.debug("querying WSMan version")
         version = ''
-        @communicator.execute(PS_GET_WSMAN_VER) do |type, line|
+        @communicator.execute(PS_GET_WSMAN_VER, { shell: :powershell }) do |type, line|
           version = version + "#{line}" if type == :stdout && !line.nil?
         end
         @logger.debug("wsman version: #{version}")
@@ -108,7 +108,7 @@ module VagrantPlugins
       def network_adapters_v3_winrm
         command = File.read(File.expand_path("../scripts/winrs_v3_get_adapters.ps1", __FILE__))
         output = ""
-        @communicator.execute(command) do |type, line|
+        @communicator.execute(command, { shell: :powershell }) do |type, line|
           output = output + "#{line}" if type == :stdout && !line.nil?
         end
 

data/plugins/guests/windows/scripts/reboot_detect.ps1

@@ -32,6 +32,11 @@ if (ShuttingDown) {
     exit 2
   }
 
+  if ($LASTEXITCODE -eq 1115) {
+    # A system shutdown is in progress
+    exit 2
+  }
+
   # Remove the pending reboot we just created above
   if ($LASTEXITCODE -eq 0) {
     . shutdown.exe -a

data/plugins/providers/docker/driver.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
         run_cmd += ports.map { |p| ['-p', p.to_s] }
         run_cmd += volumes.map { |v|
           v = v.to_s
-          if v.include?(":") && (Vagrant::Util::Platform.windows? || Vagrant::Util::Platform.wsl?)
+          if v.include?(":") && @executor.windows?
             host, guest = v.split(":", 2)
             host = Vagrant::Util::Platform.windows_path(host)
             # NOTE: Docker does not support UNC style paths (which also

data/plugins/providers/docker/executor/local.rb

@@ -29,6 +29,10 @@ module VagrantPlugins
 
           result.stdout
         end
+
+        def windows?
+          ::Vagrant::Util::Platform.windows? || ::Vagrant::Util::Platform.wsl?
+        end
       end
     end
   end

data/plugins/providers/docker/executor/vagrant.rb

@@ -65,6 +65,10 @@ module VagrantPlugins
           stdout.chomp
         end
 
+        def windows?
+          false
+        end
+
         protected
 
         def ssh_run(cmd)

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

@@ -115,7 +115,7 @@ if ($auto_start_action) {
 }
 
 if ($auto_stop_action) {
-    Set-VM -VM $vmConfig.VM -AutomaticStartAction $auto_stop_action
+    Set-VM -VM $vmConfig.VM -AutomaticStopAction $auto_stop_action
 }
 
 # Only set EFI secure boot for Gen 2 machines, not gen 1

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

@@ -62,6 +62,7 @@ module VagrantPlugins
             "4.3" => Version_4_3,
             "5.0" => Version_5_0,
             "5.1" => Version_5_1,
+            "5.2" => Version_5_2,
           }
 
           if @@version.start_with?("4.2.14")

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

@@ -0,0 +1,16 @@
+require File.expand_path("../version_5_1", __FILE__)
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Driver
+      # Driver for VirtualBox 5.2.x
+      class Version_5_2 < Version_5_1
+        def initialize(uuid)
+          super
+
+          @logger = Log4r::Logger.new("vagrant::provider::virtualbox_5_2")
+        end
+      end
+    end
+  end
+end

data/plugins/providers/virtualbox/plugin.rb

@@ -57,6 +57,7 @@ module VagrantPlugins
       autoload :Version_4_3, File.expand_path("../driver/version_4_3", __FILE__)
       autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
       autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
+      autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
     end
 
     module Model

data/plugins/providers/virtualbox/synced_folder.rb

@@ -85,7 +85,7 @@ module VagrantPlugins
       end
 
       def os_friendly_id(id)
-        id.gsub(/[\/\\]/,'_').sub(/^_/, '')
+        id.gsub(/[\s\/\\]/,'_').sub(/^_/, '')
       end
 
       # share_folders sets up the shared folder definitions on the

data/plugins/provisioners/chef/provisioner/chef_client.rb

@@ -73,35 +73,42 @@ module VagrantPlugins
             @machine.ui.warn(I18n.t("vagrant.chef_run_list_empty"))
           end
 
-          if @machine.guest.capability?(:wait_for_reboot)
-            @machine.guest.capability(:wait_for_reboot)
-          end
-
           command = CommandBuilder.command(:client, @config,
             windows: windows?,
             colored: @machine.env.ui.color?,
           )
-
+          
+          still_active = 259 #provisioner has asked chef to reboot 
+          
           @config.attempts.times do |attempt|
-            if attempt == 0
-              @machine.ui.info I18n.t("vagrant.provisioners.chef.running_client")
-            else
-              @machine.ui.info I18n.t("vagrant.provisioners.chef.running_client_again")
-            end
-
-            opts = { error_check: false, elevated: true }
-            exit_status = @machine.communicate.sudo(command, opts) do |type, data|
-              # Output the data with the proper color based on the stream.
-              color = type == :stdout ? :green : :red
-
-              data = data.chomp
-              next if data.empty?
-
-              @machine.ui.info(data, color: color)
+            exit_status = 0
+            while exit_status == 0 || exit_status == still_active 
+              if @machine.guest.capability?(:wait_for_reboot)
+                @machine.guest.capability(:wait_for_reboot)
+              elsif attempt > 0
+                sleep 10
+                @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)
+              end
+              if attempt == 0
+                @machine.ui.info I18n.t("vagrant.provisioners.chef.running_client")
+              else
+                @machine.ui.info I18n.t("vagrant.provisioners.chef.running_client_again")
+              end
+
+              opts = { error_check: false, elevated: true }
+              exit_status = @machine.communicate.sudo(command, opts) do |type, data|
+                # Output the data with the proper color based on the stream.
+                color = type == :stdout ? :green : :red
+
+                data = data.chomp
+                next if data.empty?
+
+                @machine.ui.info(data, color: color)
+              end
+
+              # There is no need to run Chef again if it converges
+              return if exit_status == 0
             end
-
-            # There is no need to run Chef again if it converges
-            return if exit_status == 0
           end
 
           # If we reached this point then Chef never converged! Error.

data/plugins/provisioners/chef/provisioner/chef_solo.rb

@@ -176,36 +176,43 @@ module VagrantPlugins
             @machine.ui.warn(I18n.t("vagrant.chef_run_list_empty"))
           end
 
-          if @machine.guest.capability?(:wait_for_reboot)
-            @machine.guest.capability(:wait_for_reboot)
-          end
-
           command = CommandBuilder.command(:solo, @config,
             windows: windows?,
             colored: @machine.env.ui.color?,
             legacy_mode: @config.legacy_mode,
           )
 
+          still_active = 259 #provisioner has asked chef to reboot
+          
           @config.attempts.times do |attempt|
-            if attempt == 0
-              @machine.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
-            else
-              @machine.ui.info I18n.t("vagrant.provisioners.chef.running_solo_again")
-            end
+            exit_status = 0
+            while exit_status == 0 || exit_status == still_active 
+              if @machine.guest.capability?(:wait_for_reboot)
+                @machine.guest.capability(:wait_for_reboot)
+              elsif attempt > 0
+                sleep 10
+                @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)
+              end
+              if attempt == 0
+                @machine.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
+              else
+                @machine.ui.info I18n.t("vagrant.provisioners.chef.running_solo_again")
+              end
 
-            opts = { error_check: false, elevated: true }
-            exit_status = @machine.communicate.sudo(command, opts) do |type, data|
-              # Output the data with the proper color based on the stream.
-              color = type == :stdout ? :green : :red
+              opts = { error_check: false, elevated: true }
+              exit_status = @machine.communicate.sudo(command, opts) do |type, data|
+                # Output the data with the proper color based on the stream.
+                color = type == :stdout ? :green : :red
 
-              data = data.chomp
-              next if data.empty?
+                data = data.chomp
+                next if data.empty?
 
-              @machine.ui.info(data, color: color)
-            end
+                @machine.ui.info(data, color: color)
+              end
 
-            # There is no need to run Chef again if it converges
-            return if exit_status == 0
+              # There is no need to run Chef again if it converges
+              return if exit_status == 0
+            end
           end
 
           # If we reached this point then Chef never converged! Error.

data/plugins/provisioners/chef/provisioner/chef_zero.rb

@@ -56,36 +56,43 @@ module VagrantPlugins
             @machine.ui.warn(I18n.t("vagrant.chef_run_list_empty"))
           end
 
-          if @machine.guest.capability?(:wait_for_reboot)
-            @machine.guest.capability(:wait_for_reboot)
-          end
-
           command = CommandBuilder.command(:client, @config,
             windows:    windows?,
             colored:    @machine.env.ui.color?,
             local_mode: true,
           )
 
+          still_active = 259 #provisioner has asked chef to reboot 
+          
           @config.attempts.times do |attempt|
-            if attempt == 0
-              @machine.ui.info I18n.t("vagrant.provisioners.chef.running_zero")
-            else
-              @machine.ui.info I18n.t("vagrant.provisioners.chef.running_zero_again")
+            exit_status = 0
+            while exit_status == 0 || exit_status == still_active 
+              if @machine.guest.capability?(:wait_for_reboot)
+                @machine.guest.capability(:wait_for_reboot)
+              elsif attempt > 0
+                sleep 10
+                @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)
+              end
+              if attempt == 0
+                @machine.ui.info I18n.t("vagrant.provisioners.chef.running_zero")
+              else
+                @machine.ui.info I18n.t("vagrant.provisioners.chef.running_zero_again")
+              end
+
+              opts = { error_check: false, elevated: true }
+              exit_status = @machine.communicate.sudo(command, opts) do |type, data|
+                # Output the data with the proper color based on the stream.
+                color = type == :stdout ? :green : :red
+
+                data = data.chomp
+                next if data.empty?
+
+                @machine.ui.info(data, color: color)
+              end
+
+              # There is no need to run Chef again if it converges
+              return if exit_status == 0
             end
-
-            opts = { error_check: false, elevated: true }
-            exit_status = @machine.communicate.sudo(command, opts) do |type, data|
-              # Output the data with the proper color based on the stream.
-              color = type == :stdout ? :green : :red
-
-              data = data.chomp
-              next if data.empty?
-
-              @machine.ui.info(data, color: color)
-            end
-
-            # There is no need to run Chef again if it converges
-            return if exit_status == 0
           end
 
           # If we reached this point then Chef never converged! Error.

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

@@ -105,9 +105,16 @@ module VagrantPlugins
           end
 
           # Make sure the temporary directory is properly set up
+          if windows?
+            tmp_command = "mkdir -p #{config.temp_dir}"
+            comm_opts = { shell: :powershell}
+          else
+            tmp_command = "mkdir -p #{config.temp_dir}; chmod 0777 #{config.temp_dir}"
+            comm_opts = {}
+          end
+
           @machine.communicate.tap do |comm|
-            comm.sudo("mkdir -p #{config.temp_dir}")
-            comm.sudo("chmod 0777 #{config.temp_dir}")
+            comm.sudo(tmp_command, comm_opts)
           end
 
           verify_shared_folders(check)
@@ -271,6 +278,10 @@ module VagrantPlugins
             error_key: :ssh_bad_exit_status_muted,
             good_exit: [0,2],
           }
+
+          if windows?
+            opts[:shell] = :powershell
+          end
           @machine.communicate.sudo(command, opts) do |type, data|
             if !data.chomp.empty?
               @machine.ui.info(data.chomp)
@@ -281,14 +292,22 @@ module VagrantPlugins
         def verify_shared_folders(folders)
           folders.each do |folder|
             @logger.debug("Checking for shared folder: #{folder}")
-            if !@machine.communicate.test("test -d #{folder}", sudo: true)
+            if windows?
+              testcommand = "Test-Path #{folder}"
+              comm_opts = { shell: :powershell}
+            else
+              testcommand = "test -d #{folder}"
+              comm_opts = { sudo: true}
+            end
+
+            if !@machine.communicate.test(testcommand, comm_opts)
               raise PuppetError, :missing_shared_folders
             end
           end
         end
 
         def windows?
-          @machine.config.vm.communicator == :winrm
+          @machine.config.vm.communicator == :winrm || @machine.config.vm.communicator == :winssh
         end
       end
     end