em-simple_telnet 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac1cbb2de2d9e9285a27c2e36f9c255e00f6c13
-  data.tar.gz: 2491898f33c8cf1933ca7389296fb50d6d977b5c
+  metadata.gz: a3a87aad1b79cbd0d9d345286f057f9645b762ed
+  data.tar.gz: 1afc5e5953809b6ba526672a07ad778b600419dd
 SHA512:
-  metadata.gz: fa352be4b89435b9c8f2ae773c80dab83a1f6ffba98175c147d9adbaf0eac5497f67418806f5b26bf155c84b702e08effabf763891664974ea95fafe2bae3cf9
-  data.tar.gz: 73b705b35ad35d862000dd2218c4c968ab1200997cce3698cc11c1b4a505d5d79570a0ae5de777846e72ec3e6ccf98dab9a63aa2d6274dcd69c0ae23d1c6f780
+  metadata.gz: 43f09ceba50d39a511a8a800b9a143bc16b42b504a4f327ad4a5aa744e5d91587df422dad994f579f60111be7db8ba7d4146f99affe6f25d1f95be5d28556e1a
+  data.tar.gz: 45480727c86fc53583f24f96112b6f7d3cf02c79552ba5abdf9f8528c317d29c7f59a150dc287db4925d8d85e5b83a2d93efdfa68b73cc45724c5046bcc21dd9

data/lib/em-simple_telnet.rb

@@ -521,7 +521,7 @@ class Protocols::SimpleTelnet < Connection
   # #log_output. Then calls #process_payload.
   #
   def receive_data data
-    @recently_received_data << data if logger.debug?
+    @recently_received_data << data if log_recently_received_data?
     if @telnet_options[:telnet_mode]
       c = @input_rest + data
       se_pos = c.rindex(/#{IAC}#{SE}/no) || 0
@@ -673,7 +673,8 @@ class Protocols::SimpleTelnet < Connection
   #
   def waitfor prompt=nil, opts={}
     if closed?
-      abort "Can't wait for anything when connection is already closed!"
+      raise Errno::ENOTCONN,
+        "Can't wait for anything when connection is already closed!"
     end
     options_were = @telnet_options
     timeout_was = self.timeout if opts.key?(:timeout)
@@ -756,9 +757,8 @@ class Protocols::SimpleTelnet < Connection
     raise Errno::ENOTCONN,
       "Can't send data: Connection is already closed." if closed?
     @last_sent_data = Time.now
-    log_recently_received_data if logger.debug?
+    log_recently_received_data
     logger.debug "#{node}: Sending #{s.inspect}"
-    log_output(s)
     super
   end
 
@@ -933,7 +933,7 @@ class Protocols::SimpleTelnet < Connection
   def unbind(reason)
     prev_conn_state = @connection_state
     self.connection_state = :closed
-    logger.debug "#{node}: Unbinding because of: " + reason.inspect
+    logger.debug "#{node}: Unbind reason: " + reason.inspect
     @@_telnet_connection_count -= 1
     close_logs
 
@@ -999,23 +999,22 @@ class Protocols::SimpleTelnet < Connection
 
   private
 
-  # Prints recently received data (@recently_received), if there's any, and
-  # empties that buffer afterwards.
+  # Prints recently received data (@recently_received_data) if
+  # {#log_recently_received_data?} says so and there is recently received data
+  # in the buffer. Clears the buffer afterwards.
   #
   # The goal is to log data in a more readable way, by periodically log what
   # has recently been received, as opposed to each single character in case of
   # a slowly answering telnet server.
   def log_recently_received_data
-    return if @recently_received_data.empty?
+    return if @recently_received_data.empty? || !log_recently_received_data?
     logger.debug "#{node}: Received: #{@recently_received_data.inspect}"
-    @recently_received_data = ""
+    @recently_received_data.clear
   end
 
-  # Returns +true+ if recently received data should be logged.
-  # @see #log_recently_received_data
-  # @return [Boolean]
-  def should_log_recently_received_data?
-    true & logger.debug?
+  # @return [Boolean] if recently received data should be logged or not
+  def log_recently_received_data?
+    logger.debug?
   end
 
   # Sets the @connection_state to _new_state_. Raises if current (old) state is

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-simple_telnet
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Patrik Wenger