ruby_ami 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # develop
 
+# 0.1.3 - 2011-11-22
+  * Bugfix: A client can now safely be shut down before it is started, and only performs actions on live streams.
+  * Bugfix: RubyAMI::Error#inspect now shows an error's message and headers
+  * Bugfix: Spec and JRuby fixes
+
 # 0.1.2
   * Bugfix: Prevent stream connection status events being passed up to the consumer event handler
   * Bugfix: Corrected the README usage docs

data/features/step_definitions/lexer_steps.rb

@@ -134,12 +134,12 @@ end
 Then "the protocol should have lexed without syntax errors" do
   current_pointer     = @lexer.send(:instance_variable_get, :@current_pointer)
   data_ending_pointer = @lexer.send(:instance_variable_get, :@data_ending_pointer)
-  current_pointer.should equal(data_ending_pointer)
+  current_pointer.should == data_ending_pointer
   @lexer.syntax_errors.size.should equal(0)
 end
 
 Then /^the protocol should have lexed with (\d+) syntax errors?$/ do |number|
-  @lexer.syntax_errors.size.should equal(number.to_i)
+  @lexer.syntax_errors.size.should == number.to_i
 end
 
 Then "the syntax error fixture named $name should have been encountered" do |name|
@@ -148,7 +148,7 @@ Then "the syntax error fixture named $name should have been encountered" do |nam
 end
 
 Then /^(\d+) messages? should have been received$/ do |number_received|
-  @lexer.received_messages.size.should equal(number_received.to_i)
+  @lexer.received_messages.size.should == number_received.to_i
 end
 
 Then /^the 'follows' body of (\d+) messages? received should equal (\w+)$/ do |number, method_name|
@@ -156,7 +156,7 @@ Then /^the 'follows' body of (\d+) messages? received should equal (\w+)$/ do |n
   @lexer.received_messages.should_not be_empty
   @lexer.received_messages.select do |message|
     message.text_body == multi_line_response
-  end.size.should eql(number.to_i)
+  end.size.should == number.to_i
 end
 
 Then "the version should be set to $version" do |version|

data/lib/ruby_ami/client.rb

@@ -175,7 +175,7 @@ module RubyAMI
     end
 
     def streams
-      [actions_stream, events_stream]
+      [actions_stream, events_stream].compact
     end
 
     class ErrorHandler

data/lib/ruby_ami/error.rb

@@ -17,5 +17,9 @@ module RubyAMI
     def action_id
       @headers['ActionID']
     end
+
+    def inspect
+      "#<#{self.class} #{[:message, :headers].map { |c| "#{c}=#{self.__send__(c).inspect rescue nil}" }.compact * ', '}>"
+    end
   end
 end # RubyAMI

data/lib/ruby_ami/version.rb

@@ -1,3 +1,3 @@
 module RubyAMI
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/ruby_ami/action_spec.rb

@@ -73,11 +73,11 @@ module RubyAMI
         end
 
         context 'with an error' do
-          let(:error) { Error.new }
+          let(:error) { Error.new.tap { |e| e.message = 'AMI error' } }
 
           it 'should set the response and raise the error when reading it' do
             subject << error
-            lambda { subject.response }.should raise_error error
+            lambda { subject.response }.should raise_error Error, 'AMI error'
           end
         end
 

data/spec/ruby_ami/client_spec.rb

@@ -22,6 +22,8 @@ module RubyAMI
 
     its(:action_queue) { should be_a GirlFriday::WorkQueue }
 
+    its(:streams) { should == [] }
+
     describe 'starting up' do
       before do
         MockServer.any_instance.stubs :receive_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168838980 !ruby/object:Gem::Requirement
+  requirement: &2152043120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2168838980
+  version_requirements: *2152043120
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2168838460 !ruby/object:Gem::Requirement
+  requirement: &2152216580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168838460
+  version_requirements: *2152216580
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2168837740 !ruby/object:Gem::Requirement
+  requirement: &2152215700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168837740
+  version_requirements: *2152215700
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2168837020 !ruby/object:Gem::Requirement
+  requirement: &2152215100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168837020
+  version_requirements: *2152215100
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2168836320 !ruby/object:Gem::Requirement
+  requirement: &2152214020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168836320
+  version_requirements: *2152214020
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2168835000 !ruby/object:Gem::Requirement
+  requirement: &2152213160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168835000
+  version_requirements: *2152213160
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2168833400 !ruby/object:Gem::Requirement
+  requirement: &2152211160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168833400
+  version_requirements: *2152211160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168832740 !ruby/object:Gem::Requirement
+  requirement: &2152225660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2168832740
+  version_requirements: *2152225660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168831600 !ruby/object:Gem::Requirement
+  requirement: &2152224400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2168831600
+  version_requirements: *2152224400
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2168813300 !ruby/object:Gem::Requirement
+  requirement: &2152222740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168813300
+  version_requirements: *2152222740
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2168812140 !ruby/object:Gem::Requirement
+  requirement: &2152220040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2168812140
+  version_requirements: *2152220040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168810900 !ruby/object:Gem::Requirement
+  requirement: &2152232480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2168810900
+  version_requirements: *2152232480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2168809620 !ruby/object:Gem::Requirement
+  requirement: &2152228860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168809620
+  version_requirements: *2152228860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168809100 !ruby/object:Gem::Requirement
+  requirement: &2152240800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168809100
+  version_requirements: *2152240800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2168808600 !ruby/object:Gem::Requirement
+  requirement: &2152238240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168808600
+  version_requirements: *2152238240
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2168808100 !ruby/object:Gem::Requirement
+  requirement: &2152461540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168808100
+  version_requirements: *2152461540
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2168807580 !ruby/object:Gem::Requirement
+  requirement: &2152456860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168807580
+  version_requirements: *2152456860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2168807200 !ruby/object:Gem::Requirement
+  requirement: &2152468740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168807200
+  version_requirements: *2152468740
 description: A Ruby client library for the Asterisk Management Interface build on
   eventmachine.
 email: