knife-windows 0.5.14.rc.0 → 0.5.14.rc.1

data/lib/chef/knife/bootstrap/windows-chef-client-msi.erb

@@ -111,6 +111,7 @@ goto install
 <% url += "&v=#{@config[:bootstrap_version]}" if @config.key? :bootstrap_version -%>
 @set "REMOTE_SOURCE_MSI_URL=<%= url %>"
 @set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+@set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
 @set "FALLBACK_QUERY_STRING=&DownloadContext=PowerShell"
 
 @rem Clear any pre-existing downloads
@@ -125,6 +126,9 @@ goto install
     echo No existing downloaded packages to delete.
 )
 
+@rem If there's somehow a name collision, remove pre-existing log
+@if EXIST "%CHEF_CLIENT_MSI_LOG_PATH%" del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
+
 @echo Attempting to download client package using cscript...
 cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
 
@@ -164,10 +168,18 @@ cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL
     )
 )
 
-@echo Starting bootstrap with downloaded client package
+@echo Installing downloaded client package...
 
 <%= install_chef %>
 
+@if ERRORLEVEL 1 (
+    echo Chef-client package failed to install with status code !ERRORLEVEL!. > "&2"
+    echo See installation log for additional detail: %CHEF_CLIENT_MSI_LOG_PATH%. > "&2"
+) else (
+    @echo Installation completed successfully
+    del /f /q "%CHEF_CLIENT_MSI_LOG_PATH%"
+)
+
 @endlocal
 
 @echo off
@@ -194,5 +206,6 @@ echo Validation key written.
  <%= first_boot %>
 )
 
+@echo Starting chef to bootstrap the node...
 <%= start_chef %>
 

data/lib/chef/knife/core/windows_bootstrap_context.rb

@@ -149,7 +149,7 @@ WGET_PS
         end
 
         def install_chef
-          install_chef = 'msiexec /qn /i "%LOCAL_DESTINATION_MSI_PATH%"'
+          install_chef = 'msiexec /qn /log "%CHEF_CLIENT_MSI_LOG_PATH%" /i "%LOCAL_DESTINATION_MSI_PATH%"'
         end
 
         def bootstrap_directory

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "0.5.14.rc.0"
+    VERSION = "0.5.14.rc.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 0.5.14.rc.0
+  version: 0.5.14.rc.1
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-winrm
@@ -94,3 +94,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/knife/bootstrap_template_spec.rb
 - spec/unit/knife/winrm_spec.rb
+has_rdoc: true