rspec-rayo 0.1.16 → 0.2.0

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

@@ -9,7 +9,7 @@ module RSpecRayo
       @call_event     = FutureResource.new
       self.call_event = options[:call_event] if options[:call_event]
       @ring_event     = FutureResource.new
-      @protocol       = options[:protocol]
+      @client         = options[:client]
       @queue          = options[:queue]
       @read_timeout   = options[:read_timeout] || 5
       @write_timeout  = options[:write_timeout] || 5
@@ -128,7 +128,8 @@ module RSpecRayo
     private
 
     def write(msg)
-      response = @protocol.write @call_id, 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/rayo/driver.rb

@@ -25,7 +25,7 @@ module RSpecRayo
     end
 
     def dial(options)
-      Call.new(:protocol => @rayo, :queue => Queue.new, :read_timeout => @queue_timeout, :write_timeout => @write_timeout).tap do |call|
+      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
@@ -41,7 +41,7 @@ module RSpecRayo
           case event
           when Punchblock::Event::Offer
             call = Call.new :call_event     => event,
-                            :protocol       => @rayo,
+                            :client         => @rayo,
                             :queue          => Queue.new,
                             :read_timeout   => @queue_timeout,
                             :write_timeout  => @write_timeout
@@ -74,14 +74,15 @@ module RSpecRayo
       initialize_logging options
 
       # Setup our Rayo environment
-      @rayo = Punchblock::Connection.new  :username         => options[:username],
-                                          :password         => options[:password],
-                                          :host             => options[:host],
-                                          :port             => options[:port],
-                                          :wire_logger      => @wire_logger,
-                                          :transport_logger => @transport_logger,
-                                          :auto_reconnect   => false,
-                                          :write_timeout    => options[:write_timeout]
+      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

data/lib/rspec-rayo/version.rb

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

data/rspec-rayo.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency %q<rspec>, [">= 2.6.0"]
-  s.add_dependency %q<punchblock>, [">= 0.4.2"]
+  s.add_dependency %q<punchblock>, [">= 0.5.0"]
   s.add_dependency %q<countdownlatch>, [">= 1.0.0"]
   s.add_dependency %q<future-resource>, [">= 0.0.2"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rayo
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000 -07:00
+date: 2011-10-30 01:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169308840 !ruby/object:Gem::Requirement
+  requirement: &2156850680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,21 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169308840
+  version_requirements: *2156850680
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2169308220 !ruby/object:Gem::Requirement
+  requirement: &2156850160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169308220
+  version_requirements: *2156850160
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2169307540 !ruby/object:Gem::Requirement
+  requirement: &2156849660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169307540
+  version_requirements: *2156849660
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2169306880 !ruby/object:Gem::Requirement
+  requirement: &2156849160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2169306880
+  version_requirements: *2156849160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2169306400 !ruby/object:Gem::Requirement
+  requirement: &2156848580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2169306400
+  version_requirements: *2156848580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2169305860 !ruby/object:Gem::Requirement
+  requirement: &2156847980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2169305860
+  version_requirements: *2156847980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2169305240 !ruby/object:Gem::Requirement
+  requirement: &2156847440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169305240
+  version_requirements: *2156847440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2169304600 !ruby/object:Gem::Requirement
+  requirement: &2156846840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169304600
+  version_requirements: *2156846840
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2169304120 !ruby/object:Gem::Requirement
+  requirement: &2156846240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2169304120
+  version_requirements: *2156846240
 description: Rspec2 Matchers for Rayo
 email: jsgoecke@voxeo.com, ben@langfeld.me
 executables: []