vagrant-windows-update 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54ea485d5e4758a19ea3a8504daf7f1e5ff17d02
-  data.tar.gz: e17fa78130d2eee869788409b26217595e9692f4
+  metadata.gz: 4b2bca4595670ddeb5e08add150fea22c6aa0700
+  data.tar.gz: f725f87e1f42c7a16d2ce2a470f7b30910382dac
 SHA512:
-  metadata.gz: e90107938bd2ad31cdee9e9bcf85f48af5e352e6d246221ca822168654bf775bcdffb256966b3347fac7d4bfe21071bdb80e66287da7bcf73d2b6834244b8e22
-  data.tar.gz: 6cb0b04df5ad00fe868c3871e7e90db1e686fe3ff5cc22bb8491bed49b308d6631d7eb95eb6b4b3f70c4a8be211d8cd1b2323d100f73164256a27bd04d6aba57
+  metadata.gz: 9d52c4a301cb8d1cb46bb0521e200d7a4140167803f402a3323dd12c458c8b835e6308eea9712e6c94a3e5bbe341cf7afaeb07a1271513d193c4d5b549ff6ef5
+  data.tar.gz: 1915066fa60a3f950830f0ae03a8b24ef8be4079531022b204ae8c6414531994f8ab69362dac5dc7ebde740fa3200a98ba626784920c966ef4bc10878800f8dd

data/lib/vagrant-windows-update/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module WindowsUpdate
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/vagrant-windows-update/windows-update.ps1

@@ -20,6 +20,7 @@ $ErrorActionPreference = 'Stop'
 trap {
     Write-Output "ERROR: $_"
     Write-Output (($_.ScriptStackTrace -split '\r?\n') -replace '^(.*)$','ERROR: $1')
+    Write-Output (($_.Exception.ToString() -split '\r?\n') -replace '^(.*)$','ERROR EXCEPTION: $1')
     Exit 1
 }
 
@@ -61,10 +62,14 @@ function Wait-Condition {
     }
 }
 
-function ExitWhenRebootRequired {
+function ExitWhenRebootRequired([bool]$forceReboot=$false) {
+    $rebootRequired = $forceReboot
+
     # check for pending Windows Updates.
-    $systemInformation = New-Object -ComObject 'Microsoft.Update.SystemInfo'
-    $rebootRequired = $systemInformation.RebootRequired
+    if (!$rebootRequired) {
+        $systemInformation = New-Object -ComObject 'Microsoft.Update.SystemInfo'
+        $rebootRequired = $rebootRequired -or $systemInformation.RebootRequired
+    }
 
     # check for pending Windows Features.
     if (!$rebootRequired) {
@@ -74,8 +79,10 @@ function ExitWhenRebootRequired {
     }
 
     if ($rebootRequired) {
-        Write-Output 'Pending Reboot detected. Waiting for the Windows Modules Installer to exit...'
-        Wait-Condition {(Get-Process -ErrorAction SilentlyContinue TiWorker,TrustedInstaller | Measure-Object).Count -eq 0}
+        if (!$forceReboot) {
+            Write-Output 'Pending Reboot detected. Waiting for the Windows Modules Installer to exit...'
+            Wait-Condition {(Get-Process -ErrorAction SilentlyContinue TiWorker,TrustedInstaller | Measure-Object).Count -eq 0}
+        }
         Write-Output 'Rebooting...'
         Exit 0
     }
@@ -131,9 +138,7 @@ if ($searchResult.Updates.Count) {
         $updateInstaller = $updateSession.CreateUpdateInstaller()
         $updateInstaller.Updates = $updatesToInstall
         $installResult = $updateInstaller.Install()
-        if ($installResult.RebootRequired) {
-            ExitWhenRebootRequired
-        }
+        ExitWhenRebootRequired $true
     }
 } else {
     Write-Output 'No Windows updates found'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-update
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rui Lopes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake