diff options
| author | delano <delano.mandelbaum@gmail.com> | 2013-01-10 14:30:47 -0800 |
|---|---|---|
| committer | delano <delano.mandelbaum@gmail.com> | 2013-01-10 14:30:47 -0800 |
| commit | a94363a5e925e2f8971155cd514e690c993ebbd2 (patch) | |
| tree | 4fd4ffddcc31cce7755a928cc400d9babc0e23a8 | |
| parent | ba33401b45d2f24b2a19752e9eaff3d3c00a206b (diff) | |
| parent | e843bfac1bbd33578f949a89b9833f86e3ae1237 (diff) | |
| download | net-ssh-a94363a5e925e2f8971155cd514e690c993ebbd2.tar.gz | |
Pull latest
| -rw-r--r-- | lib/net/ssh/key_factory.rb | 2 | ||||
| -rw-r--r-- | lib/net/ssh/service/forward.rb | 2 | ||||
| -rw-r--r-- | net-ssh.gemspec | 3 | ||||
| -rw-r--r-- | test/common.rb | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/lib/net/ssh/key_factory.rb b/lib/net/ssh/key_factory.rb index 34dc37c..fdc7eda 100644 --- a/lib/net/ssh/key_factory.rb +++ b/lib/net/ssh/key_factory.rb @@ -61,7 +61,7 @@ module Net; module SSH error_class = OpenSSL::PKey::RSAError elsif data.match(/-----BEGIN EC PRIVATE KEY-----/) && defined?(OpenSSL::PKey::EC) key_type = OpenSSL::PKey::EC - error_class = OpenSSL::PKey::RCError + error_class = OpenSSL::PKey::ECError elsif data.match(/-----BEGIN (.+) PRIVATE KEY-----/) raise OpenSSL::PKey::PKeyError, "not a supported key type '#{$1}'" else diff --git a/lib/net/ssh/service/forward.rb b/lib/net/ssh/service/forward.rb index 4774f41..5e23e36 100644 --- a/lib/net/ssh/service/forward.rb +++ b/lib/net/ssh/service/forward.rb @@ -177,7 +177,7 @@ module Net; module SSH; module Service # time a session channel is opened, when the connection was created with # :forward_agent set to true: # - # Net::SSH.start("remote.host", "me", :forwrd_agent => true) do |ssh| + # Net::SSH.start("remote.host", "me", :forward_agent => true) do |ssh| # ssh.open_channel do |ch| # # agent will be automatically forwarded by this point # end diff --git a/net-ssh.gemspec b/net-ssh.gemspec index 22314b2..c3075e5 100644 --- a/net-ssh.gemspec +++ b/net-ssh.gemspec @@ -20,6 +20,9 @@ s.add_dependency 'jruby-pageant', ">=1.1.1" end + s.add_development_dependency 'test-unit' + s.add_development_dependency 'mocha' + s.executables = %w[] # = MANIFEST = diff --git a/test/common.rb b/test/common.rb index 4637cf0..c8ed15c 100644 --- a/test/common.rb +++ b/test/common.rb @@ -1,7 +1,8 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib" gem "test-unit" # http://rubyforge.org/pipermail/test-unit-tracker/2009-July/000075.html +gem 'mocha' require 'test/unit' -require 'mocha' +require 'mocha/setup' require 'net/ssh/buffer' require 'net/ssh/config' require 'net/ssh/loggable' |