em-ssh 0.3.0.pre0 → 0.3.0.pre1

data/lib/em-ssh/shell.rb

@@ -73,6 +73,7 @@ module EventMachine
         @parent          = opts[:parent]
         @children        = []
         @reconnect       = opts[:reconnect]
+        @buffer          = ''
 
         if block_given?
           Fiber.new { open(&blk).tap{|r| raise r if r.is_a?(Exception) } }.resume
@@ -137,28 +138,42 @@ module EventMachine
         reconnect? ? open : raise(Disconnected) unless connected?
         raise ClosedChannel if closed?
         debug("wait_for(#{strregex.inspect}, #{opts})")
-        opts      = { :timeout => @timeout }.merge(opts)
-        buffer    = ''
-        found     = nil
-        f         = Fiber.current
-        trace     = caller
-        timer     = nil
+        opts          = { :timeout => @timeout }.merge(opts)
+        found         = nil
+        f             = Fiber.current
+        trace         = caller
+        timer         = nil
+        data_callback = nil
+        matched       = false
+        started       = Time.new
 
         timeout = proc do
-          shell.on_data {|c,d| }
-          f.resume(TimeoutError.new("#{host}: timeout while waiting for #{strregex.inspect}; received: #{buffer.inspect}"))
+          data_callback && data_callback.cancel
+          f.resume(TimeoutError.new("#{host}: inactivity timeout (#{opts[:timeout]}) while waiting for #{strregex.inspect}; received: #{@buffer.inspect}; waited total: #{Time.new - started}"))
         end
-        shell.on_data do |ch,data|
-          buffer = "#{buffer}#{data}"
-          debug("data: #{buffer.dump}")
-          if strregex.is_a?(Regexp) ? buffer.match(strregex)  :  buffer.include?(strregex)
+
+        data_callback = on(:data) do
+          timer && timer.cancel
+          if matched
+            debug("data_callback invoked when already matched")
+            next
+          end
+          matched = @buffer.match(strregex)
+          if matched
             debug("data matched")
-            timer.respond_to?(:cancel) && timer.cancel
-            shell.on_data {|c,d| }
-            f.resume(buffer)
+            data_callback.cancel
+            @buffer=matched.post_match
+            f.resume(matched.pre_match + matched.to_s)
+          else
+            timer = EM::Timer.new(opts[:timeout], &timeout)
           end
         end
 
+        # Check against current buffer
+        EM::next_tick {
+          data_callback.call() if @buffer.length>0
+        }
+
         timer = EM::Timer.new(opts[:timeout], &timeout)
         debug("set timer: #{timer} for #{opts[:timeout]}")
         res = Fiber.yield
@@ -201,7 +216,13 @@ module EventMachine
               conerr && conerr.cancel
               debug "***** shell open: #{shell}"
               @closed = false
-              @shell  = shell
+              @shell = shell
+              @shell.on_data do |ch,data|
+                debug("data: #{@buffer.dump}")
+                @buffer += data
+                fire(:data)
+              end
+
               Fiber.new { yield(self) if block_given? }.resume
               f.resume(self)
             end # |shell,success|

data/lib/em-ssh/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Ssh
-    VERSION='0.3.0.pre0'
+    VERSION='0.3.0.pre1'
   end # class::Ssh
 end # module::EventMachine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-ssh
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre0
+  version: 0.3.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -123,4 +123,3 @@ signing_key:
 specification_version: 3
 summary: An EventMachine compatible net-ssh
 test_files: []
-has_rdoc: