knife-windows 0.5.8 → 0.5.10.rc.1

data/knife-windows.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.required_ruby_version	= ">= 1.9.1"
-  s.add_dependency "em-winrm", "= 0.5.2"
+  s.add_dependency "em-winrm", "= 0.5.4.rc.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -135,7 +135,11 @@ class Chef
         # create a bootstrap.bat file on the node
         # we have to run the remote commands in 2047 char chunks
         create_bootstrap_bat_command do |command_chunk, chunk_num|
-          run_command("cmd.exe /C echo \"Rendering '#{bootstrap_bat_file}' chunk #{chunk_num}\" && #{command_chunk}").run
+          begin
+            run_command("cmd.exe /C echo \"Rendering '#{bootstrap_bat_file}' chunk #{chunk_num}\" && #{command_chunk}").run
+          rescue SystemExit => e
+            raise unless e.success?
+          end
         end
 
         # execute the bootstrap.bat file

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

@@ -79,7 +79,7 @@ CONFIG
         end
 
         def start_chef
-          start_chef = "SET PATH=%PATH%;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin\n"
+          start_chef = "SET \"PATH=%PATH%;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin\"\n"
           start_chef << "chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json -E #{bootstrap_environment}\n"
         end
 
@@ -91,6 +91,7 @@ CONFIG
           win_wget = <<-WGET
 url = WScript.Arguments.Named("url")
 path = WScript.Arguments.Named("path")
+proxy = null
 Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP")
 Set wshShell = CreateObject( "WScript.Shell" )
 Set objUserVariables = wshShell.Environment("USER")
@@ -100,11 +101,17 @@ Set objUserVariables = wshShell.Environment("USER")
 On Error Resume Next
 
 If NOT (objUserVariables("HTTP_PROXY") = "") Then
-objXMLHTTP.setProxy 2, objUserVariables("HTTP_PROXY")
+proxy = objUserVariables("HTTP_PROXY")
 
 'fall back to named arg
 ElseIf NOT (WScript.Arguments.Named("proxy") = "") Then
-objXMLHTTP.setProxy 2, WScript.Arguments.Named("proxy")
+proxy = WScript.Arguments.Named("proxy")
+End If
+
+If NOT isNull(proxy) Then
+'setProxy method is only available on ServerXMLHTTP 6.0+
+Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP.6.0")
+objXMLHTTP.setProxy 2, proxy
 End If
 
 On Error Goto 0

data/lib/chef/knife/winrm.rb

@@ -41,6 +41,13 @@ class Chef
         :description => "The attribute to use for opening the connection - default is fqdn",
         :default => "fqdn"
 
+      option :returns,
+       :long => "--returns CODES",
+       :description => "A comma delimited list of return codes which indicate success",
+       :default => nil,
+       :proc => Proc.new { |codes|
+         Chef::Config[:knife][:returns] = codes.split(',').collect {|item| item.to_i} }
+
       option :manual,
         :short => "-m",
         :long => "--manual-list",
@@ -90,8 +97,8 @@ class Chef
         list.each do |item|
           Chef::Log.debug("Adding #{item}")
           session_opts = {}
-          session_opts[:user] = Chef::Config[:knife][:winrm_user] || config[:winrm_user]
-          session_opts[:password] = Chef::Config[:knife][:winrm_password] if config[:winrm_password]
+          session_opts[:user] = config[:winrm_user] = Chef::Config[:knife][:winrm_user] || config[:winrm_user]
+          session_opts[:password] = config[:winrm_password] = Chef::Config[:knife][:winrm_password] || config[:winrm_password]
           session_opts[:port] = Chef::Config[:knife][:winrm_port] || config[:winrm_port]
           session_opts[:keytab] = Chef::Config[:knife][:kerberos_keytab_file] if Chef::Config[:knife][:kerberos_keytab_file]
           session_opts[:realm] = Chef::Config[:knife][:kerberos_realm] if Chef::Config[:knife][:kerberos_realm]
@@ -99,12 +106,24 @@ class Chef
           session_opts[:ca_trust_path] = Chef::Config[:knife][:ca_trust_file] if Chef::Config[:knife][:ca_trust_file]
           session_opts[:operation_timeout] = 1800 # 30 min OperationTimeout for long bootstraps fix for KNIFE_WINDOWS-8
 
+          ## If you have a \\ in your name you need to use NTLM domain authentication
+          if session_opts[:user].split("\\").length.eql?(2)
+            session_opts[:basic_auth_only] = false
+          else
+            session_opts[:basic_auth_only] = true
+          end
+
           if config.keys.any? {|k| k.to_s =~ /kerberos/ }
             session_opts[:transport] = :kerberos
             session_opts[:basic_auth_only] = false
           else
             session_opts[:transport] = (Chef::Config[:knife][:winrm_transport] || config[:winrm_transport]).to_sym
-            session_opts[:basic_auth_only] = true
+            session_opts[:disable_sspi] = true
+            if session_opts[:user] and
+                (not session_opts[:password])
+              session_opts[:password] = Chef::Config[:knife][:winrm_password] = config[:winrm_password] = get_password
+
+            end
           end
 
           session.use(item, session_opts)
@@ -189,6 +208,17 @@ class Chef
         end
       end
 
+      def check_for_errors!(exit_codes)
+
+        exit_codes.each do |host, value|
+          unless Chef::Config[:knife][:returns].include? value.to_i
+            @exit_code = 1
+            ui.error "Failed to execute command on #{host} return code #{value}"
+          end
+        end
+
+      end
+
       def run
         STDOUT.sync = STDERR.sync = true
 
@@ -202,7 +232,13 @@ class Chef
             interactive
           else
             winrm_command(@name_args[1..-1].join(" "))
+
+            if config[:returns]
+              check_for_errors! session.exit_codes
+            end
+
             session.close
+            exit @exit_code || 0
           end
         rescue WinRM::WinRMHTTPTransportError => e
           case e.message

data/lib/knife-windows/version.rb

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

metadata

@@ -1,39 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-windows
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.8
+version: !ruby/object:Gem::Version
+  version: 0.5.10.rc.1
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: em-winrm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70110195009760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.5.4.rc.1
   type: :runtime
-  version_requirements: *id001
-description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows
-email: 
+  prerelease: false
+  version_requirements: *70110195009760
+description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
+  with nodes running Microsoft Windows
+email:
 - schisamo@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -52,30 +50,27 @@ files:
 - lib/knife-windows/version.rb
 homepage: https://github.com/opscode/knife-windows
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows
+summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
+  with nodes running Microsoft Windows
 test_files: []
-