knife-windows 0.5.12 → 0.5.14.rc.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+
+script: bundle exec rake spec

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in knife-windows.gemspec
 gemspec
@@ -7,4 +7,5 @@ group :test do
   gem "rspec"
   gem "ruby-wmi"
   gem "chef"
+  gem 'rake'
 end

data/README.rdoc

@@ -118,7 +118,7 @@ For development and testing purposes, unencrypted traffic with Basic authenticat
 
 = CONTRIBUTING:
 
-Please file bugs against the KNIFE_WINDOWS project at http://tickets.opscode.com/browse/KNIFE_WINDOWS
+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:

data/features/knife_help.feature

@@ -0,0 +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)"

data/features/support/env.rb

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

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

@@ -16,10 +16,21 @@
 @rem limitations under the License.
 @rem
 
-@setlocal
+@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] %>
-mkdir <%= bootstrap_directory %>
+
+@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 %>
@@ -31,36 +42,54 @@ mkdir <%= bootstrap_directory %>
 
 @rem Determine the version and the architecture
 
-FOR /F "tokens=1-8 delims=.[] " %%A IN ('ver') DO (
+@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
-goto architecture
+@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
+goto architecture_select
 
 :Version6.0
 @set MACHINE_OS=2008
-goto architecture
+goto architecture_select
 
 :Version5.2
 @set MACHINE_OS=2003r2
-goto architecture
+goto architecture_select
 
 :Version6.1
 @set MACHINE_OS=2008r2
-goto architecture
+goto architecture_select
 
 :Version6.2
 @set MACHINE_OS=2012
-goto architecture
+goto architecture_select
+
+@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012 
+:Version6.3
+goto Version6.2
 
-:architecture
+:architecture_select
+goto Architecture%PROCESSOR_ARCHITEW6432%
 
+:Architecture
 goto Architecture%PROCESSOR_ARCHITECTURE%
 
 @rem If this is an unknown architecture set the default
@@ -78,37 +107,79 @@ goto install
 :install
 @rem Install Chef using chef-client MSI installer
 
-@set "REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/download?p=windows&pv=%MACHINE_OS%&m=%MACHINE_ARCH%"
+<% 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 "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.
+)
+
+@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.
-@if ERRORLEVEL 1 (      
-    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%"
-    @powershell -ExecutionPolicy Unrestricted -NoProfile -NonInteractive "& '<%= bootstrap_directory %>\wget.ps1' '%REMOTE_SOURCE_MSI_URL%%FALLBACK_QUERY_STRING%' '%LOCAL_DESTINATION_MSI_PATH%'"
-
-    if NOT ERRORLEVEL 1 (
-        echo Download succeeded
+@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 Failed to download "%REMOTE_SOURCE_MSI_URL%"
-        echo Subsequent attempt to install the downloaded MSI is likely to fail
+        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 Starting bootstrap with downloaded client package
+
 <%= install_chef %>
 
 @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 %>
@@ -120,7 +191,7 @@ cscript /nologo <%= bootstrap_directory %>\wget.vbs /url:"%REMOTE_SOURCE_MSI_URL
 )
 
 > <%= bootstrap_directory %>\first-boot.json (
- <%= run_list %>
+ <%= first_boot %>
 )
 
 <%= start_chef %>

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -18,6 +18,7 @@
 
 require 'chef/knife'
 require 'chef/encrypted_data_bag_item'
+require 'chef/knife/core/windows_bootstrap_context'
 
 class Chef
   class Knife
@@ -53,6 +54,11 @@ class Chef
             :description => "The proxy server for the node being bootstrapped",
             :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
 
+          option :bootstrap_no_proxy,
+            :long => "--bootstrap-no-proxy ",
+            :description => "Avoid a proxy server for the given addresses",
+            :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
+
           option :distro,
             :short => "-d DISTRO",
             :long => "--distro DISTRO",
@@ -71,6 +77,13 @@ class Chef
             :proc => lambda { |o| o.split(",") },
             :default => []
 
+          option :first_boot_attributes,
+            :short => "-j JSON_ATTRIBS",
+            :long => "--json-attributes",
+            :description => "A JSON string to be added to the first run of chef-client",
+            :proc => lambda { |o| JSON.parse(o) },
+            :default => {}
+          
           option :encrypted_data_bag_secret,
             :short => "-s SECRET",
             :long  => "--secret ",
@@ -136,7 +149,7 @@ class Chef
         # we have to run the remote commands in 2047 char chunks
         create_bootstrap_bat_command do |command_chunk, chunk_num|
           begin
-            run_command("cmd.exe /C echo \"Rendering '#{bootstrap_bat_file}' chunk #{chunk_num}\" && #{command_chunk}")
+            run_command("cmd.exe /C echo \"Rendering #{bootstrap_bat_file} chunk #{chunk_num}\" && #{command_chunk}")
           rescue SystemExit => e
             raise unless e.success?
           end
@@ -167,7 +180,7 @@ class Chef
       end
 
       def bootstrap_bat_file
-        @bootstrap_bat_file ||= "%TEMP%\\bootstrap-#{Process.pid}-#{Time.now.to_i}.bat"
+        @bootstrap_bat_file ||= "\"%TEMP%\\bootstrap-#{Process.pid}-#{Time.now.to_i}.bat\""
       end
 
       def locate_config_value(key)

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

@@ -69,6 +69,7 @@ CONFIG
             client_rb << "\n"
             client_rb << %Q{http_proxy        "#{knife_config[:bootstrap_proxy]}"\n}
             client_rb << %Q{https_proxy       "#{knife_config[:bootstrap_proxy]}"\n}
+            client_rb << %Q{no_proxy          "#{knife_config[:bootstrap_no_proxy]}"\n} if knife_config[:bootstrap_no_proxy]
           end
 
           if @config[:encrypted_data_bag_secret]
@@ -83,10 +84,6 @@ CONFIG
           start_chef << "chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json -E #{bootstrap_environment}\n"
         end
 
-        def run_list
-          escape_and_echo({ "run_list" => @run_list }.to_json)
-        end
-
         def win_wget
           win_wget = <<-WGET
 url = WScript.Arguments.Named("url")
@@ -152,7 +149,7 @@ WGET_PS
         end
 
         def install_chef
-          install_chef = 'msiexec /qb /i "%LOCAL_DESTINATION_MSI_PATH%"'
+          install_chef = 'msiexec /qn /i "%LOCAL_DESTINATION_MSI_PATH%"'
         end
 
         def bootstrap_directory
@@ -163,6 +160,11 @@ WGET_PS
           local_download_path = "%TEMP%\\chef-client-latest.msi"
         end
 
+        def first_boot
+          first_boot_attributes_and_run_list = (@config[:first_boot_attributes] || {}).merge(:run_list => @run_list)          
+          escape_and_echo(first_boot_attributes_and_run_list.to_json)
+        end                
+
         # escape WIN BATCH special chars
         # and prefixes each line with an
         # echo

data/lib/chef/knife/windows_helper.rb

@@ -0,0 +1,34 @@
+#
+# Author:: Chirag Jog (<chirag@clogeny.com>)
+# Copyright:: Copyright (c) 2013 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.
+#
+
+require 'chef/knife'
+require 'chef/knife/winrm'
+require 'chef/knife/bootstrap_windows_ssh'
+require 'chef/knife/bootstrap_windows_winrm'
+
+class Chef
+  class Knife
+    class WindowsHelper < Knife
+
+      banner "#{BootstrapWindowsWinrm.banner}\n" +
+              "#{BootstrapWindowsSsh.banner}\n" +
+              "#{Winrm.banner}"
+    end
+  end
+end
+

data/lib/chef/knife/winrm.rb

@@ -75,6 +75,26 @@ class Chef
 
       end
 
+      # TODO: Copied from Knife::Core:GenericPresenter. Should be extracted
+      def extract_nested_value(data, nested_value_spec)
+        nested_value_spec.split(".").each do |attr|
+          if data.nil?
+            nil # don't get no method error on nil
+          elsif data.respond_to?(attr.to_sym)
+            data = data.send(attr.to_sym)
+          elsif data.respond_to?(:[])
+            data = data[attr]
+          else
+            data = begin
+                     data.send(attr.to_sym)
+                   rescue NoMethodError
+                     nil
+                   end
+          end
+        end
+        ( !data.kind_of?(Array) && data.respond_to?(:to_hash) ) ? data.to_hash : data
+      end
+
       def configure_session
         list = case config[:manual]
                when true
@@ -84,7 +104,7 @@ class Chef
                  q = Chef::Search::Query.new
                  @action_nodes = q.search(:node, @name_args[0])[0]
                  @action_nodes.each do |item|
-                   i = format_for_display(item)[config[:attribute]]
+                   i = extract_nested_value(item, config[:attribute])
                    r.push(i) unless i.nil?
                  end
                  r

data/lib/knife-windows/version.rb

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

data/spec/functional/bootstrap_download_spec.rb

@@ -50,6 +50,9 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     # Location to which the download script will be modified to write
     # the downloaded msi
     @local_file_download_destination = "#{@temp_directory}/chef-client-latest.msi"
+
+    source_code_directory = File.dirname(__FILE__)    
+    @template_file_path ="#{source_code_directory}/../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"    
   end
 
   after(:all) do
@@ -64,7 +67,8 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
       @mock_bootstrap_context = Chef::Knife::Core::WindowsBootstrapContext.new({ }, nil, { })
 
       # Stub the bootstrap context and prevent config related sections
-      # to be populated, chef installation and first chef run
+      # from being populated, i.e. chef installation and first chef
+      # run sections
       @mock_bootstrap_context.stub(:validation_key).and_return("echo.validation_key")
       @mock_bootstrap_context.stub(:encrypted_data_bag_secret).and_return("echo.encrypted_data_bag_secret")
       @mock_bootstrap_context.stub(:config_content).and_return("echo.config_content")
@@ -72,7 +76,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
       @mock_bootstrap_context.stub(:run_list).and_return("echo.run_list")
       @mock_bootstrap_context.stub(:install_chef).and_return("echo.echo install_chef_command")
 
-      # Change the directorires where bootstrap files will be created
+      # Change the directories where bootstrap files will be created
       @mock_bootstrap_context.stub(:bootstrap_directory).and_return(@temp_directory.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR))
       @mock_bootstrap_context.stub(:local_download_path).and_return(@local_file_download_destination.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR))
 
@@ -87,14 +91,15 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     it "downloads the chef-client MSI during winrm bootstrap" do
       clean_test_case
 
-      bootstrap_context = Chef::Knife::BootstrapWindowsWinrm.new([ "127.0.0.1" ])
+      winrm_bootstrapper = Chef::Knife::BootstrapWindowsWinrm.new([ "127.0.0.1" ])
+      winrm_bootstrapper.config[:template_file] = @template_file_path      
 
       # Execute the commands locally that would normally be executed via WinRM
-      bootstrap_context.stub(:run_command) do |command|
+      winrm_bootstrapper.stub(:run_command) do |command|
         system(command)
       end
 
-      bootstrap_context.run
+      winrm_bootstrapper.run
 
       # Download should succeed
       download_succeeded?.should == true
@@ -105,7 +110,7 @@ describe 'Knife::Windows::Core msi download functionality for knife Windows winr
     File.exists?(@local_file_download_destination) && ! File.zero?(@local_file_download_destination)
   end
 
-  # Remove file artifiacts generated by individual test cases
+  # Remove file artifacts generated by individual test cases
   def clean_test_case
     if File.exists?(@local_file_download_destination)
       File.delete(@local_file_download_destination)

data/spec/unit/knife/bootstrap_template_spec.rb

@@ -0,0 +1,91 @@
+#
+# Author:: Chirag Jog (<chirag@clogeny.com>)
+# Copyright:: Copyright (c) 2013 Chirag Jog
+# 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.
+
+
+TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+
+require 'spec_helper'
+
+describe "While Windows Bootstrapping" do
+  context "the default Windows bootstrapping template" do
+    bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
+    bootstrap.config[:template_file] = TEMPLATE_FILE
+
+    template = bootstrap.load_template
+    template_file_lines = template.split('\n')
+    it "should download Platform specific MSI" do
+      download_url=template_file_lines.find {|l| l.include?("url=")}
+      download_url.include?("%MACHINE_OS%") && download_url.include?("%MACHINE_ARCH%")
+    end
+    it "should download specific version of MSI if supplied" do
+      download_url_ext= template_file_lines.find {|l| l.include?("url +=")}
+      download_url_ext.include?("[:bootstrap_version]")
+    end
+  end
+end
+
+describe Chef::Knife::BootstrapWindowsWinrm do
+  before(:all) do
+    @original_config = Chef::Config.hash_dup
+    @original_knife_config = Chef::Config[:knife].dup
+  end
+
+  after(:all) do
+    Chef::Config.configuration = @original_config
+    Chef::Config[:knife] = @original_knife_config
+  end
+
+  before(:each) do
+    Chef::Log.logger = Logger.new(StringIO.new)
+    @knife = Chef::Knife::BootstrapWindowsWinrm.new
+    # Merge default settings in.
+    @knife.merge_configs
+    @knife.config[:template_file] = TEMPLATE_FILE
+    @stdout = StringIO.new
+    @knife.ui.stub(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub(:stderr).and_return(@stderr)
+  end
+
+  describe "specifying no_proxy with various entries" do
+    subject(:knife) { described_class.new }
+    let(:options){ ["--bootstrap-proxy", "", "--bootstrap-no-proxy", setting] }
+    let(:template_file) { TEMPLATE_FILE }
+    let(:rendered_template) do
+      knife.instance_variable_set("@template_file", template_file)
+      knife.parse_options(options)
+      # Avoid referencing a validation keyfile we won't find during #render_template
+      template_string = knife.read_template.gsub(/^.*[Vv]alidation_key.*$/, '')
+      knife.render_template(template_string)
+    end
+
+    context "via --bootstrap-no-proxy" do
+      let(:setting) { "api.opscode.com" }
+
+      it "renders the client.rb with a single FQDN no_proxy entry" do
+        rendered_template.should match(%r{.*no_proxy\s*\"api.opscode.com\".*})
+      end
+    end
+    context "via --bootstrap-no-proxy multiple" do
+      let(:setting) { "api.opscode.com,172.16.10.*" }
+
+      it "renders the client.rb with comma-separated FQDN and wildcard IP address no_proxy entries" do
+        rendered_template.should match(%r{.*no_proxy\s*"api.opscode.com,172.16.10.\*".*})
+      end
+    end
+  end
+end

data/spec/unit/knife/winrm_spec.rb

@@ -40,6 +40,7 @@ describe Chef::Knife::Winrm do
     @node_bar = Chef::Node.new
     @node_bar.automatic_attrs[:fqdn] = "bar.example.org"
     @node_bar.automatic_attrs[:ipaddress] = "10.0.0.2"
+    @node_bar.automatic_attrs[:ec2][:public_hostname] = "somewhere.com"
   end
 
   describe "#configure_session" do
@@ -49,6 +50,7 @@ describe Chef::Knife::Winrm do
 
     context "when there are some hosts found but they do not have an attribute to connect with" do
       before do
+        @knife.config[:manual] = false
         @query.stub!(:search).and_return([[@node_foo, @node_bar]])
         @node_foo.automatic_attrs[:fqdn] = nil
         @node_bar.automatic_attrs[:fqdn] = nil
@@ -61,5 +63,20 @@ describe Chef::Knife::Winrm do
         @knife.configure_session
       end
     end
+
+    context "when there are nested attributes" do
+      before do
+        @knife.config[:manual] = false
+        @query.stub!(:search).and_return([[@node_foo, @node_bar]])
+        Chef::Search::Query.stub!(:new).and_return(@query)
+      end
+    
+      it "should use nested attributes (KNIFE-276)" do
+        @knife.config[:attribute] = "ec2.public_hostname"
+        @knife.stub!(:session_from_list)
+        @knife.configure_session
+
+      end
+    end
   end
 end  

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 0.5.12
-  prerelease: 
+  version: 0.5.14.rc.0
+  prerelease: 7
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-winrm
@@ -39,11 +39,14 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
+- features/knife_help.feature
+- features/support/env.rb
 - knife-windows.gemspec
 - lib/chef/knife/bootstrap/windows-chef-client-msi.erb
 - lib/chef/knife/bootstrap/windows-shell.erb
@@ -51,11 +54,13 @@ files:
 - lib/chef/knife/bootstrap_windows_ssh.rb
 - lib/chef/knife/bootstrap_windows_winrm.rb
 - lib/chef/knife/core/windows_bootstrap_context.rb
+- lib/chef/knife/windows_helper.rb
 - lib/chef/knife/winrm.rb
 - lib/chef/knife/winrm_base.rb
 - lib/knife-windows/version.rb
 - spec/functional/bootstrap_download_spec.rb
 - spec/spec_helper.rb
+- spec/unit/knife/bootstrap_template_spec.rb
 - spec/unit/knife/winrm_spec.rb
 homepage: https://github.com/opscode/knife-windows
 licenses: []
@@ -72,14 +77,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
   with nodes running Microsoft Windows
-test_files: []
+test_files:
+- features/knife_help.feature
+- features/support/env.rb
+- spec/functional/bootstrap_download_spec.rb
+- spec/spec_helper.rb
+- spec/unit/knife/bootstrap_template_spec.rb
+- spec/unit/knife/winrm_spec.rb