em-ssh 0.5.1 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.6.0
+ - Disconnect error codes are converted to Ruby exceptions and raised
+ - ChannelOpen error codes are converted to Ruby exceptions and raised
+ - Shell#split will detect ChannelOpen errors and raise an Exception
+
 0.5.1
  - [#21](https://github.com/simulacre/em-ssh/pull/22) - Fix em-ssh throws exception when no logger is defined [@mandre](https://github.com/mandre)
  - [#20](https://github.com/simulacre/em-ssh/pull/20) - Fix Interactive timeout wasn't set if parameter not fed [@freakhill](https://github.com/freakhill)

data/bin/em-ssh-shell

@@ -62,20 +62,29 @@ EM.run do
 
     shell.callback do 
       commands.clone.each do |command|
+
         mys = shell.split
+        mys.errback do |err|
+          $stderr.puts "subshell error: #{err} (#{err.class})"
+          mys.close
+        end
+
         mys.on(:closed) do
           commands.delete(command)
           EM.stop if commands.empty?
         end
 
         puts("waiting for: #{waitstr.inspect}")
-        mys.expect(waitstr) do 
-          puts "sending #{command.inspect} and waiting for #{waitstr.inspect}"
-          mys.expect(waitstr, command) do |result|
-            puts "#{mys} result: '#{result}'"
-            mys.close
+        mys.callback do
+          mys.expect(waitstr) do 
+            puts "sending #{command.inspect} and waiting for #{waitstr.inspect}"
+            mys.expect(waitstr, command) do |result|
+              puts "#{mys} result: '#{result}'"
+              mys.close
+            end 
           end 
-        end 
+        end
+
       end 
     end 
   end 

data/lib/em-ssh/connection/channel/interactive.rb

@@ -129,7 +129,7 @@ module EventMachine
 
             timeout_proc = proc do
               data_callback && data_callback.cancel
-              f.resume(TimeoutError.new("#{connection.host}: inactivity timeout (#{opts[:timeout]}) while waiting for #{strregex.inspect}; received: #{buffer.inspect}; waited total: #{Time.new - started}"))
+              f.resume(TimeoutError.new("#{@host}: inactivity timeout (#{opts[:timeout]}) while waiting for #{strregex.inspect}; received: #{buffer.inspect}; waited total: #{Time.new - started}"))
             end
 
             data_callback = on(:data) do

data/lib/em-ssh/connection.rb

@@ -128,7 +128,10 @@ module EventMachine
           instance_variable_set(iv, nil)
         end
 
-        fail(NegotiationTimeout.new(@host)) if failed_timeout
+        if failed_timeout
+          fail(@disconnect ? EM::Ssh::Disconnect.from_packet(@disconnect) : NegotiationTimeout.new(@host))
+
+        end
       end
 
       def receive_data(data)
@@ -289,6 +292,7 @@ module EventMachine
           while (packet = @socket.poll_next_packet)
             case packet.type
             when DISCONNECT
+              @disconnect = packet
               close_connection
             when IGNORE
               debug("IGNORE packet received: #{packet[:data].inspect}")

data/lib/em-ssh/shell.rb

@@ -87,8 +87,12 @@ module EventMachine
         # TODO make all methods other than #callback and #errback inaccessible until connected? == true
         yield self if block_given?
         Fiber.new {
-          open rescue fail($!)
-          succeed(self) if connected? && !closed?
+          begin
+            open
+            succeed(self) if connected? && !closed?
+          rescue => e
+            fail(e)
+          end
         }.resume
       end
 
@@ -155,6 +159,7 @@ module EventMachine
           Fiber.new { yield(self) if block_given? }.resume
           f.resume(self)
         end
+        @on_open_err = proc { |e| f.resume(e) }
         open!
         return Fiber.yield.tap { |r| raise r if r.is_a?(Exception) }
       end
@@ -166,7 +171,7 @@ module EventMachine
         @opening = true
         begin
           connect
-          session.open_channel do |channel|
+          chan = session.open_channel do |channel|
             debug "**** channel open: #{channel}"
             channel.request_pty(options[:pty] || {}) do |pty,suc|
               debug "***** pty open: #{pty}; suc: #{suc}"
@@ -186,6 +191,9 @@ module EventMachine
               end # |shell,success|
             end # |pty,suc|
           end # |channel|
+          chan.on_open_failed do |chan, code, desc|
+            @on_open_err && @on_open_err[ChannelOpenFailed.from_code(code, desc)]
+          end
         rescue => e
           @opening = false
           raise ConnectionError.new("failed to create shell for #{host}: #{e} (#{e.class})")
@@ -236,7 +244,7 @@ module EventMachine
         fire(:split, child)
         if block_given?
           # requires that the caller be in a Fiber
-          child.open rescue child.fail($!)
+          child.open
           yield(child).tap { child.close }
         else
           child

data/lib/em-ssh/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Ssh
-    VERSION='0.5.1'
+    VERSION='0.6.0'
   end # class::Ssh
 end # module::EventMachine

data/lib/em-ssh.rb

@@ -28,6 +28,67 @@ module EventMachine
     class ConnectionTerminated < SshError; end
     # The server failed to negotiate an ssh protocol version
     class NegotiationTimeout < ConnectionFailed; end
+    class Disconnect < SshError
+      class HostNotAllowedToConnect < Disconnect; end
+      class ProtocolError < Disconnect; end
+      class KeyExchangeFailed < Disconnect; end
+      class Reserved < Disconnect; end
+      class MacError < Disconnect; end
+      class CompressionError < Disconnect; end
+      class ServiceNotAvailable < Disconnect; end
+      class ProtocolVersionNotSupported < Disconnect; end
+      class HostKeyNotVerifiable < Disconnect; end
+      class ConnectionLost < Disconnect; end
+      class ByApplication < Disconnect; end
+      class TooManyConnections < Disconnect; end
+      class AuthCancelledByUser < Disconnect; end
+      class NoMoreAuthMethodsAvailable < Disconnect; end
+      class IllegalUserName < Disconnect; end
+
+      CODES = [
+        Disconnect,
+        HostNotAllowedToConnect,
+        ProtocolError,
+        KeyExchangeFailed,
+        Reserved,
+        MacError,
+        CompressionError,
+        ServiceNotAvailable,
+        ProtocolVersionNotSupported,
+        HostKeyNotVerifiable,
+        ConnectionLost,
+        ByApplication,
+        TooManyConnections,
+        AuthCancelledByUser,
+        NoMoreAuthMethodsAvailable,
+        IllegalUserName,
+      ]
+      class << self
+        def from_packet(packet)
+          (CODES[packet[:reason_code]] || Disconnect).new(packet[:description])
+        end
+      end
+    end # class::Disconnect < SshError
+
+    class ChannelOpenFailed < Net::SSH::ChannelOpenFailed
+      include Error
+      class AdministrativelyProhibited < ChannelOpenFailed; end
+      class ConnectFailed < ChannelOpenFailed; end
+      class UnknownChannelType < ChannelOpenFailed; end
+      class ResourceShortage < ChannelOpenFailed; end
+      CODES = [
+        ChannelOpenFailed,
+        AdministrativelyProhibited,
+        ConnectFailed,
+        UnknownChannelType,
+        ResourceShortage
+      ]
+      class << self
+        def from_code(code, desc)
+          (CODES[code] || ChannelOpenFailed).new(code, desc)
+        end
+      end
+    end
 
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-ssh
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine