adhearsion 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.8.2
+ - ManagerInterfaceResponse now include()s DRbUndumped, allowing send_action() to be called directly over DRb.
+ - Fixes an inconsequential bug when CTL-C'ing Adhearsion.
+
+0.8.1
+ - The sandbox component now comes 
+ - Minor bug fixes
+
 0.8.0 rev 2
  - Added a few non-critical files to the .gemspec. They were ignored
 

data/EVENTS

@@ -6,6 +6,6 @@
   - manager_interface
   - before_call
   - failed_call
-  - call_hangup
+  - hungup_call
 
-# Note: This file is valid YAML for programatic parsing.
+# Note: This file is valid YAML for programatic parsing.

data/Rakefile

@@ -118,3 +118,10 @@ task :debug_gem do
   Thread.new { spec = eval("$SAFE = 3\n#{gemspec}") }.join
   puts "SUCCESS: Gemspec runs at the $SAFE level 3."
 end
+
+desc 'Install the package as a gem.'
+task :install_gem => [:clobber_package, :package] do
+  windows = /djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM
+  gem = Dir['pkg/*.gem'].first
+  sh "#{'sudo ' unless windows}gem install --local #{gem}"
+end

data/adhearsion.gemspec

@@ -1,5 +1,4 @@
 ADHEARSION_FILES = %w{
-  README.markdown
   adhearsion.gemspec
   app_generators/ahn/ahn_generator.rb
   app_generators/ahn/templates/.ahnrc
@@ -113,7 +112,7 @@ ADHEARSION_FILES = %w{
 
 Gem::Specification.new do |s|
   s.name = "adhearsion"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Phillips"]

data/app_generators/ahn/templates/Rakefile

@@ -1,3 +1,5 @@
+# This file is for the "rake" tool which automates project-related tasks. If you need to automate things, you can create
+# a new Rake task here. See http://rake.rubyforge.org for more info.
 require 'rubygems'
 
 begin

data/app_generators/ahn/templates/components/disabled/sandbox/sandbox.rb

@@ -6,7 +6,6 @@ SANDBOX_VERSION = 1.0
 initialization do
   # We shouldn't start initializing until after the AGI server has initialized.
   Events.register_callback(:after_initialized) do
-    ahn_log.sandbox "Fetching sandbox connection information"
     
     config = if COMPONENTS.sandbox.has_key? "connect_to"
       {"connect_to" => COMPONENTS.sandbox["connect_to"]}
@@ -30,8 +29,6 @@ initialization do
       
         host, port = config.values_at "host", "port"
       
-        ahn_log.sandbox "Connecting to #{host}:#{port}"
-        
         username, password = COMPONENTS.sandbox["username"], COMPONENTS.sandbox["password"]
         
         if username.blank? || password.blank? || username == "user123"
@@ -55,8 +52,6 @@ initialization do
               socket.puts identifying_hash
               response = socket.gets
               unless response
-                ahn_log.sandbox "Communication with the sandbox ended before receiving any response. Trying again in 10 seconds."
-                sleep 10
                 next
               end
               response.chomp!
@@ -75,7 +70,7 @@ initialization do
                     rescue => e
                       ahn_log.error "Non-fatal exception in the AGI server: #{e.inspect} \n" + e.backtrace.join("\n")
                     ensure
-                      socket.close
+                      socket.close rescue nil
                     end
                     ahn_log.sandbox "AGI server finished serving call. Reconnecting to sandbox."
                   else

data/app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.yml

@@ -9,4 +9,4 @@ port: 61613
 
 # subscriptions:
 #   - start_call
-#   - hangup_call
+#   - hungup_call

data/app_generators/ahn/templates/events.rb

@@ -25,7 +25,7 @@
 # - events.shutdown
 # - events.asterisk.before_call
 # - events.asterisk.failed_call
-# - events.asterisk.call_hangup
+# - events.asterisk.hungup_call
 #
 #
 # Note: events are mostly for components to register and expose to you.

data/lib/adhearsion/initializer.rb

@@ -128,15 +128,15 @@ module Adhearsion
       switch_to_root_directory
       catch_termination_signal
       bootstrap_rc
-      daemonize! if should_daemonize?
       initialize_log_file
       load_all_init_files
       init_components_subsystem
       init_modules
       init_events_subsystem
-      create_pid_file if pid_file
       load_components
       init_events_file
+      daemonize! if should_daemonize?
+      create_pid_file if pid_file
       
       ahn_log "Adhearsion initialized!"
       

data/lib/adhearsion/initializer/database.rb

@@ -11,7 +11,8 @@ module Adhearsion
           require_dependencies
           require_models
           @@config = Adhearsion::AHN_CONFIG.database
-          ActiveRecord::Base.allow_concurrency = true
+          # You may need to uncomment the following line for older versions of ActiveRecord
+          # ActiveRecord::Base.allow_concurrency = true
           establish_connection
           create_call_hook_for_connection_cleanup
         end

data/lib/adhearsion/initializer/rails.rb

@@ -17,7 +17,8 @@ module Adhearsion
                 "It's not a directory!" unless File.directory?(rails_root)
           load_rails
           if defined? ActiveRecord
-            ActiveRecord::Base.allow_concurrency = true
+            # You may need to uncomment the following line for older versions of ActiveRecord
+            # ActiveRecord::Base.allow_concurrency = true
             Events.register_callback([:asterisk, :before_call]) do
               ActiveRecord::Base.verify_active_connections!
             end

data/lib/adhearsion/version.rb

@@ -2,8 +2,8 @@ module Adhearsion #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0 unless defined? MAJOR
     MINOR = 8 unless defined? MINOR
-    TINY  = 1 unless defined? TINY
+    TINY  = 2 unless defined? TINY
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined? STRING
   end
-end
+end

data/lib/adhearsion/voip/asterisk/agi_server.rb

@@ -21,6 +21,9 @@ module Adhearsion
       	      # This is what happens 99.9% of the time.
       	      
       	      DialPlan::Manager.handle call
+    	      rescue Hangup
+    	        ahn_log.agi "HANGUP event for call with uniqueid #{call.variables[:uniqueid].inspect} and channel #{call.variables[:channel].inspect}"
+    	        call.hangup!
             rescue DialPlan::Manager::NoContextError => e
               ahn_log.agi e.message
               call.hangup!
@@ -34,8 +37,8 @@ module Adhearsion
               end
             rescue HungupExtensionCallException => hungup_call
               begin
-                ahn_log.agi "Received \"h\" meta-call. Executing /asterisk/call_hangup event callbacks."
-                Events.trigger [:asterisk, :call_hangup], hungup_call.call
+                ahn_log.agi "Received \"h\" meta-call. Executing /asterisk/hungup_call event callbacks."
+                Events.trigger [:asterisk, :hungup_call], hungup_call.call
                 call.hangup!
               rescue => e
                 ahn_log.agi.error e
@@ -78,4 +81,4 @@ module Adhearsion
       end
     end
   end
-end
+end

data/lib/adhearsion/voip/asterisk/commands.rb

@@ -48,6 +48,7 @@ module Adhearsion
         
         def read
           returning from_pbx.gets do |message|
+            raise Hangup if message.nil?
             ahn_log.agi.debug "<<< #{message}"
           end
         end
@@ -891,7 +892,7 @@ module Adhearsion
           
           def validate_digits(digits)
             returning digits.to_s do |digits_as_string|
-              raise ArgumentError, "Can only be called with valid digits!" unless digits_as_string =~ /^\d+$/
+              raise ArgumentError, "Can only be called with valid digits!" unless digits_as_string =~ /^[0-9*#-]+$/
             end
           end
           

data/lib/adhearsion/voip/call.rb

@@ -16,6 +16,10 @@ module Adhearsion
     end
   end
   
+  class Hangup < Exception
+    # At the moment, we'll just use this to end a call-handling Thread.
+  end
+  
   ##
   # This manages the list of calls the Adhearsion service receives
   class Calls

data/lib/theatre/invocation.rb

@@ -32,7 +32,7 @@ module Theatre
       @returned_value_lock = Monitor.new
       
       # Used when wait() is called to notify all waiting threads by using a ConditionVariable
-      @returned_value_blocker = Monitor::ConditionVariable.new @returned_value_lock
+      @returned_value_blocker = @returned_value_lock.new_cond#Monitor::ConditionVariable.new @returned_value_lock
     end
     
     def queued

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Jay Phillips
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -07:00
+date: 2008-08-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.markdown
 - adhearsion.gemspec
 - app_generators/ahn/ahn_generator.rb
 - app_generators/ahn/templates/.ahnrc

data/README.markdown

@@ -1,31 +0,0 @@
-Adhearsion
-==========
-
-Adhearsion is an open-source voice application development framework. Adhearsion users write applications atop the framework with Ruby and **call into their code**.
-
-Adhearsion rests above a lower-level telephony platform, namely [Asterisk](http://asterisk.org), though there are experimental bindings for both [FreeSWITCH](http://freeswitch.org) and [Yate](http://yate.null.ro/pmwiki).
-
-Adhearsion has...
-
-* An elegant dialplan system for writing the code which controls a live phone call
-* A sophisticated Asterisk Manager Interface library with a lexer written in [Ragel](http://www.complang.org/ragel).
-* An events subsystem which maintains a Thread-pool for executing your namespaced callbacks. (supports AMI events too!)
-* A very useful component architecture with which you may write Adhearsion plugins and share them with the world.
-* JRuby compatibility for running atop the Java Virtual Machine and using virtually any Java library.
-* Good regression test coverage
-
-Use the public Adhearsion sandbox!
-==================================
-
-Don't want to screw with setting up a telephony system? You can test your Adhearsion applications using our public sandbox!
-
-Visit [http://adhearsion.com/getting_started](http://adhearsion.com/getting_started) for more information!
-
-Yes, in minutes you can be controlling your cell phone for free!  :)
-
-Documentation
-=============
-
-Visit [Adhearsion's website](http://adhearsion.com) for more information about the framework or visit the [wiki](http://docs.adhearsion.com) for documentation on how to use it.
-
-If you're having trouble, you may want to try asking your question on the IRC channel, [mailing list](http://groups.google.com/group/adhearsion) or, if you've found a bug, report it on the [bug tracker](http://adhearsion.lighthouseapp.com/projects/5871-adhearsion/overview).