From 3f08b7dae5e563ecd44711acdc929097957ba95d Mon Sep 17 00:00:00 2001
From: Zachary Scott <zachary@zacharyscott.net>
Date: Wed, 7 Aug 2013 15:05:58 -0400
Subject: [PATCH] Test against sinatra 1.4, move sinatra -> sinatra_13

---
 .travis.yml                                      |  3 ++-
 Rakefile                                         |  4 ++--
 gemfiles/{sinatra.gemfile => sinatra_13.gemfile} |  0
 gemfiles/sinatra_14.gemfile                      | 13 +++++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)
 rename gemfiles/{sinatra.gemfile => sinatra_13.gemfile} (100%)
 create mode 100644 gemfiles/sinatra_14.gemfile

diff --git a/.travis.yml b/.travis.yml
index 1114efd..20b8330 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,4 +14,5 @@ gemfile:
   - gemfiles/data_mapper_12.gemfile
   - gemfiles/mongo_mapper.gemfile
   - gemfiles/mongoid_30.gemfile
-  - gemfiles/sinatra.gemfile
+  - gemfiles/sinatra_13.gemfile
+  - gemfiles/sinatra_14.gemfile
diff --git a/Rakefile b/Rakefile
index fa04024..7b477f6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_30 mongoid_24 mongo_mapper sinatra).each do |gemfile|
+  %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -23,7 +23,7 @@ namespace :spec do
 
   desc "Run Tests against all ORMs"
   task :all do
-    %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_30 mongoid_24 mongo_mapper sinatra).each do |gemfile|
+    %w(active_record_edge active_record_40 active_record_32 active_record_31 active_record_30 data_mapper_12 mongoid_30 mongoid_24 mongo_mapper sinatra_13 sinatra_14).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end
diff --git a/gemfiles/sinatra.gemfile b/gemfiles/sinatra_13.gemfile
similarity index 100%
rename from gemfiles/sinatra.gemfile
rename to gemfiles/sinatra_13.gemfile
diff --git a/gemfiles/sinatra_14.gemfile b/gemfiles/sinatra_14.gemfile
new file mode 100644
index 0000000..32f32c6
--- /dev/null
+++ b/gemfiles/sinatra_14.gemfile
@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.0', :require => 'active_record'
+gem 'sinatra', '~> 1.4.0'
+gem 'tilt', '~> 1.3.0'
+gem 'padrino-helpers', '~> 0.11.3'
+gem 'rack-test', '>= 0'
+gem 'sinatra-contrib', '~> 1.4.0'
+gem 'nokogiri'
+gem 'xpath'
+gem 'mime-types'
+
+gemspec :path => '../'