rubysl-net-telnet 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d353089dab3645fd5ca605d81306dfcebd266b6
-  data.tar.gz: e7ca71d78d8d85227baaea39533740ac5b55ea63
+  metadata.gz: 8967a940f0b7bd40863d0c33da78c9b4695c9620
+  data.tar.gz: 9f57926d7208c5c1a112f27c63fbb63988ac2e93
 SHA512:
-  metadata.gz: 53b69e7936e45819196ebe17322e132769d14790fb910f77d4681cbdf3e0e5d97570ba1f33597f4b862cd585547e5c92a5842c2dd1312afd540acf9d6103d059
-  data.tar.gz: 3540d9a078d8671651859ac4b2417e3c79dd884e4ea19fba34d21d1d582a10b1916ee3a1727a99ac6296d5cf08e687c40927871b48ae720db4cf07e83c20d8fd
+  metadata.gz: 84a1ed324893d9a06243a9d69169e8c80d95f3920bb94a6c1e17afef00f0edef341fb815ab5f15c398e3bcc2fa22df4a9b3ff5443beb4fc955ec7fc9749ae7c9
+  data.tar.gz: 7293c743dc6834d10de079127fb578fd8ea2a59f78d4bc67afd949a5557bfdf97f874422d878f5b0cc8e0a17cb6acdc484ec4abaa627170a26d3e8993497a467

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/net/telnet/telnet.rb

@@ -1,7 +1,7 @@
 # = net/telnet.rb - Simple Telnet Client Library
-# 
+#
 # Author:: Wakou Aoyama <wakou@ruby-lang.org>
-# Documentation:: William Webber and Wakou Aoyama 
+# Documentation:: William Webber and Wakou Aoyama
 #
 # This file holds the class Net::Telnet, which provides client-side
 # telnet functionality.
@@ -9,11 +9,9 @@
 # For documentation, see Net::Telnet.
 #
 
-require "socket"
-require "delegate"
-require "timeout"
+require "net/protocol"
 require "English"
- 
+
 module Net
 
   #
@@ -50,11 +48,11 @@ module Net
   # have to handle authentication yourself.
   #
   # For some protocols, it will be possible to specify the +Prompt+
-  # option once when you create the Telnet object and use #cmd() calls; 
+  # option once when you create the Telnet object and use #cmd() calls;
   # for others, you will have to specify the response sequence to
   # look for as the Match option to every #cmd() call, or call
-  # #puts() and #waitfor() directly; for yet others, you will have 
-  # to use #sysread() instead of #waitfor() and parse server 
+  # #puts() and #waitfor() directly; for yet others, you will have
+  # to use #sysread() instead of #waitfor() and parse server
   # responses yourself.
   #
   # It is worth noting that when you create a new Net::Telnet object,
@@ -63,21 +61,21 @@ module Net
   # to already open sockets, or to any read-write IO object.  This
   # can be useful, for instance, for setting up a test fixture for
   # unit testing.
-  # 
+  #
   # == Examples
-  # 
+  #
   # === Log in and send a command, echoing all output to stdout
-  # 
+  #
   #   localhost = Net::Telnet::new("Host" => "localhost",
   #                                "Timeout" => 10,
   #                                "Prompt" => /[$%#>] \z/n)
   #   localhost.login("username", "password") { |c| print c }
   #   localhost.cmd("command") { |c| print c }
   #   localhost.close
-  # 
-  # 
+  #
+  #
   # === Check a POP server to see if you have mail
-  # 
+  #
   #   pop = Net::Telnet::new("Host" => "your_destination_host_here",
   #                          "Port" => 110,
   #                          "Telnetmode" => false,
@@ -93,77 +91,77 @@ module Net
   # of relevant RFCs, see
   # http://www.omnifarious.org/~hopper/technical/telnet-rfc.html
   #
-  class Telnet < SimpleDelegator
+  class Telnet
 
     # :stopdoc:
     IAC   = 255.chr # "\377" # "\xff" # interpret as command
-    DONT  = 254.chr # "\376" # "\xfe" # you are not to use option 
-    DO    = 253.chr # "\375" # "\xfd" # please, you use option 
-    WONT  = 252.chr # "\374" # "\xfc" # I won't use option 
-    WILL  = 251.chr # "\373" # "\xfb" # I will use option 
-    SB    = 250.chr # "\372" # "\xfa" # interpret as subnegotiation 
-    GA    = 249.chr # "\371" # "\xf9" # you may reverse the line 
-    EL    = 248.chr # "\370" # "\xf8" # erase the current line 
-    EC    = 247.chr # "\367" # "\xf7" # erase the current character 
-    AYT   = 246.chr # "\366" # "\xf6" # are you there 
-    AO    = 245.chr # "\365" # "\xf5" # abort output--but let prog finish 
-    IP    = 244.chr # "\364" # "\xf4" # interrupt process--permanently 
-    BREAK = 243.chr # "\363" # "\xf3" # break 
-    DM    = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning 
-    NOP   = 241.chr # "\361" # "\xf1" # nop 
-    SE    = 240.chr # "\360" # "\xf0" # end sub negotiation 
-    EOR   = 239.chr # "\357" # "\xef" # end of record (transparent mode) 
-    ABORT = 238.chr # "\356" # "\xee" # Abort process 
-    SUSP  = 237.chr # "\355" # "\xed" # Suspend process 
-    EOF   = 236.chr # "\354" # "\xec" # End of file 
-    SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls 
-
-    OPT_BINARY         =   0.chr # "\000" # "\x00" # Binary Transmission 
-    OPT_ECHO           =   1.chr # "\001" # "\x01" # Echo 
-    OPT_RCP            =   2.chr # "\002" # "\x02" # Reconnection 
-    OPT_SGA            =   3.chr # "\003" # "\x03" # Suppress Go Ahead 
-    OPT_NAMS           =   4.chr # "\004" # "\x04" # Approx Message Size Negotiation 
-    OPT_STATUS         =   5.chr # "\005" # "\x05" # Status 
-    OPT_TM             =   6.chr # "\006" # "\x06" # Timing Mark 
-    OPT_RCTE           =   7.chr # "\a"   # "\x07" # Remote Controlled Trans and Echo 
-    OPT_NAOL           =   8.chr # "\010" # "\x08" # Output Line Width 
-    OPT_NAOP           =   9.chr # "\t"   # "\x09" # Output Page Size 
-    OPT_NAOCRD         =  10.chr # "\n"   # "\x0a" # Output Carriage-Return Disposition 
-    OPT_NAOHTS         =  11.chr # "\v"   # "\x0b" # Output Horizontal Tab Stops 
-    OPT_NAOHTD         =  12.chr # "\f"   # "\x0c" # Output Horizontal Tab Disposition 
-    OPT_NAOFFD         =  13.chr # "\r"   # "\x0d" # Output Formfeed Disposition 
-    OPT_NAOVTS         =  14.chr # "\016" # "\x0e" # Output Vertical Tabstops 
-    OPT_NAOVTD         =  15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition 
-    OPT_NAOLFD         =  16.chr # "\020" # "\x10" # Output Linefeed Disposition 
-    OPT_XASCII         =  17.chr # "\021" # "\x11" # Extended ASCII 
-    OPT_LOGOUT         =  18.chr # "\022" # "\x12" # Logout 
-    OPT_BM             =  19.chr # "\023" # "\x13" # Byte Macro 
-    OPT_DET            =  20.chr # "\024" # "\x14" # Data Entry Terminal 
-    OPT_SUPDUP         =  21.chr # "\025" # "\x15" # SUPDUP 
-    OPT_SUPDUPOUTPUT   =  22.chr # "\026" # "\x16" # SUPDUP Output 
-    OPT_SNDLOC         =  23.chr # "\027" # "\x17" # Send Location 
-    OPT_TTYPE          =  24.chr # "\030" # "\x18" # Terminal Type 
-    OPT_EOR            =  25.chr # "\031" # "\x19" # End of Record 
-    OPT_TUID           =  26.chr # "\032" # "\x1a" # TACACS User Identification 
-    OPT_OUTMRK         =  27.chr # "\e"   # "\x1b" # Output Marking 
-    OPT_TTYLOC         =  28.chr # "\034" # "\x1c" # Terminal Location Number 
-    OPT_3270REGIME     =  29.chr # "\035" # "\x1d" # Telnet 3270 Regime 
-    OPT_X3PAD          =  30.chr # "\036" # "\x1e" # X.3 PAD 
-    OPT_NAWS           =  31.chr # "\037" # "\x1f" # Negotiate About Window Size 
-    OPT_TSPEED         =  32.chr # " "    # "\x20" # Terminal Speed 
-    OPT_LFLOW          =  33.chr # "!"    # "\x21" # Remote Flow Control 
-    OPT_LINEMODE       =  34.chr # "\""   # "\x22" # Linemode 
-    OPT_XDISPLOC       =  35.chr # "#"    # "\x23" # X Display Location 
-    OPT_OLD_ENVIRON    =  36.chr # "$"    # "\x24" # Environment Option 
-    OPT_AUTHENTICATION =  37.chr # "%"    # "\x25" # Authentication Option 
-    OPT_ENCRYPT        =  38.chr # "&"    # "\x26" # Encryption Option 
-    OPT_NEW_ENVIRON    =  39.chr # "'"    # "\x27" # New Environment Option 
-    OPT_EXOPL          = 255.chr # "\377" # "\xff" # Extended-Options-List 
-
-    NULL = "\000" 
-    CR   = "\015"   
-    LF   = "\012" 
-    EOL  = CR + LF 
+    DONT  = 254.chr # "\376" # "\xfe" # you are not to use option
+    DO    = 253.chr # "\375" # "\xfd" # please, you use option
+    WONT  = 252.chr # "\374" # "\xfc" # I won't use option
+    WILL  = 251.chr # "\373" # "\xfb" # I will use option
+    SB    = 250.chr # "\372" # "\xfa" # interpret as subnegotiation
+    GA    = 249.chr # "\371" # "\xf9" # you may reverse the line
+    EL    = 248.chr # "\370" # "\xf8" # erase the current line
+    EC    = 247.chr # "\367" # "\xf7" # erase the current character
+    AYT   = 246.chr # "\366" # "\xf6" # are you there
+    AO    = 245.chr # "\365" # "\xf5" # abort output--but let prog finish
+    IP    = 244.chr # "\364" # "\xf4" # interrupt process--permanently
+    BREAK = 243.chr # "\363" # "\xf3" # break
+    DM    = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning
+    NOP   = 241.chr # "\361" # "\xf1" # nop
+    SE    = 240.chr # "\360" # "\xf0" # end sub negotiation
+    EOR   = 239.chr # "\357" # "\xef" # end of record (transparent mode)
+    ABORT = 238.chr # "\356" # "\xee" # Abort process
+    SUSP  = 237.chr # "\355" # "\xed" # Suspend process
+    EOF   = 236.chr # "\354" # "\xec" # End of file
+    SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls
+
+    OPT_BINARY         =   0.chr # "\000" # "\x00" # Binary Transmission
+    OPT_ECHO           =   1.chr # "\001" # "\x01" # Echo
+    OPT_RCP            =   2.chr # "\002" # "\x02" # Reconnection
+    OPT_SGA            =   3.chr # "\003" # "\x03" # Suppress Go Ahead
+    OPT_NAMS           =   4.chr # "\004" # "\x04" # Approx Message Size Negotiation
+    OPT_STATUS         =   5.chr # "\005" # "\x05" # Status
+    OPT_TM             =   6.chr # "\006" # "\x06" # Timing Mark
+    OPT_RCTE           =   7.chr # "\a"   # "\x07" # Remote Controlled Trans and Echo
+    OPT_NAOL           =   8.chr # "\010" # "\x08" # Output Line Width
+    OPT_NAOP           =   9.chr # "\t"   # "\x09" # Output Page Size
+    OPT_NAOCRD         =  10.chr # "\n"   # "\x0a" # Output Carriage-Return Disposition
+    OPT_NAOHTS         =  11.chr # "\v"   # "\x0b" # Output Horizontal Tab Stops
+    OPT_NAOHTD         =  12.chr # "\f"   # "\x0c" # Output Horizontal Tab Disposition
+    OPT_NAOFFD         =  13.chr # "\r"   # "\x0d" # Output Formfeed Disposition
+    OPT_NAOVTS         =  14.chr # "\016" # "\x0e" # Output Vertical Tabstops
+    OPT_NAOVTD         =  15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition
+    OPT_NAOLFD         =  16.chr # "\020" # "\x10" # Output Linefeed Disposition
+    OPT_XASCII         =  17.chr # "\021" # "\x11" # Extended ASCII
+    OPT_LOGOUT         =  18.chr # "\022" # "\x12" # Logout
+    OPT_BM             =  19.chr # "\023" # "\x13" # Byte Macro
+    OPT_DET            =  20.chr # "\024" # "\x14" # Data Entry Terminal
+    OPT_SUPDUP         =  21.chr # "\025" # "\x15" # SUPDUP
+    OPT_SUPDUPOUTPUT   =  22.chr # "\026" # "\x16" # SUPDUP Output
+    OPT_SNDLOC         =  23.chr # "\027" # "\x17" # Send Location
+    OPT_TTYPE          =  24.chr # "\030" # "\x18" # Terminal Type
+    OPT_EOR            =  25.chr # "\031" # "\x19" # End of Record
+    OPT_TUID           =  26.chr # "\032" # "\x1a" # TACACS User Identification
+    OPT_OUTMRK         =  27.chr # "\e"   # "\x1b" # Output Marking
+    OPT_TTYLOC         =  28.chr # "\034" # "\x1c" # Terminal Location Number
+    OPT_3270REGIME     =  29.chr # "\035" # "\x1d" # Telnet 3270 Regime
+    OPT_X3PAD          =  30.chr # "\036" # "\x1e" # X.3 PAD
+    OPT_NAWS           =  31.chr # "\037" # "\x1f" # Negotiate About Window Size
+    OPT_TSPEED         =  32.chr # " "    # "\x20" # Terminal Speed
+    OPT_LFLOW          =  33.chr # "!"    # "\x21" # Remote Flow Control
+    OPT_LINEMODE       =  34.chr # "\""   # "\x22" # Linemode
+    OPT_XDISPLOC       =  35.chr # "#"    # "\x23" # X Display Location
+    OPT_OLD_ENVIRON    =  36.chr # "$"    # "\x24" # Environment Option
+    OPT_AUTHENTICATION =  37.chr # "%"    # "\x25" # Authentication Option
+    OPT_ENCRYPT        =  38.chr # "&"    # "\x26" # Encryption Option
+    OPT_NEW_ENVIRON    =  39.chr # "'"    # "\x27" # New Environment Option
+    OPT_EXOPL          = 255.chr # "\377" # "\xff" # Extended-Options-List
+
+    NULL = "\000"
+    CR   = "\015"
+    LF   = "\012"
+    EOL  = CR + LF
     REVISION = '$Id$'
     # :startdoc:
 
