Merge pull request #272 from basho/features/lrb/travis-ci-updates

Travis CI updates

.travis.yml

@@ -1,31 +1,10 @@
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-18mode
-  - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
-services:
-  - riak
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby
 bundler_args: --without=guard
-before_script:
-  - "curl http://apt.basho.com/gpg/basho.apt.key | sudo apt-key add -"
-  - 'sudo bash -c "echo deb http://apt.basho.com $(lsb_release -sc) main > /etc/apt/sources.list.d/basho.list"'
-  - "sudo apt-get update"
-  - "yes n | sudo apt-get install riak"
-  - "sudo service riak start"
-  - ! 'echo "root: .riaktest" > spec/support/test_server.yml'
-  - ! 'echo "source: /usr/sbin" >> spec/support/test_server.yml'
-  - "ulimit -n 2048"
 notifications:
   webhooks: http://basho-engbot.herokuapp.com/travis?key=d9ab1d53db09fc1760d7a5dde3246201522ca2c7
-  email: sean@basho.com
+  email: clients@basho.com

README.md

@@ -667,6 +667,7 @@ Thank you to all of our contributors!
 * [Eric Cestari](https://github.com/cstar)
 * [Eric Redmond](https://github.com/coderoshi)
 * [Hidekazu Tanaka](https://github.com/holidayworking)
+* [Hiroyasu Ohyama](https://github.com/userlocalhost2000)
 * [Jace](https://github.com/jace)
 * [Jack Dempsey](https://github.com/jackdempsey)
 * Jay Adkisson

Rakefile

@@ -82,9 +82,9 @@ namespace :spec do
   end
 end
 
-desc "Run All Specs (including slow specs, excluding time_series)"
+desc "Run Unit Test Specs (excluding slow, integration and time_series)"
 RSpec::Core::RakeTask.new(:ci) do |spec|
-  spec.rspec_opts = %w[--profile --tag '~time_series']
+  spec.rspec_opts = %w[--profile --tag '~slow' --tag '~integration' --tag '~time_series']
 end
 task :default => :ci