diff options
| author | Miklós Fazekas <mfazekas@szemafor.com> | 2016-05-16 08:15:43 +0200 |
|---|---|---|
| committer | Miklós Fazekas <mfazekas@szemafor.com> | 2016-05-16 08:15:43 +0200 |
| commit | 18678f4b188e8e99f8e06539d5d2e1e79d840632 (patch) | |
| tree | 01417ba8be3b2f04bbe6f81e8ad3d7a120e58bc9 | |
| parent | 74d7da59546748882641975933b7367e82890792 (diff) | |
| parent | a88c8a0c36c86024b454461d48608a7ef1df40cd (diff) | |
| download | net-ssh-18678f4b188e8e99f8e06539d5d2e1e79d840632.tar.gz | |
Merge pull request #372 from mfazekas/fix-ci
Fix rbnacl-libsodium issue on windows, fix CI
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | lib/net/ssh/authentication/ed25519.rb | 2 | ||||
| -rw-r--r-- | lib/net/ssh/key_factory.rb | 2 | ||||
| -rw-r--r-- | net-ssh.gemspec | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 5b6ac9d..d4c88b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ install: - sudo pip install ansible - gem install bundler -v "= 1.11.2" - bundle _1.11.2_ install + - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.11.2_ install - sudo ansible-galaxy install rvm_io.rvm1-ruby - ansible-playbook ./test/integration/playbook.yml -i "localhost," --become -c local -e 'no_rvm=true' -e 'myuser=travis' -e 'mygroup=travis' -e 'homedir=/home/travis' diff --git a/lib/net/ssh/authentication/ed25519.rb b/lib/net/ssh/authentication/ed25519.rb index 10fae6e..7dce81c 100644 --- a/lib/net/ssh/authentication/ed25519.rb +++ b/lib/net/ssh/authentication/ed25519.rb @@ -1,5 +1,5 @@ gem 'rbnacl-libsodium', '~> 1.0.10' -gem 'rbnacl', '~> 3.3.0' +gem 'rbnacl', '~> 3.4.0' gem 'bcrypt_pbkdf', '~> 1.0.0.alpha1' unless RUBY_PLATFORM == "java" require 'rbnacl/libsodium' diff --git a/lib/net/ssh/key_factory.rb b/lib/net/ssh/key_factory.rb index 84c2b09..60f1dc8 100644 --- a/lib/net/ssh/key_factory.rb +++ b/lib/net/ssh/key_factory.rb @@ -3,7 +3,7 @@ require 'net/ssh/prompt' begin require 'net/ssh/authentication/ed25519' -rescue Gem::LoadError => e # rubocop:disable Lint/HandleExceptions +rescue LoadError => e # rubocop:disable Lint/HandleExceptions end module Net; module SSH diff --git a/net-ssh.gemspec b/net-ssh.gemspec index a6e54b8..d6b163f 100644 --- a/net-ssh.gemspec +++ b/net-ssh.gemspec @@ -29,9 +29,9 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] unless ENV['NET_SSH_NO_RBNACL'] - spec.add_development_dependency("rbnacl-libsodium", ">= 1.0.2") - spec.add_development_dependency("rbnacl", ">= 3.1.2") - spec.add_development_dependency("bcrypt_pbkdf", "= 1.0.0.alpha1") unless RUBY_PLATFORM == "java" + spec.add_development_dependency("rbnacl-libsodium", "~> 1.0.10") + spec.add_development_dependency("rbnacl", "~> 3.4.0") + spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0.0.alpha1") unless RUBY_PLATFORM == "java" end spec.add_development_dependency "bundler", "~> 1.11.2" |