From 1911f578d06962d870ba294b65b7fb17db98b26e Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 5 Jul 2016 08:29:46 -0400
Subject: [PATCH 1/3] Ensure json/pure is loaded before json is

Also, add `json_pure` as a development dependency.
---
 dpl.gemspec         | 5 ++++-
 lib/dpl/provider.rb | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dpl.gemspec b/dpl.gemspec
index e1f289098..f650dec57 100644
--- a/dpl.gemspec
+++ b/dpl.gemspec
@@ -16,10 +16,13 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
   s.required_ruby_version = '>= 1.9.3'
 
+  json_version = '1.8.1'
+
   s.add_development_dependency 'rspec', '~> 3.0.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'json', '1.8.1'
+  s.add_development_dependency 'json', json_version
+  s.add_development_dependency 'json_pure', json_version
   s.add_development_dependency 'coveralls'
 
 
diff --git a/lib/dpl/provider.rb b/lib/dpl/provider.rb
index aee24e8ff..8805ce031 100644
--- a/lib/dpl/provider.rb
+++ b/lib/dpl/provider.rb
@@ -1,6 +1,7 @@
 require 'dpl/error'
 require 'dpl/version'
 require 'fileutils'
+require 'json/pure'
 
 module DPL
   class Provider

From e7563e4b2fb34e9494e1a1e1ada452f2d3cf497b Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 5 Jul 2016 08:39:55 -0400
Subject: [PATCH 2/3] Relax version requirement on json_pure

`af` requires '< 1.7.0, >= 1.5.1'
---
 dpl.gemspec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dpl.gemspec b/dpl.gemspec
index f650dec57..f32bc82d1 100644
--- a/dpl.gemspec
+++ b/dpl.gemspec
@@ -16,13 +16,11 @@ Gem::Specification.new do |s|
   s.require_path          = 'lib'
   s.required_ruby_version = '>= 1.9.3'
 
-  json_version = '1.8.1'
-
   s.add_development_dependency 'rspec', '~> 3.0.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'json', json_version
-  s.add_development_dependency 'json_pure', json_version
+  s.add_development_dependency 'json', '1.8.1'
+  s.add_development_dependency 'json_pure'
   s.add_development_dependency 'coveralls'
 
 

From 88406110403d4a183ee3ea030a26808ecdb48bce Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Sun, 3 Jul 2016 23:45:05 -0400
Subject: [PATCH 3/3] Pin rubyzip to 1.1 and up

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

diff --git a/Gemfile b/Gemfile
index 51e46e8d9..bc7c54aa8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ end
 
 group :lambda do
   gem 'aws-sdk', '>= 2.0.18.pre'
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
 end
 
 group :cloud_files do
@@ -57,7 +57,7 @@ group :gcs do
 end
 
 group :elastic_beanstalk do
-  gem 'rubyzip'
+  gem 'rubyzip', '~> 1.1'
   gem 'aws-sdk-v1'
 end