em-winrm 0.5.2 → 0.5.4.rc.1

data/README.rdoc

@@ -1,8 +1,14 @@
 = EM-WinRM
 
-An EventMachine client for Windows Remote Management (WinRM). This allows you to invoke commands on Windows machines from any machine that can run Ruby.  This client leverages the EventMachine reactor to run the same command across multiple machines in parallel (think net-ssh-multi).
+An EventMachine client for Windows Remote Management (WinRM). This allows you to
+invoke commands on Windows machines from any machine that can run Ruby.  This
+client leverages the EventMachine reactor to run the same command across multiple
+machines in parallel (think net-ssh-multi).
 
-WinRM allows you to call native objects in Windows.  This includes, but is not limited to, running batch scripts, powershell scripts and fetching WMI variables.  For more information on WinRM, please visit {Microsoft's WinRM site}[http://msdn.microsoft.com/en-us/library/aa384426(v=VS.85).aspx].
+WinRM allows you to call native objects in Windows.  This includes, but is not
+limited to, running batch scripts, powershell scripts and fetching WMI variables.
+For more information on WinRM, please visit
+{Microsoft's WinRM site}[http://msdn.microsoft.com/en-us/library/aa384426(v=VS.85).aspx].
 
 = Example Usage
 
@@ -11,11 +17,11 @@ WinRM allows you to call native objects in Windows.  This includes, but is not l
       'ec2-50-xxx-xxx-141.compute-1.amazonaws.com' => {:port => 80, :user => 'Administrator', :password => 'super_secret_passowrd'},
       'ec2-75-xxx-xxx-192.compute-1.amazonaws.com' => {:port => 80, :user => 'Administrator', :password => 'super_secret_passowrd'}
     }
-    
+
     def h
       @highline ||= HighLine.new
     end
-    
+
     def print_data(host, data, color = :cyan)
       if data =~ /\n/
           data.split(/\n/).each { |d| print_data(host, d, color) }
@@ -23,15 +29,15 @@ WinRM allows you to call native objects in Windows.  This includes, but is not l
         puts "#{h.color(host, color)} #{data.chomp}"
       end
     end
-    
+
     # create a session
     session = EventMachine::WinRM::Session.new(:log_level => :info)
-    
+
     # add some servers
     servers.each do |host,options|
       session.use(host,options)
     end
-    
+
     # create some callbacks
     session.on_output do |host, data|
       print_data(host, data)
@@ -43,7 +49,7 @@ WinRM allows you to call native objects in Windows.  This includes, but is not l
       host = host == :done ? 'All Servers' : host
       print_data(host, 'done.')
     end
-    
+
     # run a command
     session.relay_command('dir')
 
@@ -51,9 +57,9 @@ Gives the following output:
 
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com  Volume in drive C has no label.
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com  Volume Serial Number is 9415-4101
-    ec2-75-xxx-xxx-192.compute-1.amazonaws.com 
+    ec2-75-xxx-xxx-192.compute-1.amazonaws.com
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com  Directory of C:\Users\Administrator
-    ec2-75-xxx-xxx-192.compute-1.amazonaws.com 
+    ec2-75-xxx-xxx-192.compute-1.amazonaws.com
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com 03/01/2011  03:30 AM    <DIR>          .
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com 03/01/2011  03:30 AM    <DIR>          ..
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com 03/01/2011  03:30 AM    <DIR>          Contacts
@@ -71,9 +77,9 @@ Gives the following output:
     ec2-75-xxx-xxx-192.compute-1.amazonaws.com               13 Dir(s)  21,553,827,840 bytes free
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com  Volume in drive C has no label.
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com  Volume Serial Number is 9415-4101
-    ec2-75-xxx-xxx-127.compute-1.amazonaws.com 
+    ec2-75-xxx-xxx-127.compute-1.amazonaws.com
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com  Directory of C:\Users\Administrator
-    ec2-75-xxx-xxx-127.compute-1.amazonaws.com 
+    ec2-75-xxx-xxx-127.compute-1.amazonaws.com
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com 02/28/2011  06:13 PM    <DIR>          .
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com 02/28/2011  06:13 PM    <DIR>          ..
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com 02/28/2011  06:13 PM    <DIR>          Contacts
@@ -91,9 +97,9 @@ Gives the following output:
     ec2-75-xxx-xxx-127.compute-1.amazonaws.com               13 Dir(s)  21,535,481,856 bytes free
     ec2-50-xxx-xxx-141.compute-1.amazonaws.com  Volume in drive C has no label.
     ec2-50-xxx-xxx-141.compute-1.amazonaws.com  Volume Serial Number is 9415-4101
-    ec2-50-xxx-xxx-141.compute-1.amazonaws.com 
+    ec2-50-xxx-xxx-141.compute-1.amazonaws.com
     ec2-50-xxx-xxx-141.compute-1.amazonaws.com  Directory of C:\Users\Administrator
-    ec2-50-xxx-xxx-141.compute-1.amazonaws.com 
+    ec2-50-xxx-xxx-141.compute-1.amazonaws.com
     ec2-50-xxx-xxx-141.compute-1.amazonaws.com 03/01/2011  01:17 AM    <DIR>          .
     ec2-50-xxx-xxx-141.compute-1.amazonaws.com 03/01/2011  01:17 AM    <DIR>          ..
     ec2-50-xxx-xxx-141.compute-1.amazonaws.com 03/01/2011  01:17 AM    <DIR>          Contacts
@@ -116,7 +122,13 @@ Gives the following output:
 
 = Credit
 
-Thanks to {Dan Wanek}[http://github.com/zenchild] who wrote the {WinRM Ruby client gem}[https://github.com/zenchild/WinRM] that is used heavily in this gem.
+Thanks to {Dan Wanek}[http://github.com/zenchild] who wrote the
+{WinRM Ruby client gem}[https://github.com/zenchild/WinRM] that is used heavily
+by this gem.
+
+Also big thanks to {Paul Morton}[https://github.com/pmorton] and
+{Chris McClimans}[https://github.com/hh] (aka Hippie Hacker) for lots of real
+world testing and features!
 
 = Contact
 
@@ -140,4 +152,4 @@ 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.
+limitations under the License.

data/em-winrm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version	= '>= 1.9.1'
   s.add_dependency "eventmachine", "= 1.0.0.beta.3"
-  s.add_dependency "winrm", "~> 1.0.3"
+  s.add_dependency "winrm", "~> 1.1.0"
   s.add_dependency "mixlib-log", ">= 1.3.0"
   s.add_dependency "uuidtools", "~> 2.1.1"
 

data/lib/em-winrm/server.rb

@@ -33,7 +33,7 @@ module EventMachine
         @options[:user] = @options.delete(:user) || ENV['USER'] || ENV['USERNAME'] || "unknown"
         @options[:pass] = @options.delete(:password)
         @options[:port] = @options.delete(:port) || 5985
-        @options[:basic_auth_only] = @options.delete(:basic_auth_only) || true
+        @options[:basic_auth_only] = true unless defined? @options[:basic_auth_only]
       end
 
       #
@@ -52,8 +52,8 @@ module EventMachine
             @shell.on_error do |error|
               @master.relay_error_from_backend(@host, error)
             end
-            @shell.on_close do |result|
-              @master.command_complete(@host, cid)
+            @shell.on_close do |result, exit_code|
+              @master.command_complete(@host, cid, exit_code)
             end
             @shell.run_command(data)
           end)
@@ -85,4 +85,4 @@ module EventMachine
       end
     end
   end
-end
+end

data/lib/em-winrm/session.rb

@@ -20,6 +20,7 @@ module EventMachine
   module WinRM
     class Session
 
+      attr_reader :exit_codes
       ##### Proxy Methods
       def on_output(&blk); @on_output = blk; end
       def on_error(&blk); @on_error = blk; end
@@ -36,6 +37,7 @@ module EventMachine
         end
         @servers = {}
         @commands = []
+        @exit_codes = {}
         WinRM::Log.debug(":session => :init")
       end
 
@@ -111,10 +113,11 @@ module EventMachine
       #
       # called by backend server when it completes a command
       #
-      def command_complete(host, cid)
-        WinRM::Log.debug(":command_complete => #{host}")
+      def command_complete(host, cid,exit_code)
+        WinRM::Log.debug(":command_complete => #{host} with return code #{exit_code}")
         @commands.delete(cid)
         @on_command_complete.call(host) if @on_command_complete
+        @exit_codes[host] = exit_code
         if @commands.compact.size.zero?
           @on_command_complete.call(:all) if @on_command_complete
           EM.stop

data/lib/em-winrm/shell.rb

@@ -59,13 +59,15 @@ module EventMachine
       def run_command(command)
         command_id = client.run_command(@remote_id, command)
         WinRM::Log.debug("#{server.host}[#{@remote_id}] => :run_command[#{command}]")
-        client.get_command_output(@remote_id, command_id) do |out,error|
+        output=client.get_command_output(@remote_id, command_id) do |out,error|
           @out_channel.push(out) if out
           @err_channel.push(error) if error
         end
         client.cleanup_command(@remote_id, command_id)
         WinRM::Log.debug("#{server.host}[#{@remote_id}] => :command_cleanup[#{command}]")
+        @last_exit_code = output[:exitcode]
         close
+        output[:exitcode]
       end
 
       #
@@ -74,8 +76,8 @@ module EventMachine
       def close
         r = client.close_shell(@remote_id)
         WinRM::Log.debug("#{server.host}[#{@remote_id}] => :shell_close")
-        @on_close.call(r) if @on_close
+        @on_close.call(r,@last_exit_code) if @on_close
       end
     end
   end
-end
+end

data/lib/em-winrm/version.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.
@@ -18,7 +18,7 @@
 
 module EventMachine
   module WinRM
-    VERSION = "0.5.2"
+    VERSION = "0.5.4.rc.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,73 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-winrm
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.2
+version: !ruby/object:Gem::Version
+  version: 0.5.4.rc.1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70095016839240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.0.0.beta.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: winrm
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70095016839240
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: &70095016838500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.3
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mixlib-log
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70095016838500
+- !ruby/object:Gem::Dependency
+  name: mixlib-log
+  requirement: &70095016837740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70095016837740
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70095016836700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70095016836700
 description: EventMachine based, asynchronous parallel WinRM client
-email: 
+email:
 - schisamo@opscode.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -79,33 +75,28 @@ files:
 - lib/em-winrm/session.rb
 - lib/em-winrm/shell.rb
 - lib/em-winrm/version.rb
-has_rdoc: true
 homepage: http://github.com/schisamo/em-winrm
 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.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: EventMachine based, asynchronous parallel WinRM client
 test_files: []
-