rspec-rayo 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# develop
+
+# 0.3.0
+  * Update everything to work again (new PB, changes to Rayo, etc)
+  * Remove Tropo
+
+# 0.2.0
+  * Ancient history

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source :rubygems
 
 gemspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :version => 2, :cli => '--format documentation' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec/" }
+end

data/README.md

@@ -1,7 +1,7 @@
 rspec-rayo
 ============
 
-This library extends the Rspec testing library for Rayo specific expectations. The library also provides classes for Tropo1 and Rayo drivers.
+This library extends the Rspec testing library for Rayo specific expectations. The library also provides a Rayo driver using Punchblock.
 
 Howto Install
 -------------
@@ -11,15 +11,11 @@ Howto Install
 Example Driver Setup
 --------------------
 
-	ap "Starting RayoDriver to manage events over XMPP."
 	@rayo = RSpecRayo::RayoDriver.new :username         => @config['rayo_server']['jid'],
 	                                  :password         => @config['rayo_server']['password'],
 	                                  :wire_logger      => Logger.new(@config['rayo_server']['wire_log']),
 	                                  :transport_logger => Logger.new(@config['rayo_server']['transport_log'])
 
-	ap "Starting Tropo1Driver to host scripts via DRb and launch calls via HTTP."
-	@tropo1 = RSpecRayo::Tropo1Driver.new(@config['tropo1']['druby_uri'])
-
 Custom Matchers
 ---------------
 

data/lib/rspec-rayo.rb

@@ -1,7 +1,36 @@
 %w{
-  rspec-rayo/tropo1/driver
+  punchblock
 
-  rspec-rayo/rayo/driver
-  rspec-rayo/rayo/call
-  rspec-rayo/rayo/matchers
+  rspec-rayo/version
+  rspec-rayo/driver
+  rspec-rayo/call
+  rspec-rayo/matchers
 }.each { |lib| require lib }
+
+module Punchblock
+  class CommandNode
+    def await_completion(timeout = 60)
+      tap do |c|
+        c.response timeout
+      end
+    end
+  end
+
+  module Component
+    class ComponentNode
+      attr_accessor :event_queue
+
+      def initialize(*args)
+        super
+        @event_queue = Queue.new
+        register_event_handler do |event|
+          @event_queue << event
+        end
+      end
+
+      def next_event(timeout = nil)
+        Timeout::timeout(timeout || $config['rayo_queue']['connection_timeout']) { event_queue.pop }
+      end
+    end
+  end
+end

data/lib/rspec-rayo/{rayo/call.rb → call.rb}

@@ -6,13 +6,14 @@ module RSpecRayo
     attr_reader :queue
 
     def initialize(options)
-      @call_event     = FutureResource.new
-      self.call_event = options[:call_event] if options[:call_event]
+      @offer_event    = FutureResource.new
       @ring_event     = FutureResource.new
+      @queue          = Queue.new
+
       @client         = options[:client]
-      @queue          = options[:queue]
       @read_timeout   = options[:read_timeout] || 5
       @write_timeout  = options[:write_timeout] || 5
+
       @status         = :offered
     end
 
@@ -26,14 +27,6 @@ module RSpecRayo
       write Punchblock::Command::Answer.new
     end
 
-    def ask(options = {})
-      write Punchblock::Component::Tropo::Ask.new(options)
-    end
-
-    def conference(options = {})
-      write Punchblock::Component::Tropo::Conference.new(options)
-    end
-
     def dial(options = {})
       write Punchblock::Command::Dial.new(options)
     end
@@ -54,14 +47,6 @@ module RSpecRayo
       end
     end
 
-    def say(options = {})
-      write Punchblock::Component::Tropo::Say.new(options)
-    end
-
-    def transfer(options = {})
-      write Punchblock::Component::Tropo::Transfer.new(options)
-    end
-
     def record(options = {})
       write Punchblock::Component::Record.new(options)
     end
@@ -106,30 +91,45 @@ module RSpecRayo
       Timeout::timeout(timeout || @read_timeout) { @queue.pop }
     end
 
-    def call_event
-      @call_event.resource @write_timeout
+    def offer_event
+      @offer_event.resource @read_timeout
     end
 
-    def call_event=(other)
-      raise ArgumentError, 'Call event must be a Punchblock::Event::Offer' unless other.is_a? Punchblock::Event::Offer
-      @call_event.resource  = other
-      @call_id              = other.call_id
+    def offer_event=(other)
+      pb_logger.debug "Setting offer_event to #{other.inspect}"
+      @offer_event.resource  = other
+      @offer_id              = other.call_id
     end
 
-    def ring_event
-      @ring_event.resource @write_timeout
+    def ring_event(timeout = @read_timeout)
+      @ring_event.resource timeout
     end
 
     def ring_event=(other)
-      raise ArgumentError, 'Ring event must be a Punchblock::Event::Ringing' unless other.is_a? Punchblock::Event::Ringing
+      pb_logger.debug "Setting ring_event to #{other.inspect}"
       @ring_event.resource = other
     end
 
+    def <<(event)
+      pb_logger.debug "Processing event #{event.inspect}"
+      case event
+      when Punchblock::Event::Offer
+        pb_logger.debug "Received an offer event"
+        self.offer_event = event
+      when Punchblock::Event::Ringing
+        pb_logger.debug "Received a ringing event"
+        self.ring_event = event
+      when Punchblock::Event::End
+        pb_logger.debug "Received an end event"
+        @status = :finished
+      end
+      @queue << event if event
+    end
+
     private
 
     def write(msg)
       response = @client.execute_command msg, :call_id => @call_id, :async => false
-      raise response if response.is_a?(Exception)
       msg if response
     end
   end

data/lib/rspec-rayo/driver.rb

@@ -0,0 +1,82 @@
+require 'countdownlatch'
+
+module RSpecRayo
+  class RayoDriver
+    attr_reader :call_queue, :calls
+
+    def initialize(options)
+      @calls            = {}
+      @call_queue       = Queue.new
+      @queue_timeout    = options.delete(:queue_timeout) || 5
+      @write_timeout    = options.delete(:write_timeout) || 5
+      @threads          = []
+      @connection_latch = CountDownLatch.new 1
+
+      initialize_punchblock options
+    end
+
+    def wait_for_connection(timeout = nil)
+      @connection_latch.wait timeout
+    end
+
+    def get_call
+      Timeout::timeout(@queue_timeout) { @call_queue.pop }
+    end
+
+    def cleanup_calls
+      @calls.each_pair do |call_id, call|
+        call.hangup unless call.status == :finished
+      end
+      @calls = {}
+    end
+
+    def dial(options)
+      new_call.tap do |call|
+        dial = call.dial options
+        call.call_id = dial.call_id
+        @calls[call.call_id] = call
+      end
+    end
+
+    private
+
+    def new_call
+      Call.new :client        => @pb_client,
+               :read_timeout  => @queue_timeout,
+               :write_timeout => @write_timeout
+    end
+
+    def initialize_punchblock(options)
+      logger = Logger.new 'punchblock.log'
+
+      def logger.trace(*args)
+        debug *args
+      end
+
+      Punchblock.logger = logger
+
+      connection = Punchblock::Connection::XMPP.new options
+
+      @pb_client = Punchblock::Client.new  :connection => connection,
+                                           :write_timeout => options[:write_timeout]
+
+      @pb_client.register_event_handler do |event|
+        if event.is_a?(Punchblock::Connection::Connected)
+          logger.info "Connected!"
+          @connection_latch.countdown!
+          throw :pass
+        end
+
+        if call = @calls[event.call_id]
+          @calls[event.call_id] << event
+        else
+          call = new_call
+          @calls[event.call_id] = call
+          @call_queue.push call
+        end
+      end
+
+      Thread.new { @pb_client.run }
+    end
+  end
+end

data/lib/rspec-rayo/{rayo/matchers.rb → matchers.rb}

@@ -12,20 +12,17 @@ def match_type(object, type)
 end
 
 %w{
-  ask
   call_control
-  conference
   dtmf
   input
   join
   output
   recording
-  say
-  transfer
-}.each { |matcher| require "rspec-rayo/rayo/matchers/#{matcher}" }
+}.each { |matcher| require "rspec-rayo/matchers/#{matcher}" }
 
 RSpec::Matchers.define :have_executed_correctly do
   match_for_should do |command|
+    command.await_completion
     match_type command, Punchblock::CommandNode do
       unless command.executing?
         @error = "expected status to be #{:executing.inspect}, got #{command.state_name}"
@@ -45,9 +42,7 @@ end
 
 RSpec::Matchers.define :have_dialed_correctly do
   match_for_should do |call|
-    match_type call, RSpecRayo::Call do
-      call.ring_event.should be_a_valid_ringing_event
-    end
+    match_type call, RSpecRayo::Call
   end
 
   failure_message_for_should do |actual|

data/lib/rspec-rayo/{rayo/matchers → matchers}/join.rb

@@ -3,14 +3,14 @@ RSpec::Matchers.define :be_a_valid_joined_event do
     @other_call_id = other_call_id
   end
 
-  chain :with_mixer_id do |mixer_id|
-    @mixer_id = mixer_id
+  chain :with_mixer_name do |mixer_name|
+    @mixer_name = mixer_name
   end
 
   match_for_should do |event|
     match_type event, Punchblock::Event::Joined do
       @error = "The other call ID was not correct. Expected '#{@other_call_id}', got '#{event.other_call_id}'" if @other_call_id && event.other_call_id != @other_call_id
-      @error = "The mixer ID was not correct. Expected '#{@mixer_id}', got '#{event.mixer_id}'" if @mixer_id && event.mixer_id != @mixer_id
+      @error = "The mixer ID was not correct. Expected '#{@mixer_name}', got '#{event.mixer_name}'" if @mixer_name && event.mixer_name != @mixer_name
     end
   end
 
@@ -21,7 +21,7 @@ RSpec::Matchers.define :be_a_valid_joined_event do
   description do
     "be a valid joined event".tap do |d|
       d << " with other call ID '#{@other_call_id}'" if @other_call_id
-      d << " with mixer ID '#{@mixer_id}'" if @mixer_id
+      d << " with mixer ID '#{@mixer_name}'" if @mixer_name
     end
   end
 end
@@ -31,14 +31,14 @@ RSpec::Matchers.define :be_a_valid_unjoined_event do
     @other_call_id = other_call_id
   end
 
-  chain :with_mixer_id do |mixer_id|
-    @mixer_id = mixer_id
+  chain :with_mixer_name do |mixer_name|
+    @mixer_name = mixer_name
   end
 
   match_for_should do |event|
     match_type event, Punchblock::Event::Unjoined do
       @error = "The other call ID was not correct. Expected '#{@other_call_id}', got '#{event.other_call_id}'" if @other_call_id && event.other_call_id != @other_call_id
-      @error = "The mixer ID was not correct. Expected '#{@mixer_id}', got '#{event.mixer_id}'" if @mixer_id && event.mixer_id != @mixer_id
+      @error = "The mixer ID was not correct. Expected '#{@mixer_name}', got '#{event.mixer_name}'" if @mixer_name && event.mixer_name != @mixer_name
     end
   end
 
@@ -49,7 +49,7 @@ RSpec::Matchers.define :be_a_valid_unjoined_event do
   description do
     "be a valid unjoined event".tap do |d|
       d << " with other call ID '#{@other_call_id}'" if @other_call_id
-      d << " with mixer ID '#{@mixer_id}'" if @mixer_id
+      d << " with mixer ID '#{@mixer_name}'" if @mixer_name
     end
   end
 end

data/lib/rspec-rayo/version.rb

@@ -1,3 +1,3 @@
 module RSpecRayo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/rspec-rayo.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency %q<rspec>, [">= 2.6.0"]
-  s.add_dependency %q<punchblock>, [">= 0.5.0"]
+  s.add_dependency %q<rspec>, [">= 2.9.0.rc1"]
+  s.add_dependency %q<punchblock>, [">= 0.9.2"]
   s.add_dependency %q<countdownlatch>, [">= 1.0.0"]
