From a76d4400673487dcac4d90bb108cdc5d16d8e1c0 Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian@adrianshort.org>
Date: Sun, 4 Mar 2018 18:27:49 +0000
Subject: [PATCH] Upgrade to ruby 2.3.1 and newer gems

---
 .ruby-version |  2 +-
 Gemfile       |  3 +--
 Gemfile.lock  | 71 ++++++++++++++++++++++++++++-----------------------
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 67b8bc0..c1026d2 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-1.9.3
+ruby-2.3.1
diff --git a/Gemfile b/Gemfile
index b59757f..124c28f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org/"
-ruby "1.9.3"
+ruby "2.3.1"
 
 gem 'sinatra'
 gem 'haml'
@@ -11,7 +11,6 @@ gem 'rack-flash3'
 
 group :development do
   gem 'shotgun'
-  gem 'taps'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0537a93..e167eed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.2.8)
-    bcrypt-ruby (3.0.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    bcrypt (3.1.11)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
     data_mapper (1.2.0)
       dm-aggregates (~> 1.2.0)
       dm-constraints (~> 1.2.0)
@@ -13,14 +16,14 @@ GEM
       dm-transactions (~> 1.2.0)
       dm-types (~> 1.2.0)
       dm-validations (~> 1.2.0)
-    data_objects (0.10.12)
+    data_objects (0.10.17)
       addressable (~> 2.1)
     dm-aggregates (1.2.0)
       dm-core (~> 1.2.0)
     dm-constraints (1.2.0)
       dm-core (~> 1.2.0)
-    dm-core (1.2.0)
-      addressable (~> 2.2.6)
+    dm-core (1.2.1)
+      addressable (~> 2.3)
     dm-do-adapter (1.2.0)
       data_objects (~> 0.10.6)
       dm-core (~> 1.2.0)
@@ -49,40 +52,39 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_postgres (0.10.12)
-      data_objects (= 0.10.12)
+    do_postgres (0.10.17)
+      data_objects (= 0.10.17)
     fastercsv (1.5.5)
-    haml (4.0.2)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    json (1.8.0)
-    json_pure (1.8.0)
-    kgio (2.9.2)
-    mime-types (1.23)
-    multi_json (1.7.3)
-    pg (0.15.1)
-    rack (1.5.2)
+    json (1.8.6)
+    json_pure (1.8.6)
+    kgio (2.11.2)
+    multi_json (1.13.1)
+    mustermann (1.0.2)
+    pg (1.0.0)
+    public_suffix (3.0.2)
+    rack (2.0.4)
     rack-flash3 (1.0.5)
       rack
-    raindrops (0.13.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    sequel (3.20.0)
-    shotgun (0.9)
-      rack (>= 1.0)
-    sinatra (1.0)
+    rack-protection (2.0.1)
+      rack
+    raindrops (0.19.0)
+    shotgun (0.9.2)
       rack (>= 1.0)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
     stringex (1.5.1)
-    taps (0.3.24)
-      rack (>= 1.0.1)
-      rest-client (>= 1.4.0, < 1.7.0)
-      sequel (~> 3.20.0)
-      sinatra (~> 1.0.0)
-    tilt (1.4.1)
-    unicorn (4.8.2)
+    temple (0.8.0)
+    tilt (2.0.8)
+    unicorn (5.4.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    uuidtools (2.1.4)
+    uuidtools (2.1.5)
 
 PLATFORMS
   ruby
@@ -95,5 +97,10 @@ DEPENDENCIES
   rack-flash3
   shotgun
   sinatra
-  taps
   unicorn
+
+RUBY VERSION
+   ruby 2.3.1p112
+
+BUNDLED WITH
+   1.16.1