knife-windows 0.5.0 → 0.5.1

data/knife-windows.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.required_ruby_version	= ">= 1.9.1"
-  s.add_dependency "chef", ">= 0.10.0.beta.5"
-  s.add_dependency "em-winrm", "= 0.0.4"
+  s.add_dependency "em-winrm", "= 0.0.5"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

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

@@ -19,25 +19,7 @@
 mkdir C:\chef
 
 > C:\chef\wget.vbs (
- echo.strFileUrl = WScript.Arguments.Item^(0^)
- echo.strHDLocation = WScript.Arguments.Item^(1^)
- echo.Set objXMLHTTP = CreateObject^("MSXML2.XMLHTTP"^)
- echo.objXMLHTTP.open "GET", strFileURL, false
- echo.objXMLHTTP.send^(^)
- echo.If objXMLHTTP.Status = 200 Then
- echo.Set objADOStream = CreateObject^("ADODB.Stream"^)
- echo.objADOStream.Open
- echo.objADOStream.Type = 1
- echo.objADOStream.Write objXMLHTTP.ResponseBody
- echo.objADOStream.Position = 0
- echo.Set objFSO = Createobject^("Scripting.FileSystemObject"^)
- echo.If objFSO.Fileexists^(strHDLocation^) Then objFSO.DeleteFile strHDLocation
- echo.Set objFSO = Nothing
- echo.objADOStream.SaveToFile strHDLocation
- echo.objADOStream.Close
- echo.Set objADOStream = Nothing
- echo.End if
- echo.Set objXMLHTTP = Nothing
+ <%= 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
@@ -51,50 +33,24 @@ cmd.exe /C C:\DevKit\rubydevkit.exe -y
 cmd.exe /C C:\ruby\bin\ruby c:/DevKit/dk.rb init
 cmd.exe /C C:\ruby\bin\ruby c:/DevKit/dk.rb install
 
-cmd.exe /C C:\ruby\bin\gem install win32-open3 ruby-wmi windows-api windows-pr --no-rdoc --no-ri --verbose
+cmd.exe /C C:\ruby\bin\gem install win32-open3 rdp-ruby-wmi windows-api windows-pr --no-rdoc --no-ri --verbose
 
 @rem Install Chef gems separately to prevent 'failed to allocate memory' errors
-cmd.exe /C C:\ruby\bin\gem install ohai --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
-cmd.exe /C C:\ruby\bin\gem install chef --no-rdoc --no-ri --verbose <%= '--prerelease' if @config[:prerelease] %>
+cmd.exe /C C:\ruby\bin\gem install ohai --no-rdoc --no-ri --verbose
+cmd.exe /C C:\ruby\bin\gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
 
 > C:\chef\validation.pem (
- <% IO.read(Chef::Config[:validation_key]).each_line do |line| -%>
- <%= "echo.#{line.strip}" %>
- <% end -%>
- echo.
+ <%= validation_key %>
 )
 
 > C:\chef\client.rb (
  echo.require 'win32ole'
  echo.WIN32OLE.codepage = WIN32OLE::CP_UTF8
- echo.log_level               :info
- echo.log_location            STDOUT
- echo.chef_server_url         "<%= Chef::Config[:chef_server_url] %>"
- echo.validation_client_name  "<%= Chef::Config[:validation_client_name] %>"
- echo.client_key              "c:/chef/client.pem"
- echo.validation_key          "c:/chef/validation.pem"
- echo.checksum_path           "c:/chef/checksums"
- echo.file_cache_path         "c:/chef/cache"
- echo.file_backup_path        "c:/chef/backup"
- echo.cache_options          ^( {:path, "c:/chef/cache/checksums", :skip_expires, true} ^)
-<% if Chef::Config[:http_proxy] != nil %>
- echo.http_proxy              "<%= Chef::Config[:http_proxy] %>"
-<% end %>
-<% if Chef::Config[:https_proxy] != nil %>
- echo.https_proxy             "<%= Chef::Config[:https_proxy] %>"
-<% end %>
-<% if Chef::Config[:no_proxy] != nil %>
- echo.no_proxy                "<%= Chef::Config[:no_proxy] %>"
-<% end %>
-<% if @config[:chef_node_name] == nil %>
- echo.# Using default node name
-<% else %>
- echo.node_name               "<%= @config[:chef_node_name] %>"
-<% end %> 
+ <%= config_content %>
 )
 
 > C:\chef\first-boot.json (
- echo.<%= { "run_list" => @run_list }.to_json %>
+ <%= run_list %>
 )
 
-c:/ruby/bin/ruby c:/ruby/bin/chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json -l <%= Chef::Config[:log_level] %>
+<%= start_chef %>

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

@@ -0,0 +1,109 @@
+#
+# 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.
+#
+
+require 'chef/knife/core/bootstrap_context'
+
+class Chef
+  class Knife
+    module Core
+      # Instances of BootstrapContext are the context objects (i.e., +self+) for
+      # bootstrap templates. For backwards compatability, they +must+ set the
+      # following instance variables:
+      # * @config   - a hash of knife's config values
+      # * @run_list - the run list for the node to boostrap
+      # 
+      class WindowsBootstrapContext < BootstrapContext
+        
+        def initialize(config, run_list, chef_config)
+          @config       = config
+          @run_list     = run_list
+          @chef_config  = chef_config
+          super(config, run_list, chef_config)
+        end
+
+        def validation_key
+          val_key = escape_and_echo(super)
+          val_key << 'echo.'
+        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} )
+
+CONFIG
+          if @config[:chef_node_name]
+            client_rb << %Q{node_name "#{@config[:chef_node_name]}"\n}
+          else
+            client_rb << "# Using default node name (fqdn)\n"
+          end
+          escape_and_echo(client_rb)
+        end
+
+        def start_chef
+          "c:/ruby/bin/ruby c:/ruby/bin/chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json -E #{bootstrap_environment}"
+        end
+
+        def run_list
+          escape_and_echo({ "run_list" => @run_list }.to_json)
+        end
+
+        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
+objXMLHTTP.send()
+If objXMLHTTP.Status = 200 Then
+Set objADOStream = CreateObject("ADODB.Stream")
+objADOStream.Open
+objADOStream.Type = 1
+objADOStream.Write objXMLHTTP.ResponseBody
+objADOStream.Position = 0
+Set objFSO = Createobject("Scripting.FileSystemObject")
+If objFSO.Fileexists(strHDLocation) Then objFSO.DeleteFile strHDLocation
+Set objFSO = Nothing
+objADOStream.SaveToFile strHDLocation
+objADOStream.Close
+Set objADOStream = Nothing
+End if
+Set objXMLHTTP = Nothing
+WGET
+          escape_and_echo(win_wget)
+        end
+
+        # escape WIN BATCH special chars
+        # and prefixes each line with an
+        # echo
+        def escape_and_echo(file_contents)
+          file_contents.gsub(/^(.*)$/, 'echo.\1').gsub(/([(<|>)^])/, '^\1')
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/winrm_bootstrap.rb

@@ -17,18 +17,20 @@
 #
 
 require 'chef/knife'
+require 'erubis'
 
 class Chef
   class Knife
-    class WinrmBootstrap < Knife
+    class WinrmBootstrap < Bootstrap
 
       deps do
+        require 'chef/knife/core/windows_bootstrap_context'
         require 'chef/json_compat'
         require 'tempfile'
-        require 'erubis'
+         Chef::Knife::Winrm.load_deps
       end
 
-      banner "knife winrm bootstrap FQDN [RUN LIST...] (options)"
+      banner "knife winrm bootstrap FQDN (options)"
 
       option :winrm_user,
         :short => "-x USERNAME",
@@ -90,6 +92,11 @@ class Chef
         :long => "--prerelease",
         :description => "Install the pre-release chef gems"
 
+      option :bootstrap_version,
+        :long => "--bootstrap-version VERSION",
+        :description => "The version of Chef to install",
+        :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
       option :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
@@ -108,6 +115,7 @@ class Chef
         :proc => lambda { |o| o.split(",") },
         :default => []
 
+      # TODO: This should go away when CHEF-2193 is fixed
       def load_template(template=nil)
         # Are we bootstrapping using an already shipped template?
         if config[:template_file]
@@ -136,9 +144,7 @@ class Chef
       end
 
       def render_template(template=nil)
-        context = {}
-        context[:run_list] = config[:run_list]
-        context[:config] = config
+        context = Knife::Core::WindowsBootstrapContext.new(config, config[:run_list], Chef::Config)
         Erubis::Eruby.new(template).evaluate(context)
       end
 
@@ -163,16 +169,16 @@ class Chef
         knife_winrm(bootstrap_command).run
       end
 
-      def validate_name_args!
-        if Array(@name_args).first.nil?
-          ui.error("Must pass an FQDN or ip to bootstrap")
-          exit 1
-        end
-      end
-
-      def server_name
-        Array(@name_args).first
-      end
+      # def validate_name_args!
+      #   if Array(@name_args).first.nil?
+      #     ui.error("Must pass an FQDN or ip to bootstrap")
+      #     exit 1
+      #   end
+      # end
+      # 
+      # def server_name
+      #   Array(@name_args).first
+      # end
 
       def knife_winrm(command = '')
         winrm = Chef::Knife::Winrm.new
@@ -185,7 +191,7 @@ class Chef
         winrm.config[:kerberos_service] = Chef::Config[:knife][:kerberos_service] if Chef::Config[:knife][:kerberos_service]
         winrm.config[:ca_trust_file] = Chef::Config[:knife][:ca_trust_file] if Chef::Config[:knife][:ca_trust_file]
         winrm.config[:manual] = true
-        winrm.config[:winrm_port] = Chef::Config[:knife][:winrm_port]
+        winrm.config[:winrm_port] = Chef::Config[:knife][:winrm_port] || config[:winrm_port]
         winrm
       end
 
@@ -212,6 +218,7 @@ class Chef
       def bootstrap_bat_file
         "%TEMP%\\bootstrap.bat"
       end
+
     end
   end
 end

data/lib/knife-windows/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: knife-windows
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,31 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0.beta.5
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: em-winrm
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows
 email: 
 - schisamo@opscode.com
@@ -53,6 +42,7 @@ files:
 - Rakefile
 - knife-windows.gemspec
 - lib/chef/knife/bootstrap/windows-shell.erb
+- lib/chef/knife/core/windows_bootstrap_context.rb
 - lib/chef/knife/winrm.rb
 - lib/chef/knife/winrm_bootstrap.rb
 - lib/knife-windows/version.rb