vagrant-windows 1.2.3 → 1.3.0.pre.1

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

@@ -9,6 +9,7 @@ module VagrantPlugins
         
         include VagrantWindows::Helper
 
+        provision_on_linux = instance_method(:provision)
         run_chef_solo_on_linux = instance_method(:run_chef_solo)
 
         # This patch is needed until Vagrant supports chef on Windows guests
@@ -16,8 +17,25 @@ module VagrantPlugins
           is_windows ? run_chef_solo_on_windows() : run_chef_solo_on_linux.bind(self).()
         end
         
+        define_method(:provision) do
+          wait_if_rebooting() if is_windows
+          provision_on_linux.bind(self).()
+        end
+        
+        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?
+          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)

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

@@ -0,0 +1,31 @@
+# function to check whether machine is currently shutting down
+function ShuttingDown {
+    [string]$sourceCode = @"
+using System;
+using System.Runtime.InteropServices;
+
+namespace VagrantWindows {
+    public static class RemoteManager {
+        private const int SM_SHUTTINGDOWN = 0x2000;
+
+        [DllImport("User32.dll", CharSet = CharSet.Unicode)]
+        private static extern int GetSystemMetrics(int Index);
+
+        public static bool Shutdown() {
+            return (0 != GetSystemMetrics(SM_SHUTTINGDOWN));
+        }
+    }
+}
+"@
+    $type = Add-Type -TypeDefinition $sourceCode -PassThru
+    return $type::Shutdown()
+}
+
+if (ShuttingDown) {
+  Write-Host "Shutting Down"
+  exit 1
+}
+else {
+  Write-Host "All good"
+  exit 0
+}

data/lib/vagrant-windows/version.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.2.3
-  prerelease: 
+  version: 1.3.0.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - Paul Morton
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -186,6 +186,7 @@ files:
 - lib/vagrant-windows/scripts/cheftaskrun.ps1.erb
 - lib/vagrant-windows/scripts/command_alias.ps1
 - lib/vagrant-windows/scripts/mount_volume.ps1.erb
+- lib/vagrant-windows/scripts/reboot_detect.ps1
 - lib/vagrant-windows/scripts/set_work_network.ps1
 - lib/vagrant-windows/scripts/winrs_v3_get_adapters.ps1
 - lib/vagrant-windows/version.rb
@@ -224,16 +225,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3479257835022585511
+      hash: -1146635457027208657
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3479257835022585511
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23