em-winrm 0.0.1 → 0.0.2

data/README.rdoc

@@ -2,7 +2,7 @@
 
 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 object 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
 
@@ -116,7 +116,7 @@ Gives the following output:
 
 = Credit
 
-{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 in this gem.
 
 = Contact
 

data/em-winrm.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "eventmachine", ">= 1.0.0.beta.2"
-  s.add_dependency "winrm", ">= 1.0.0rc1"
+  s.add_dependency "winrm", ">= 1.0.0rc2"
   s.add_dependency "mixlib-log", ">= 1.2.0"
 end

data/lib/em-winrm/server.rb

@@ -26,10 +26,11 @@ module EventMachine
       def initialize(master, host, options)
         @master = master
         @host = host
-        @user = options[:user] || ENV['USER'] || ENV['USERNAME'] || "unknown"
-        @port = options[:port] || 5985
-        @password = options[:password]
         @transport = options[:transport] || :plaintext
+        @options = options
+        @options[:user] = @options.delete(:user) || ENV['USER'] || ENV['USERNAME'] || "unknown"
+        @options[:pass] = @options.delete(:password)
+        @options[:port] = @options.delete(:port) || 5985
       end
 
       #
@@ -68,9 +69,9 @@ module EventMachine
 
       def client
         @winrm ||= begin
-          http_method = ( @port.to_s=~/(443|5986)/ ? 'https' : 'http' )
-          endpoint = "#{http_method}://#{@host}:#{@port}/wsman"
-          ::WinRM::WinRMWebService.new(endpoint, @transport, {:user => @user, :pass => @password})
+          http_method = ( @options[:port].to_s=~/(443|5986)/ ? 'https' : 'http' )
+          endpoint = "#{http_method}://#{@host}:#{@options[:port]}/wsman"
+          ::WinRM::WinRMWebService.new(endpoint, @transport, @options)
         rescue ::WinRM::WinRMAuthorizationError => error
           raise ::WinRM::WinRMAuthorizationError.new("#{error.message}@#{@host}")
         end

data/lib/em-winrm/session.rb

@@ -88,12 +88,11 @@ module EventMachine
       def unbind_backend(host)
         WinRM::Log.debug(":unbind_backend => #{host}")
         @servers[host] = nil
+        @on_finish.call(host) if @on_finish
 
         if @servers.values.compact.size.zero?
           @on_finish.call(:done) if @on_finish
-          close
-        else
-          @on_finish.call(host) if @on_finish
+          close 
         end
       end
 

data/lib/em-winrm/version.rb

@@ -18,7 +18,7 @@
 
 module EventMachine
   module WinRM
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: em-winrm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -05:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0rc1
+        version: 1.0.0rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency