From 8f0106b1903d9a27cea0bf6a81d3e38ddf6adbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Wed, 24 Sep 2014 13:24:44 +0200
Subject: [PATCH 1/2] Update Sinatra to 1.4.5

Also update backports package, its current version is causing issues on
Ruby 2.1.3
---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 033ea19..f8eef12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "sinatra"
+gem "sinatra", '~> 1.4'
 gem "sinatra-contrib"
 gem "activesupport", '~> 3.2'
 gem "riak-client", :github => "5apps/riak-ruby-client", :branch => "invalid_uri_error"
diff --git a/Gemfile.lock b/Gemfile.lock
index c3a49fa..e9c498b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,7 +16,7 @@ GEM
     activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    backports (3.3.0)
+    backports (3.6.1)
     beefcake (0.3.7)
     builder (3.2.2)
     eventmachine (1.0.3)
@@ -49,7 +49,7 @@ GEM
     purdytest (1.0.0)
       minitest (~> 2.2)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -60,7 +60,7 @@ GEM
     raindrops (0.13.0)
     rake (0.9.2.2)
     ruby-hmac (0.4.0)
-    sinatra (1.4.3)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -88,5 +88,5 @@ DEPENDENCIES
   rainbows
   rake
   riak-client!
-  sinatra
+  sinatra (~> 1.4)
   sinatra-contrib

From 2f5ca36a70c2d5ad6a9a1cd8aaae6cc5061a905a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Wed, 24 Sep 2014 13:33:50 +0200
Subject: [PATCH 2/2] Run specs on Travis on Ruby 2.1.3 as well as 1.9.3

Also use bundler to run the specs
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 21c69ec..e60edf3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.1.3
 before_install:
   - sh .travis/install_riakcs.sh
 before_script:
   - cp config.yml.example config.yml
-script: rake test
+script: bundle exec rake test
 branches:
   only:
     - master