Merge 60a8f2b into 02308ca

RubyCrypto · Sep 27, 2014 · 1c758d2 · 1c758d2
2 parents 02308ca + 60a8f2b
commit 1c758d2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-script: "LD_LIBRARY_PATH=lib bundle exec rake ci"
+script: bundle exec rake ci
 
 rvm:
   - 1.9.3

diff --git a/Gemfile b/Gemfile
@@ -8,5 +8,6 @@ group :development do
 end
 
 group :test do
-  gem 'coveralls', :require => false
+  gem 'coveralls', require: false
+  gem 'rbnacl-libsodium'
 end
diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,6 @@
-require "bundler/gem_tasks"
-Dir[File.expand_path("../tasks/**/*.rake", __FILE__)].each { |task| load task }
-require File.expand_path("../lib/rbnacl/rake_tasks", __FILE__)
+require 'bundler/gem_tasks'
 
-task :default => %w(spec rubocop)
+Dir[File.expand_path('../tasks/**/*.rake', __FILE__)].each { |task| load task }
+
+task default: %w(spec rubocop)
+task ci: :spec
diff --git a/lib/rbnacl/rake_tasks.rb b/lib/rbnacl/rake_tasks.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,7 +7,7 @@
 $RBNACL_SELF_TEST = false
 
 require 'bundler/setup'
-require 'rbnacl'
+require 'rbnacl/libsodium'
 require 'shared/box'
 require 'shared/authenticator'
 require 'shared/key_equality'

diff --git a/tasks/ci.rake b/tasks/ci.rake