knife-windows 0.5.1 → 0.5.2

data/lib/chef/knife/bootstrap/windows-shell.erb

@@ -22,11 +22,11 @@ mkdir C:\chef
  <%= win_wget %>
 )
 
-cscript /nologo C:\chef\wget.vbs http://files.rubyforge.vm.bytemark.co.uk/rubyinstaller/rubyinstaller-1.8.7-p334.exe %TEMP%\rubyinstaller.exe
+cscript /nologo C:\chef\wget.vbs /url:http://files.rubyforge.vm.bytemark.co.uk/rubyinstaller/rubyinstaller-1.8.7-p334.exe /path:%TEMP%\rubyinstaller.exe
 %TEMP%\rubyinstaller.exe /verysilent /dir="C:\ruby" /tasks="assocfiles,modpath"
 
 @rem Install the Ruby Dev Kit so we compile us some native gems
-cscript /nologo C:\chef\wget.vbs http://cloud.github.com/downloads/oneclick/rubyinstaller/DevKit-tdm-32-4.5.1-20101214-1400-sfx.exe %TEMP%\rubydevkit.exe
+cscript /nologo C:\chef\wget.vbs /url:http://cloud.github.com/downloads/oneclick/rubyinstaller/DevKit-tdm-32-4.5.1-20101214-1400-sfx.exe /path:%TEMP%\rubydevkit.exe
 mkdir C:\DevKit
 copy %TEMP%\rubydevkit.exe C:\DevKit
 cmd.exe /C C:\DevKit\rubydevkit.exe -y

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

@@ -37,23 +37,22 @@ class Chef
         end
 
         def validation_key
-          val_key = escape_and_echo(super)
-          val_key << 'echo.'
+          escape_and_echo(super)
         end
 
         def config_content
           client_rb = <<-CONFIG
 log_level        :info
 log_location     STDOUT
+
 chef_server_url  "#{@chef_config[:chef_server_url]}"
 validation_client_name "#{@chef_config[:validation_client_name]}"
-
 client_key        "c:/chef/client.pem"
 validation_key    "c:/chef/validation.pem"
-checksum_path     "c:/chef/checksums"
+
 file_cache_path   "c:/chef/cache"
 file_backup_path  "c:/chef/backup"
-cache_options     ( {:path => "c:/chef/cache/checksums", :skip_expires => true} )
+cache_options     ({:path => "c:/chef/cache/checksums", :skip_expires => true})
 
 CONFIG
           if @config[:chef_node_name]
@@ -74,10 +73,14 @@ CONFIG
 
         def win_wget
           win_wget = <<-WGET
-strFileUrl = WScript.Arguments.Item(0)
-strHDLocation = WScript.Arguments.Item(1)
-Set objXMLHTTP = CreateObject("MSXML2.XMLHTTP")
-objXMLHTTP.open "GET", strFileURL, false
+url = WScript.Arguments.Named("url")
+path = WScript.Arguments.Named("path")
+Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP")
+'proxy is optional
+On Error Resume Next
+objXMLHTTP.setProxy 2, WScript.Arguments.Named("proxy")
+On Error Goto 0
+objXMLHTTP.open "GET", url, false
 objXMLHTTP.send()
 If objXMLHTTP.Status = 200 Then
 Set objADOStream = CreateObject("ADODB.Stream")
@@ -86,9 +89,9 @@ objADOStream.Type = 1
 objADOStream.Write objXMLHTTP.ResponseBody
 objADOStream.Position = 0
 Set objFSO = Createobject("Scripting.FileSystemObject")
-If objFSO.Fileexists(strHDLocation) Then objFSO.DeleteFile strHDLocation
+If objFSO.Fileexists(path) Then objFSO.DeleteFile path
 Set objFSO = Nothing
-objADOStream.SaveToFile strHDLocation
+objADOStream.SaveToFile path
 objADOStream.Close
 Set objADOStream = Nothing
 End if

data/lib/knife-windows/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: knife-windows
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency