vagrant-windows 1.3.0.pre.1 → 1.3.0.pre.2

data/lib/vagrant-windows/monkey_patches/plugins/provisioners/chef/provisioner/chef_solo.rb

@@ -25,21 +25,14 @@ module VagrantPlugins
         def wait_if_rebooting
           # Check to see if the guest is rebooting, if its rebooting then wait until its ready
           @logger.info('Checking guest reboot status')
-          reboot_detect_script = VagrantWindows.load_script('reboot_detect.ps1')
-          exit_status = @machine.communicate.execute(reboot_detect_script, :error_check => false)
-          if exit_status != 0
-            begin
-              @logger.debug('Guest is rebooting, waiting 10 seconds...')
-              sleep(10)
-            end until @machine.communicate.ready?
+          
+          while is_rebooting?(machine) 
+            @logger.debug('Guest is rebooting, waiting 10 seconds...')
+            sleep(10)
           end
         end
         
-        def run_chef_solo_on_windows
-          # This re-establishes our symbolic links if they were created between now and a reboot
-          # Fixes issue #119
-          @machine.communicate.execute('& net use a-non-existant-share', :error_check => false)
-          
+        def run_chef_solo_on_windows          
           # create cheftaskrun.ps1 that the scheduled task will invoke when run
           render_file_and_upload("cheftaskrun.ps1", chef_script_options[:chef_task_run_ps1], :options => chef_script_options)
 
@@ -63,6 +56,10 @@ module VagrantPlugins
             else
               @machine.env.ui.info I18n.t("vagrant.provisioners.chef.running_solo_again")
             end
+            
+            # This re-establishes our symbolic links if they were created between now and a reboot
+            # Fixes issue #119
+            @machine.communicate.execute('& net use a-non-existant-share', :error_check => false)
 
             exit_status = @machine.communicate.execute(command, :error_check => false) do |type, data|
               # Output the data with the proper color based on the stream.
@@ -117,7 +114,12 @@ module VagrantPlugins
             }
           end
           @chef_script_options
-        end        
+        end
+        
+        def is_rebooting?(machine)
+          reboot_detect_script = VagrantWindows.load_script('reboot_detect.ps1')
+          @machine.communicate.execute(reboot_detect_script, :error_check => false) != 0
+        end
         
         def is_windows
           @machine.config.vm.guest.eql? :windows

data/lib/vagrant-windows/scripts/reboot_detect.ps1

@@ -22,10 +22,22 @@ namespace VagrantWindows {
 }
 
 if (ShuttingDown) {
-  Write-Host "Shutting Down"
   exit 1
 }
 else {
-  Write-Host "All good"
-  exit 0
+  # see if a reboot is scheduled in the future by trying to schedule a reboot
+  . shutdown.exe -f -r -t 60
+  
+  if ($LASTEXITCODE -eq 1190) {
+    # reboot is already pending
+    exit 2
+  }
+  
+  # Remove the pending reboot we just created above
+  if ($LASTEXITCODE -eq 0) {
+    . shutdown.exe -a
+  }
 }
+
+# no reboot in progress or scheduled
+exit 0

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.3.0.pre.1"
+  VERSION = "1.3.0.pre.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.1
+  version: 1.3.0.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1146635457027208657
+      hash: -2247683547305016940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: