net-telnet-rfc2217 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80efcdecc1ad8f12d8546c6487de4ced9f2042beb7126046fd616cb4f507685c
-  data.tar.gz: 88afffcd92a3d0764047da96e01f1be3811614247230d4d58e563963d894ad06
+  metadata.gz: f0b5b2b5e014b1fc9906ae0be1e7d33fb5d3971cce0b4eda74332e6a1ee24a9e
+  data.tar.gz: b56a17ffee69e60c4c8f805fd5fb16a0195a95719ed3b93a4fc5417c1dbb0e2f
 SHA512:
-  metadata.gz: 984cfeac7c438e93816979be2ea410d398376e7d1bd0255c85e10e94bd18791c346a30357a3e36d650278ade772aff53b147e5f29485079d320995b3d606ec1d
-  data.tar.gz: 23c8a0d1ee8b9ac9179973f9ec8defde1402b21022febe9b26c29370eaff7def8f509c5c9848ec2cabc09c5013931eefb5224481a0eb9615f81eb9dcb96dee15
+  metadata.gz: 1b4b82e214841d59828c733e9c15a65d2e623ee807f42df97353054564cb6bd7991f6900182ecd35cedebf83876c9388ecdce8574639a86b0e4d237e3e8f0a96
+  data.tar.gz: 35da8ce422ca87cfc75ad2c4461582d9ec54f8335f74bb381fe178d12890bae4f5034e7338488187c07cdfb6a900e2eb89f95909c7cdd536a33581062b0c5861

data/lib/net/telnet/rfc2217.rb

@@ -8,6 +8,10 @@ Net::Telnet.prepend(Net::Telnet::RFC2217::TelnetExtensions)
 module Net
   class Telnet
     class RFC2217
+      class WaitReadable < RuntimeError
+        include ::IO::WaitReadable
+      end
+
       attr_reader :telnet
 
       COM_PORT_OPTION = 44.chr
@@ -81,7 +85,9 @@ module Net
         @modem_params['baud'] = 115200 unless @modem_params.key?('baud')
         @modem_params['data_bits'] = 8 unless @modem_params.key?('data_bits')
         @modem_params['stop_bits'] = 1 unless @modem_params.key?('stop_bits')
-        @modem_params['parity'] = (data_bits == 8 ? NONE : EVEN)
+        unless @modem_params.key?('parity')
+          @modem_params['parity'] = (data_bits == 8 ? NONE : EVEN)
+        end
         write_modem_params if telnet
       end
 
@@ -116,7 +122,7 @@ module Net
       def readpartial(length, outbuf = '')
         loop do
           # 0 is special and means 'read at least one control sequence'
-          break if length != 0 && @buffer.length != 0
+          break if length != 0 || @buffer.length != 0
 
           data = sock.sysread([length - @buffer.length, 64 * 1024].max)
 
@@ -134,7 +140,9 @@ module Net
               true
             elsif DONT[0] == control[0] && COM_PORT_OPTION == control[1]
               raise "Serial port control not supported"
-              false
+            elsif (WILL[0] == control[0] || DONT[0] == control[0]) && OPT_ECHO == control[1]
+              # just ignore echo requests
+              true
             else
               false
             end
@@ -149,6 +157,32 @@ module Net
         outbuf
       end
 
+      def read_nonblock(length, outbuf = '', options = {})
+        if outbuf == ({ exception: false })
+          options = outbuf
+          outbuf = ''
+        end
+        loop do
+          result = wait_readable(0)
+          if result == nil
+            raise WaitReadable unless options[:exception] == false
+            return :wait_readable
+          end
+          # we have to try to consume control characters first
+          readpartial(0)
+          # and then only do a real read if we have something
+          return readpartial(length, outbuf) unless @buffer.empty?
+          # otherwise loop and see if there's more there
+        end
+      end
+
+      def wait_readable(timeout = nil)
+        return true unless @buffer.empty?
+        result = sock.wait_readable(timeout)
+        result = self if result == sock
+        result
+      end
+
       def ungetbyte(b)
         @buffer.insert(0, b.chr)
       end
@@ -162,6 +196,10 @@ module Net
         telnet.write(string)
       end
 
+      def flush
+        sock.flush
+      end
+
       def close
         telnet.close
       end

data/lib/net/telnet/rfc2217/telnet.rb

@@ -1,78 +1,80 @@
 module Net
   class Telnet
-    module RFC2217::TelnetExtensions
-      def preprocess(string)
-        # combine CR+NULL into CR
-        string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
+    class RFC2217
+      module TelnetExtensions
+        def preprocess(string)
+          # combine CR+NULL into CR
+          string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
 
-        # combine EOL into "\n"
-        string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
+          # combine EOL into "\n"
+          string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
 
-        # remove NULL
-        string = string.gsub(/#{NULL}/no, '') unless @options["Binmode"]
+          # remove NULL
+          string = string.gsub(/#{NULL}/no, '') unless @options["Binmode"]
 
-        string.gsub(/#{IAC}(
-                    [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
-                    [#{DO}#{DONT}#{WILL}#{WONT}]
-                      [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{44.chr}#{OPT_EXOPL}]|
-                    #{SB}[^#{IAC}]*#{IAC}#{SE}
-                  )/xno) do
-          if block_given? && IAC != $1
-            # already handled; don't handle it ourselves
-            next '' if yield $1
-          end
+          string.gsub(/#{IAC}(
+                      [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
+                      [#{DO}#{DONT}#{WILL}#{WONT}]
+                        [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{44.chr}#{OPT_EXOPL}]|
+                      #{SB}[^#{IAC}]*#{IAC}#{SE}
+                    )/xno) do
+            if block_given? && IAC != $1
+              # already handled; don't handle it ourselves
+              next '' if yield $1
+            end
 
-          if    IAC == $1  # handle escaped IAC characters
-            IAC
-          elsif AYT == $1  # respond to "IAC AYT" (are you there)
-            self.write("nobody here but us pigeons" + EOL)
-            ''
-          elsif DO[0] == $1[0]  # respond to "IAC DO x"
-            if OPT_BINARY[0] == $1[1]
-              unless @telnet_option["BINARY"] == true
-                @telnet_option["BINARY"] = true
-                self.write(IAC + WILL + OPT_BINARY)
+            if    IAC == $1  # handle escaped IAC characters
+              IAC
+            elsif AYT == $1  # respond to "IAC AYT" (are you there)
+              self.write("nobody here but us pigeons" + EOL)
+              ''
+            elsif DO[0] == $1[0]  # respond to "IAC DO x"
+              if OPT_BINARY[0] == $1[1]
+                unless @telnet_option["BINARY"] == true
+                  @telnet_option["BINARY"] = true
+                  self.write(IAC + WILL + OPT_BINARY)
+                end
+              else
+                self.write(IAC + WONT + $1[1..1])
               end
-            else
+              ''
+            elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
               self.write(IAC + WONT + $1[1..1])
-            end
-            ''
-          elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
-            self.write(IAC + WONT + $1[1..1])
-            ''
-          elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
-            if    OPT_BINARY[0] == $1[1]
-              self.write(IAC + DO + OPT_BINARY)
-            elsif OPT_ECHO[0] == $1[1]
-              self.write(IAC + DO + OPT_ECHO)
-            elsif OPT_SGA[0]  == $1[1]
-              unless @telnet_option["SGA"]
-                @telnet_option["SGA"] = true
-                self.write(IAC + DO + OPT_SGA)
+              ''
+            elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
+              if    OPT_BINARY[0] == $1[1]
+                self.write(IAC + DO + OPT_BINARY)
+              elsif OPT_ECHO[0] == $1[1]
+                self.write(IAC + DO + OPT_ECHO)
+              elsif OPT_SGA[0]  == $1[1]
+                unless @telnet_option["SGA"]
+                  @telnet_option["SGA"] = true
+                  self.write(IAC + DO + OPT_SGA)
+                end
+              else
+                self.write(IAC + DONT + $1[1..1])
               end
-            else
-              self.write(IAC + DONT + $1[1..1])
-            end
-            ''
-          elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
-            if    OPT_ECHO[0] == $1[1]
-              self.write(IAC + DONT + OPT_ECHO)
-            elsif OPT_SGA[0]  == $1[1]
-              unless @telnet_option["SGA"] == false
-                @telnet_option["SGA"] = false
-                self.write(IAC + DONT + OPT_SGA)
+              ''
+            elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
+              if    OPT_ECHO[0] == $1[1]
+                self.write(IAC + DONT + OPT_ECHO)
+              elsif OPT_SGA[0]  == $1[1]
+                unless @telnet_option["SGA"] == false
+                  @telnet_option["SGA"] = false
+                  self.write(IAC + DONT + OPT_SGA)
+                end
+              else
+                self.write(IAC + DONT + $1[1..1])
               end
+              ''
+            elsif SB[0] == $1[0] # yield sub option
+              ''
             else
-              self.write(IAC + DONT + $1[1..1])
+              ''
             end
-            ''
-          elsif SB[0] == $1[0] # yield sub option
-            ''
-          else
-            ''
           end
-        end
-      end # preprocess
+        end # preprocess
+      end
     end
   end
 end

data/lib/net/telnet/rfc2217/version.rb

@@ -1,7 +1,7 @@
 module Net
   class Telnet
     class RFC2217
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-telnet-rfc2217
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Cody Cutrer