net-ssh-telnet 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00bb9ece1f4ba5a748bc3c1c7f6a65f386c76543
-  data.tar.gz: 9af12f0b2318c4e1123ead13004f7223974bb9ce
+  metadata.gz: 29d0a1186cd6ea45319c2afbdab046530200851d
+  data.tar.gz: 8e2f7f9c996225aefc02c6bcaf3738c693ebc08f
 SHA512:
-  metadata.gz: 1d6d0b0c1a9b38d5f96f0f89d4b556c69621a768629625dc3e70c7709a75819fdd480b218a9db10c2a3f53cac5a33152e4d002494a996431aec0a45edd707baf
-  data.tar.gz: e148e3bae70620f0413b1cab661a1b35473c8bed1e596ae5f32b92bac142bc30b8735477f49f7dbd1ccc6117e22c30433e76e1f549100f79ac7e4b7a669c6b76
+  metadata.gz: ac0df2b1f5d6a5a7e2b64d5d401300aa97e6c5f6b563487ced4a1fdc2b62d04a725020ecce65c91fbe573ae5bd6a7c88e2dda5a355a54a8d5ebef5d2d6521e25
+  data.tar.gz: f73a34decc609c1c853a36c6ff322e5d3c055ddfb44386fc882bd8689ad0ddbf10323e89d1d68af6ebd8a3e5d85081c5d0a3b26fe2290f15e6557ad7e32a5eba

data/{History.txt → History.md}

@@ -1,15 +1,19 @@
-=== 0.2.0 / 2017-01-16
+### 0.2.1 / 2017-10-08
+* Add compatibility for net-ssh v4.2 (patch from haccht)
+* Add PTYOptions option (patch from Ben Miller)
+
+### 0.2.0 / 2017-01-16
 * Add option to change prompt after initialization
 * Cleanup requires for gemspec
 
-=== 0.1.1 / 2016-05-06
+### 0.1.1 / 2016-05-06
 * Apply fix to race condition during initialization from lumean
 
-=== 0.1.0 / 2016-02-09
+### 0.1.0 / 2016-02-09
 * Fixed 'Timeout' and 'Waittime' options
 * Fork to net-ssh-telnet2
 
-=== 0.0.2 / 2009-03-15
+### 0.0.2 / 2009-03-15
 
 * 4 bugfixes from Brian Candler
   * Bug in original Net::Telnet EOL translation
@@ -19,7 +23,7 @@
   * Handle EOF more gracefully.
   * Allow FailEOF to propagate through cmd() to waitfor().
 
-=== 0.0.1 / 2008-06-06
+### 0.0.1 / 2008-06-06
 
 * 1 major enhancement
   * Birthday!

data/{README.txt → README.md}

@@ -1,32 +1,32 @@
-= net-ssh-telnet
+# net-ssh-telnet
 
 * https://github.com/duke-automation/net-ssh-telnet
 * mailto:sean@duke.edu
 
-== DESCRIPTION:
+## 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).
 
-== FEATURES/PROBLEMS:
+## FEATURES/PROBLEMS
 
 * FIX (list of features or problems)
 
-== SYNOPSIS:
+## SYNOPSIS
 
   FIX (code sample of usage)
 
-== REQUIREMENTS:
+## REQUIREMENTS
 
 * net-ssh >= 2.0.1
 
-== INSTALL:
+## INSTALL
 
 * sudo gem install net-ssh-telnet
 
-== LICENSE:
+## LICENSE
 
 (The MIT License)
 

data/lib/net/ssh/telnet.rb

@@ -144,15 +144,16 @@ module SSH
     # * <tt>"Host"</tt> - a string to define the hostname to connect to(Default: "localhost")
     # * <tt>"Port"</tt> - port number to connect to(Default: 22)
     # * <tt>"Prompt"</tt> - a regular expression to define the the prompt to expect(Default: /[$%#>] \z/n )
-    # * <tt>"Timeout"</tt> - the time out value passed on to Net::Ssh - also the default value for #waitfor(Default: 10)
+    # * <tt>"Timeout"</tt> - the time out value passed on to Net::SSH - also the default value for #waitfor(Default: 10)
     # * <tt>"Waittime"</tt> - Max time to wait after a possible prompt it seen to make sure more data isn't coming(Default: 0)
     # * <tt>"Terminator"</tt> - This value is appended to all strings that are sent to #print.(Default: LF)
     # * <tt>"Binmode"</tt> - Enable binary mode.(Default: false)
     # * <tt>"Output_log"</tt> - A file name to open as an output log.
     # * <tt>"Dump_log"</tt> - A file name to open to dump the entire session to.
-    # * <tt>"Session"</tt> - An existing Net::Ssh object for Net::Ssh::Telnet to use as its connection(See example 1)
+    # * <tt>"Session"</tt> - An existing Net::SSH object for Net::SSH::Telnet to use as its connection(See example 1)
     # * <tt>"Proxy"</tt> - An open IO object to use as a Proxy(See example 3)
-    # * <tt>"Factory"</tt> - A connection factory to use to establish the connection. Net::Ssh::Telnet will call #open(host, post) on this object.(See example 4)
+    # * <tt>"Factory"</tt> - A connection factory to use to establish the connection. Net::SSH::Telnet will call #open(host, post) on this object.(See example 4)
+    # * <tt>"PTYOptions"</tt> - A hash to be passed to Net::SSH::Connection::Channel#request_pty. See Net::SSH::Connection::Channel::VALID_PTY_OPTIONS for valid options.
     #
     def initialize(options, &blk) # :yield: mesg
       @options = options
@@ -162,6 +163,7 @@ module SSH
       @options["Timeout"]    = 10            unless @options.has_key?("Timeout")
       @options["Waittime"]   = 0             unless @options.has_key?("Waittime")
       @options["Terminator"] = LF            unless @options.has_key?("Terminator")
+      @options["PTYOptions"] = {}            unless @options.has_key?("PTYOptions")
 
       unless @options.has_key?("Binmode")
         @options["Binmode"]    = false
@@ -208,14 +210,15 @@ module SSH
         @ssh = @options["Session"]
         @close_all = false
       elsif @options.has_key?("Proxy")
-        @ssh = Net::SSH.start(nil, nil,
-                :host_name => @options["Host"],  # ignored
-                :port => @options["Port"],       # ignored
-                :user => @options["Username"],
-                :password => @options["Password"],
-                :timeout => @options["Timeout"],
-                :proxy => TinyFactory.new(@options["Proxy"])
-        )
+        opts = {
+          :host_name => @options["Host"],  # ignored
+          :port => @options["Port"],       # ignored
+          :user => @options["Username"],
+          :password => @options["Password"],
+          :timeout => @options["Timeout"],
+          :proxy => TinyFactory.new(@options["Proxy"])
+        }.delete_if { |_,v| v.nil? }
+        @ssh = Net::SSH.start(nil, nil, opts)
         @close_all = true
       else
         message = "Trying " + @options["Host"] + "...\n"
@@ -224,14 +227,15 @@ module SSH
         @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
 
         begin
-          @ssh = Net::SSH.start(nil, nil,
-                :host_name => @options["Host"],
-                :port => @options["Port"],
-                :user => @options["Username"],
-                :password => @options["Password"],
-                :timeout => @options["Timeout"],
-                :proxy => @options["Factory"]
-          )
+          opts = {
+            :host_name => @options["Host"],
+            :port => @options["Port"],
+            :user => @options["Username"],
+            :password => @options["Password"],
+            :timeout => @options["Timeout"],
+            :proxy => @options["Factory"]
+          }.delete_if { |_,v| v.nil? }
+          @ssh = Net::SSH.start(nil, nil, opts)
           @close_all = true
         rescue TimeoutError
           raise TimeoutError, "timed out while opening a connection to the host"
@@ -254,7 +258,7 @@ module SSH
         channel.on_data { |ch,data| @buf << data }
         channel.on_extended_data { |ch,type,data| @buf << data if type == 1 }
         channel.on_close { @eof = true }
-        channel.request_pty { |ch,success|
+        channel.request_pty(@options["PTYOptions"]) { |ch,success|
           if success == false
             raise "Failed to open ssh pty"
           end

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

@@ -1,7 +1,7 @@
 module Net
 module SSH
 class Telnet
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 end
 end
 end

data/net-ssh-telnet.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ["lib"]
-  spec.extra_rdoc_files = ['README.txt', 'History.txt']
+  spec.extra_rdoc_files = ['README.md', 'History.md']
 
   spec.add_runtime_dependency 'net-ssh', '>= 2.0.1'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-telnet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sean Dilda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -46,14 +46,14 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.txt
-- History.txt
+- README.md
+- History.md
 files:
 - ".gitignore"
 - ".yardopts"
 - Gemfile
-- History.txt
-- README.txt
+- History.md
+- README.md
 - Rakefile
 - Todo.txt
 - examples/detailed_debug.rb
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Provides Net::Telnet API for SSH connections