em-winrm 0.0.2 → 0.0.3

data/em-winrm.gemspec

@@ -6,20 +6,22 @@ Gem::Specification.new do |s|
   s.name        = "em-winrm"
   s.version     = EventMachine::WinRM::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
   s.authors     = ["Seth Chisamore"]
   s.email       = ["schisamo@opscode.com"]
   s.homepage    = "http://github.com/schisamo/em-winrm"
   s.summary     = %q{EventMachine based, asynchronous parallel WinRM client}
   s.description = s.summary
 
-  s.rubyforge_project = "em-winrm"
+  s.required_ruby_version	= '>= 1.9.1'
+  s.add_dependency "eventmachine", ">= 1.0.0.beta.2"
+  s.add_dependency "winrm", ">= 1.0.0rc2"
+  s.add_dependency "mixlib-log", ">= 1.2.0"
+  s.add_dependency "uuidtools", ">= 2.1.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.add_dependency "eventmachine", ">= 1.0.0.beta.2"
-  s.add_dependency "winrm", ">= 1.0.0rc2"
-  s.add_dependency "mixlib-log", ">= 1.2.0"
 end

data/lib/em-winrm/server.rb

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require 'uuidtools'
+
 module EventMachine
   module WinRM
     class Server
@@ -37,6 +39,7 @@ module EventMachine
       # create a shell and run command
       #
       def run_command(data)
+        cid = UUIDTools::UUID.random_create.to_s
         EM.epoll
         EM.run do
           EM.defer(proc do
@@ -49,11 +52,12 @@ module EventMachine
               @master.relay_error_from_backend(@host, error)
             end
             @shell.on_close do |result|
-              unbind
+              @master.command_complete(@host, cid)
             end
             @shell.run_command(data)
           end)
         end
+        cid
       end
 
       #

data/lib/em-winrm/session.rb

@@ -23,7 +23,9 @@ module EventMachine
       ##### Proxy Methods
       def on_output(&blk); @on_output = blk; end
       def on_error(&blk); @on_error = blk; end
+      def on_command_complete(&blk); @on_command_complete = blk; end
       def on_finish(&blk); @on_finish = blk; end
+      def on_close(&blk); @on_close = blk; end
 
       def initialize(options={})
         if options[:logger]
@@ -33,6 +35,8 @@ module EventMachine
           WinRM::Log.level(log_level)
         end
         @servers = {}
+        @commands = []
+        WinRM::Log.debug(":session => :init")
       end
 
       #
@@ -46,7 +50,7 @@ module EventMachine
           servers.each do |s|
             operation = proc do
               WinRM::Log.debug(":relayed => #{s.host}")
-              s.run_command(data)
+              @commands << s.run_command(data)
             end
             EM.defer(operation)
           end
@@ -57,8 +61,35 @@ module EventMachine
       # initialize connections to a server
       #
       def use(host, options)
-        srv = Server.new(self, host, options)
-        @servers[host] = srv
+        @servers[host] = Server.new(self, host, options)
+      end
+
+      #
+      # return an array of the current servers in the session
+      #
+      def servers
+        @servers.values
+      end
+
+      #
+      # set the current servers in the session
+      #
+      def servers=(servers)
+        @servers = {}
+        servers.each{|s| @servers[s.host] = s}
+      end
+
+      #
+      # returns a new EventMachine::WinRM::Session instance
+      # consisting of a specific sub-set of servers
+      #
+      # inspired by Net::SSH::Multi::Session.on
+      #
+      def on(*new_servers)
+        subsession = self.clone
+        subsession.servers = new_servers & servers
+        yield subsession if block_given?
+        subsession
       end
 
       #
@@ -77,6 +108,19 @@ module EventMachine
         data = @on_error.call(host, data) if @on_error
       end
 
+      #
+      # called by backend server when it completes a command
+      #
+      def command_complete(host, cid)
+        WinRM::Log.debug(":command_complete => #{host}")
+        @commands.delete(cid)
+        @on_command_complete.call(host) if @on_command_complete
+        if @commands.compact.size.zero?
+          @on_command_complete.call(:all) if @on_command_complete
+          EM.stop
+        end
+      end
+
       def unbind
         WinRM::Log.debug(":unbind => :connection")
         # terminate any unfinished connections
@@ -89,10 +133,8 @@ module EventMachine
         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 
+          @on_finish.call(:all) if @on_finish
         end
       end
 
@@ -102,7 +144,10 @@ module EventMachine
       #
       def close
         unbind
-        EM.stop
+        # try to stop eventmachine loop
+        EM.stop rescue
+        @on_close.call if @on_close
+        WinRM::Log.debug(":session => :close")
       end
     end
   end

data/lib/em-winrm/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: em-winrm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -46,6 +46,17 @@ dependencies:
         version: 1.2.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.1
+  type: :runtime
+  version_requirements: *id004
 description: EventMachine based, asynchronous parallel WinRM client
 email: 
 - schisamo@opscode.com
@@ -53,8 +64,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
+- LICENSE
 files: 
 - .gitignore
 - Gemfile
@@ -81,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -90,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: em-winrm
+rubyforge_project: 
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3