From 5d8c84827361ab7bfe7e2b7afac446f8017d3a02 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Wed, 22 Jul 2015 10:37:57 -0700
Subject: [PATCH] Update gems and requires

---
 Gemfile.lock        | 59 ++++++++++++++++++++++++++++++++++++++-------
 actioncable.gemspec |  6 ++---
 lib/action_cable.rb |  2 +-
 test/test_helper.rb |  2 ++
 4 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 822f27d5b1b..7a84c5fed5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,12 +4,12 @@ PATH
     actioncable (0.1.0)
       actionpack (>= 4.2.0)
       activesupport (>= 4.2.0)
-      celluloid (~> 0.16.0)
+      celluloid (~> 0.17.0)
       coffee-rails
       em-hiredis (~> 0.3.0)
-      faye-websocket (~> 0.9.2)
+      faye-websocket (~> 0.10.0)
       redis (~> 3.0)
-      websocket-driver (= 0.5.4)
+      websocket-driver (~> 0.6.1)
 
 GEM
   remote: https://rubygems.org/
@@ -34,7 +34,46 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     builder (3.2.2)
-    celluloid (0.16.0)
+    celluloid (0.17.0)
+      bundler
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (~> 4.0.0)
+    celluloid-essentials (0.20.1.1)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (~> 4.0.0)
+    celluloid-extras (0.20.0)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (~> 4.0.0)
+    celluloid-fsm (0.20.0)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (~> 4.0.0)
+    celluloid-pool (0.20.0)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
+      timers (~> 4.0.0)
+    celluloid-supervision (0.20.0)
+      bundler
+      dotenv
+      nenv
+      rspec-logsplit (>= 0.1.2)
       timers (~> 4.0.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -43,13 +82,14 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
+    dotenv (2.0.2)
     em-hiredis (0.3.0)
       eventmachine (~> 1.0)
       hiredis (~> 0.5.0)
     erubis (2.7.0)
     eventmachine (1.0.7)
     execjs (2.5.2)
-    faye-websocket (0.9.2)
+    faye-websocket (0.10.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hiredis (0.5.2)
@@ -63,11 +103,11 @@ GEM
     minitest (5.7.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
+    nenv (0.2.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    puma (2.10.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.6.0)
+    puma (2.12.2)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
@@ -85,13 +125,14 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     redis (3.2.1)
+    rspec-logsplit (0.1.3)
     thor (0.19.1)
     thread_safe (0.3.5)
     timers (4.0.1)
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    websocket-driver (0.5.4)
+    websocket-driver (0.6.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 
diff --git a/actioncable.gemspec b/actioncable.gemspec
index 509c5ca75a4..2d07d0d9ebe 100644
--- a/actioncable.gemspec
+++ b/actioncable.gemspec
@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport',    '>= 4.2.0'
   s.add_dependency 'actionpack',       '>= 4.2.0'
-  s.add_dependency 'faye-websocket',   '~> 0.9.2'
-  s.add_dependency 'websocket-driver', '= 0.5.4'
-  s.add_dependency 'celluloid',        '~> 0.16.0'
+  s.add_dependency 'faye-websocket',   '~> 0.10.0'
+  s.add_dependency 'websocket-driver', '~> 0.6.1'
+  s.add_dependency 'celluloid',        '~> 0.17.0'
   s.add_dependency 'em-hiredis',       '~> 0.3.0'
   s.add_dependency 'redis',            '~> 3.0'
   s.add_dependency 'coffee-rails'
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index 968adafc256..9ce63dae28c 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -11,7 +11,7 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/callbacks'
 
 require 'faye/websocket'
-require 'celluloid'
+require 'celluloid/current'
 require 'em-hiredis'
 require 'redis'
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 759ea185247..5640178f340 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,6 +10,8 @@ Bundler.require :default, :test
 require 'puma'
 require 'mocha/mini_test'
 
+require 'rack/mock'
+
 require 'action_cable'
 ActiveSupport.test_order = :sorted