Merge pull request #4 from mixi-inc/supported-versions

Change supported versions to avoid dependency hell

.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Gemfile.187.lock
 InstalledFiles
 _yardoc
 coverage
@@ -14,4 +15,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp
+vendor

.travis.yml

@@ -1,6 +1,21 @@
+sudo: false
+bundler_args: --without development
+before_install: gem install bundler
+cache: bundler
+language: ruby
+script:
+  - bundle exec rake
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
   - ruby-head
-  - jruby
+  - jruby
+matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: Gemfile.187
+allow_failure:
+  - rvm: ruby-head

Gemfile

@@ -4,10 +4,17 @@ gem 'rake'
 # Specify your gem's dependencies in omniauth-mixi.gemspec
 gemspec
 
-group :development, :test do
+group :development do
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-bundler'
   gem 'rb-fsevent'
   gem 'growl'
+end
+
+group :test do
+  gem 'rspec', '~> 2.7'
+  gem 'rack-test'
+  gem 'simplecov'
+  gem 'webmock'
 end

Gemfile.187

@@ -0,0 +1,23 @@
+source 'http://rubygems.org'
+
+gem 'addressable', '< 2.4.0'
+gem 'jwt', '< 1.5.1'
+
+gem 'rake'
+# Specify your gem's dependencies in omniauth-mixi.gemspec
+gemspec
+
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+  gem 'rb-fsevent'
+  gem 'growl'
+end
+
+group :test do
+  gem 'rspec', '~> 2.7'
+  gem 'rack-test'
+  gem 'simplecov'
+  gem 'webmock'
+end

README.md

@@ -103,7 +103,7 @@ And, open http://localhost:9292/ in your browser, then you will see the authenti
 
 ## Supported Rubies
 
-OmniAuth mixi is tested under 1.8.7, 1.9.2, 1.9.3 and JRuby.
+OmniAuth mixi is tested under 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1, 2.2 and JRuby.
 
 [![CI Build
 Status](https://secure.travis-ci.org/mixi-inc/omniauth-mixi.png)](http://travis-ci.org/mixi-inc/omniauth-mixi)
@@ -117,4 +117,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

omniauth-mixi.gemspec

@@ -17,8 +17,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'omniauth', '~> 1.0'
   gem.add_dependency 'omniauth-oauth2', '~> 1.1'
-  gem.add_development_dependency 'rspec', '~> 2.7'
-  gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'webmock'
-end
+end

spec/spec_helper.rb

@@ -1,8 +1,10 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-require 'simplecov'
-SimpleCov.start
+if RUBY_VERSION >= '1.9.0'
+  require 'simplecov'
+  SimpleCov.start
+end
 
 require 'rspec'
 require 'rack/test'