knife-windows 1.0.0.rc.1 → 1.0.0.rc.2

data/RELEASE_NOTES.md

@@ -1,74 +1,79 @@
-<!---
-This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
-
-Example Note:
-
-## Example Heading
-Details about the thing that changed that needs to get included in the Release Notes in markdown.
--->
-# knife-windows 1.0.0.rc.0 release notes:
-This release of knife-windows includes new features to improve authentication,
-simplify use of the WinRM SSL transport, and addresses compatibility issues with Chef Client 12.0.
-
-You can install the new features using the `gem` command:
-
-    gem install knife-windows --pre
-
-## Reporting issues and contributing
-
-`knife-windows` issues like those addressed in this release should be reported in the ticketing system at https://github.com/chef/knife-windows/issues. You can learn more about how to contribute features and bug fixes to `knife-windows` in the [Chef Contributions document](http://docs.chef.io/community_contributions.html).
-
-## Breaking changes
-
-### Negotiate as the default authentication protocol
-With this release, the default authentication protocol for WinRM
-communication is negotiate, which is the same as that for tools built-in to
-the Windows operating system. Prior to this release, the protocol depended
-on the format of the `--winrm-user` option -- the basic authentication
-protocol would be assumed unless that option had the format `domain\user`.
-
-To revert to the behavior of previous releases or otherwise force `knife-windows` to use a specific authentication protocol such as
-basic, use the `--winrm-authentication-protocol` option.
-
-### Default WinRM port depends on the transport
-The default port for WinRM communication is now **5986** when the SSL transport is used (the transport is
-configured by the `winrm_transport` option), otherwise it is **5985**. In
-previous releases, if the port was not specified, it was always 5985.
-
-To override this behavior, explicitly specify the desired port using the
-`winrm_port` (`-p`) option.
-
-### Kerberos Keytab short option is now -T
-The short option flag for --keytab-file is now -T to fix a conflict with the --identity-file option.
-
-## Features added in knife-windows 1.0.0.rc.0
-* New `--winrm-authentication-protocol` option for explicit control of WinRM authentication
-* `knife windows cert generate` subcommand:
-  Generates a certificate and related public key file for use in configuring a WinRM listener and validating communication involving it.
-* `knife windows cert install` subcommand:
-  Installs a certificate such as one generated by the `cert generate`
-  subcommand into the Windows certificate store's LocalMachine personal store
-  so that it can be used as part of the configuration for a WinRM SSL listener
-* `knife windows listener create` subcommand:
-  Creates a WinRM SSL listener on a Windows system
-* Added `--hint` option for creating Ohai hints on bootstrap
-* Validatorless bootstrapping is now supported
-* New `--install-as-service` option will have Chef Client be installed as a service on bootstrap
-* Added `--msi_url` option for providing an alternate URL to the Chef Client installation package
-* `knife wsman test` subcommaned:
-  Verifies winrm functionality on a remote system, e.g. `knife wsman test 192.168.1.10 -m --winrm-transport ssl`
-  
-## Issues fixed in knife-windows 1.0.0.rc.0
-* [knife-windows #159](https://github.com/chef/knife-windows/issues/159) `winrm_port` option should default to 5986 if `winrm_transport` option is `ssl`
-* [knife-windows #139](https://github.com/chef/knife-windows/issues/139) Force dev dependency on Chef 11 for test scenarios to avoid Ohai 8 conflict on Ruby 1.9.x
-* [knife-windows #133](https://github.com/chef/knife-windows/issues/133) Bootstrap failure -- unable to validate SSL chef server endpoints
-* [knife-windows #125](https://github.com/chef/knife-windows/issues/125) knife-windows should use PowerShell first before cscript to download the  Chef Client msi
-* [knife-windows #92](https://github.com/chef/knife-windows/issues/92) EventMachine issue: knife bootstrap windows winrm error
-* [knife-windows #94](https://github.com/chef/knife-windows/issues/94) Remove Eventmachine dependency
-* [knife-windows #213](https://github.com/chef/knife-windows/pull/213) Search possibilities of HOME for bootstrap templates
-* [knife-windows #227](https://github.com/chef/knife-windows/issues/227) Exception: NoMethodError: undefined method 'gsub' for false:FalseClass
-
-## knife-windows on RubyGems and Github
-https://rubygems.org/gems/knife-windows
-https://github.com/chef/knife-windows
-
+<!---
+This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
+
+Example Note:
+
+## Example Heading
+Details about the thing that changed that needs to get included in the Release Notes in markdown.
+-->
+# knife-windows 1.0.0 release notes:
+This release of knife-windows includes new features to improve authentication,
+simplify use of the WinRM SSL transport, and addresses compatibility issues with Chef Client 12.0.
+
+You can install the new features using the `gem` command:
+
+    gem install knife-windows
+
+Due to dependency conflicts, to use knife-windows 1.0.0+ with ChefDK 0.6.2, you must also upgrade chef-provisioning to 1.2.0+ and update the line referencing chef-provisioning in c:\opscode\chefdk\bin\chef. ChefDK 0.7.0+ will include the latest versions of both knife-windows and chef-provisioning.
+
+    chef gem install knife-windows
+    chef gem install chef-provisioning
+
+## Reporting issues and contributing
+
+`knife-windows` issues like those addressed in this release should be reported in the ticketing system at https://github.com/chef/knife-windows/issues. You can learn more about how to contribute features and bug fixes to `knife-windows` in the [Chef Contributions document](http://docs.chef.io/community_contributions.html).
+
+## Breaking changes
+
+### Negotiate as the default authentication protocol
+With this release, the default authentication protocol for WinRM
+communication is negotiate, which is the same as that for tools built-in to
+the Windows operating system. Prior to this release, the protocol depended
+on the format of the `--winrm-user` option -- the basic authentication
+protocol would be assumed unless that option had the format `domain\user`.
+
+To revert to the behavior of previous releases or otherwise force `knife-windows` to use a specific authentication protocol such as
+basic, use the `--winrm-authentication-protocol` option.
+
+### Default WinRM port depends on the transport
+The default port for WinRM communication is now **5986** when the SSL transport is used (the transport is
+configured by the `winrm_transport` option), otherwise it is **5985**. In
+previous releases, if the port was not specified, it was always 5985.
+
+To override this behavior, explicitly specify the desired port using the
+`winrm_port` (`-p`) option.
+
+### Kerberos Keytab short option is now -T
+The short option flag for --keytab-file is now -T to fix a conflict with the --identity-file option.
+
+## Features added in knife-windows 1.0.0
+* New `--winrm-authentication-protocol` option for explicit control of WinRM authentication
+* `knife windows cert generate` subcommand:
+  Generates a certificate and related public key file for use in configuring a WinRM listener and validating communication involving it.
+* `knife windows cert install` subcommand:
+  Installs a certificate such as one generated by the `cert generate`
+  subcommand into the Windows certificate store's LocalMachine personal store
+  so that it can be used as part of the configuration for a WinRM SSL listener
+* `knife windows listener create` subcommand:
+  Creates a WinRM SSL listener on a Windows system
+* Added `--hint` option for creating Ohai hints on bootstrap
+* Validatorless bootstrapping is now supported
+* New `--install-as-service` option will have Chef Client be installed as a service on bootstrap
+* Added `--msi_url` option for providing an alternate URL to the Chef Client installation package
+* `knife wsman test` subcommaned:
+  Verifies winrm functionality on a remote system, e.g. `knife wsman test 192.168.1.10 -m --winrm-transport ssl`
+  
+## Issues fixed in knife-windows 1.0.0
+* [knife-windows #159](https://github.com/chef/knife-windows/issues/159) `winrm_port` option should default to 5986 if `winrm_transport` option is `ssl`
+* [knife-windows #139](https://github.com/chef/knife-windows/issues/139) Force dev dependency on Chef 11 for test scenarios to avoid Ohai 8 conflict on Ruby 1.9.x
+* [knife-windows #133](https://github.com/chef/knife-windows/issues/133) Bootstrap failure -- unable to validate SSL chef server endpoints
+* [knife-windows #125](https://github.com/chef/knife-windows/issues/125) knife-windows should use PowerShell first before cscript to download the  Chef Client msi
+* [knife-windows #92](https://github.com/chef/knife-windows/issues/92) EventMachine issue: knife bootstrap windows winrm error
+* [knife-windows #94](https://github.com/chef/knife-windows/issues/94) Remove Eventmachine dependency
+* [knife-windows #213](https://github.com/chef/knife-windows/pull/213) Search possibilities of HOME for bootstrap templates
+* [knife-windows #227](https://github.com/chef/knife-windows/issues/227) Exception: NoMethodError: undefined method 'gsub' for false:FalseClass
+
+## knife-windows on RubyGems and Github
+https://rubygems.org/gems/knife-windows
+https://github.com/chef/knife-windows
+

data/Rakefile

@@ -1,16 +1,21 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-begin
-  require 'rspec/core/rake_task'
-
-  task :default => :spec
-
-  desc "Run all specs in spec directory"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/**/*_spec.rb'
-  end
-
-rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+begin
+  require 'rspec/core/rake_task'
+
+  task :default => [:unit_spec, :functional_spec]
+
+  desc "Run all functional specs in spec directory"
+  RSpec::Core::RakeTask.new(:functional_spec) do |t|
+    t.pattern = 'spec/functional/**/*_spec.rb'
+  end
+
+  desc "Run all unit specs in spec directory"
+  RSpec::Core::RakeTask.new(:unit_spec) do |t|
+    t.pattern = 'spec/unit/**/*_spec.rb'
+  end
+
+rescue LoadError
+  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
+end

data/appveyor.yml

@@ -1,42 +1,42 @@
-version: "master-{build}"
-
-os: Windows Server 2012
-platform:
-  - x64
-
-environment:
-  bundle_gemfile: ci.gemfile
-
-  matrix:
-    - ruby_version: "193"
-      chef_version: "< 12"
-
-    - ruby_version: "200"
-      chef_version: "< 12"
-
-    - ruby_version: "200"
-      chef_version: "~> 12.0"
-
-    - ruby_version: "200"
-      chef_version: "master"
-
-clone_folder: c:\projects\knife-windows
-clone_depth: 1
-branches:
-  only:
-    - master
-
-install:
-  - winrm quickconfig -q
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - echo %PATH%
-  - ruby --version
-  - gem --version
-  - gem install bundler --quiet --no-ri --no-rdoc
-  - bundler --version
-
-build_script:
-  - bundle install || bundle install || bundle install
-
-test_script:
-  - bundle exec rake spec
+version: "master-{build}"
+
+os: Windows Server 2012
+platform:
+  - x64
+
+environment:
+  bundle_gemfile: ci.gemfile
+
+  matrix:
+    - ruby_version: "193"
+      chef_version: "< 12"
+
+    - ruby_version: "200"
+      chef_version: "< 12"
+
+    - ruby_version: "200"
+      chef_version: "~> 12.0"
+
+    - ruby_version: "200"
+      chef_version: "master"
+
+clone_folder: c:\projects\knife-windows
+clone_depth: 1
+branches:
+  only:
+    - master
+
+install:
+  - winrm quickconfig -q
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - echo %PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundler --version
+
+build_script:
+  - bundle install || bundle install || bundle install
+
+test_script:
+  - bundle exec rake

data/ci.gemfile

@@ -1,15 +1,15 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in knife-windows.gemspec
-gemspec
-
-if ENV['CHEF_VERSION'] == 'master'
-  gem 'chef', github: 'chef/chef'
-else
-  gem 'chef', ENV['CHEF_VERSION']
-end
-
-gem "rspec", '~> 3.0'
-gem "ruby-wmi"
-gem "httpclient"
-gem 'rake'
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in knife-windows.gemspec
+gemspec
+
+if ENV['CHEF_VERSION'] == 'master'
+  gem 'chef', github: 'chef/chef'
+else
+  gem 'chef', ENV['CHEF_VERSION']
+end
+
+gem "rspec", '~> 3.0'
+gem "ruby-wmi"
+gem "httpclient"
+gem 'rake'

data/features/knife_help.feature

@@ -1,20 +1,20 @@
-Feature: Ensure that the help works as designed
-  In order to test the help via CLI
-  As an Operator
-  I want to run the CLI with different arguments
-
-Scenario: Running the windows sub-command shows available commands
-  When I run `knife windows`
-  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
-
-Scenario: Running the windows sub-command shows available commands
-  When I run `knife windows --help`
-  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
-
-Scenario: Running the windows sub-command shows available commands
-  When I run `knife windows help`
-  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
-
-Scenario: Running the knife command shows available windows command"
-  When I run `knife`
-  And the output should contain "** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
+Feature: Ensure that the help works as designed
+  In order to test the help via CLI
+  As an Operator
+  I want to run the CLI with different arguments
+
+Scenario: Running the windows sub-command shows available commands
+  When I run `knife windows`
+  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
+
+Scenario: Running the windows sub-command shows available commands
+  When I run `knife windows --help`
+  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
+
+Scenario: Running the windows sub-command shows available commands
+  When I run `knife windows help`
+  And the output should contain "Available windows subcommands: (for details, knife SUB-COMMAND --help)\n\n** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"
+
+Scenario: Running the knife command shows available windows command"
+  When I run `knife`
+  And the output should contain "** WINDOWS COMMANDS **\nknife bootstrap windows winrm FQDN (options)\nknife bootstrap windows ssh FQDN (options)\nknife winrm QUERY COMMAND (options)"

data/features/support/env.rb

@@ -1,5 +1,5 @@
-require 'aruba/cucumber'
-
-Before do
-  @aruba_timeout_seconds = 5
-end
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 5
+end

data/knife-windows.gemspec

@@ -1,28 +1,28 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "knife-windows/version"
-
-Gem::Specification.new do |s|
-  s.name        = "knife-windows"
-  s.version     = Knife::Windows::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Seth Chisamore"]
-  s.email       = ["schisamo@opscode.com"]
-  s.license     = "Apache-2.0"
-  s.homepage    = "https://github.com/opscode/knife-windows"
-  s.summary     = %q{Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows}
-  s.description = s.summary
-
-  s.required_ruby_version	= ">= 1.9.1"
-  s.add_dependency "winrm", "~> 1.3"
-  s.add_dependency "winrm-s", "~> 0.3.0.dev.0"
-  s.add_dependency "nokogiri"
-
-  s.add_development_dependency 'pry'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end
-
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "knife-windows/version"
+
+Gem::Specification.new do |s|
+  s.name        = "knife-windows"
+  s.version     = Knife::Windows::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Seth Chisamore"]
+  s.email       = ["schisamo@chef.io"]
+  s.license     = "Apache-2.0"
+  s.homepage    = "https://github.com/chef/knife-windows"
+  s.summary     = %q{Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows}
+  s.description = s.summary
+
+  s.required_ruby_version	= ">= 1.9.1"
+  s.add_dependency "winrm", "~> 1.3"
+  s.add_dependency "winrm-s", "~> 0.3.0"
+  s.add_dependency "nokogiri"
+
+  s.add_development_dependency 'pry'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end
+

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

@@ -1,241 +1,247 @@
-@rem
-@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
-@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
-@rem License:: Apache License, Version 2.0
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
-@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
-@rem the line is read. See help for the /E switch from cmd.exe /? .
-@setlocal ENABLEDELAYEDEXPANSION
-
-<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
-
-@set BOOTSTRAP_DIRECTORY=<%= bootstrap_directory %>
-@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
-@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
-    @echo Existing directory not found, creating.
-    @mkdir %BOOTSTRAP_DIRECTORY%
-) else (
-    @echo Existing directory found, skipping creation.
-)
-
-> <%= bootstrap_directory %>\wget.vbs (
- <%= win_wget %>
-)
-
-> <%= bootstrap_directory %>\wget.ps1 (
- <%= win_wget_ps %>
-)
-
-@rem Determine the version and the architecture
-
-@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
-@set WinMajor=%%D
-@set WinMinor=%%E
-@set WinBuild=%%F
-)
-
-@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
-
-@set LATEST_OS_VERSION_MAJOR=6
-@set LATEST_OS_VERSION_MINOR=3
-
-@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
-@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
-  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
-)
-
-goto Version%WinMajor%.%WinMinor%
-
-:VersionUnknown
-@rem If this is an unknown version of windows set the default
-@set MACHINE_OS=2008r2
-@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
-goto architecture_select
-
-:Version6.0
-@set MACHINE_OS=2008
-goto architecture_select
-
-:Version5.2
-@set MACHINE_OS=2003r2
-goto architecture_select
-
-:Version6.1
-@set MACHINE_OS=2008r2
-goto architecture_select
-
-:Version6.2
-@set MACHINE_OS=2012
-goto architecture_select
-
-@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
-:Version6.3
-goto Version6.2
-
-:architecture_select
-goto Architecture%PROCESSOR_ARCHITEW6432%
-
-:Architecture
-goto Architecture%PROCESSOR_ARCHITECTURE%
-
-@rem If this is an unknown architecture set the default
-@set MACHINE_ARCH=i686
-goto install
-
-:Architecturex86
-@set MACHINE_ARCH=i686
-goto install
-
-:Architectureamd64
-@set MACHINE_ARCH=x86_64
-goto install
-
-:install
-@rem Install Chef using chef-client MSI installer
-
-@set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
-@set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
-
-@rem Clear any pre-existing downloads
-@echo Checking for existing downloaded package at "%LOCAL_DESTINATION_MSI_PATH%"
-@if EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-    @echo Found existing downloaded package, deleting.
-    @del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-    @if ERRORLEVEL 1 (
-        echo Warning: Failed to delete pre-existing package with status code !ERRORLEVEL! > "&2"
-    )
-) else (
-    echo No existing downloaded packages to delete.
-)
-
-@rem If there is 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 PowerShell if available...
-@set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%', 'PowerShell') %>"
-@set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%" "%LOCAL_DESTINATION_MSI_PATH%"
-@echo !powershell_download!
-@call !powershell_download!
-
-@set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
-
-@if ERRORLEVEL 1 (
-    @echo Failed PowerShell download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
-    @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
-) else (
-    @rem Sometimes the error level is not set even when the download failed,
-    @rem so check for the file to be sure it is there -- if it is not, we will retry
-    @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-        echo Failed download: download completed, but downloaded file not found > "&2"
-        set DOWNLOAD_ERROR_STATUS=2
-    ) else (
-        echo Download via PowerShell succeeded.
-    )
-)
-
-@if NOT %DOWNLOAD_ERROR_STATUS%==0 (
-    @echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
-    @echo Warning: Retrying download with cscript ...
-
-    @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-
-    @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%') %>"
-    cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
-
-    @if NOT ERRORLEVEL 1 (
-        @rem Sometimes the error level is not set even when the download failed,
-        @rem so check for the file to be sure it is there.
-        @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
-            echo Failed download: download completed, but downloaded file not found > "&2"
-            echo Exiting without bootstrapping due to download failure. > "&2"
-            exit /b 1
-        ) else (
-            echo Download via cscript succeeded.
-        )
-    ) else (
-        echo Failed to download "%REMOTE_SOURCE_MSI_URL%" with status code !ERRORLEVEL!. > "&2"
-        echo Exiting without bootstrapping due to download failure. > "&2"
-        exit /b 1
-    )
-)
-
-@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
-
-<% if client_pem -%>
-> <%= bootstrap_directory %>\client.pem (
- <%= escape_and_echo(::File.read(::File.expand_path(client_pem))) %>
-)
-<% end -%>
-
-echo Writing validation key...
-
-<% if validation_key -%>
-> <%= bootstrap_directory %>\validation.pem (
- <%= escape_and_echo(validation_key) %>
-)
-<% end -%>
-
-echo Validation key written.
-@echo on
-
-<% if @config[:secret] -%>
-> <%= bootstrap_directory %>\encrypted_data_bag_secret (
- <%= secret %>
-)
-<% end -%>
-
-<% unless trusted_certs_script.empty? -%>
-mkdir <%= bootstrap_directory %>\trusted_certs
-<%= trusted_certs_script %>
-<% end -%>
-
-<%# Generate Ohai Hints -%>
-<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
-mkdir <%= bootstrap_directory %>\ohai\hints
-
-<% @chef_config[:knife][:hints].each do |name, hash| -%>
-> <%= bootstrap_directory %>\ohai\hints\<%= name %>.json (
-  <%= escape_and_echo(hash.to_json) %>
-)
-<% end -%>
-<% end -%>
-
-> <%= bootstrap_directory %>\client.rb (
- <%= config_content %>
-)
-
-> <%= bootstrap_directory %>\first-boot.json (
- <%= first_boot %>
-)
-
-@echo Starting chef to bootstrap the node...
-<%= start_chef %>
-
+@rem
+@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
+@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
+@rem License:: Apache License, Version 2.0
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
+@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
+@rem the line is read. See help for the /E switch from cmd.exe /? .
+@setlocal ENABLEDELAYEDEXPANSION
+
+<%= "SETX HTTP_PROXY \"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] %>
+
+@set BOOTSTRAP_DIRECTORY=<%= bootstrap_directory %>
+@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
+@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
+    @echo Existing directory not found, creating.
+    @mkdir %BOOTSTRAP_DIRECTORY%
+) else (
+    @echo Existing directory found, skipping creation.
+)
+
+> <%= bootstrap_directory %>\wget.vbs (
+ <%= win_wget %>
+)
+
+> <%= bootstrap_directory %>\wget.ps1 (
+ <%= win_wget_ps %>
+)
+
+@rem Determine the version and the architecture
+
+@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
+@set WinMajor=%%D
+@set WinMinor=%%E
+@set WinBuild=%%F
+)
+
+@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
+
+@set LATEST_OS_VERSION_MAJOR=6
+@set LATEST_OS_VERSION_MINOR=3
+
+@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
+@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
+  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
+)
+
+goto Version%WinMajor%.%WinMinor%
+
+:VersionUnknown
+@rem If this is an unknown version of windows set the default
+@set MACHINE_OS=2008r2
+@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
+goto architecture_select
+
+:Version6.0
+@set MACHINE_OS=2008
+goto architecture_select
+
+:Version5.2
+@set MACHINE_OS=2003r2
+goto architecture_select
+
+:Version6.1
+@set MACHINE_OS=2008r2
+goto architecture_select
+
+:Version6.2
+@set MACHINE_OS=2012
+goto architecture_select
+
+@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
+:Version6.3
+goto Version6.2
+
+:architecture_select
+goto Architecture%PROCESSOR_ARCHITEW6432%
+
+:Architecture
+goto Architecture%PROCESSOR_ARCHITECTURE%
+
+@rem If this is an unknown architecture set the default
+@set MACHINE_ARCH=i686
+goto install
+
+:Architecturex86
+@set MACHINE_ARCH=i686
+goto install
+
+:Architectureamd64
+@set MACHINE_ARCH=x86_64
+goto install
+
+:install
+@rem If user has provided the custom installation command for chef-client then execute it
+<% if @chef_config[:knife][:bootstrap_install_command] %>
+  <%= @chef_config[:knife][:bootstrap_install_command] %>
+<% else %>
+  @rem Install Chef using chef-client MSI installer
+
+  @set "LOCAL_DESTINATION_MSI_PATH=<%= local_download_path %>"
+  @set "CHEF_CLIENT_MSI_LOG_PATH=%TEMP%\chef-client-msi%RANDOM%.log"
+
+  @rem Clear any pre-existing downloads
+  @echo Checking for existing downloaded package at "%LOCAL_DESTINATION_MSI_PATH%"
+  @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+      @echo Found existing downloaded package, deleting.
+      @del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+      @if ERRORLEVEL 1 (
+          echo Warning: Failed to delete pre-existing package with status code !ERRORLEVEL! > "&2"
+      )
+  ) else (
+      echo No existing downloaded packages to delete.
+    )
+
+  @rem If there is 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 PowerShell if available...
+  @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%', 'PowerShell') %>"
+  @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%" "%LOCAL_DESTINATION_MSI_PATH%"
+  @echo !powershell_download!
+  @call !powershell_download!
+
+  @set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
+
+  @if ERRORLEVEL 1 (
+      @echo Failed PowerShell download with status code !DOWNLOAD_ERROR_STATUS! > "&2"
+      @if !DOWNLOAD_ERROR_STATUS!==0 set DOWNLOAD_ERROR_STATUS=2
+  ) else (
+      @rem Sometimes the error level is not set even when the download failed,
+      @rem so check for the file to be sure it is there -- if it is not, we will retry
+      @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+          echo Failed download: download completed, but downloaded file not found > "&2"
+          set DOWNLOAD_ERROR_STATUS=2
+      ) else (
+          echo Download via PowerShell succeeded.
+        )
+    )
+
+  @if NOT %DOWNLOAD_ERROR_STATUS%==0 (
+      @echo Warning: Failed to download "%REMOTE_SOURCE_MSI_URL%" to "%LOCAL_DESTINATION_MSI_PATH%"
+      @echo Warning: Retrying download with cscript ...
+
+      @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+
+      @set "REMOTE_SOURCE_MSI_URL=<%= msi_url('%MACHINE_OS%', '%MACHINE_ARCH%') %>"
+      cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
+
+      @if NOT ERRORLEVEL 1 (
+          @rem Sometimes the error level is not set even when the download failed,
+          @rem so check for the file to be sure it is there.
+          @if NOT EXIST "%LOCAL_DESTINATION_MSI_PATH%" (
+              echo Failed download: download completed, but downloaded file not found > "&2"
+              echo Exiting without bootstrapping due to download failure. > "&2"
+              exit /b 1
+          ) else (
+              echo Download via cscript succeeded.
+            )
+      ) else (
+          echo Failed to download "%REMOTE_SOURCE_MSI_URL%" with status code !ERRORLEVEL!. > "&2"
+          echo Exiting without bootstrapping due to download failure. > "&2"
+          exit /b 1
+        )
+  )
+
+  @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%"
+    )
+
+<% end %>
+
+@endlocal
+
+@echo off
+
+<% if client_pem -%>
+> <%= bootstrap_directory %>\client.pem (
+ <%= escape_and_echo(::File.read(::File.expand_path(client_pem))) %>
+)
+<% end -%>
+
+echo Writing validation key...
+
+<% if validation_key -%>
+> <%= bootstrap_directory %>\validation.pem (
+ <%= escape_and_echo(validation_key) %>
+)
+<% end -%>
+
+echo Validation key written.
+@echo on
+
+<% if @config[:secret] -%>
+> <%= bootstrap_directory %>\encrypted_data_bag_secret (
+ <%= secret %>
+)
+<% end -%>
+
+<% unless trusted_certs_script.empty? -%>
+mkdir <%= bootstrap_directory %>\trusted_certs
+<%= trusted_certs_script %>
+<% end -%>
+
+<%# Generate Ohai Hints -%>
+<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
+mkdir <%= bootstrap_directory %>\ohai\hints
+
+<% @chef_config[:knife][:hints].each do |name, hash| -%>
+> <%= bootstrap_directory %>\ohai\hints\<%= name %>.json (
+  <%= escape_and_echo(hash.to_json) %>
+)
+<% end -%>
+<% end -%>
+
+> <%= bootstrap_directory %>\client.rb (
+ <%= config_content %>
+)
+
+> <%= bootstrap_directory %>\first-boot.json (
+ <%= first_boot %>
+)
+
+@echo Starting chef to bootstrap the node...
+<%= start_chef %>
+