@@ -174,13 +172,13 @@ module Net
     # provided: see below).  If a block is provided, it is yielded
     # status messages on the attempt to connect to the server, of
     # the form:
-    # 
+    #
     #   Trying localhost...
     #   Connected to localhost.
     #
     # +options+ is a hash of options.  The following example lists
     # all options and their default values.
-    # 
+    #
     #   host = Net::Telnet::new(
     #            "Host"       => "localhost",  # default: "localhost"
     #            "Port"       => 23,           # default: 23
@@ -198,16 +196,16 @@ module Net
     #
     # The options have the following meanings:
     #
-    # Host:: the hostname or IP address of the host to connect to, as a String. 
+    # Host:: the hostname or IP address of the host to connect to, as a String.
     #        Defaults to "localhost".
     #
     # Port:: the port to connect to.  Defaults to 23.
     #
-    # Binmode:: if false (the default), newline substitution is performed.  
+    # Binmode:: if false (the default), newline substitution is performed.
     #           Outgoing LF is
     #           converted to CRLF, and incoming CRLF is converted to LF.  If
     #           true, this substitution is not performed.  This value can
-    #           also be set with the #binmode() method.  The 
+    #           also be set with the #binmode() method.  The
     #           outgoing conversion only applies to the #puts() and #print()
     #           methods, not the #write() method.  The precise nature of
     #           the newline conversion is also affected by the telnet options
@@ -217,13 +215,13 @@ module Net
     #              and all received traffic to.  In the case of a proper
     #              Telnet session, this will include the client input as
     #              echoed by the host; otherwise, it only includes server
-    #              responses.  Output is appended verbatim to this file.  
+    #              responses.  Output is appended verbatim to this file.
     #              By default, no output log is kept.
     #
     # Dump_log:: as for Output_log, except that output is written in hexdump
     #            format (16 bytes per line as hex pairs, followed by their
     #            printable equivalent), with connection status messages
-    #            preceded by '#', sent traffic preceded by '>', and 
+    #            preceded by '#', sent traffic preceded by '>', and
     #            received traffic preceded by '<'.  By default, not dump log
     #            is kept.
     #
@@ -233,7 +231,7 @@ module Net
     #          ready to receive a new command.  By default, this regular
     #          expression is /[$%#>] \z/n.
     #
-    # Telnetmode:: a boolean value, true by default.  In telnet mode, 
+    # Telnetmode:: a boolean value, true by default.  In telnet mode,
     #              traffic received from the host is parsed for special
     #              command sequences, and these sequences are escaped
     #              in outgoing traffic sent using #puts() or #print()
@@ -245,21 +243,21 @@ module Net
     #
     # Timeout:: the number of seconds to wait before timing out both the
     #           initial attempt to connect to host (in this constructor),
-    #           and all attempts to read data from the host (in #waitfor(),
-    #           #cmd(), and #login()).  Exceeding this timeout causes a
-    #           TimeoutError to be raised.  The default value is 10 seconds.
+    #           which raises a Net::OpenTimeout, and all attempts to read data
+    #           from the host, which raises a Net::ReadTimeout (in #waitfor(),
+    #           #cmd(), and #login()).  The default value is 10 seconds.
     #           You can disable the timeout by setting this value to false.
     #           In this case, the connect attempt will eventually timeout
     #           on the underlying connect(2) socket call with an
     #           Errno::ETIMEDOUT error (but generally only after a few
     #           minutes), but other attempts to read data from the host
-    #           will hand indefinitely if no data is forthcoming.
+    #           will hang indefinitely if no data is forthcoming.
     #
-    # Waittime:: the amount of time to wait after seeing what looks like a 
+    # Waittime:: the amount of time to wait after seeing what looks like a
     #            prompt (that is, received data that matches the Prompt
     #            option regular expression) to see if more data arrives.
     #            If more data does arrive in this time, Net::Telnet assumes
-    #            that what it saw was not really a prompt.  This is to try to 
+    #            that what it saw was not really a prompt.  This is to try to
     #            avoid false matches, but it can also lead to missing real
     #            prompts (if, for instance, a background process writes to
     #            the terminal soon after the prompt is displayed).  By
@@ -267,12 +265,12 @@ module Net
     #
     # Proxy:: a proxy object to used instead of opening a direct connection
     #         to the host.  Must be either another Net::Telnet object or
-    #         an IO object.  If it is another Net::Telnet object, this 
+    #         an IO object.  If it is another Net::Telnet object, this
     #         instance will use that one's socket for communication.  If an
     #         IO object, it is used directly for communication.  Any other
     #         kind of object will cause an error to be raised.
     #
-    def initialize(options) # :yield: mesg 
+    def initialize(options) # :yield: mesg
       @options = options
       @options["Host"]       = "localhost"   unless @options.has_key?("Host")
       @options["Port"]       = 23            unless @options.has_key?("Port")
@@ -280,7 +278,7 @@ module Net
       @options["Timeout"]    = 10            unless @options.has_key?("Timeout")
       @options["Waittime"]   = 0             unless @options.has_key?("Waittime")
       unless @options.has_key?("Binmode")
-        @options["Binmode"]    = false         
+        @options["Binmode"]    = false
       else
         unless (true == @options["Binmode"] or false == @options["Binmode"])
           raise ArgumentError, "Binmode option must be true or false"
@@ -288,7 +286,7 @@ module Net
       end
 
       unless @options.has_key?("Telnetmode")
-        @options["Telnetmode"] = true          
+        @options["Telnetmode"] = true
       else
         unless (true == @options["Telnetmode"] or false == @options["Telnetmode"])
           raise ArgumentError, "Telnetmode option must be true or false"
@@ -348,12 +346,12 @@ module Net
           if @options["Timeout"] == false
             @sock = TCPSocket.open(@options["Host"], @options["Port"])
           else
-            timeout(@options["Timeout"]) do
+            Timeout.timeout(@options["Timeout"], Net::OpenTimeout) do
               @sock = TCPSocket.open(@options["Host"], @options["Port"])
             end
           end
-        rescue TimeoutError
-          raise TimeoutError, "timed out while opening a connection to the host"
+        rescue Net::OpenTimeout
+          raise Net::OpenTimeout, "timed out while opening a connection to the host"
         rescue
           @log.write($ERROR_INFO.to_s + "\n") if @options.has_key?("Output_log")
           @dumplog.log_dump('#', $ERROR_INFO.to_s + "\n") if @options.has_key?("Dump_log")
@@ -368,13 +366,12 @@ module Net
         @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
       end
 
-      super(@sock)
     end # initialize
 
     # The socket the Telnet object is using.  Note that this object becomes
     # a delegate of the Telnet object, so normally you invoke its methods
     # directly on the Telnet object.
-    attr :sock 
+    attr :sock
 
     # Set telnet command interpretation on (+mode+ == true) or off
     # (+mode+ == false), or return the current value (+mode+ not
@@ -408,7 +405,7 @@ module Net
     def binmode(mode = nil)
       case mode
       when nil
-        @options["Binmode"] 
+        @options["Binmode"]
       when true, false
         @options["Binmode"] = mode
       else
@@ -428,7 +425,7 @@ module Net
     # Preprocess received data from the host.
     #
     # Performs newline conversion and detects telnet command sequences.
-    # Called automatically by #waitfor().  You should only use this 
+    # Called automatically by #waitfor().  You should only use this
     # method yourself if you have read input directly using sysread()
     # or similar, and even then only if in telnet mode.
     def preprocess(string)
@@ -438,6 +435,9 @@ module Net
       # combine EOL into "\n"
       string = string.gsub(/#{EOL}/no, "\n") 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}]
@@ -491,9 +491,9 @@ module Net
     # Read data from the host until a certain sequence is matched.
     #
     # If a block is given, the received data will be yielded as it
-    # is read in (not necessarily all in one go), or nil if EOF 
+    # is read in (not necessarily all in one go), or nil if EOF
     # occurs before any data is received.  Whether a block is given
-    # or not, all data read will be returned in a single string, or again 
+    # or not, all data read will be returned in a single string, or again
     # nil if EOF occurs before any data is received.  Note that
     # received data includes the matched sequence we were looking for.
     #
@@ -507,7 +507,7 @@ module Net
     #          into a regular expression.  Used only if Match and
     #          Prompt are not specified.
     # Timeout:: the number of seconds to wait for data from the host
-    #           before raising a TimeoutError.  If set to false, 
+    #           before raising a Timeout::Error.  If set to false,
     #           no timeout will occur.  If not specified, the
     #           Timeout option value specified when this instance
     #           was created will be used, or, failing that, the
@@ -524,7 +524,7 @@ module Net
     #           EOFError will be raised. Otherwise, defaults to the old
     #           behaviour that the function will return whatever data
     #           has been received already, or nil if nothing was received.
-    #           
+    #
     def waitfor(options) # :yield: recvdata
       time_out = @options["Timeout"]
       waittime = @options["Waittime"]
@@ -554,15 +554,15 @@ module Net
       rest = ''
       until(prompt === line and not IO::select([@sock], nil, nil, waittime))
         unless IO::select([@sock], nil, nil, time_out)
-          raise TimeoutError, "timed out while waiting for more data"
+          raise Net::ReadTimeout, "timed out while waiting for more data"
         end
         begin
           c = @sock.readpartial(1024 * 1024)
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
           if @options["Telnetmode"]
             c = rest + c
-            if Integer(c.rindex(/#{IAC}#{SE}/no)) <
-               Integer(c.rindex(/#{IAC}#{SB}/no))
+            if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
+               Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
               buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
               rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
             elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
@@ -619,7 +619,7 @@ module Net
     # Sends a string to the host.
     #
     # This does _not_ automatically append a newline to the string.  Embedded
-    # newlines may be converted and telnet command sequences escaped 
+    # newlines may be converted and telnet command sequences escaped
     # depending upon the values of telnetmode, binmode, and telnet options
     # set by the host.
     def print(string)
@@ -654,7 +654,7 @@ module Net
     # data until is sees the prompt or other matched sequence.
     #
     # If a block is given, the received data will be yielded to it as
-    # it is read in.  Whether a block is given or not, the received data 
+    # it is read in.  Whether a block is given or not, the received data
     # will be return as a string.  Note that the received data includes
     # the prompt and in most cases the host's echo of our command.
     #
@@ -678,20 +678,22 @@ module Net
     def cmd(options) # :yield: recvdata
       match    = @options["Prompt"]
       time_out = @options["Timeout"]
+      fail_eof = @options["FailEOF"]
 
       if options.kind_of?(Hash)
         string   = options["String"]
         match    = options["Match"]   if options.has_key?("Match")
         time_out = options["Timeout"] if options.has_key?("Timeout")
+        fail_eof = options["FailEOF"] if options.has_key?("FailEOF")
       else
         string = options
       end
 
       self.puts(string)
       if block_given?
-        waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
+        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}){|c| yield c }
       else
-        waitfor({"Prompt" => match, "Timeout" => time_out})
+        waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof})
       end
     end
 
@@ -699,7 +701,7 @@ module Net
     #
     # The username and password can either be provided as two string
     # arguments in that order, or as a hash with keys "Name" and
-    # "Password".    
+    # "Password".
     #
     # This method looks for the strings "login" and "Password" from the
     # host to determine when to send the username and password.  If the
@@ -723,8 +725,8 @@ module Net
       if options.kind_of?(Hash)
         username = options["Name"]
         password = options["Password"]
-	login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
-	password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
+        login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
+        password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
       else
         username = options
       end
@@ -751,6 +753,11 @@ module Net
       line
     end
 
+    # Closes the connection
+    def close
+      @sock.close
+    end
+
   end  # class Telnet
 end  # module Net
 

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

@@ -1,7 +1,7 @@
 module RubySL
   module Net
     module Telnet
-      VERSION = "1.0.0"
+      VERSION = "2.0.0"
     end
   end
 end

data/rubysl-net-telnet.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-net-telnet
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library telnet.
 email:
 - brixen@gmail.com
@@ -80,7 +66,6 @@ files:
 - README.md
 - Rakefile
 - lib/net/telnet.rb
-- lib/net/telnets.rb
 - lib/rubysl/net/telnet.rb
 - lib/rubysl/net/telnet/telnet.rb
 - lib/rubysl/net/telnet/version.rb

data/lib/net/telnets.rb

@@ -1 +0,0 @@
-require 'openssl/net/telnets'