em-winrm 0.5.4 → 0.5.5

data/Rakefile

@@ -1,2 +1,2 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/em-winrm.gemspec

@@ -1,27 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "em-winrm/version"
-
-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.required_ruby_version	= '>= 1.9.1'
-  s.add_dependency "eventmachine", "= 1.0.0.beta.3"
-  s.add_dependency "winrm", "~> 1.1.0"
-  s.add_dependency "mixlib-log", ">= 1.3.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"]
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "em-winrm/version"
+
+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.required_ruby_version	= '>= 1.9.1'
+  s.add_dependency "eventmachine", "~> 1.0.0"
+  s.add_dependency "winrm", "~> 1.1.2"
+  s.add_dependency "mixlib-log", ">= 1.3.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"]
+end

data/lib/em-winrm.rb

@@ -1,38 +1,38 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Seth Chisamore
-# License:: Apache License, Version 2.0
-#
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'mixlib/log'
-require "rubygems"
-require "eventmachine"
-require "winrm"
-
-module EventMachine
-  module WinRM
-    NAME    = 'em-winrm'
-    LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-    PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-    class Log
-      extend Mixlib::Log
-    end
-  end
-end
-
-require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/session")
-require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/server")
-require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/shell")
-require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/version")
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Seth Chisamore
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'mixlib/log'
+require "rubygems"
+require "eventmachine"
+require "winrm"
+
+module EventMachine
+  module WinRM
+    NAME    = 'em-winrm'
+    LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+    PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+    class Log
+      extend Mixlib::Log
+    end
+  end
+end
+
+require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/session")
+require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/server")
+require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/shell")
+require File.join(EventMachine::WinRM::LIBPATH, "em-winrm/version")

data/lib/em-winrm/server.rb

@@ -1,88 +1,88 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Seth Chisamore
-# License:: Apache License, Version 2.0
-#
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'uuidtools'
-
-module EventMachine
-  module WinRM
-    class Server
-      include EM::Deferrable
-
-      attr_accessor :master, :host
-
-      def initialize(master, host, options)
-        @master = master
-        @host = host
-        @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
-        @options[:basic_auth_only] = true unless defined? @options[:basic_auth_only]
-      end
-
-      #
-      # 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
-            WinRM::Log.debug("#{@host} => :run_command")
-            @shell = Shell.new(client, self)
-            @shell.on_output do |out|
-              @master.relay_output_from_backend(@host, out)
-            end
-            @shell.on_error do |error|
-              @master.relay_error_from_backend(@host, error)
-            end
-            @shell.on_close do |result, exit_code|
-              @master.command_complete(@host, cid, exit_code)
-            end
-            @shell.run_command(data)
-          end)
-        end
-        cid
-      end
-
-      #
-      # Notify upstream master that the backend server is done
-      # processing the request
-      #
-      def unbind
-        WinRM::Log.debug("#{@host} => :unbind")
-        @master.unbind_backend(@host)
-      end
-
-      private
-
-      def client
-        @winrm ||= begin
-          http_method = ( @options[:port].to_s=~/(443|5986)/ ? 'https' : 'http' )
-          endpoint = "#{http_method}://#{@host}:#{@options[:port]}/wsman"
-          client = ::WinRM::WinRMWebService.new(endpoint, @transport, @options)
-          client.set_timeout(@options[:operation_timeout]) if @options[:operation_timeout]
-          client
-        rescue ::WinRM::WinRMAuthorizationError => error
-          raise ::WinRM::WinRMAuthorizationError.new("#{error.message}@#{@host}")
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Seth Chisamore
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'uuidtools'
+
+module EventMachine
+  module WinRM
+    class Server
+      include EM::Deferrable
+
+      attr_accessor :master, :host
+
+      def initialize(master, host, options)
+        @master = master
+        @host = host
+        @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
+        @options[:basic_auth_only] = true unless defined? @options[:basic_auth_only]
+      end
+
+      #
+      # 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
+            WinRM::Log.debug("#{@host} => :run_command")
+            @shell = Shell.new(client, self)
+            @shell.on_output do |out|
+              @master.relay_output_from_backend(@host, out)
+            end
+            @shell.on_error do |error|
+              @master.relay_error_from_backend(@host, error)
+            end
+            @shell.on_close do |result, exit_code|
+              @master.command_complete(@host, cid, exit_code)
+            end
+            @shell.run_command(data)
+          end)
+        end
+        cid
+      end
+
+      #
+      # Notify upstream master that the backend server is done
+      # processing the request
+      #
+      def unbind
+        WinRM::Log.debug("#{@host} => :unbind")
+        @master.unbind_backend(@host)
+      end
+
+      private
+
+      def client
+        @winrm ||= begin
+          http_method = ( @options[:port].to_s=~/(443|5986)/ ? 'https' : 'http' )
+          endpoint = "#{http_method}://#{@host}:#{@options[:port]}/wsman"
+          client = ::WinRM::WinRMWebService.new(endpoint, @transport, @options)
+          client.set_timeout(@options[:operation_timeout]) if @options[:operation_timeout]
+          client
+        rescue ::WinRM::WinRMAuthorizationError => error
+          raise ::WinRM::WinRMAuthorizationError.new("#{error.message}@#{@host}")
+        end
+      end
+    end
+  end
+end

