librevox 0.6 → 0.7

data/README.md

@@ -183,8 +183,8 @@ the `Librevox::Commands` and `Librevox::Applications` modules.
 
 ## License
 
-(c) 2009, 2010, 2011 Harry Vangberg <harry@vangberg.name>
-(c) 2011, 2012 Firmafon ApS <info@firmafon.dk>
+(c) 2009-2014 Harry Vangberg <harry@vangberg.name>
+(c) 2011-2014 Firmafon ApS <info@firmafon.dk>
 
 Librevox was inspired by and uses code from Freeswitcher, which is distributed
 under the MIT license and (c) 2009 The Rubyists (Jayson Vaughn, Tj Vanderpoel,

data/lib/librevox.rb

@@ -6,8 +6,6 @@ require 'librevox/listener/outbound'
 require 'librevox/command_socket'
 
 module Librevox
-  VERSION = "0.5"
-
   def self.options
     @options ||= {
       :log_file   => STDOUT,
@@ -25,6 +23,10 @@ module Librevox
     logger
   end
 
+  def self.reopen_log
+    @logger = logger!
+  end
+
   # When called without a block, it will start the listener that is passed as
   # first argument:
   #   
@@ -42,19 +44,21 @@ module Librevox
     EM.run do
       trap("TERM") {stop}
       trap("INT") {stop}
+      trap("HUP") {reopen_log}
 
       block_given? ? instance_eval(&block) : run(klass, args)
     end
   end
 
   def self.run klass, args={}
-    host = args.delete(:host) || "localhost"
-    port = args.delete(:port)
+    args[:host] ||= "localhost"
 
     if klass.ancestors.include? Librevox::Listener::Inbound
-      EM.connect host, port || "8021", klass, args
+      args[:port] ||= 8021
+      EM.connect args[:host], args[:port], klass, args
     elsif klass.ancestors.include? Librevox::Listener::Outbound
-      EM.start_server host, port || "8084", klass, args
+      args[:port] ||= 8084
+      EM.start_server host, args[:port], klass, args
     end
   end
 

data/lib/librevox/listener/inbound.rb

@@ -7,13 +7,24 @@ module Librevox
         super
 
         @auth = args[:auth] || "ClueCon"
+        @host, @port = args.values_at(:host, :port)
+
+        EventMachine.add_shutdown_hook {@shutdown = true}
       end
 
-      def post_init
+      def connection_completed
+        Librevox.logger.info "Connected."
         super
         send_data "auth #{@auth}\n\n"
         send_data "event plain ALL\n\n"
       end
+
+      def unbind
+        if !@shutdown
+          Librevox.logger.error "Lost connection. Reconnecting in 1 second."
+          EM.add_timer(1) {reconnect(@host, @port.to_i)}
+        end
+      end
     end
   end
 end

data/librevox.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "librevox"
-  s.version  = "0.6"
-  s.date     = "2013-01-21"
+  s.version  = "0.7"
+  s.date     = "2014-01-15"
   s.summary  = "Ruby library for interacting with FreeSWITCH."
   s.email    = "harry@vangberg.name"
   s.homepage = "http://github.com/vangberg/librevox"
@@ -33,5 +33,5 @@ open source telephony platform FreeSwitch."
     "spec/librevox/listener/spec_inbound.rb",
     "spec/librevox/listener/spec_outbound.rb"
   ]
-  s.add_dependency "eventmachine", ">= 0.12.10"
+  s.add_dependency "eventmachine", ">= 1.0.0"
 end

data/spec/librevox/listener/spec_inbound.rb

@@ -15,6 +15,7 @@ describe "Inbound listener" do
   behaves_like "api commands"
 
   should "authorize and subscribe to events" do
+    @listener.connection_completed
     @listener.outgoing_data.shift.should == "auth ClueCon\n\n"
     @listener.outgoing_data.shift.should == "event plain ALL\n\n"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librevox
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.0
 description: ! 'EventMachine-based Ruby library for interacting with the
 
   open source telephony platform FreeSwitch.'
@@ -87,3 +87,4 @@ test_files:
 - spec/librevox/spec_response.rb
 - spec/librevox/listener/spec_inbound.rb
 - spec/librevox/listener/spec_outbound.rb
+has_rdoc: