ruby_ami 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8603127eccbe4b6d3ac1ea33dff328f812a80b3e
-  data.tar.gz: f554d2fafe014638ad9a4d471aad4e9068a4668d
+  metadata.gz: e8028e8180d0b9f71505465dc8477ecdf2421d1e
+  data.tar.gz: 5d7cfeb91c314b10e322c4c551ca4e63c3a0f306
 SHA512:
-  metadata.gz: 23fb266482d73bc721d01713a48b08a8bedcb39d0e1fa39b3159d3bedd7c4ea9de669543b5c46d7f278d2c11bcd476b46ce47218ffc7cad2eb00309c16c9750f
-  data.tar.gz: 10e4ca5ae35e7294a16deb1fb3a14e342839aa742f5f72edc8aa6ef22a73d614c08055035e568211603cfc37261128bf4e8a1d561f86fec9f8c1d56627a13762
+  metadata.gz: 689ab93300857dac9f3c898f48ae7a39ea797bc2069befe9b5db706351d65eadb71dcff303030e5d8cadd74b3d06f2347fd6465c9448a734d703437923fdb0ea
+  data.tar.gz: ba4ba318a93004d0e986f6bd9a3fb8dec068d4e92fa4a93ca01f472b65f0749aa31e380e88c0e09000282764ccb58734563358191f3d9ad98035b846cd81ef96

data/.gitignore

@@ -12,4 +12,5 @@ spec/reports
 features/reports
 vendor
 *.swp
-.rbx/*
+.rbx/*
+tmp

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/ruby_ami)
 
+# [1.3.2](https://github.com/adhearsion/ruby_ami/compare/v1.3.1...v1.3.2) - [2013-03-22](https://rubygems.org/gems/ruby_ami/versions/1.3.2)
+  * CS: Avoid celluloid deprecation warnings
+
 # [1.3.1](https://github.com/adhearsion/ruby_ami/compare/v1.3.0...v1.3.1) - [2013-03-20](https://rubygems.org/gems/ruby_ami/versions/1.3.1)
   * Bugfix: Add support for causal event types `confbridgelist` and `confbridgelistrooms`
   * Bugfix: Loosen celluloid dependency

data/lib/ruby_ami/client.rb

@@ -13,7 +13,7 @@ module RubyAMI
       if RubyAMI.rbx?
         logger.warn 'The "timeout" parameter is not supported when using Rubinius'
       end
-      
+
       stop_writing_actions
 
       @pending_actions  = {}
@@ -48,7 +48,7 @@ module RubyAMI
     def start
       @events_stream  = new_stream lambda { |event| @event_processor << event }
       @actions_stream = new_stream lambda { |message| @message_processor << message }
-      streams.each(&:run!)
+      streams.each { |stream| stream.async.run }
       @state = :started
       streams.each { |s| Celluloid::Actor.join s }
     end

data/lib/ruby_ami/stream.rb

@@ -16,6 +16,8 @@ module RubyAMI
 
     attr_reader :logger
 
+    finalizer :finalize
+
     def initialize(host, port, event_callback, logger = Logger, timeout = 0)
       super()
       @host, @port, @event_callback, @logger, @timeout = host, port, event_callback, logger, timeout
@@ -28,7 +30,7 @@ module RubyAMI
     end
 
     def run
-      Timeout::timeout(@timeout) do 
+      Timeout::timeout(@timeout) do
         @socket = TCPSocket.from_ruby_socket ::TCPSocket.new(@host, @port)
       end
       post_init
@@ -74,6 +76,8 @@ module RubyAMI
 
     alias :error_received :message_received
 
+    private
+
     def finalize
       logger.debug "Finalizing stream"
       @socket.close if @socket

data/lib/ruby_ami/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module RubyAMI
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/ruby_ami.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.12"]
+  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.13"]
   s.add_runtime_dependency %q<future-resource>, [">= 0"]
   s.add_runtime_dependency %q<girl_friday>, [">= 0"]
   s.add_runtime_dependency %q<countdownlatch>, ["~> 1.0"]

data/spec/ruby_ami/stream_spec.rb

@@ -27,7 +27,7 @@ module RubyAMI
       mock_target.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
       s = ServerMock.new '127.0.0.1', server_port, mock_target
       @stream = Stream.new '127.0.0.1', server_port, lambda { |m| client.message_received m }
-      @stream.run!
+      @stream.async.run
       fake_client.call if fake_client.respond_to? :call
       Celluloid::Actor.join s
       Celluloid::Actor.join @stream

data/spec/support/mock_server.rb

@@ -4,12 +4,14 @@ MockServer = Class.new
 class ServerMock
   include Celluloid::IO
 
+  finalizer :finalize
+
   def initialize(host, port, mock_target = MockServer.new)
     puts "*** Starting echo server on #{host}:#{port}"
     @server = TCPServer.new host, port
     @mock_target = mock_target
     @clients = []
-    run!
+    async.run
   end
 
   def finalize
@@ -20,7 +22,7 @@ class ServerMock
 
   def run
     after(0.5) { terminate }
-    loop { handle_connection! @server.accept }
+    loop { async.handle_connection @server.accept }
   end
 
   def handle_connection(socket)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ben Langfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: future-resource
   requirement: !ruby/object:Gem::Requirement