-  s.add_dependency %q<future-resource>, [">= 0.0.2"]
+  s.add_dependency %q<future-resource>, [">= 1.0.0"]
 
-  s.add_development_dependency %q<yard>, ["~> 0.6.0"]
-  s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
-  s.add_development_dependency %q<rcov>, [">= 0"]
+  s.add_development_dependency %q<yard>, [">= 0.6.0"]
+  s.add_development_dependency %q<bundler>, [">= 1.0.0"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
+  s.add_development_dependency %q<guard-rspec>
 end

data/spec/rspec-rayo/rayo/matchers/join_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Rayo call control matchers" do
   describe "a joined event" do
     subject do
-      Punchblock::Event::Joined.new(:other_call_id => 'foo', :mixer_id => 'foo1').tap do |event|
+      Punchblock::Event::Joined.new(:other_call_id => 'foo', :mixer_name => 'foo1').tap do |event|
         event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
         event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
       end
@@ -12,13 +12,13 @@ describe "Rayo call control matchers" do
     it { should be_a_valid_joined_event }
     it { should be_a_valid_joined_event.with_other_call_id('foo') }
     it { should_not be_a_valid_joined_event.with_other_call_id('bar') }
-    it { should be_a_valid_joined_event.with_mixer_id('foo1') }
-    it { should_not be_a_valid_joined_event.with_mixer_id('bar1') }
+    it { should be_a_valid_joined_event.with_mixer_name('foo1') }
+    it { should_not be_a_valid_joined_event.with_mixer_name('bar1') }
   end
 
   describe "an unjoined event" do
     subject do
-      Punchblock::Event::Unjoined.new(:other_call_id => 'foo', :mixer_id => 'foo1').tap do |event|
+      Punchblock::Event::Unjoined.new(:other_call_id => 'foo', :mixer_name => 'foo1').tap do |event|
         event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
         event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
       end
@@ -27,7 +27,7 @@ describe "Rayo call control matchers" do
     it { should be_a_valid_unjoined_event }
     it { should be_a_valid_unjoined_event.with_other_call_id('foo') }
     it { should_not be_a_valid_unjoined_event.with_other_call_id('bar') }
-    it { should be_a_valid_unjoined_event.with_mixer_id('foo1') }
-    it { should_not be_a_valid_unjoined_event.with_mixer_id('bar1') }
+    it { should be_a_valid_unjoined_event.with_mixer_name('foo1') }
+    it { should_not be_a_valid_unjoined_event.with_mixer_name('bar1') }
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rspec'
 require 'rspec-rayo'
-require 'punchblock'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rayo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,34 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 01:00:00.000000000 +01:00
-default_executable: 
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156850680 !ruby/object:Gem::Requirement
+  requirement: &2152810580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *2156850680
+  version_requirements: *2152810580
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2156850160 !ruby/object:Gem::Requirement
+  requirement: &2152809920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156850160
+  version_requirements: *2152809920
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2156849660 !ruby/object:Gem::Requirement
+  requirement: &2152809360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,43 +44,43 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156849660
+  version_requirements: *2152809360
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2156849160 !ruby/object:Gem::Requirement
+  requirement: &2152824660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156849160
+  version_requirements: *2152824660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156848580 !ruby/object:Gem::Requirement
+  requirement: &2152823860 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156848580
+  version_requirements: *2152823860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156847980 !ruby/object:Gem::Requirement
+  requirement: &2152822380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156847980
+  version_requirements: *2152822380
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2156847440 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2152820500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,29 +88,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156847440
+  version_requirements: *2152820500
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2156846840 !ruby/object:Gem::Requirement
+  name: ci_reporter
+  requirement: &2152818700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2156846840
+  version_requirements: *2152818700
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: &2156846240 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &2152665400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156846240
+  version_requirements: *2152665400
 description: Rspec2 Matchers for Rayo
 email: jsgoecke@voxeo.com, ben@langfeld.me
 executables: []
@@ -121,39 +120,31 @@ files:
 - .document
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/rspec-rayo.rb
-- lib/rspec-rayo/rayo/call.rb
-- lib/rspec-rayo/rayo/driver.rb
-- lib/rspec-rayo/rayo/matchers.rb
-- lib/rspec-rayo/rayo/matchers/ask.rb
-- lib/rspec-rayo/rayo/matchers/call_control.rb
-- lib/rspec-rayo/rayo/matchers/conference.rb
-- lib/rspec-rayo/rayo/matchers/dtmf.rb
-- lib/rspec-rayo/rayo/matchers/input.rb
-- lib/rspec-rayo/rayo/matchers/join.rb
-- lib/rspec-rayo/rayo/matchers/output.rb
-- lib/rspec-rayo/rayo/matchers/recording.rb
-- lib/rspec-rayo/rayo/matchers/say.rb
-- lib/rspec-rayo/rayo/matchers/transfer.rb
-- lib/rspec-rayo/tropo1/driver.rb
+- lib/rspec-rayo/call.rb
+- lib/rspec-rayo/driver.rb
+- lib/rspec-rayo/matchers.rb
+- lib/rspec-rayo/matchers/call_control.rb
+- lib/rspec-rayo/matchers/dtmf.rb
+- lib/rspec-rayo/matchers/input.rb
+- lib/rspec-rayo/matchers/join.rb
+- lib/rspec-rayo/matchers/output.rb
+- lib/rspec-rayo/matchers/recording.rb
 - lib/rspec-rayo/version.rb
 - rspec-rayo.gemspec
-- spec/rspec-rayo/rayo/matchers/ask_spec.rb
 - spec/rspec-rayo/rayo/matchers/call_control_spec.rb
-- spec/rspec-rayo/rayo/matchers/conference_spec.rb
 - spec/rspec-rayo/rayo/matchers/dtmf_spec.rb
 - spec/rspec-rayo/rayo/matchers/input_spec.rb
 - spec/rspec-rayo/rayo/matchers/join_spec.rb
 - spec/rspec-rayo/rayo/matchers/output_spec.rb
-- spec/rspec-rayo/rayo/matchers/say_spec.rb
-- spec/rspec-rayo/rayo/matchers/transfer_spec.rb
 - spec/rspec-rayo/rayo/matchers_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/tropo/rspec-rayo
 licenses:
 - MIT
@@ -175,19 +166,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rspec2 for Rayo
 test_files:
-- spec/rspec-rayo/rayo/matchers/ask_spec.rb
 - spec/rspec-rayo/rayo/matchers/call_control_spec.rb
-- spec/rspec-rayo/rayo/matchers/conference_spec.rb
 - spec/rspec-rayo/rayo/matchers/dtmf_spec.rb
 - spec/rspec-rayo/rayo/matchers/input_spec.rb
 - spec/rspec-rayo/rayo/matchers/join_spec.rb
 - spec/rspec-rayo/rayo/matchers/output_spec.rb
-- spec/rspec-rayo/rayo/matchers/say_spec.rb
-- spec/rspec-rayo/rayo/matchers/transfer_spec.rb
 - spec/rspec-rayo/rayo/matchers_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/rspec-rayo/rayo/driver.rb

@@ -1,113 +0,0 @@
-module RSpecRayo
-  class RayoDriver
-    attr_reader :call_queue, :event_queue, :threads
-    attr_accessor :calls
-
-    def initialize(options)
-      @calls            = {}
-      @call_queue       = Queue.new
-      @queue_timeout    = options[:queue_timeout] || 5
-      @write_timeout    = options[:write_timeout] || 5
-      @threads          = []
-
-      initialize_rayo options
-    end
-
-    def get_call
-      read_queue @call_queue
-    end
-
-    def cleanup_calls
-      @calls.each_pair do |call_id, call|
-        call.hangup unless call.status == :finished
-      end
-      @calls = {}
-    end
-
-    def dial(options)
-      Call.new(:client => @rayo, :queue => Queue.new, :read_timeout => @queue_timeout, :write_timeout => @write_timeout).tap do |call|
-        dial = call.dial options
-        call.call_id = dial.call_id
-        @calls.merge! call.call_id => call
-      end
-    end
-
-    def start_event_dispatcher
-      @threads << Thread.new do
-        event = nil
-
-        until event == 'STOP' do
-          event = @event_queue.pop
-          case event
-          when Punchblock::Event::Offer
-            call = Call.new :call_event     => event,
-                            :client         => @rayo,
-                            :queue          => Queue.new,
-                            :read_timeout   => @queue_timeout,
-                            :write_timeout  => @write_timeout
-            @calls.merge! event.call_id => call
-            @call_queue.push call
-          when Punchblock::Event::Ringing
-            call = @calls[event.call_id]
-            call.ring_event = event if call
-          else
-            # Temp based on this nil returned on conference: https://github.com/tropo/punchblock/issues/27
-            begin
-              if event.is_a?(Punchblock::Event::End)
-                @calls[event.call_id].status = :finished
-              end
-              @calls[event.call_id].queue.push event unless event.nil?
-            rescue => error
-              # Event nil issue to be addressed here: https://github.com/tropo/rspec-rayo/issues/2
-            end
-          end
-        end
-
-      end
-    end
-
-    def read_queue(queue)
-      Timeout::timeout(@queue_timeout) { queue.pop }
-    end
-
-    def initialize_rayo(options)
-      initialize_logging options
-
-      # Setup our Rayo environment
-      connection = Punchblock::Connection::XMPP.new :username         => options[:username],
-                                                    :password         => options[:password],
-                                                    :host             => options[:host],
-                                                    :port             => options[:port],
-                                                    :wire_logger      => @wire_logger,
-                                                    :transport_logger => @transport_logger,
-                                                    :auto_reconnect   => false
-      @rayo = Punchblock::Client.new  :connection => connection,
-                                      :write_timeout => options[:write_timeout]
-      @event_queue = @rayo.event_queue
-
-      start_rayo
-    end
-
-    def initialize_logging(options)
-      @wire_logger = options[:wire_logger]
-      @wire_logger.level = options[:log_level]
-      #@wire_logger.info "Starting up..." if @wire_logger
-
-      @transport_logger = options[:transport_logger]
-      @transport_logger.level = options[:log_level]
-      #@transport_logger.info "Starting up..." if @transport_logger
-    end
-
-    def start_rayo
-      # Launch the Rayo thread
-      @threads << Thread.new do
-        begin
-          @rayo.run
-        rescue => e
-          puts "Exception in XMPP thread! #{e.message}"
-          puts e.backtrace.join("\t\n")
-        end
-      end
-    end
-  end
-end

data/lib/rspec-rayo/rayo/matchers/ask.rb

@@ -1,60 +0,0 @@
-RSpec::Matchers.define :be_a_valid_successful_ask_event do
-  chain :with_utterance do |utterance|
-    @utterance = utterance
-  end
-
-  chain :with_interpretation do |interpretation|
-    @interpretation = interpretation
-  end
-
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Ask::Complete::Success
-      @error = "The utterance was not correct. Expected '#{@utterance}', got '#{event.reason.utterance}'" if @utterance && event.reason.utterance != @utterance
-      @error = "The interpretation was not correct. Expected '#{@interpretation}', got '#{event.reason.interpretation}'" if @interpretation && event.reason.interpretation != @interpretation
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The ask event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid successful ask event".tap do |d|
-      d << " with utterance '#{@utterance}'" if @utterance
-      d << " with interpretation '#{@interpretation}'" if @interpretation
-    end
-  end
-end
-
-RSpec::Matchers.define :be_a_valid_ask_noinput_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Ask::Complete::NoInput
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The ask event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid noinput ask event"
-  end
-end
-
-RSpec::Matchers.define :be_a_valid_ask_nomatch_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Ask::Complete::NoMatch
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The ask event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid nomatch ask event"
-  end
-end

data/lib/rspec-rayo/rayo/matchers/conference.rb

@@ -1,73 +0,0 @@
-RSpec::Matchers.define :be_a_valid_conference_offhold_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Component::Tropo::Conference::OffHold
-  end
-
-  failure_message_for_should do |actual|
-    "The ask event was not valid: #{@error}"
-  end
-
-  description do
-    "Validate an ask event"
-  end
-end
-
-RSpec::Matchers.define :be_a_valid_speaking_event do
-  chain :for_call_id do |call_id|
-    @call_id = call_id
-  end
-
-  match_for_should do |event|
-    match_type event, Punchblock::Component::Tropo::Conference::Speaking do
-      @error = "The speaking call ID was not correct. Expected '#{@call_id}', got '#{event.speaking_call_id}'" if @call_id && event.speaking_call_id != @call_id
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The speaking event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid speaking event".tap do |d|
-      d << " with call ID '#{@call_id}'" if @call_id
-    end
-  end
-end
-
-RSpec::Matchers.define :be_a_valid_finished_speaking_event do
-  chain :for_call_id do |call_id|
-    @call_id = call_id
-  end
-
-  match_for_should do |event|
-    match_type event, Punchblock::Component::Tropo::Conference::FinishedSpeaking do
-      @error = "The finished-speaking call ID was not correct. Expected '#{@call_id}', got '#{event.speaking_call_id}'" if @call_id && event.speaking_call_id != @call_id
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The finished speaking event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid finished speaking event".tap do |d|
-      d << " with call ID '#{@call_id}'" if @call_id
-    end
-  end
-end
-
-RSpec::Matchers.define :be_a_valid_conference_complete_terminator_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Conference::Complete::Terminator
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The conference complete terminator event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid conference complete terminator event"
-  end
-end

data/lib/rspec-rayo/rayo/matchers/say.rb

@@ -1,15 +0,0 @@
-RSpec::Matchers.define :be_a_valid_say_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Say::Complete::Success
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The say event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid successful say event"
-  end
-end

data/lib/rspec-rayo/rayo/matchers/transfer.rb

@@ -1,31 +0,0 @@
-RSpec::Matchers.define :be_a_valid_transfer_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Transfer::Complete::Success
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The transfer event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid transfer event"
-  end
-end
-
-RSpec::Matchers.define :be_a_valid_transfer_timeout_event do
-  match_for_should do |event|
-    match_type event, Punchblock::Event::Complete do
-      match_type event.reason, Punchblock::Component::Tropo::Transfer::Complete::Timeout
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "The transfer event was not valid: #{@error}"
-  end
-
-  description do
-    "be a valid transfer timeout event"
-  end
-end

data/lib/rspec-rayo/tropo1/driver.rb

@@ -1,51 +0,0 @@
-module RSpecRayo
-  class Tropo1Driver
-    require 'drb'
-    require 'net/http'
-    require 'uri'
-    require 'countdownlatch'
-
-    attr_accessor :script_content, :result, :drb, :config
-
-    def initialize(uri = nil, latch_timeout = 5)
-      @uri            = uri || "druby://0.0.0.0:8787"
-      @latch_timeout  = latch_timeout
-      @config         = {}
-      reset!
-    end
-
-    def start_drb
-      @drb = DRb.start_service @uri, self
-    end
-
-    def stop_drb
-      @drb.stop_service
-    end
-
-    def reset!
-      @script_content = nil
-      @result = nil
-      @latches = {}
-    end
-
-    def trigger(latch_name)
-      latch = @latches[latch_name]
-      raise RuntimeError, "No latch by that name" unless latch
-      latch.countdown!
-    end
-
-    def add_latch(latch_name, count = 1)
-      @latches[latch_name] = CountDownLatch.new count
-    end
-
-    def wait(latch_name)
-      latch = @latches[latch_name]
-      raise RuntimeError, "No latch by that name" unless latch
-      latch.wait @latch_timeout
-    end
-
-    def place_call(session_url)
-      Net::HTTP.get URI.parse(session_url)
-    end
-  end
-end

data/spec/rspec-rayo/rayo/matchers/ask_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe "Rayo Ask matchers" do
-  describe "an ask complete event" do
-    subject do
-      Punchblock::Event::Complete.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-        event << reason
-      end
-    end
-
-    describe "that's successful" do
-      let :reason do
-        Punchblock::Component::Tropo::Ask::Complete::Success.new.tap do |success|
-          success << '<utterance>blah</utterance>'
-          success << '<interpretation>blah</interpretation>'
-        end
-      end
-
-      it { should be_a_valid_successful_ask_event }
-      it { should be_a_valid_successful_ask_event.with_utterance('blah') }
-      it { should_not be_a_valid_successful_ask_event.with_utterance('woo') }
-      it { should be_a_valid_successful_ask_event.with_interpretation('blah') }
-      it { should_not be_a_valid_successful_ask_event.with_interpretation('woo') }
-    end
-
-    describe "that stopped" do
-      let(:reason) { Punchblock::Event::Complete::Stop.new }
-      it { should be_a_valid_complete_stopped_event }
-    end
-
-    describe "that got no input" do
-      let(:reason) { Punchblock::Component::Tropo::Ask::Complete::NoInput.new }
-      it { should be_a_valid_ask_noinput_event }
-    end
-
-    describe "that got no match" do
-      let(:reason) { Punchblock::Component::Tropo::Ask::Complete::NoMatch.new }
-      it { should be_a_valid_ask_nomatch_event }
-    end
-  end
-end

data/spec/rspec-rayo/rayo/matchers/conference_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe "Rayo Conference matchers" do
-  describe "a conference event" do
-    subject do
-      Punchblock::Component::Tropo::Conference::OffHold.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-      end
-    end
-
-    it { should be_a_valid_conference_offhold_event }
-  end
-
-  describe "a speaking event" do
-    subject do
-      Punchblock::Component::Tropo::Conference::Speaking.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-        event.write_attr :'call-id', 'abc123'
-      end
-    end
-
-    it { should be_a_valid_speaking_event }
-    it { should be_a_valid_speaking_event.for_call_id('abc123') }
-    it { should_not be_a_valid_speaking_event.for_call_id('123abc') }
-  end
-
-  describe "a finished-speaking event" do
-    subject do
-      Punchblock::Component::Tropo::Conference::FinishedSpeaking.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-        event.write_attr :'call-id', 'abc123'
-      end
-    end
-
-    it { should be_a_valid_finished_speaking_event }
-    it { should be_a_valid_finished_speaking_event.for_call_id('abc123') }
-    it { should_not be_a_valid_finished_speaking_event.for_call_id('123abc') }
-  end
-
-  describe "a conference complete terminator event" do
-    subject do
-      Punchblock::Event::Complete.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-        event << Punchblock::Component::Tropo::Conference::Complete::Terminator.new
-      end
-    end
-
-    it { should be_a_valid_conference_complete_terminator_event }
-  end
-end

data/spec/rspec-rayo/rayo/matchers/say_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "Rayo Say matchers" do
-  describe "a say complete event" do
-    subject do
-      Punchblock::Event::Complete.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-        event << reason
-      end
-    end
-
-    describe "that's successful" do
-      let(:reason) { Punchblock::Component::Tropo::Say::Complete::Success.new }
-      it { should be_a_valid_say_event }
-    end
-
-    describe "that stopped" do
-      let(:reason) { Punchblock::Event::Complete::Stop.new }
-      it { should be_a_valid_complete_stopped_event }
-    end
-  end
-end

data/spec/rspec-rayo/rayo/matchers/transfer_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "Rayo call control matchers" do
-  describe "a transfer complete event" do
-    subject do
-      Punchblock::Event::Complete.new.tap do |event|
-        event.call_id = '5d6fe904-103d-4551-bd47-cf212c37b8c7'
-        event.component_id = '6d5bf745-8fa9-4e78-be18-6e6a48393f13'
-        event << reason
-      end
-    end
-
-    describe "that's successful" do
-      let(:reason) { Punchblock::Component::Tropo::Transfer::Complete::Success.new }
-      it { should be_a_valid_transfer_event }
-    end
-
-    describe "that timed out" do
-      let(:reason) { Punchblock::Component::Tropo::Transfer::Complete::Timeout.new }
-      it { should be_a_valid_transfer_timeout_event }
-    end
-  end
-end