data/lib/em-winrm/session.rb

@@ -1,157 +1,157 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Seth Chisamore
-# License:: Apache License, Version 2.0
-#
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-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
-      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]
-          WinRM::Log.logger = options[:logger]
-        else
-          log_level = options[:log_level] || :info
-          WinRM::Log.level(log_level)
-        end
-        @servers = {}
-        @commands = []
-        @exit_codes = {}
-        WinRM::Log.debug(":session => :init")
-      end
-
-      #
-      # run command on all servers
-      #
-      def relay_command(data)
-        EM.epoll
-        EM.run do
-          WinRM::Log.debug(":relay_to_servers => #{data}")
-          servers ||= @servers.values.compact
-          servers.each do |s|
-            operation = proc do
-              WinRM::Log.debug(":relayed => #{s.host}")
-              @commands << s.run_command(data)
-            end
-            EM.defer(operation)
-          end
-        end
-      end
-
-      #
-      # initialize connections to a server
-      #
-      def use(host, options)
-        @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
-
-      #
-      # relay output from backend server to client
-      #
-      def relay_output_from_backend(host, data)
-        WinRM::Log.debug(":relay_output_from_backend => #{[host, data]}")
-        data = @on_output.call(host, data) if @on_output
-      end
-
-      #
-      # relay error output from backend server to client
-      #
-      def relay_error_from_backend(host, data)
-        WinRM::Log.debug(":relay_error_from_backend => #{[host, data]}")
-        data = @on_error.call(host, data) if @on_error
-      end
-
-      #
-      # called by backend server when it completes a command
-      #
-      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
-        end
-      end
-
-      def unbind
-        WinRM::Log.debug(":unbind => :connection")
-        # terminate any unfinished connections
-        @servers.values.compact.each do |s|
-          s.unbind
-        end
-      end
-
-      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(:all) if @on_finish
-        end
-      end
-
-      #
-      # clean up servers and stop 
-      # the EventMachine event loop
-      #
-      def close
-        unbind
-        # try to stop eventmachine loop
-        EM.stop rescue
-        @on_close.call if @on_close
-        WinRM::Log.debug(":session => :close")
-      end
-    end
-  end
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Seth Chisamore
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+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
+      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]
+          WinRM::Log.logger = options[:logger]
+        else
+          log_level = options[:log_level] || :info
+          WinRM::Log.level(log_level)
+        end
+        @servers = {}
+        @commands = []
+        @exit_codes = {}
+        WinRM::Log.debug(":session => :init")
+      end
+
+      #
+      # run command on all servers
+      #
+      def relay_command(data)
+        EM.epoll
+        EM.run do
+          WinRM::Log.debug(":relay_to_servers => #{data}")
+          servers ||= @servers.values.compact
+          servers.each do |s|
+            operation = proc do
+              WinRM::Log.debug(":relayed => #{s.host}")
+              @commands << s.run_command(data)
+            end
+            EM.defer(operation)
+          end
+        end
+      end
+
+      #
+      # initialize connections to a server
+      #
+      def use(host, options)
+        @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
+
+      #
+      # relay output from backend server to client
+      #
+      def relay_output_from_backend(host, data)
+        WinRM::Log.debug(":relay_output_from_backend => #{[host, data]}")
+        data = @on_output.call(host, data) if @on_output
+      end
+
+      #
+      # relay error output from backend server to client
+      #
+      def relay_error_from_backend(host, data)
+        WinRM::Log.debug(":relay_error_from_backend => #{[host, data]}")
+        data = @on_error.call(host, data) if @on_error
+      end
+
+      #
+      # called by backend server when it completes a command
+      #
+      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
+        end
+      end
+
+      def unbind
+        WinRM::Log.debug(":unbind => :connection")
+        # terminate any unfinished connections
+        @servers.values.compact.each do |s|
+          s.unbind
+        end
+      end
+
+      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(:all) if @on_finish
+        end
+      end
+
+      #
+      # clean up servers and stop 
+      # the EventMachine event loop
+      #
+      def close
+        unbind
+        # try to stop eventmachine loop
+        EM.stop rescue
+        @on_close.call if @on_close
+        WinRM::Log.debug(":session => :close")
+      end
+    end
+  end
 end