From d23e168146702f1f3188afdd6c62fa6285456140 Mon Sep 17 00:00:00 2001
From: Andrew Cantino <cantino@gmail.com>
Date: Sat, 2 May 2015 13:47:12 -0700
Subject: [PATCH] update twitter and twitter-stream for the secuity issue in
 the http gem

---
 Gemfile      |  4 ++--
 Gemfile.lock | 28 +++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8f2ac282f9..dd1e75cf44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,8 +19,8 @@ gem 'hypdf', '~> 1.0.7'           # PDFInfoAgent
 gem "google-api-client", require: 'google/api_client'
 
 # Twitter Agents
-gem 'twitter', '~> 5.8.0' # Must to be loaded before cantino-twitter-stream.
-gem 'twitter-stream', github: 'dsander/twitter-stream', branch: 'huginn'
+gem 'twitter', '~> 5.14.0' # Must to be loaded before cantino-twitter-stream.
+gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'huginn'
 gem 'omniauth-twitter'
 
 # Tumblr Agents
diff --git a/Gemfile.lock b/Gemfile.lock
index 434f489aa0..adf62394ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
-  remote: git://github.com/dsander/twitter-stream.git
-  revision: 1713b4fe5b387580364b39716bb5c26d6601c50f
+  remote: git://github.com/cantino/twitter-stream.git
+  revision: f7e7edb0bae013bffabf3598e7147773d9fd370f
   branch: huginn
   specs:
     twitter-stream (0.1.15)
       eventmachine (~> 1.0.7)
       http_parser.rb (~> 0.6.0)
-      simple_oauth (~> 0.2.0)
+      simple_oauth (~> 0.3.0)
 
 GIT
   remote: git://github.com/wunderlist/omniauth-wunderlist.git
@@ -56,7 +56,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
+    addressable (2.3.8)
     arel (6.0.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
@@ -131,7 +131,7 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    equalizer (0.0.9)
+    equalizer (0.0.11)
     erector (0.10.0)
       treetop (>= 1.2.3)
     erubis (2.7.0)
@@ -199,8 +199,8 @@ GEM
     httmultiparty (0.3.10)
       httparty (>= 0.7.3)
       multipart-post
-    http (0.5.1)
-      http_parser.rb
+    http (0.6.4)
+      http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
     httparty (0.13.1)
       json (~> 1.8)
@@ -238,7 +238,7 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mini_portile (0.6.2)
     minitest (5.5.1)
     mqtt (0.3.1)
@@ -327,8 +327,6 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.2.0)
-      json (~> 1.4)
     ref (1.0.5)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
@@ -389,7 +387,7 @@ GEM
       jwt (>= 0.1.5)
       multi_json (>= 1.0.0)
     simple-rss (1.3.1)
-    simple_oauth (0.2.0)
+    simple_oauth (0.3.1)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -437,17 +435,17 @@ GEM
       builder (>= 2.1.2)
       jwt (>= 0.1.2)
       multi_json (>= 1.3.0)
-    twitter (5.8.0)
+    twitter (5.14.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.9)
       faraday (~> 0.9.0)
-      http (~> 0.5.0)
+      http (~> 0.6.0)
       http_parser.rb (~> 0.6.0)
       json (~> 1.8)
       memoizable (~> 0.4.0)
       naught (~> 1.0)
-      simple_oauth (~> 0.2.0)
+      simple_oauth (~> 0.3.0)
     typhoeus (0.6.9)
       ethon (>= 0.7.1)
     tzinfo (1.2.2)
@@ -559,7 +557,7 @@ DEPENDENCIES
   therubyracer (~> 0.12.1)
   tumblr_client
   twilio-ruby (~> 3.11.5)
-  twitter (~> 5.8.0)
+  twitter (~> 5.14.0)
   twitter-stream!
   typhoeus (~> 0.6.3)
   tzinfo (>= 1.2.0)