Organizing gemfiles for Travis.

Moving json dependency to gemspec

.travis.yml

@@ -1,10 +1,14 @@
 rvm:
-- 1.8.7
-- 1.9.2
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
 gemfile:
-- Gemfile
-- Rails2
-- Rails3
+  - gemfiles/Rails2
+  - gemfiles/Rails3
+  - gemfiles/Sinatra1.1
+  - gemfiles/Sinatra1.2
+  - gemfiles/Sinatra1.3
 env:
 notifications:
   email:

Rakefile

@@ -2,13 +2,13 @@ require "rake/testtask"
 
 spec = Gem::Specification.load(Dir["*.gemspec"].first)
 
-GEMFILE_MAP = {"Rails2" => "Rails 2.3", "Rails3" => "Rails 3.x", "Sinatra1.1" => "Sinatra 1.1", "Sinatra1.2" => "Sinatra 1.2", "Sinatra1.3" => "Sinatra 1.3"}
+GEMFILE_MAP = {"gemfiles/Rails2" => "Rails 2.3", "gemfiles/Rails3" => "Rails 3.x", "gemfiles/Sinatra1.1" => "Sinatra 1.1", "gemfiles/Sinatra1.2" => "Sinatra 1.2", "gemfiles/Sinatra1.3" => "Sinatra 1.3"}
 
 desc "Install dependencies"
 task :setup do
   GEMFILE_MAP.each do |gemfile, name|
     puts "Installing gems for testing with #{name} ..."
-    sh "env BUNDLE_GEMFILE=#{gemfile} bundle install"
+    sh "env BUNDLE_GEMFILE=#{File.dirname(__FILE__) + '/' + gemfile} bundle install"
   end
 end
 

Gemfile → gemfiles/Rails2

@@ -1,5 +1,7 @@
 source :rubygems
-gemspec
+gemspec :path=>"../"
+
+gem "rails", "~>2.3"
 
 group :development do
   gem "rake"

gemfiles/Rails3

@@ -0,0 +1,17 @@
+source :rubygems
+gemspec :path=>"../"
+
+gem "rails", "~>3.0"
+
+group :development do
+  gem "rake"
+  gem "thin"
+  gem "yard"
+end
+
+group :test do
+  gem "awesome_print"
+  gem "rack-test"
+  gem "shoulda"
+  gem "timecop"
+end

gemfiles/Sinatra1.1

@@ -0,0 +1,17 @@
+source :rubygems
+gemspec :path=>"../"
+
+gem "sinatra", "~>1.1.0"
+
+group :development do
+  gem "rake"
+  gem "thin"
+  gem "yard"
+end
+
+group :test do
+  gem "awesome_print"
+  gem "rack-test"
+  gem "shoulda"
+  gem "timecop"
+end

gemfiles/Sinatra1.2

@@ -0,0 +1,17 @@
+source :rubygems
+gemspec :path=>"../"
+
+gem "sinatra", "~>1.2.0"
+
+group :development do
+  gem "rake"
+  gem "thin"
+  gem "yard"
+end
+
+group :test do
+  gem "awesome_print"
+  gem "rack-test"
+  gem "shoulda"
+  gem "timecop"
+end

gemfiles/Sinatra1.3

@@ -0,0 +1,17 @@
+source :rubygems
+gemspec :path=>"../"
+
+gem "sinatra", "~>1.3.0"
+
+group :development do
+  gem "rake"
+  gem "thin"
+  gem "yard"
+end
+
+group :test do
+  gem "awesome_print"
+  gem "rack-test"
+  gem "shoulda"
+  gem "timecop"
+end

rack-oauth2-server.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mongo", "~>1"
   spec.add_dependency "bson_ext"
   spec.add_dependency "sinatra", "~>1.1"
+  spec.add_dependency "json"
 end