diff options
| author | sawanoboly <sawanoboriyu@higanworks.com> | 2016-03-11 14:34:21 +0900 |
|---|---|---|
| committer | sawanoboly <sawanoboriyu@higanworks.com> | 2016-03-11 14:34:21 +0900 |
| commit | 1da3d4876a09f3b7932b32b58a309cfbbde1726a (patch) | |
| tree | 50ed9e449955cb564e2bde72b415acf02e935218 | |
| parent | 4f5083f1505e9005158cb36a8f4a9f0535fa25b8 (diff) | |
| parent | dc9c6e79d2572d355cf6d67a7d8a3c3b22d23d12 (diff) | |
| download | net-ssh-multi-1da3d4876a09f3b7932b32b58a309cfbbde1726a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into keep_forwarding_in_pending_connection
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | README.rdoc | 2 | ||||
| -rw-r--r-- | lib/net/ssh/multi/server.rb | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b520c8f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: ruby +sudo: false +rvm: + - 2.0.0 + - 2.1.0 + - 2.2.0 + - 2.3.0 + - jruby-head + - rbx-2 + +install: gem install test-unit mocha net-ssh net-ssh-gateway + +script: rake test + +matrix: + allow_failures: + - rvm: jruby-head diff --git a/README.rdoc b/README.rdoc index f45918e..1187637 100644 --- a/README.rdoc +++ b/README.rdoc @@ -66,7 +66,7 @@ If you want to run the tests or use any of the Rake tasks, you'll need: * gem install net-ssh-multi -However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signiture[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once): +However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signature[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once): # Add the public key as a trusted certificate # (You only need to do this once) diff --git a/lib/net/ssh/multi/server.rb b/lib/net/ssh/multi/server.rb index f8fa552..58083e3 100644 --- a/lib/net/ssh/multi/server.rb +++ b/lib/net/ssh/multi/server.rb @@ -1,4 +1,5 @@ require 'net/ssh' +require 'timeout' module Net; module SSH; module Multi # Encapsulates the connection information for a single remote server, as well |