ruby_ami 1.2.6 → 1.3.0

data/.gitignore

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

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/ruby_ami)
 
+# [1.3.0](https://github.com/adhearsion/ruby_ami/compare/v1.2.6...v1.3.0) - [2013-01-23](https://rubygems.org/gems/ruby_ami/versions/1.3.0)
+  * Feature: Added timeout feature to client connection process. Currently does not work on Rubinius due to https://github.com/rubinius/rubinius/issues/2127
+
 # [1.2.6](https://github.com/adhearsion/ruby_ami/compare/v1.2.5...v1.2.6) - [2012-12-26](https://rubygems.org/gems/ruby_ami/versions/1.2.6)
   * Bugfix: JRuby and rbx compatability
 

data/README.md

@@ -18,7 +18,8 @@ client = Client.new :username       => 'test',
                     :port           => 5038,
                     :event_handler  => lambda { |e| handle_event e },
                     :logger         => Logger.new(STDOUT),
-                    :log_level      => Logger::DEBUG
+                    :log_level      => Logger::DEBUG,
+                    :timeout        => 10 
 
 def handle_event(event)
   case event.name

data/lib/ruby_ami/client.rb

@@ -10,6 +10,10 @@ module RubyAMI
       @event_handler    = @options[:event_handler]
       @state            = :stopped
 
+      if RubyAMI.rbx?
+        logger.warn 'The "timeout" parameter is not supported when using Rubinius'
+      end
+      
       stop_writing_actions
 
       @pending_actions  = {}
@@ -181,7 +185,7 @@ module RubyAMI
     end
 
     def new_stream(callback)
-      Stream.new @options[:host], @options[:port], callback, logger
+      Stream.new @options[:host], @options[:port], callback, logger, @options[:timeout]
     end
 
     def logger

data/lib/ruby_ami/stream.rb

@@ -16,9 +16,9 @@ module RubyAMI
 
     attr_reader :logger
 
-    def initialize(host, port, event_callback, logger = Logger)
+    def initialize(host, port, event_callback, logger = Logger, timeout = 0)
       super()
-      @host, @port, @event_callback, @logger = host, port, event_callback, logger
+      @host, @port, @event_callback, @logger, @timeout = host, port, event_callback, logger, timeout
       logger.debug "Starting up..."
       @lexer = Lexer.new self
     end
@@ -28,7 +28,9 @@ module RubyAMI
     end
 
     def run
-      @socket = TCPSocket.from_ruby_socket ::TCPSocket.new(@host, @port)
+      Timeout::timeout(@timeout) do 
+        @socket = TCPSocket.from_ruby_socket ::TCPSocket.new(@host, @port)
+      end
       post_init
       loop { receive_data @socket.readpartial(4096) }
     rescue Errno::ECONNREFUSED, SocketError => e
@@ -37,6 +39,9 @@ module RubyAMI
     rescue EOFError
       logger.info "Client socket closed!"
       current_actor.terminate!
+    rescue Timeout::Error
+      logger.error "Timeout exceeded while trying to connect."
+      current_actor.terminate!
     end
 
     def post_init

data/lib/ruby_ami/version.rb

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

data/lib/ruby_ami.rb

@@ -14,6 +14,10 @@ module RubyAMI
   def self.new_uuid
     SecureRandom.uuid
   end
+  
+  def self.rbx?
+    RbConfig::CONFIG['RUBY_INSTALL_NAME'] == 'rbx'
+  end
 end
 
 %w{

data/spec/ruby_ami/client_spec.rb

@@ -25,6 +25,23 @@ module RubyAMI
 
     its(:streams) { should == [] }
 
+    it 'should return when the timeout option is specified and reached' do
+      options[:timeout] = 2
+      options[:host] = '192.0.2.1' # unreachable IP that will generally cause a timeout (RFC 5737)
+      
+      start_time = Time.now
+      subject.start
+      duration = Time.now - start_time
+      
+      if RubyAMI.rbx?
+         pending 'waiting for resolution to Rubinius bug (https://github.com/rubinius/rubinius/issues/2127)' do
+           duration.should be_between(options[:timeout], options[:timeout] + 1)
+        end
+      else
+        duration.should be_between(options[:timeout], options[:timeout] + 1)
+      end
+    end
+    
     describe 'starting up' do
       before do
         ms = MockServer.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -283,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1351275234021844884
+      hash: 3069284135143660442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1351275234021844884
+      hash: 3069284135143660442
 requirements: []
 rubyforge_project: ruby_ami
 rubygems_version: 1.8.24