adhearsion 2.0.0.rc1 → 2.0.0.rc2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.0.0.rc2](https://github.com/adhearsion/adhearsion/compare/v2.0.0.rc1...v2.0.0.rc2) - [2012-03-22](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc2)
+  * Bugfix: Exceptions raised in call event handlers no longer kill the call actor
+  * Bugfix: More exceptions handled internally by Adhearsion are logged in an appropriate context
+  * Bugfix/Change: `Adhearsion::Calls` (`Adhearsion.active_calls`) is now an actor for better thread-safety, and mirrors the Hash API more closely.
+  * Bugfix: Calls are now removed from the active call collection and hung up if their actor dies
+  * Bugfix: SimonGame now works using the new `CallController#ask` api
+
 # [2.0.0.rc1](https://github.com/adhearsion/adhearsion/compare/v2.0.0.beta1...v2.0.0.rc1) - [2012-03-20](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc1)
   * Change: `CallController#join` now blocks until a corresponding unjoined event is received
   * Change: `CallController#speak` is now `CallController#say`

data/adhearsion.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Runtime dependencies
   s.add_runtime_dependency 'bundler', [">= 1.0.10"]
-  s.add_runtime_dependency 'punchblock', [">= 0.9.1"]
+  s.add_runtime_dependency 'punchblock', [">= 0.10.0"]
   s.add_runtime_dependency 'logging', [">= 1.6.1"]
   s.add_runtime_dependency 'adhearsion-loquacious', [">= 1.9.0"]
   s.add_runtime_dependency 'activesupport', [">= 3.0.10"]

data/lib/adhearsion.rb

@@ -24,6 +24,8 @@ abort "ERROR: You are running Adhearsion on an unsupported version of Ruby (Ruby
 module Adhearsion
   extend ActiveSupport::Autoload
 
+  Error = Class.new StandardError
+
   autoload :Process
   autoload :Call
   autoload :CallController
@@ -79,7 +81,11 @@ module Adhearsion
     end
 
     def active_calls
-      @calls ||= Calls.new
+      if @calls && @calls.alive?
+        @calls
+      else
+        @calls = Calls.new
+      end
     end
 
     def status

data/lib/adhearsion/call.rb

@@ -8,9 +8,9 @@ module Adhearsion
   #
   class Call
 
-    Hangup          = Class.new StandardError
+    Hangup          = Class.new Adhearsion::Error
+    CommandTimeout  = Class.new Adhearsion::Error
     ExpiredError    = Class.new Celluloid::DeadActorError
-    CommandTimeout  = Class.new StandardError
 
     include Celluloid
     include HasGuardedHandlers
@@ -72,7 +72,7 @@ module Adhearsion
 
     def deliver_message(message)
       logger.debug "Receiving message: #{message.inspect}"
-      trigger_handler :event, message
+      catching_standard_errors { trigger_handler :event, message }
     end
 
     alias << deliver_message

data/lib/adhearsion/call_controller.rb

@@ -113,7 +113,7 @@ module Adhearsion
       yield component if block_given?
 
       complete_event = component.complete_event
-      raise StandardError, [complete_event.reason.details, component.inspect].join(": ") if complete_event.reason.is_a? Punchblock::Event::Complete::Error
+      raise Adhearsion::Error, [complete_event.reason.details, component.inspect].join(": ") if complete_event.reason.is_a? Punchblock::Event::Complete::Error
       component
     end
 

data/lib/adhearsion/call_controller/output.rb

@@ -3,7 +3,7 @@
 module Adhearsion
   class CallController
     module Output
-      PlaybackError = Class.new StandardError # Represents failure to play audio, such as when the sound file cannot be found
+      PlaybackError = Class.new Adhearsion::Error # Represents failure to play audio, such as when the sound file cannot be found
 
       def say(text, options = {})
         play_ssml(text, options) || output(:text, text.to_s, options)

data/lib/adhearsion/calls.rb

@@ -1,17 +1,12 @@
 # encoding: utf-8
 
-require 'thread'
-
 module Adhearsion
   ##
   # This manages the list of calls the Adhearsion service receives
-  class Calls
-    attr_reader :semaphore, :calls
+  class Calls < Hash
+    include Celluloid
 
-    def initialize
-      @semaphore = Monitor.new
-      @calls     = {}
-    end
+    trap_exit :call_died
 
     def from_offer(offer)
       Call.new(offer).tap do |call|
@@ -20,63 +15,45 @@ module Adhearsion
     end
 
     def <<(call)
-      atomically do
-        calls[call.id] = call
-      end
-      self
-    end
-
-    def any?
-      atomically { !calls.empty? }
+      link call
+      self[call.id] = call
+      current_actor
     end
 
     def remove_inactive_call(call)
-      atomically { calls.delete call.id }
-    end
-
-    # Searches all active calls by their id
-    def find(id)
-      atomically { calls[id] }
-    end
-    alias :[] :find
-
-    def clear!
-      atomically { calls.clear }
+      if call_is_dead?(call) != nil
+        call_id = key call
+        delete call_id if call_id
+      elsif call.respond_to?(:id)
+        delete call.id
+      else
+        delete call
+      end
     end
 
     def with_tag(tag)
-      atomically do
-        calls.inject([]) do |calls_with_tag,(_,call)|
-          call.tagged_with?(tag) ? calls_with_tag << call : calls_with_tag
-        end
+      find_all do |call|
+        call.tagged_with? tag
       end
     end
 
     def each(&block)
-      atomically { calls.values.each(&block) }
-    end
-
-    def each_pair
-      calls.each_pair { |id, call| yield id, call }
-    end
-
-    def to_a
-      calls.values
-    end
-
-    def to_h
-      calls
-    end
-
-    def method_missing(m, *args)
-      atomically { calls.send m.to_sym, *args }
+      values.each(&block)
     end
 
     private
 
-    def atomically(&block)
-      semaphore.synchronize(&block)
+    def call_is_dead?(call)
+      !call.alive?
+    rescue NoMethodError
     end
 
+    def call_died(call, reason)
+      catching_standard_errors do
+        call_id = key call
+        remove_inactive_call call
+        PunchblockPlugin.client.execute_command Punchblock::Command::Hangup, :async => true, :call_id => call_id
+      end
+    end
   end
 end

data/lib/adhearsion/configuration.rb

@@ -3,7 +3,7 @@
 module Adhearsion
   class Configuration
 
-    ConfigurationError = Class.new StandardError # Error raised while trying to configure a non existent plugin
+    ConfigurationError = Class.new Adhearsion::Error # Error raised while trying to configure a non existent plugin
 
     ##
     # Initialize the configuration object
@@ -45,7 +45,8 @@ module Adhearsion
             Supported levels (in increasing severity) -- :trace < :debug < :info < :warn < :error < :fatal
           __
           outputters ["log/adhearsion.log"], :transform => Proc.new { |val| Array(val) }, :desc => <<-__
-            An array of log outputters to use. The default is to log to stdout and log/adhearsion.log
+            An array of log outputters to use. The default is to log to stdout and log/adhearsion.log.
+            Each item must be either a string to use as a filename, or a valid Logging appender (see http://github.com/TwP/logging)
           __
           formatter nil, :desc => <<-__
             A log formatter to apply to all active outputters. If nil, the Adhearsion default formatter will be used.

data/lib/adhearsion/foundation/exception_handler.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 class Object
-  def catching_standard_errors(&block)
+  def catching_standard_errors(l = logger, &block)
     begin
       yield
     rescue StandardError => e
-      Adhearsion::Events.trigger :exception, e
+      Adhearsion::Events.trigger :exception, [e, l]
     end
   end
 end

data/lib/adhearsion/generators/app/templates/lib/simon_game.rb

@@ -5,7 +5,7 @@ class SimonGame < Adhearsion::CallController
     answer
     reset
     loop do
-      say_number
+      update_number
       collect_attempt
       verify_attempt
     end
@@ -19,20 +19,16 @@ class SimonGame < Adhearsion::CallController
     @number << random_number
   end
 
-  def say_number
-    update_number
-    say @number
-  end
-
   def collect_attempt
-    @attempt = input @number.length
+    result = ask @number, :limit => @number.length
+    @attempt = result.response
   end
 
   def verify_attempt
     if attempt_correct?
-      say 'good'
+      speak 'good'
     else
-      say "#{@number.length - 1} times wrong, try again smarty"
+      speak "#{@number.length - 1} times wrong, try again smarty"
       reset
     end
   end

data/lib/adhearsion/initializer.rb

@@ -299,6 +299,6 @@ module Adhearsion
       end
     end
 
-    InitializationFailedError = Class.new StandardError
+    InitializationFailedError = Class.new Adhearsion::Error
   end
 end

data/lib/adhearsion/menu_dsl/menu.rb

@@ -8,7 +8,7 @@ module Adhearsion
       DEFAULT_MAX_NUMBER_OF_TRIES = 1
       DEFAULT_TIMEOUT             = 5
 
-      InvalidStructureError = Class.new StandardError
+      InvalidStructureError = Class.new Adhearsion::Error
 
       attr_reader :builder, :timeout, :tries_count, :max_number_of_tries, :terminator, :limit, :interruptible, :status
 

data/lib/adhearsion/process.rb

@@ -74,7 +74,7 @@ module Adhearsion
 
     def final_shutdown
       Adhearsion.active_calls.each do |call|
-        call.hangup
+        call.hangup!
       end
 
       # This should shut down any remaining threads.  Once those threads have

data/lib/adhearsion/punchblock_plugin/initializer.rb

@@ -150,7 +150,7 @@ module Adhearsion
         end
 
         def dispatch_call_event(event)
-          if call = Adhearsion.active_calls.find(event.call_id)
+          if call = Adhearsion.active_calls[event.call_id]
             call.deliver_message! event
           else
             logger.error "Event received for inactive call #{event.call_id}: #{event.inspect}"

data/lib/adhearsion/version.rb

@@ -1,32 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion #:nodoc:
-  VERSION = '2.0.0.rc1'
-
-  class PkgVersion
-    include Comparable
-
-    attr_reader :major, :minor, :revision
-
-    def initialize(version = nil)
-      version ||= ""
-      @major, @minor, @revision, @patchlevel = version.split(".", 4).map(&:to_i)
-      @major = 0 unless @major
-    end
-
-    def <=>(other)
-      return @major     <=> other.major     unless (@major <=> other.major) == 0
-      return @minor     <=> other.minor     unless (@minor <=> other.minor) == 0
-      return @revision  <=> other.revision  unless (@revision <=> other.revision) == 0
-      return 0
-    end
-
-    def self.sort
-      self.sort! { |a,b| a <=> b }
-    end
-
-    def to_s
-      "#{@major}.#{@minor}.#{@revision}"
-    end
-  end
+  VERSION = '2.0.0.rc2'
 end

data/spec/adhearsion/call_controller/record_spec.rb

@@ -43,12 +43,19 @@ module Adhearsion
           end
 
           it "should pass the exception to the events system" do
-            flexmock(Events).should_receive(:trigger).once.with(:exception, TestException)
+            latch = CountDownLatch.new 1
+            Adhearsion::Events.exception do |e, l|
+              e.should be_a TestException
+              l.should be subject.logger
+              latch.countdown!
+            end
             expect_component_execution component
             subject.record { |rec| raise TestException }
             component.request!
             component.execute!
             component.trigger_event_handler response
+            latch.wait(1).should be true
+            Adhearsion::Events.clear_handlers :exception
           end
         end
 

data/spec/adhearsion/call_controller_spec.rb

@@ -354,7 +354,7 @@ module Adhearsion
         let(:details) { "Oh noes, it's all borked" }
 
         it "raises the error" do
-          lambda { subject.execute_component_and_await_completion component }.should raise_error(StandardError, "#{details}: #{component}")
+          lambda { subject.execute_component_and_await_completion component }.should raise_error(Adhearsion::Error, "#{details}: #{component}")
         end
       end
 
@@ -424,8 +424,15 @@ describe ExampleCallController do
   it "should capture errors in callbacks" do
     subject.should_receive(:setup_models).and_raise StandardError
     subject.should_receive(:clean_up_models).and_raise StandardError
-    flexmock(Adhearsion::Events).should_receive(:trigger).times(4).with :exception, StandardError
+    latch = CountDownLatch.new 4
+    Adhearsion::Events.exception do |e, l|
+      e.should be_a StandardError
+      l.should be subject.logger
+      latch.countdown!
+    end
     subject.execute!
+    latch.wait(1).should be true
+    Adhearsion::Events.clear_handlers :exception
   end
 
   describe "when the controller finishes without a hangup" do

data/spec/adhearsion/call_spec.rb

@@ -2,6 +2,12 @@
 
 require 'spec_helper'
 
+class BrokenController < Adhearsion::CallController
+  def run
+    raise "Blat!"
+  end
+end
+
 module Adhearsion
   describe Call do
     let(:mock_client) { flexmock('Client').tap(&:should_ignore_missing) }
@@ -117,6 +123,28 @@ module Adhearsion
           subject << event
         end
       end
+
+      context "when raising an exception" do
+        it "does not kill the call actor" do
+          subject.register_event_handler { |e| raise 'foo' }
+          lambda { subject << :foo }.should_not raise_error
+          sleep 1
+          subject.should be_alive
+        end
+
+        it 'passes the exception through the Events system' do
+          latch = CountDownLatch.new 1
+          Adhearsion::Events.exception do |e, l|
+            e.should be_a RuntimeError
+            l.should be subject.logger
+            latch.countdown!
+          end
+          subject.register_event_handler { |e| raise 'foo' }
+          lambda { subject << :foo }.should_not raise_error
+          latch.wait(3).should be true
+          Adhearsion::Events.clear_handlers :exception
+        end
+      end
     end
 
     describe "#<<" do
@@ -605,6 +633,18 @@ module Adhearsion
           controller_thread = subject.execute_controller mock_controller, latch
           Adhearsion::Process.important_threads.should include controller_thread
         end
+
+        it "should pass the exception to the events system" do
+          latch = CountDownLatch.new 1
+          Adhearsion::Events.exception do |e, l|
+            e.should be_a RuntimeError
+            l.should be subject.logger
+            latch.countdown!
+          end
+          subject.execute_controller BrokenController.new(subject), latch
+          latch.wait(3).should be true
+          Adhearsion::Events.clear_handlers :exception
+        end
       end
 
       describe "#register_controller" do

data/spec/adhearsion/calls_spec.rb

@@ -4,44 +4,70 @@ require 'spec_helper'
 
 module Adhearsion
   describe Calls do
-    before { Adhearsion.active_calls.clear! }
-
     let(:call) { Adhearsion::Call.new new_offer }
 
+    let(:number_of_calls) { 10 }
+    let :calls do
+      Array.new(number_of_calls) { Adhearsion::Call.new new_offer }
+    end
+
     def new_offer(call_id = nil, headers = {})
-      Punchblock::Event::Offer.new :call_id => call_id || rand, :headers => headers
+      Punchblock::Event::Offer.new :call_id => call_id || random_call_id, :headers => headers
     end
 
-    it 'can create a call and add it to the active calls' do
-      Adhearsion.active_calls.any?.should be == false
-      call = Adhearsion.active_calls.from_offer new_offer
+    it 'can create a call and add it to the collection' do
+      subject.any?.should be == false
+      call = subject.from_offer new_offer
       call.should be_a Adhearsion::Call
-      Adhearsion.active_calls.size.should be == 1
+      subject.size.should be == 1
+      subject[call.id].should be call
     end
 
-    it '#size should return the size of the collection' do
+    it '#size should return the number of calls in the collection' do
       subject.size.should be == 0
       subject << call
       subject.size.should be == 1
     end
 
-    it '#remove_inactive_call should delete the call in the Hash' do
-      number_of_calls = 10
-      calls = Array.new(number_of_calls) { Adhearsion::Call.new new_offer }
-      calls.each { |call| subject << call }
+    describe "removing a call" do
+      let(:deleted_call) { calls[number_of_calls / 2] }
 
-      deleted_call = calls[number_of_calls / 2]
-      subject.remove_inactive_call deleted_call
-      subject.size.should be == number_of_calls - 1
-    end
+      before { calls.each { |call| subject << call } }
 
-    it '#find should pull the Call from the Hash using the id' do
-      subject << call
-      subject.find(call.id).should be call
+      context "by call object" do
+        before { subject.remove_inactive_call deleted_call }
+
+        it "should remove the call from the collection" do
+          subject.size.should be == number_of_calls - 1
+          subject[deleted_call.id].should be_nil
+        end
+      end
+
+      context "by dead call object" do
+        before do
+          @call_id = deleted_call.id
+          deleted_call.terminate
+          deleted_call.should_not be_alive
+          subject.remove_inactive_call deleted_call
+        end
+
+        it "should remove the call from the collection" do
+          subject.size.should be == number_of_calls - 1
+          subject[@call_id].should be_nil
+        end
+      end
+
+      context "by ID" do
+        before { subject.remove_inactive_call deleted_call.id }
+
+        it "should remove the call from the collection" do
+          subject.size.should be == number_of_calls - 1
+          subject[deleted_call.id].should be_nil
+        end
+      end
     end
 
     it "finding calls by a tag" do
-      calls = Array.new(3) { Adhearsion::Call.new new_offer }
       calls.each { |call| subject << call }
 
       tagged_call = calls.last
@@ -56,5 +82,48 @@ module Adhearsion
         subject.size.should be == 2
       end
     end
+
+    describe "when a call in the collection crashes" do
+      let(:wrapped_object) { call.wrapped_object }
+
+      before do
+        def wrapped_object.crash_me
+          raise StandardError, "Someone crashed me"
+        end
+      end
+
+      def crash
+        lambda { call.crash_me }.should raise_error(StandardError, "Someone crashed me")
+        sleep 0.5
+      end
+
+      it "is removed from the collection" do
+        call_id = call.id
+        size_before = subject.size
+
+        subject << call
+        subject.size.should be > size_before
+        subject[call_id].should be call
+
+        crash
+        subject.size.should be == size_before
+        subject[call_id].should be_nil
+      end
+
+      it "is sends a hangup command for the call" do
+        call_id = call.id
+        flexmock PunchblockPlugin, :client => flexmock('Client')
+        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(Punchblock::Command::Hangup, :async => true, :call_id => call_id)
+
+        subject << call
+
+        crash
+      end
+
+      it "shuts down the actor" do
+        crash
+        call.should_not be_alive
+      end
+    end
   end
 end

data/spec/adhearsion/process_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 module Adhearsion
   describe Adhearsion::Process do
     before :all do
-      Adhearsion.active_calls.clear!
+      Adhearsion.active_calls.clear
     end
 
     before :each do
@@ -17,6 +17,7 @@ module Adhearsion
       flexmock(Events).should_receive(:trigger_immediately).once.with(:shutdown).ordered
       Adhearsion::Process.booted
       Adhearsion::Process.shutdown
+      sleep 0.2
     end
 
     it '#stop_when_zero_calls should wait until the list of active calls reaches 0' do
@@ -48,14 +49,14 @@ module Adhearsion
     describe "#final_shutdown" do
       it "should hang up active calls" do
         3.times do
-          fake_call = flexmock Object.new, :id => rand
-          flexmock(fake_call).should_receive(:hangup).once
+          fake_call = flexmock Call.new, :id => random_call_id
+          flexmock(fake_call).should_receive(:hangup!).once
           Adhearsion.active_calls << fake_call
         end
 
         Adhearsion::Process.final_shutdown
 
-        Adhearsion.active_calls.clear!
+        Adhearsion.active_calls.clear
       end
 
       it "should trigger shutdown handlers synchronously" do
@@ -89,6 +90,7 @@ module Adhearsion
       Adhearsion::Process.state_name.should be :stopped
       flexmock(Adhearsion::Process.instance).should_receive(:die_now!).once
       Adhearsion::Process.shutdown
+      sleep 0.2
     end
 
     it 'should forcibly kill the Adhearsion process on :force_stop' do

data/spec/adhearsion_spec.rb

@@ -61,6 +61,16 @@ describe Adhearsion do
     it "should return the same instance each time" do
       Adhearsion.active_calls.should be Adhearsion.active_calls
     end
+
+    it "should create a new collection if the existing one dies" do
+      original = Adhearsion.active_calls
+      original.terminate
+      original.should_not be_alive
+
+      current = Adhearsion.active_calls
+      current.should be_alive
+      current.should_not be original
+    end
   end
 
   describe "#status" do

data/spec/spec_helper.rb

@@ -70,3 +70,4 @@ end
 def new_uuid
   UUID.new.generate.to_s
 end
+alias :random_call_id :new_uuid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160607180 !ruby/object:Gem::Requirement
+  requirement: &2156226700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,21 +24,21 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2160607180
+  version_requirements: *2156226700
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2160605540 !ruby/object:Gem::Requirement
+  requirement: &2156221520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160605540
+  version_requirements: *2156221520
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2160604040 !ruby/object:Gem::Requirement
+  requirement: &2156220200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160604040
+  version_requirements: *2156220200
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
-  requirement: &2160578160 !ruby/object:Gem::Requirement
+  requirement: &2156218540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160578160
+  version_requirements: *2156218540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160576060 !ruby/object:Gem::Requirement
+  requirement: &2156217580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2160576060
+  version_requirements: *2156217580
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160574920 !ruby/object:Gem::Requirement
+  requirement: &2156213900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160574920
+  version_requirements: *2156213900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160574020 !ruby/object:Gem::Requirement
+  requirement: &2156213080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160574020
+  version_requirements: *2156213080
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2160571980 !ruby/object:Gem::Requirement
+  requirement: &2156212120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160571980
+  version_requirements: *2156212120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160571280 !ruby/object:Gem::Requirement
+  requirement: &2156211580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160571280
+  version_requirements: *2156211580
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2160570360 !ruby/object:Gem::Requirement
+  requirement: &2156210340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160570360
+  version_requirements: *2156210340
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2160532560 !ruby/object:Gem::Requirement
+  requirement: &2156209660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160532560
+  version_requirements: *2156209660
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2160531060 !ruby/object:Gem::Requirement
+  requirement: &2156208320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160531060
+  version_requirements: *2156208320
 - !ruby/object:Gem::Dependency
   name: ruby_speech
-  requirement: &2160530200 !ruby/object:Gem::Requirement
+  requirement: &2156207180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160530200
+  version_requirements: *2156207180
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2160529380 !ruby/object:Gem::Requirement
+  requirement: &2156193500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +167,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160529380
+  version_requirements: *2156193500
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2160528360 !ruby/object:Gem::Requirement
+  requirement: &2156188320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160528360
+  version_requirements: *2156188320
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2160527640 !ruby/object:Gem::Requirement
+  requirement: &2156187600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +189,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160527640
+  version_requirements: *2156187600
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2160526260 !ruby/object:Gem::Requirement
+  requirement: &2156186680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +200,10 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2160526260
+  version_requirements: *2156186680
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2160525580 !ruby/object:Gem::Requirement
+  requirement: &2156186020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -211,10 +211,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160525580
+  version_requirements: *2156186020
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &2160504660 !ruby/object:Gem::Requirement
+  requirement: &2152014220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,10 +222,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160504660
+  version_requirements: *2152014220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160503420 !ruby/object:Gem::Requirement
+  requirement: &2152012400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -233,10 +233,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2160503420
+  version_requirements: *2152012400
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2160502300 !ruby/object:Gem::Requirement
+  requirement: &2152011380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,10 +244,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160502300
+  version_requirements: *2152011380
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160498180 !ruby/object:Gem::Requirement
+  requirement: &2152009540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -255,10 +255,10 @@ dependencies:
         version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *2160498180
+  version_requirements: *2152009540
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2160497260 !ruby/object:Gem::Requirement
+  requirement: &2152008640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +266,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160497260
+  version_requirements: *2152008640
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2160471000 !ruby/object:Gem::Requirement
+  requirement: &2152007400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,10 +277,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160471000
+  version_requirements: *2152007400
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2160469500 !ruby/object:Gem::Requirement
+  requirement: &2152006220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +288,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160469500
+  version_requirements: *2152006220
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2160468520 !ruby/object:Gem::Requirement
+  requirement: &2156172140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,10 +299,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160468520
+  version_requirements: *2156172140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2160466580 !ruby/object:Gem::Requirement
+  requirement: &2156170840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -310,10 +310,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160466580
+  version_requirements: *2156170840
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2160464820 !ruby/object:Gem::Requirement
+  requirement: &2156169560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -321,10 +321,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160464820
+  version_requirements: *2156169560
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2160436460 !ruby/object:Gem::Requirement
+  requirement: &2156167960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -332,10 +332,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160436460
+  version_requirements: *2156167960
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2160435420 !ruby/object:Gem::Requirement
+  requirement: &2156120960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -343,10 +343,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160435420
+  version_requirements: *2156120960
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2160434400 !ruby/object:Gem::Requirement
+  requirement: &2156118080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -354,7 +354,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160434400
+  version_requirements: *2156118080
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1319504717136623069
+      hash: -2676474875029582124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: