net-ssh-telnet 0.0.1 → 0.0.2

data/History.txt

@@ -1,7 +1,16 @@
+=== 0.0.2 / 2009-03-15
+
+* 4 bugfixes from Brian Candler
+  * Bug in original Net::Telnet EOL translation 
+    (http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/16599) 
+    duplicate the fix.
+  * Remove rubygems require.
+  * Handle EOF more gracefully.
+  * Allow FailEOF to propagate through cmd() to waitfor().
+
 === 0.0.1 / 2008-06-06
 
 * 1 major enhancement
-
   * Birthday!
+  * Initial revision by Brian Candler based on Net::Telnet.
   * Test release.
-

data/README.txt

@@ -1,7 +1,7 @@
 = net-ssh-telnet
 
 * http://net-ssh-telnet.rubyforge.org
-* mailto:matt@bravenet.com
+* mailto:mkent@magoazul.com
 
 == DESCRIPTION:
 

data/lib/net/ssh/telnet.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'net/ssh'
  
 module Net
@@ -15,7 +14,7 @@ module SSH
     CR   = "\015"
     LF   = "\012"
     EOL  = CR + LF
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
 
     # Wrapper to emulate the behaviour of Net::Telnet "Proxy" option, where
     # the user passes in an already-open socket
@@ -320,17 +319,27 @@ module SSH
       rest = ''
       sock = @ssh.transport.socket
 
-      until prompt === line and ((@eof and @buf == "") or not IO::select([sock], nil, nil, waittime))
+      until prompt === line and @buf == "" and (@eof or (not sock.closed? and not IO::select([sock], nil, nil, waittime)))
         while @buf == "" and !@eof
           # timeout is covered by net-ssh
-          @channel.connection.process(0.1)
+          begin
+            @channel.connection.process(0.1)
+          rescue IOError
+            @eof = true
+          end
         end
         if @buf != ""
           c = @buf; @buf = ""
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-          buf = c
-          buf.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"]
+          buf = rest + c
           rest = ''
+          unless @options["Binmode"]
+            if pt = buf.rindex(/\r\z/no)
+              buf = buf[0 ... pt]
+              rest = buf[pt .. -1]
+            end
+            buf.gsub!(/#{EOL}/no, "\n")
+          end
           @log.print(buf) if @options.has_key?("Output_log")
           line += buf
           yield buf if block_given?
@@ -389,20 +398,22 @@ module SSH
     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
 

metadata

@@ -1,56 +1,70 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: net-ssh-telnet
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2008-06-06 00:00:00 -07:00
-summary: A ruby module to provide a simple send/expect interface over SSH with an API almost identical to Net::Telnet
-require_paths: 
-- lib
-email: 
-- matt@bravenet.com
-homepage: http://net-ssh-telnet.rubyforge.org
-rubyforge_project: net-ssh-telnet
-description: A ruby module to provide a simple send/expect interface over SSH with an API almost identical to Net::Telnet. Ideally it should be a drop in replacement.  Please see Net::Telnet for main documentation (included with ruby stdlib).
+  version: 0.0.2
+platform: ruby
+authors: 
+- Matthew Kent
 autorequire: 
-default_executable: 
 bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
 cert_chain: 
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDARtYXR0
-  MRgwFgYKCZImiZPyLGQBGRYIYnJhdmVuZXQxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  HhcNMDgwNTI5MjM1MDUwWhcNMDkwNTI5MjM1MDUwWjA+MQ0wCwYDVQQDDARtYXR0
-  MRgwFgYKCZImiZPyLGQBGRYIYnJhdmVuZXQxEzARBgoJkiaJk/IsZAEZFgNjb20w
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDGVrJnpk6/hCO5lg6T7As
-  unEksqdmCly6GkRpX0cVxusWG/wbjrZw4Ka5x9pSS2m3GfefEpu5CuWH9wnGB/q0
-  LwbWhrkpQb+uNVD6hEbQcngDEiQbiitaSWZKSvrIymbM5Tl92rIScmvx7Pd7l8tz
-  BLndL/DmrBHrHWQ47xLxOmBAA4NJy0gk7HdsdAFfJwrEoC14AAXqcI3X0qU3KGrr
-  9Fs0jVeIKktx3fthwGVPrpYrMIw3xgiUqOqn7M+V4soD013dopaN7orewmCm9dQL
-  4N06FMnGNjwFaS6+MV612nk8gkVpJwgcwTHE1GNt2NItR5zeK6j+AZ01DijYdjH9
-  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ6jcdN
-  QqNNsx2XxigfTWE0Owy0XzANBgkqhkiG9w0BAQUFAAOCAQEAvWBkYaD7eKP+KHxJ
-  dtQuaebQTZvBX4vjk/Omjn7hj7u8X8aTvmCKyopnmywiApFH1zgDa8NRc1KTsvZt
-  zhSRWIuI7fFB+JFZUatE7Nius56id9UchYO98569t6bNU284XwBtcj4MN5Andfcp
-  LKdUNuuT0yui1InJG4fD0uKnOS1qcXEm+mN2s1uqPGVltEHorG7L/bPNAw8xV+uq
-  NPc7hhQTkbi7HB2Uwxr9uK9IGHEE5tDVnsPWPnJJ4jSOc7Bd1eHZuSMkEPfyREDf
-  h9ljoX3AGXW8qYohFzGjflamaWZ4xYaKZSNqS2i0Kc+M76Sy+r9FldDRNn4FGUBE
-  JqYgHg==
+  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MQ4wDAYDVQQDDAVta2Vu
+  dDEYMBYGCgmSJomT8ixkARkWCG1hZ29henVsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTA4MDcyODA0NTIzMVoXDTA5MDcyODA0NTIzMVowPzEOMAwGA1UEAwwFbWtl
+  bnQxGDAWBgoJkiaJk/IsZAEZFghtYWdvYXp1bDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9kASXLzL37znIcJoWH
+  lE6LYK9Drf9/tTP0aMJBRwzFAL6NP4KCDTSbzRcurb2gqJI5Hz7wJBm7QQaw7jnx
+  F+wUWEUnXF9v8BIpruFpIM+VHIMaj4h5ifSOh7lOARCn0tBHYYadxlyHhj+cROCf
+  h8SPXUQ7Otsba/8tIjYZTh+tiru7hZApAXZRZOiGPjARwuqvcWYYstbxWOyG5hAB
+  QHdhJD1nv03uHuCR0S/FpLmDM+REEh2PAXbvJIMkBJJ+2KP+7oWwU95/pclnEXE/
+  e0qKZkVsaszihkvh1loxlKhU/sV0Sjo+LJ/fM7SR1a9WzSw1c1C/5Twjmq6jnaLG
+  ZGECAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGhf
+  2WxIO89iFR2KfqyyXeWlUsBMMA0GCSqGSIb3DQEBBQUAA4IBAQAyvET0KFjr4Ars
+  HvOFhZOer5jWTfGDUcKB8oOfLhbs7PANVNv0BARxgH0Dj95kTcIfSvQLWfv5OmqC
+  AT3P6hPV6WbRCJOGPy0jeZcKWgPepl8vqnBciqzB8beBXmYmEe097MNvnlZptqU5
+  If5GWrjlRoeYpRDNpMpaN4UFxsb/I4MGYvbnrEVc6Ev1ztgK5Kci8oYcINjUhCls
+  EOmi6kiwQNdHUW0XLqwGanEip196lyE5IHRylQ5UiwYI0T4hDSc9f0SE+dzENdFw
+  doMOs6odERAAmX+M7PQ4i3Zvs+Jv9SazZBcl8+sohZL3I5A1fkNQXts1hV6TObce
+  T6VhSPds
   -----END CERTIFICATE-----
 
-post_install_message: 
-authors: 
-- Matthew Kent
+date: 2009-03-15 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
+description: A ruby module to provide a simple send/expect interface over SSH with an API almost identical to Net::Telnet. Ideally it should be a drop in replacement.  Please see Net::Telnet for main documentation (included with ruby stdlib).
+email: 
+- matt@bravenet.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Todo.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -63,38 +77,32 @@ files:
 - examples/non_standard_shell.rb
 - lib/net/ssh/telnet.rb
 - test/test_net-ssh-telnet.rb
-test_files: 
-- test/test_net-ssh-telnet.rb
+has_rdoc: true
+homepage: http://net-ssh-telnet.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- Todo.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.3
-    version: 
+rubyforge_project: net-ssh-telnet
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A ruby module to provide a simple send/expect interface over SSH with an API almost identical to Net::Telnet
+test_files: 
+- test/test_net-ssh-telnet.rb