From 3885fe9afc77a9864c747cb5427d4769e819ef13 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Wed, 10 Aug 2016 14:58:26 -0700
Subject: [PATCH] murder the json-jwt nightmare dependency

---
 Gemfile      |  9 +--------
 Gemfile.lock | 30 +++---------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 20d39d38..f9d91bfb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,14 +39,7 @@ gem 'simpleidn'
 gem 'gandi'
 gem 'hoe', '3.14.2', require: nil
 gem 'msgpack'
-gem 'json-jwt', {
-  git: 'https://github.com/neocities/json-jwt.git',
-  branch: 'drop_activesupport'
-}
-gem 'acme-client', {
-  git: 'https://github.com/jhass/acme-client.git',
-  branch: 'no_activesupport'
-}
+gem 'acme-client'
 gem 'http'
 gem 'htmlentities'
 gem 'rinku'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0fa7d2cf..b858543b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,8 @@
-GIT
-  remote: https://github.com/jhass/acme-client.git
-  revision: d0ced992bfe42908bb1fc25ac549ae3318386c97
-  branch: no_activesupport
-  specs:
-    acme-client (0.2.2)
-      faraday (~> 0.9, >= 0.9.1)
-      json-jwt (~> 1.2, >= 1.2.3)
-
-GIT
-  remote: https://github.com/neocities/json-jwt.git
-  revision: 00d9c3d34e6bfbab866a4a0405897182a4ed3833
-  branch: drop_activesupport
-  specs:
-    json-jwt (1.5.2)
-      bindata
-      hashery (~> 2.0)
-      multi_json (>= 1.3)
-      securecompare
-      url_safe_base64
-
 GEM
   remote: https://rubygems.org/
   specs:
+    acme-client (0.4.0)
+      faraday (~> 0.9, >= 0.9.1)
     activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -35,7 +16,6 @@ GEM
     ansi (1.5.0)
     base32 (0.3.2)
     bcrypt (3.1.11)
-    bindata (2.3.1)
     blankslate (3.1.3)
     builder (3.2.2)
     byebug (8.2.4)
@@ -91,7 +71,6 @@ GEM
       hashie
     geoip (1.6.1)
     hashdiff (0.3.0)
-    hashery (2.1.2)
     hashie (3.4.3)
     highline (1.7.8)
     hiredis (0.6.1)
@@ -201,7 +180,6 @@ GEM
     scrypt (2.1.1)
       ffi-compiler (>= 0.0.2)
       rake
-    securecompare (1.0.0)
     sequel (4.8.0)
     sequel_pg (1.6.16)
       pg (>= 0.8.0)
@@ -252,7 +230,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    url_safe_base64 (0.2.2)
     uuidtools (2.1.5)
     webmock (1.24.2)
       addressable (>= 2.3.6)
@@ -270,7 +247,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  acme-client!
+  acme-client
   addressable
   ago
   base32
@@ -295,7 +272,6 @@ DEPENDENCIES
   jdbc-postgres
   jruby-openssl
   json
-  json-jwt!
   m
   magic
   mail