knife-windows 0.0.1 → 0.0.2

data/README.rdoc

@@ -32,7 +32,7 @@ Or force a chef run:
     ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Running report handlers
     ec2-50-xx-xx-124.compute-1.amazonaws.com [Fri, 04 Mar 2011 22:00:53 +0000] INFO: Report handlers complete
 
-This subcommand operates in a very similar manner as {knife ssh}[http://wiki.opscode.com/display/chef/Knife#Knife-SSHSubcommand]...just leveraging the WinRM protocol for communication.
+This subcommand operates in a very similar manner as {knife ssh}[http://wiki.opscode.com/display/chef/Knife#Knife-SSHSubcommand]...just leveraging the WinRM protocol for communication.  It also include's +knife+ +ssh+'s "{interactive session mode}[http://wiki.opscode.com/display/chef/Knife#Knife-InteractiveMode]"
 
 == knife winrm bootstrap
 

data/knife-windows.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version	= '>= 1.9.1'
   s.add_dependency "chef", ">= 0.9.12"
-  s.add_dependency "em-winrm", ">= 0.0.2"
+  s.add_dependency "em-winrm", ">= 0.0.3"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/chef/knife/winrm.rb

@@ -102,7 +102,21 @@ class Chef
       def session
         session_opts = {}
         session_opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
-        @session ||= EventMachine::WinRM::Session.new(session_opts)
+        @session ||= begin
+          s = EventMachine::WinRM::Session.new(session_opts)
+          s.on_output do |host, data|
+            print_data(host, data)
+          end
+          s.on_error do |host, err|
+            print_data(host, err, :red)
+          end
+          s.on_command_complete do |host|
+            host = host == :all ? 'All Servers' : host
+            Chef::Log.debug("command complete on #{host}")
+          end
+          s
+        end
+
       end
 
       def h
@@ -166,17 +180,6 @@ class Chef
 
       def winrm_command(command, subsession=nil)
         subsession ||= session
-        
-        subsession.on_output do |host, data|
-          print_data(host, data)
-        end
-        subsession.on_error do |host, err|
-          print_data(host, err, :red)
-        end
-        subsession.on_finish do |host|
-          host = host == :done ? 'All Servers' : host
-          Chef::Log.debug("command complete on #{host}")
-        end
         subsession.relay_command(command)
       end
 
@@ -210,7 +213,7 @@ class Chef
       end
 
       def interactive
-        puts "Connected to #{h.list(session.servers_for.collect { |s| h.color(s.host, :cyan) }, :inline, " and ")}"
+        puts "Connected to #{h.list(session.servers.collect { |s| h.color(s.host, :cyan) }, :inline, " and ")}"
         puts
         puts "To run a command on a list of servers, do:"
         puts "  on SERVER1 SERVER2 SERVER3; COMMAND"
@@ -223,6 +226,7 @@ class Chef
           case command
           when 'quit!'
             puts 'Bye!'
+            session.close
             break
           when /^on (.+?); (.+)$/
             raw_list = $1.split(" ")
@@ -249,6 +253,7 @@ class Chef
           interactive 
         else
           winrm_command(@name_args[1..-1].join(" "))
+          session.close
         end
       end
 

data/lib/knife-windows/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: knife-windows
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   version_requirements: *id002
 description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows