em-ssh 0.0.2 → 0.0.3

data/lib/em-ssh/connection.rb

@@ -103,6 +103,7 @@ module EventMachine
         # @return
         def unbind
           debug("#{self} is unbound")
+          fire(:closed)
           @closed = true
         end
 

data/lib/em-ssh/session.rb

@@ -1,4 +1,3 @@
-
 module EventMachine
   class Ssh
     class Session < Net::SSH::Connection::Session
@@ -39,11 +38,11 @@ module EventMachine
           send(MAP[packet.type], packet)
         end #  |packet|
 
-        chann_proc = proc do
+        chan_timer = EM.add_periodic_timer(0.01) do
+          # we need to check the channel for any data to send and tell it to process any input
+          # at some point we should override Channel#enqueue_pending_output, etc.,.
           channels.each { |id, channel| channel.process unless channel.closing? }
-          EM.next_tick(&chann_proc)
         end
-        EM.next_tick(&chann_proc)
       end # register_callbacks
 
     end # class::Session

data/lib/em-ssh/shell.rb

@@ -63,7 +63,8 @@ module EventMachine
       # @param [Hash] opts
       # @option opts [Hash] :net_ssh options to pass to Net::SSH; see Net::SSH.start
       # @option opts [Boolean] :halt_on_timeout (false)
-      # @option opts [Fixnum] :timeout (TIMEOUT) default timeout for all #wait_for and #send_wait calls.
+      # @option opts [Fixnum] :timeout (TIMEOUT) default timeout for all #wait_for and #send_wait calls
+      # @option opts [Boolean] :reconnect when disconnected reconnect
       def initialize(address, user, pass, opts = {}, &blk)
         @halt_on_timeout = opts[:halt_on_timeout] || false
         @timeout         = opts[:timeout].is_a?(Fixnum) ? opts[:timeout] : TIMEOUT
@@ -75,10 +76,16 @@ module EventMachine
         @connection      = opts[:connection]
         @parent          = opts[:parent]
         @children        = []
+        @reconnect    = opts[:reconnect]
         
         block_given? ? Fiber.new { open(&blk) }.resume : open
       end
       
+      # @return [Boolean] true if the connection should be automatically re-established; default: false
+      def reconnect?
+        @reconnect == true
+      end # auto_connect?
+      
       # Close the connection to the server and all child shells.
       # Disconnected shells cannot be split.
       def disconnect
@@ -111,6 +118,7 @@ module EventMachine
       # @param [String] send_str
       # @return [String] all data in the buffer including the wait_str if it was found
       def send_and_wait(send_str, wait_str = nil, opts = {})
+        reconnect? ? connect : raise(Disconnected) unless connected?
         raise ClosedChannel if closed?
         debug("send_and_wait(#{send_str.inspect}, #{wait_str.inspect}, #{opts})")
         send_data(send_str)
@@ -124,6 +132,7 @@ module EventMachine
       # @option opts [Boolean] (false) :halt_on_timeout 
       # @return [String] the contents of the buffer
       def wait_for(strregex, opts = { })
+        reconnect? ? connect : raise(Disconnected) unless connected?
         raise ClosedChannel if closed?
         debug("wait_for(#{strregex.inspect}, #{opts})")
         opts      = { :timeout => @timeout, :halt_on_timeout => @halt_on_timeout }.merge(opts)

data/lib/em-ssh/version.rb

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

data/lib/em-ssh.rb

@@ -22,6 +22,8 @@ module EventMachine
     class SshError < Net::SSH::Exception; include Error; end
     class TimeoutError < Timeout::Error; include Error; end
     class ClosedChannel < SshError; end
+    class DisconnectedChannel < SshError; end
+    
     
     class << self
       attr_writer :logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000 +09:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70157590491700 !ruby/object:Gem::Requirement
+  requirement: &2160452560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157590491700
+  version_requirements: *2160452560
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70157590491240 !ruby/object:Gem::Requirement
+  requirement: &2160424600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157590491240
+  version_requirements: *2160424600
 - !ruby/object:Gem::Dependency
   name: ruby-termios
-  requirement: &70157590490760 !ruby/object:Gem::Requirement
+  requirement: &2160412880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157590490760
+  version_requirements: *2160412880
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70157590490300 !ruby/object:Gem::Requirement
+  requirement: &2160402840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70157590490300
+  version_requirements: *2160402840
 description: ''
 email:
 - em-ssh@simulacre.org
@@ -77,6 +78,7 @@ files:
 - bin/em-ssh
 - bin/em-ssh-shell
 - README.md
+has_rdoc: true
 homepage: http://github.com/simulacre/em-ssh
 licenses:
 - MIT
@@ -98,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An EventMachine compatible net-ssh
 test_files: []
-has_rdoc: