From 488f2578218fa76321f1937ede8f27c1aae779dc Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 10 Mar 2014 15:27:37 -0400
Subject: [PATCH 1/5] Use RAILS_VERSION on Gemfile

---
 Gemfile        |  9 ++++++++-
 Gemfile.edge   | 20 --------------------
 Gemfile.rails3 | 19 -------------------
 3 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 Gemfile.edge
 delete mode 100644 Gemfile.rails3

diff --git a/Gemfile b/Gemfile
index a5b2c5f7..3508efa2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,4 +17,11 @@ platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
-gem 'rails', '~> 4.0.0'
+version = ENV["RAILS_VERSION"] || "4.0.2"
+rails = case version
+        when "master"
+          {:github => "rails/rails"}
+        else
+          "~> #{version}"
+        end
+gem "rails", rails
diff --git a/Gemfile.edge b/Gemfile.edge
deleted file mode 100644
index 684de332..00000000
--- a/Gemfile.edge
+++ /dev/null
@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
-  gem 'sqlite3', '1.3.8'
-end
-
-platforms :mri do
-  gem 'coveralls', require: false
-  gem 'simplecov', require: false
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-# Use Rails master + current dependencies
-gem 'rails', github: 'rails/rails'
-gem 'arel', github: 'rails/arel'
diff --git a/Gemfile.rails3 b/Gemfile.rails3
deleted file mode 100644
index ac98e974..00000000
--- a/Gemfile.rails3
+++ /dev/null
@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
-  gem 'sqlite3', '1.3.8'
-end
-
-platforms :mri do
-  gem 'coveralls', require: false
-  gem 'simplecov', require: false
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-gem 'minitest', '~> 4.0'
-gem 'rails', '~> 3.2'

From 1e952ea7026a1de16d1b9525049df4b88e2c3bc4 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 10 Mar 2014 15:28:29 -0400
Subject: [PATCH 2/5] Use new ENV on travis

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 913fe9d9..ff830efa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ rvm:
   - ruby-head
   - jruby
   - rbx-2
-gemfile:
-  - Gemfile
-  - Gemfile.rails3
-  - Gemfile.edge
+env:
+  - "RAILS_VERSION=3.2.17"
+  - "RAILS_VERSION=4.0.3"
+  - "RAILS_VERSION=master"
 matrix:
   allow_failures:
     - rvm: ruby-head

From 9f7f267c8fb8c099fd317777ce48029792a87c68 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 10 Mar 2014 15:28:46 -0400
Subject: [PATCH 3/5] Test against ruby 2.1.1

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ff830efa..0a86b60e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - ruby-head
   - jruby
   - rbx-2

From a19e95c83ce6b31715fa88c5b1059a7fcb7aa570 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 10 Mar 2014 15:30:06 -0400
Subject: [PATCH 4/5] test on rails 4.1

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 0a86b60e..46764748 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ rvm:
 env:
   - "RAILS_VERSION=3.2.17"
   - "RAILS_VERSION=4.0.3"
+  - "RAILS_VERSION=4.1.0.rc1"
   - "RAILS_VERSION=master"
 matrix:
   allow_failures:

From c8d0a5408b1d9939787d28235447648a40a415b5 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 10 Mar 2014 20:00:49 -0400
Subject: [PATCH 5/5] Use minitest 4.7.x on rails 3.2

---
 Gemfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 3508efa2..e71acd3d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,3 +25,7 @@ rails = case version
           "~> #{version}"
         end
 gem "rails", rails
+
+if version < "4"
+  gem "minitest", "~> 4.7.5"
+end