Use Celluloid's "current" mode

Avoids breakage in backward compatibility: see https://github.com/celluloid/celluloid-pool/issues/14

Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sinatra', require: nil
+gem 'reel', github: 'celluloid/reel'

adhearsion.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'nokogiri', ["~> 1.5", ">= 1.5.6"]
   s.add_runtime_dependency 'pry'
   s.add_runtime_dependency 'rake'
-  s.add_runtime_dependency 'reel', ["~> 0.5.0"]
+  s.add_runtime_dependency 'reel', ["~> 0.6.0.pre5"]
   s.add_runtime_dependency 'reel-rack', ["~> 0.2.0"]
   s.add_runtime_dependency 'ruby_ami', ["~> 2.2"]
   s.add_runtime_dependency 'ruby_jid', ["~> 1.0"]

lib/adhearsion.rb

@@ -3,8 +3,8 @@
 abort "ERROR: You are running Adhearsion on an unsupported version of Ruby (Ruby #{RUBY_VERSION} #{RUBY_RELEASE_DATE})! Please upgrade to at least Ruby v2.2.0 or JRuby 9.0.0.0." if RUBY_VERSION < "2.2"
 
 %w(
+  celluloid/current
   adhearsion/rayo
-  celluloid
   active_support/inflector
 ).each { |r| require r }
 
@@ -71,7 +71,7 @@ def active_calls=(other)
     # @return [Adhearsion::Statistics] a statistics aggregator object capable of producing stats dumps
     def statistics
       unless Celluloid::Actor[:statistics]
-        Statistics.supervise_as :statistics
+        Statistics.supervise as: :statistics
         Statistics.setup_event_handlers
       end
       Celluloid::Actor[:statistics]

lib/adhearsion/http_server.rb

@@ -5,7 +5,9 @@
 
 module Adhearsion
   # @private
-  class HTTPServer
+  class HTTPServer < Reel::Rack::Server
+    include Celluloid::Internals::Logger
+
     def self.start
       config = Adhearsion.config.core.http
 
@@ -27,7 +29,7 @@ def self.start
 
       logger.info "Starting HTTP server listening on #{config.host}:#{config.port}"
 
-      supervisor = ::Reel::Rack::Server.supervise_as(:ahn_http_server, app, options)
+      supervisor = self.supervise(as: :ahn_http_server, args: [app, options])
 
       Adhearsion::Events.register_callback :shutdown do
         supervisor.terminate

lib/adhearsion/process.rb

@@ -82,14 +82,16 @@ def final_shutdown
         call.hangup
       end
 
+      Adhearsion::Events.register_callback :shutdown do
+        logger.info "Adhearsion shut down"
+      end
+
       # This should shut down any remaining threads.  Once those threads have
       # stopped, important_threads will be empty and the process will exit
       # normally.
-      Events.trigger_immediately :shutdown
+      Events.trigger :shutdown
 
       Console.stop
-
-      logger.info "Adhearsion shut down"
     end
 
     def stop_when_zero_calls