knife-windows 0.5.14 → 0.5.15

data/README.rdoc

@@ -1,140 +1,140 @@
-= Knife Windows Plugin
-
-= DESCRIPTION:
-
-This plugin adds additional functionality to the Chef Knife CLI tool for configuring/interacting with nodes running Microsoft Windows.  The subcommands should function on any system running Ruby 1.9.1+ but nodes being configured via these subcommands require Windows Remote Management (WinRM) 1.0+.  WinRM allows you to call native objects in Windows.  This includes, but is not limited to, running batch scripts, powershell scripts and fetching WMI variables.  For more information on WinRM, please visit {Microsoft's WinRM site}[http://msdn.microsoft.com/en-us/library/aa384426(v=VS.85).aspx]. You will want to familiarize yourself with (certain key aspects) of WinRM because you will be {writing scripts/running commands} with this tool to get you from (specific point A) to (specific point B).
-
-WinRM is built into Windows 7 and Windows Server 2008+.  It can also be easily installed in older version of Windows, including:
-
-* Windows XP
-* Windows Server 2003
-* Windows Vista
-
-More information can be found on {Microsoft Support article 968930}[http://support.microsoft.com/?kbid=968930].
-
-This subcommands in this plugin have been tested and verified to work on Windows Server 2008 R2.
-
-= SUBCOMMANDS:
-
-This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a --+help+ flag
-
-== knife winrm
-
-The +winrm+ subcommand allows you to invoke commands in parallel on a subset of the nodes in your infrastructure. The +winrm+ subcommand uses the same syntax as the {search subcommand}[http://wiki.opscode.com/display/chef/Search]; you could could find the uptime of all your web servers using the command:
-
-    % knife winrm "role:web" "net stats srv" -x Administrator -P 'super_secret_password'
-
-Or force a chef run:
-
-    % knife winrm 'ec2-50-xx-xx-124.compute-1.amazonaws.com' 'chef-client -c c:/chef/client.rb' -m -x Administrator -P 'super_secret_password'
-    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:49 +0000] INFO: Starting Chef Run (Version 0.9.12)
-    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:50 +0000] WARN: Node ip-0A502FFB has an empty run list.
-    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Chef Run complete in 4.383966 seconds
-    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: cleaning the checksum cache
-    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Running report handlers
-    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Report handlers complete
-
-This subcommand operates in a very similar manner as {knife ssh}[http://wiki.opscode.com/display/chef/Knife#Knife-SSHSubcommand]...just leveraging the WinRM protocol for communication.  It also include's +knife+ +ssh+'s "{interactive session mode}[http://wiki.opscode.com/display/chef/Knife#Knife-InteractiveMode]"
-
-== knife bootstrap windows winrm
-
-Performs a Chef Bootstrap (via the WinRM protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server.
-
-This subcommand operates in a very similar manner as {knife bootstrap}[http://wiki.opscode.com/display/chef/Knife+Bootstrap]...just leveraging the WinRM protocol for communication.  An initial run_list for the node can also be passed to the subcommand. Example usage:
-
-    knife bootstrap windows winrm ec2-50-xx-xx-124.compute-1.amazonaws.com -r 'role[webserver],role[production]' -x Administrator -P 'super_secret_password'
-
-== knife bootstrap windows ssh
-
-Performs a Chef Bootstrap (via the SSH protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server.
-
-This subcommand assumes the SSH session will use Windows native cmd.exe command shell vs a bash shell through an emulated cygwin layer.  Most popular Windows based SSHd daemons like {freeSSHd}[http://www.freesshd.com/] and {WinSSHD}[http://www.bitvise.com/winsshd] behave this way.
-
-An initial run_list for the node can also be passed to the subcommand. Example usage:
-
-    knife bootstrap windows ssh ec2-50-xx-xx-124.compute-1.amazonaws.com -r 'role[webserver],role[production]' -x Administrator -i ~/.ssh/id_rsa
-
-= BOOTSTRAP TEMPLATES:
-
-This gem provides the following bootstrap templates:
-
-== windows-chef-client-msi
-
-This bootstrap template does the following:
-
-* Installs the latest version of Chef (and all dependencies) using the `chef-client` msi.
-* Writes the validation.pem per the local knife configuration.
-* Writes a default config file for Chef (C:\chef\client.rb) using values from the +knife.rb+.
-* Creates a JSON attributes file containing the specified run list and run Chef.
-
-This is the default bootstrap template used by both the +windows+ +bootstrap+ subcommands.
-
-== windows-shell
-
-This bootstrap template does the following:
-
-* Installs Ruby 1.8.7 via the {Ruby Installer for Windows}[http://rubyinstaller.org/] which also includes the latest version of RubyGems
-* Installs the RubyInstaller Development Kit (DevKit). The RubyInstaller Development Kit (DevKit) is a MSYS/MinGW based toolkit than enables you to build many of the native C/C++ extensions available for Ruby.
-* Installs required Windows-related gems from RubyGems.org
-* Installs latest Chef version from RubyGems.org including {Ohai}[https://rubygems.org/gems/ohai] and {Chef}[https://rubygems.org/gems/chef]. The Chef version is configurable using the *--bootstrap-version* option.
-* Writes the validation.pem per the local knife configuration.
-* Writes a default config file for Chef (C:\chef\client.rb) using values from the +knife.rb+.
-* Creates a JSON attributes file containing the specified run list and run Chef.
-
-This should be considered a legacy bootstrap template and will most likely be removed in a future version.
-
-= REQUIREMENTS/SETUP:
-
-== Ruby
-
-Ruby 1.9.1+ is needed.
-
-== Chef Version
-
-Knife plugins require >= Chef 0.10.  More details about Knife plugins can be {found on the Chef wiki}[http://wiki.opscode.com/display/chef/Knife+Plugins].
-
-== Nodes
-
-*NOTE*: Before any WinRM related knife subcommands will function correctly a node's WinRM installation must be configured correctly.  The below settings should be added to your base server image (AMI) or passed in using some sort of user-data mechanism provided by your cloud provider.
-
-A server running WinRM must also be configured properly to allow outside connections and the entire network path from the knife workstation to the server.  The easiest way to accomplish this is to use {WinRM's quick configuration option}[http://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx#quick_default_configuration]:
-
-    C:\Users\Administrator> winrm quickconfig -q
-
-The Chef and Ohai gem installations (that occur during bootstrap) take more memory than the default 150MB WinRM allocates per shell.  Bump it up to 300MB with the following setting:
-
-    C:\Users\Administrator> winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}
-
-Bootstrap commands can take longer than the WinRM default 60 seconds to complete, bump to 30 minutes:
-
-    C:\Users\Administrator> winrm set winrm/config @{MaxTimeoutms="1800000"}
-
-WinRM supports both the HTTP and HTTPS transports and the following authentication schemes: Kerberos, Digest, Certificate and Basic.  The details of these authentication transports are outside of the scope of this README but details can be found on the {WinRM configuration guide}[http://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx].  Currently, this plugin support Kerberos and Basic authentication schemes.
-
-For development and testing purposes, unencrypted traffic with Basic authentication can make things easier:
-
-    C:\Users\Administrator> winrm set winrm/config/service @{AllowUnencrypted="true"}
-    C:\Users\Administrator> winrm set winrm/config/service/auth @{Basic="true"}
-
-= CONTRIBUTING:
-
-Please file bugs against the KNIFE_WINDOWS project at http://tickets.opscode.com/browse/knife
-
-More information on the contribution process for Opscode projects can be found at: http://wiki.opscode.com/display/chef/How+to+Contribute
-= LICENSE:
-
-Author:: Seth Chisamore (<schisamo@opscode.com>)
-Copyright:: Copyright (c) 2011 Opscode, Inc.
-License:: Apache License, Version 2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+= Knife Windows Plugin
+
+= DESCRIPTION:
+
+This plugin adds additional functionality to the Chef Knife CLI tool for configuring/interacting with nodes running Microsoft Windows.  The subcommands should function on any system running Ruby 1.9.1+ but nodes being configured via these subcommands require Windows Remote Management (WinRM) 1.0+.  WinRM allows you to call native objects in Windows.  This includes, but is not limited to, running batch scripts, powershell scripts and fetching WMI variables.  For more information on WinRM, please visit {Microsoft's WinRM site}[http://msdn.microsoft.com/en-us/library/aa384426(v=VS.85).aspx]. You will want to familiarize yourself with (certain key aspects) of WinRM because you will be {writing scripts/running commands} with this tool to get you from (specific point A) to (specific point B).
+
+WinRM is built into Windows 7 and Windows Server 2008+.  It can also be easily installed in older version of Windows, including:
+
+* Windows XP
+* Windows Server 2003
+* Windows Vista
+
+More information can be found on {Microsoft Support article 968930}[http://support.microsoft.com/?kbid=968930].
+
+This subcommands in this plugin have been tested and verified to work on Windows Server 2008 R2.
+
+= SUBCOMMANDS:
+
+This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a --+help+ flag
+
+== knife winrm
+
+The +winrm+ subcommand allows you to invoke commands in parallel on a subset of the nodes in your infrastructure. The +winrm+ subcommand uses the same syntax as the {search subcommand}[http://wiki.opscode.com/display/chef/Search]; you could could find the uptime of all your web servers using the command:
+
+    % knife winrm "role:web" "net stats srv" -x Administrator -P 'super_secret_password'
+
+Or force a chef run:
+
+    % knife winrm 'ec2-50-xx-xx-124.compute-1.amazonaws.com' 'chef-client -c c:/chef/client.rb' -m -x Administrator -P 'super_secret_password'
+    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:49 +0000] INFO: Starting Chef Run (Version 0.9.12)
+    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:50 +0000] WARN: Node ip-0A502FFB has an empty run list.
+    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Chef Run complete in 4.383966 seconds
+    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: cleaning the checksum cache
+    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Running report handlers
+    ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Report handlers complete
+
+This subcommand operates in a very similar manner as {knife ssh}[http://wiki.opscode.com/display/chef/Knife#Knife-SSHSubcommand]...just leveraging the WinRM protocol for communication.  It also include's +knife+ +ssh+'s "{interactive session mode}[http://wiki.opscode.com/display/chef/Knife#Knife-InteractiveMode]"
+
+== knife bootstrap windows winrm
+
+Performs a Chef Bootstrap (via the WinRM protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server.
+
+This subcommand operates in a very similar manner as {knife bootstrap}[http://wiki.opscode.com/display/chef/Knife+Bootstrap]...just leveraging the WinRM protocol for communication.  An initial run_list for the node can also be passed to the subcommand. Example usage:
+
+    knife bootstrap windows winrm ec2-50-xx-xx-124.compute-1.amazonaws.com -r 'role[webserver],role[production]' -x Administrator -P 'super_secret_password'
+
+== knife bootstrap windows ssh
+
+Performs a Chef Bootstrap (via the SSH protocol) on the target node. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists. It is primarily intended for Chef Client systems that talk to a Chef server.
+
+This subcommand assumes the SSH session will use Windows native cmd.exe command shell vs a bash shell through an emulated cygwin layer.  Most popular Windows based SSHd daemons like {freeSSHd}[http://www.freesshd.com/] and {WinSSHD}[http://www.bitvise.com/winsshd] behave this way.
+
+An initial run_list for the node can also be passed to the subcommand. Example usage:
+
+    knife bootstrap windows ssh ec2-50-xx-xx-124.compute-1.amazonaws.com -r 'role[webserver],role[production]' -x Administrator -i ~/.ssh/id_rsa
+
+= BOOTSTRAP TEMPLATES:
+
+This gem provides the following bootstrap templates:
+
+== windows-chef-client-msi
+
+This bootstrap template does the following:
+
+* Installs the latest version of Chef (and all dependencies) using the `chef-client` msi.
+* Writes the validation.pem per the local knife configuration.
+* Writes a default config file for Chef (C:\chef\client.rb) using values from the +knife.rb+.
+* Creates a JSON attributes file containing the specified run list and run Chef.
+
+This is the default bootstrap template used by both the +windows+ +bootstrap+ subcommands.
+
+== windows-shell
+
+This bootstrap template does the following:
+
+* Installs Ruby 1.8.7 via the {Ruby Installer for Windows}[http://rubyinstaller.org/] which also includes the latest version of RubyGems
+* Installs the RubyInstaller Development Kit (DevKit). The RubyInstaller Development Kit (DevKit) is a MSYS/MinGW based toolkit than enables you to build many of the native C/C++ extensions available for Ruby.
+* Installs required Windows-related gems from RubyGems.org
+* Installs latest Chef version from RubyGems.org including {Ohai}[https://rubygems.org/gems/ohai] and {Chef}[https://rubygems.org/gems/chef]. The Chef version is configurable using the *--bootstrap-version* option.
+* Writes the validation.pem per the local knife configuration.
+* Writes a default config file for Chef (C:\chef\client.rb) using values from the +knife.rb+.
+* Creates a JSON attributes file containing the specified run list and run Chef.
+
+This should be considered a legacy bootstrap template and will most likely be removed in a future version.
+
+= REQUIREMENTS/SETUP:
+
+== Ruby
+
+Ruby 1.9.1+ is needed.
+
+== Chef Version
+
+Knife plugins require >= Chef 0.10.  More details about Knife plugins can be {found on the Chef wiki}[http://wiki.opscode.com/display/chef/Knife+Plugins].
+
+== Nodes
+
+*NOTE*: Before any WinRM related knife subcommands will function correctly a node's WinRM installation must be configured correctly.  The below settings should be added to your base server image (AMI) or passed in using some sort of user-data mechanism provided by your cloud provider.
+
+A server running WinRM must also be configured properly to allow outside connections and the entire network path from the knife workstation to the server.  The easiest way to accomplish this is to use {WinRM's quick configuration option}[http://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx#quick_default_configuration]:
+
+    C:\Users\Administrator> winrm quickconfig -q
+
+The Chef and Ohai gem installations (that occur during bootstrap) take more memory than the default 150MB WinRM allocates per shell.  Bump it up to 300MB with the following setting:
+
+    C:\Users\Administrator> winrm set winrm/config/winrs @{MaxMemoryPerShellMB="300"}
+
+Bootstrap commands can take longer than the WinRM default 60 seconds to complete, bump to 30 minutes:
+
+    C:\Users\Administrator> winrm set winrm/config @{MaxTimeoutms="1800000"}
+
+WinRM supports both the HTTP and HTTPS transports and the following authentication schemes: Kerberos, Digest, Certificate and Basic.  The details of these authentication transports are outside of the scope of this README but details can be found on the {WinRM configuration guide}[http://msdn.microsoft.com/en-us/library/aa384372(v=vs.85).aspx].  Currently, this plugin support Kerberos and Basic authentication schemes.
+
+For development and testing purposes, unencrypted traffic with Basic authentication can make things easier:
+
+    C:\Users\Administrator> winrm set winrm/config/service @{AllowUnencrypted="true"}
+    C:\Users\Administrator> winrm set winrm/config/service/auth @{Basic="true"}
+
+= CONTRIBUTING:
+
+Please file bugs against the KNIFE_WINDOWS project at http://tickets.opscode.com/browse/knife
+
+More information on the contribution process for Opscode projects can be found at: http://wiki.opscode.com/display/chef/How+to+Contribute
+= LICENSE:
+
+Author:: Seth Chisamore (<schisamo@opscode.com>)
+Copyright:: Copyright (c) 2011 Opscode, Inc.
+License:: Apache License, Version 2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/Rakefile

@@ -1,16 +1,16 @@
-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 => :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

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,24 +1,24 @@
-# -*- 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.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
-  s.authors     = ["Seth Chisamore"]
-  s.email       = ["schisamo@opscode.com"]
-  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 "em-winrm", "= 0.5.4"
-
-  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.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.authors     = ["Seth Chisamore"]
+  s.email       = ["schisamo@opscode.com"]
+  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 "em-winrm", "~> 0.5", ">= 0.5.4"
+
+  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,211 +1,222 @@
-@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 "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
-
-<% url="https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%" -%>
-<% 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
-@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'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%"
-
-@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas
-@rem that cause the MSI download process to exceed the quota even when it is increased by administrators.
-@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available.
-@set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
-@if ERRORLEVEL 1 (
-    @echo Failed cscript 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's not, we'll 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 cscript 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 PowerShell if available...
-
-    @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
-
-    @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -command "& '<%= bootstrap_directory %>\wget.ps1' '%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%' '%LOCAL_DESTINATION_MSI_PATH%'"
-    @echo !powershell_download!
-    @call !powershell_download!
-    @if NOT ERRORLEVEL 1 (
-        echo Download via PowerShell 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
-echo Writing validation key...
-
-> <%= bootstrap_directory %>\validation.pem (
- <%= validation_key %>
-)
-
-echo Validation key written.
-@echo on
-
-<% if @config[:encrypted_data_bag_secret] -%>
-> <%= bootstrap_directory %>\encrypted_data_bag_secret (
- <%= encrypted_data_bag_secret %>
-)
-<% 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 Install Chef using chef-client MSI installer
+
+<% url="https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%" -%>
+<% 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
+@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 cscript...
+cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL%" /path:"%LOCAL_DESTINATION_MSI_PATH%"
+
+@rem Work around issues found in Windows Server 2012 around job objects not respecting WSMAN memory quotas
+@rem that cause the MSI download process to exceed the quota even when it is increased by administrators.
+@rem Retry the download using a more memory-efficient mechanism that only works if PowerShell is available.
+@set DOWNLOAD_ERROR_STATUS=!ERRORLEVEL!
+@if ERRORLEVEL 1 (
+    @echo Failed cscript 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 cscript 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 PowerShell if available...
+
+    @if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+
+    @set powershell_download=powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File  <%= bootstrap_directory %>\wget.ps1 "%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%" "%LOCAL_DESTINATION_MSI_PATH%"
+    @echo !powershell_download!
+    @call !powershell_download!
+    @if NOT ERRORLEVEL 1 (
+        echo Download via PowerShell 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
+echo Writing validation key...
+
+> <%= bootstrap_directory %>\validation.pem (
+ <%= validation_key %>
+)
+
+echo Validation key written.
+@echo on
+
+<% if @config[:encrypted_data_bag_secret] -%>
+> <%= bootstrap_directory %>\encrypted_data_bag_secret (
+ <%= encrypted_data_bag_secret %>
+)
+<% 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 %>
+