em-ssh 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+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)
+
 0.5.0
  - Shell an Connection instances can have their own Loggers 
  - [#18](https://github.com/simulacre/em-ssh/pull/18) - Target devices and options for specs can be configured through environment variables [@freakhill](https://github.com/freakhill)

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

@@ -115,10 +115,10 @@ module EventMachine
           def wait_for(strregex, opts = { })
             ###
             log = opts[:log] || NullLogger.new
-            timeout = opts[:timeout].is_a?(Fixnum) ? opts[:timeout] : DEFAULT_TIMEOUT
+            timeout_value = opts[:timeout].is_a?(Fixnum) ? opts[:timeout] : DEFAULT_TIMEOUT
             ###
-            log.debug("wait_for(#{strregex.inspect}, :timeout => #{opts[:timeout] || @timeout})")
-            opts          = { :timeout => @timeout }.merge(opts)
+            log.debug("wait_for(#{strregex.inspect}, :timeout => #{timeout_value})")
+            opts          = { :timeout => timeout_value }.merge(opts)
             found         = nil
             f             = Fiber.current
             trace         = caller
@@ -127,7 +127,7 @@ module EventMachine
             matched       = false
             started       = Time.new
 
-            timeout = proc do
+            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}"))
             end
@@ -144,14 +144,14 @@ module EventMachine
                 @buffer = matched.post_match
                 f.resume(matched.pre_match + matched.to_s)
               else
-                timer = EM::Timer.new(opts[:timeout], &timeout)
+                timer = EM::Timer.new(opts[:timeout], &timeout_proc)
               end
             end
 
             # Check against current buffer
             EM::next_tick { data_callback.call() if buffer.length > 0 }
 
-            timer = EM::Timer.new(opts[:timeout], &timeout)
+            timer = EM::Timer.new(opts[:timeout], &timeout_proc)
             Fiber.yield.tap do |res|
               if res.is_a?(Exception)
                 res.set_backtrace(Array(res.backtrace) + trace)

data/lib/em-ssh/connection/channel/null-logger.rb

@@ -6,6 +6,10 @@ module EventMachine
       class Channel
         class NullLogger < ::Logger
 
+          def initialize
+            super(nil)
+          end
+
           def add(*params, &block)
             nil
           end

data/lib/em-ssh/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Ssh
-    VERSION='0.5.0'
+    VERSION='0.5.1'
   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.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine