knife-windows 0.0.2 → 0.5.0

data/README.rdoc

@@ -63,13 +63,7 @@ This is the default bootstrap template used by the +winrm+ +bootstrap+ subcomman
 
 == Chef Version
 
-{CHEF-1248}[http://tickets.opscode.com/browse/CHEF-1248] added the ability to load Knife subcommands from alternate locations including Ruby gems (such as this one).  This feature will be built into the 0.10 release of Chef.  Until then this feature can be added to Chef 0.9.x releases by using a monkey patched +knife+ bin file:
-
-    cd YOUR_CHEF_REPO
-    curl https://gist.github.com/raw/f33e15bac2820dd572d4/cb6ab81023440235868e83b96fa0ae527d37e2d7/knife >> knife
-    chmod 744 knife
-
-More details about Knife plugins can be {found on the Chef wiki}[http://wiki.opscode.com/display/chef/Knife+Plugins].
+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
 

data/knife-windows.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   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 "chef", ">= 0.9.12"
-  s.add_dependency "em-winrm", ">= 0.0.3"
+  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.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

@@ -42,6 +42,15 @@ mkdir C:\chef
 
 cscript /nologo C:\chef\wget.vbs http://files.rubyforge.vm.bytemark.co.uk/rubyinstaller/rubyinstaller-1.8.7-p334.exe %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
+mkdir C:\DevKit
+copy %TEMP%\rubydevkit.exe C:\DevKit
+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
 
 @rem Install Chef gems separately to prevent 'failed to allocate memory' errors

data/lib/chef/knife/winrm.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,17 +17,16 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag_item'
-
-begin
-  gem "em-winrm"
-rescue LoadError
-end
 
 class Chef
   class Knife
     class Winrm < Knife
 
+      deps do
+        require 'readline'
+        require 'chef/search/query'
+      end
+
       attr_writer :password
 
       banner "knife winrm QUERY COMMAND (options)"
@@ -36,7 +35,7 @@ class Chef
         :short => "-a ATTR",
         :long => "--attribute ATTR",
         :description => "The attribute to use for opening the connection - default is fqdn",
-        :default => "fqdn" 
+        :default => "fqdn"
 
       option :manual,
         :short => "-m",
@@ -48,18 +47,21 @@ class Chef
       option :winrm_user,
         :short => "-x USERNAME",
         :long => "--winrm-user USERNAME",
-        :description => "The WinRM username"
+        :description => "The WinRM username",
+        :default => "Administrator",
+        :proc => Proc.new { |key| Chef::Config[:knife][:winrm_user] = key }
 
       option :winrm_password,
         :short => "-P PASSWORD",
         :long => "--winrm-password PASSWORD",
-        :description => "The WinRM password"
+        :description => "The WinRM password",
+        :proc => Proc.new { |key| Chef::Config[:knife][:winrm_password] = key }
 
       option :winrm_port,
         :short => "-p PORT",
         :long => "--winrm-port PORT",
         :description => "The WinRM port",
-        :default => "80",
+        :default => "5985",
         :proc => Proc.new { |key| Chef::Config[:knife][:winrm_port] = key }
 
       option :winrm_transport,
@@ -100,6 +102,7 @@ class Chef
         :proc => Proc.new { |trust| Chef::Config[:knife][:ca_trust_file] = trust }
 
       def session
+        require 'em-winrm'
         session_opts = {}
         session_opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
         @session ||= begin
@@ -119,10 +122,6 @@ class Chef
 
       end
 
-      def h
-        @highline ||= HighLine.new
-      end
-
       def configure_session
         list = case config[:manual]
                when true
@@ -137,27 +136,28 @@ class Chef
                  end
                  r
                end
-        (Chef::Log.fatal("No nodes returned from search!"); exit 10) if list.length == 0
+        (ui.fatal("No nodes returned from search!"); exit 10) if list.length == 0
         session_from_list(list)
       end
 
       def session_from_list(list)
         list.each do |item|
           Chef::Log.debug("Adding #{item}")
-
           session_opts = {}
-          session_opts[:user] = config[:winrm_user] if config[:winrm_user]
-          session_opts[:password] = config[:winrm_password] if config[:winrm_password]
-          session_opts[:port] = config[:winrm_port]
-          session_opts[:keytab] = config[:kerberos_keytab_file] if config[:kerberos_keytab_file]
-          session_opts[:realm] = config[:kerberos_realm] if config[:kerberos_realm]
-          session_opts[:service] = config[:kerberos_service] if config[:kerberos_service]
-          session_opts[:ca_trust_path] = config[:ca_trust_file] if config[:ca_trust_file]
-          
+          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[: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]
+          session_opts[:service] = Chef::Config[:knife][:kerberos_service] if Chef::Config[:knife][:kerberos_service]
+          session_opts[:ca_trust_path] = Chef::Config[:knife][:ca_trust_file] if Chef::Config[:knife][:ca_trust_file]
+
           if config.keys.any? {|k| k.to_s =~ /kerberos/ }
             session_opts[:transport] = :kerberos
+            session_opts[:basic_auth_only] = false
           else
-            session_opts[:transport] = config[:winrm_transport].to_sym
+            session_opts[:transport] = (Chef::Config[:knife][:winrm_transport] || config[:winrm_transport]).to_sym
+            session_opts[:basic_auth_only] = true
           end
 
           session.use(item, session_opts)
@@ -172,7 +172,7 @@ class Chef
           data.split(/\n/).each { |d| print_data(host, d, color) }
         else
           padding = @longest - host.length
-          print h.color(host, color)
+          print ui.color(host, color)
           padding.downto(0) { print " " }
           puts data.chomp
         end
@@ -184,7 +184,7 @@ class Chef
       end
 
       def get_password
-        @password ||= h.ask("Enter your password: ") { |q| q.echo = false }
+        @password ||= ui.ask("Enter your password: ") { |q| q.echo = false }
       end
 
       # Present the prompt and read a single line from the console. It also
@@ -193,7 +193,7 @@ class Chef
       # line is input.
       def read_line
         loop do
-          command = reader.readline("#{h.color('knife-winrm>', :bold)} ", true)
+          command = reader.readline("#{ui.color('knife-winrm>', :bold)} ", true)
 
           if command.nil?
             command = "exit"
@@ -213,7 +213,7 @@ class Chef
       end
 
       def interactive
-        puts "Connected to #{h.list(session.servers.collect { |s| h.color(s.host, :cyan) }, :inline, " and ")}"
+        puts "Connected to #{ui.list(session.servers.collect { |s| ui.color(s.host, :cyan) }, :inline, " and ")}"
         puts
         puts "To run a command on a list of servers, do:"
         puts "  on SERVER1 SERVER2 SERVER3; COMMAND"
@@ -232,7 +232,7 @@ class Chef
             raw_list = $1.split(" ")
             server_list = Array.new
             session.servers.each do |session_server|
-              server_list << session_server if raw_list.include?(session_server.host) 
+              server_list << session_server if raw_list.include?(session_server.host)
             end
             command = $2
             winrm_command(command, session.on(*server_list))
@@ -242,28 +242,20 @@ class Chef
         end
       end
 
-      def run 
+      def run
         @longest = 0
-        load_late_dependencies
 
         configure_session
 
         case @name_args[1]
         when "interactive"
-          interactive 
+          interactive
         else
           winrm_command(@name_args[1..-1].join(" "))
           session.close
         end
       end
 
-      def load_late_dependencies
-        require 'readline'
-        %w[em-winrm highline].each do |dep|
-          load_late_dependency dep
-        end
-      end
-
     end
   end
 end

data/lib/chef/knife/winrm_bootstrap.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -16,29 +16,38 @@
 # limitations under the License.
 #
 
-require 'chef/knife/bootstrap'
+require 'chef/knife'
 
 class Chef
   class Knife
-    class WinrmBootstrap < Chef::Knife::Bootstrap
+    class WinrmBootstrap < Knife
+
+      deps do
+        require 'chef/json_compat'
+        require 'tempfile'
+        require 'erubis'
+      end
 
       banner "knife winrm bootstrap FQDN [RUN LIST...] (options)"
 
       option :winrm_user,
         :short => "-x USERNAME",
         :long => "--winrm-user USERNAME",
-        :description => "The WinRM username"
+        :description => "The WinRM username",
+        :default => "Administrator",
+        :proc => Proc.new { |key| Chef::Config[:knife][:winrm_user] = key }
 
       option :winrm_password,
         :short => "-P PASSWORD",
         :long => "--winrm-password PASSWORD",
-        :description => "The WinRM password"
+        :description => "The WinRM password",
+        :proc => Proc.new { |key| Chef::Config[:knife][:winrm_password] = key }
 
       option :winrm_port,
         :short => "-p PORT",
         :long => "--winrm-port PORT",
         :description => "The WinRM port",
-        :default => "80",
+        :default => "5985",
         :proc => Proc.new { |key| Chef::Config[:knife][:winrm_port] = key }
 
       option :winrm_transport,
@@ -108,7 +117,7 @@ class Chef
           bootstrap_files << File.join(File.dirname(__FILE__), 'bootstrap', "#{config[:distro]}.erb")
           bootstrap_files << File.join(Dir.pwd, ".chef", "bootstrap", "#{config[:distro]}.erb")
           bootstrap_files << File.join(ENV['HOME'], '.chef', 'bootstrap', "#{config[:distro]}.erb")
-          bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb")) 
+          bootstrap_files << Gem.find_files(File.join("chef","knife","bootstrap","#{config[:distro]}.erb"))
         end
 
         template = Array(bootstrap_files).find do |bootstrap_template|
@@ -117,26 +126,33 @@ class Chef
         end
 
         unless template
-          Chef::Log.info("Can not find bootstrap definition for #{config[:distro]}")
+          ui.info("Can not find bootstrap definition for #{config[:distro]}")
           raise Errno::ENOENT
         end
 
         Chef::Log.debug("Found bootstrap template in #{File.dirname(template)}")
-        
+
         IO.read(template).chomp
       end
 
-      def run 
-        require 'highline'
+      def render_template(template=nil)
+        context = {}
+        context[:run_list] = config[:run_list]
+        context[:config] = config
+        Erubis::Eruby.new(template).evaluate(context)
+      end
 
-        validate_name_args!
+      def run
 
-        $stdout.sync = true
+        validate_name_args!
 
-        Chef::Log.info("Bootstrapping Chef on #{h.color(config[:server_name], :bold)}")
+        @node_name = Array(@name_args).first
+        # back compat--templates may use this setting:
+        config[:server_name] = @node_name
 
-        knife_winrm.load_late_dependencies
+        $stdout.sync = true
 
+        ui.info("Bootstrapping Chef on #{ui.color(@node_name, :bold)}")
         # 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|
@@ -147,17 +163,29 @@ 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 knife_winrm(command = '')
         winrm = Chef::Knife::Winrm.new
         winrm.name_args = [ server_name, command ]
-        winrm.config[:winrm_user] = config[:winrm_user] 
-        winrm.config[:winrm_password] = config[:winrm_password]
-        winrm.config[:winrm_transport] = config[:winrm_transport]
-        winrm.config[:kerberos_keytab_file] = config[:kerberos_keytab_file] if config[:kerberos_keytab_file]
-        winrm.config[:kerberos_realm] = config[:kerberos_realm] if config[:kerberos_realm]
-        winrm.config[:kerberos_service] = config[:kerberos_service] if config[:kerberos_service]
-        winrm.config[:ca_trust_file] = config[:ca_trust_file] if config[:ca_trust_file]
+        winrm.config[:winrm_user] = Chef::Config[:knife][:winrm_user] || config[:winrm_user]
+        winrm.config[:winrm_password] = Chef::Config[:knife][:winrm_password] if config[:winrm_password]
+        winrm.config[:winrm_transport] = Chef::Config[:knife][:winrm_transport] || config[:winrm_transport]
+        winrm.config[:kerberos_keytab_file] = Chef::Config[:knife][:kerberos_keytab_file] if Chef::Config[:knife][:kerberos_keytab_file]
+        winrm.config[:kerberos_realm] = Chef::Config[:knife][:kerberos_realm] if Chef::Config[:knife][:kerberos_realm]
+        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
       end
 
@@ -184,11 +212,6 @@ class Chef
       def bootstrap_bat_file
         "%TEMP%\\bootstrap.bat"
       end
-
-      def load_late_dependencies
-        super
-        require 'chef/knife/winrm'
-      end
     end
   end
 end

data/lib/knife-windows/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: knife-windows
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -05:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 0.10.0.beta.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   version_requirements: *id002
 description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows