sevenscale-adhearsion 0.7.1000 → 0.7.1003

data/Manifest.txt

@@ -3,6 +3,7 @@ LICENSE
 Manifest.txt
 README.txt
 Rakefile
+adhearsion.gemspec
 ahn_generators/component/USAGE
 ahn_generators/component/component_generator.rb
 ahn_generators/component/templates/configuration.rb
@@ -20,6 +21,7 @@ app_generators/ahn/templates/components/simon_game/test/test_helper.rb
 app_generators/ahn/templates/components/simon_game/test/test_simon_game.rb
 app_generators/ahn/templates/config/startup.rb
 app_generators/ahn/templates/dialplan.rb
+app_generators/ahn/templates/events.rb
 bin/ahn
 bin/ahnctl
 bin/jahn
@@ -50,6 +52,7 @@ lib/adhearsion/distributed/gateways/soap_gateway.rb
 lib/adhearsion/distributed/gateways/xmlrpc_gateway.rb
 lib/adhearsion/distributed/peer_finder.rb
 lib/adhearsion/distributed/remote_cli.rb
+lib/adhearsion/events_support.rb
 lib/adhearsion/hooks.rb
 lib/adhearsion/host_definitions.rb
 lib/adhearsion/initializer.rb
@@ -61,7 +64,6 @@ lib/adhearsion/initializer/freeswitch.rb
 lib/adhearsion/initializer/paths.rb
 lib/adhearsion/initializer/rails.rb
 lib/adhearsion/logging.rb
-lib/adhearsion/services/scheduler.rb
 lib/adhearsion/tasks.rb
 lib/adhearsion/tasks/database.rb
 lib/adhearsion/tasks/generating.rb
@@ -104,18 +106,18 @@ lib/adhearsion/voip/menu_state_machine/calculated_match.rb
 lib/adhearsion/voip/menu_state_machine/matchers.rb
 lib/adhearsion/voip/menu_state_machine/menu_builder.rb
 lib/adhearsion/voip/menu_state_machine/menu_class.rb
-script/destroy
-script/generate
 spec/fixtures/dialplan.rb
 spec/initializer/test_configuration.rb
 spec/initializer/test_loading.rb
 spec/initializer/test_paths.rb
+spec/sample.rb
 spec/silence.rb
 spec/test_ahn_command.rb
 spec/test_code_quality.rb
 spec/test_component_manager.rb
 spec/test_constants.rb
 spec/test_drb.rb
+spec/test_events.rb
 spec/test_helper.rb
 spec/test_hooks.rb
 spec/test_host_definitions.rb

data/README.txt

@@ -2,5 +2,4 @@ Adhearsion
     by Jay Phillips, et. al
     http://adhearsion.com
 
-Adhearsion is an open-source framework written in Ruby designed to vastly improve Voice over IP development. It rests atop established telephony platforms (such as Asterisk and Freeswitch) and abstracts their complexity with the beauty of a well-designed, high-level suite of solutions.
-
+Adhearsion is an open-source framework written in Ruby designed to vastly improve Voice over IP development. It rests atop established telephony platforms (such as Asterisk and Freeswitch) and abstracts their complexity with the beauty of a well-designed, high-level suite of solutions.

data/Rakefile

@@ -4,6 +4,7 @@ ENV['RUBY_FLAGS'] = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
 require 'rubygems'
 require 'hoe'
 require 'lib/adhearsion/version'
+# require File.dirname(__FILE__) + "/support/yard/lib/yard"
 
 begin
   require 'rcov/rcovtask'
@@ -24,6 +25,11 @@ task :test do
   # The other :test task is created by Hoe below.
 end
 
+# YARD::Rake::YardocTask.new do |t|
+#   t.files   = ['lib/**/*.rb']   # optional
+#   # t.options = ['--any', '--extra', '--opts'] # optional
+# end
+
 # Need to migrate away from Hoe...
 Hoe.new('adhearsion', Adhearsion::VERSION::STRING) do |p|
   p.rubyforge_name = 'adhearsion'
@@ -45,4 +51,4 @@ end
 
 task :ragel do
   `ragel -n -R lib/adhearsion/voip/asterisk/ami/machine.rl | rlgen-ruby -o lib/adhearsion/voip/asterisk/ami/machine.rb`
-end
+end

data/adhearsion.gemspec

@@ -0,0 +1,40 @@
+Gem::Specification.new do |s|
+  s.name = %q{adhearsion}
+  s.version = "0.7.1003"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jay Phillips"]
+  s.date = %q{2008-09-16}
+  s.description = %q{Adhearsion is an open-source VoIP development framework written in Ruby}
+  s.email = %q{Jay -at- Codemecca.com}
+  s.executables = ["ahn", "ahnctl", "jahn"]
+  s.extra_rdoc_files = ["Manifest.txt", "README.txt"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest.txt", "README.txt", "Rakefile", "adhearsion.gemspec", "ahn_generators/component/USAGE", "ahn_generators/component/component_generator.rb", "ahn_generators/component/templates/configuration.rb", "ahn_generators/component/templates/lib/lib.rb.erb", "ahn_generators/component/templates/test/test.rb.erb", "ahn_generators/component/templates/test/test_helper.rb", "app_generators/ahn/USAGE", "app_generators/ahn/ahn_generator.rb", "app_generators/ahn/templates/.ahnrc", "app_generators/ahn/templates/README", "app_generators/ahn/templates/Rakefile", "app_generators/ahn/templates/components/simon_game/configuration.rb", "app_generators/ahn/templates/components/simon_game/lib/simon_game.rb", "app_generators/ahn/templates/components/simon_game/test/test_helper.rb", "app_generators/ahn/templates/components/simon_game/test/test_simon_game.rb", "app_generators/ahn/templates/config/startup.rb", "app_generators/ahn/templates/dialplan.rb", "app_generators/ahn/templates/events.rb", "bin/ahn", "bin/ahnctl", "bin/jahn", "lib/adhearsion.rb", "lib/adhearsion/blank_slate.rb", "lib/adhearsion/cli.rb", "lib/adhearsion/component_manager.rb", "lib/adhearsion/core_extensions/all.rb", "lib/adhearsion/core_extensions/array.rb", "lib/adhearsion/core_extensions/custom_daemonizer.rb", "lib/adhearsion/core_extensions/global.rb", "lib/adhearsion/core_extensions/guid.rb", "lib/adhearsion/core_extensions/hash.rb", "lib/adhearsion/core_extensions/metaprogramming.rb", "lib/adhearsion/core_extensions/numeric.rb", "lib/adhearsion/core_extensions/proc.rb", "lib/adhearsion/core_extensions/pseudo_uuid.rb", "lib/adhearsion/core_extensions/publishable.rb", "lib/adhearsion/core_extensions/relationship_properties.rb", "lib/adhearsion/core_extensions/string.rb", "lib/adhearsion/core_extensions/thread.rb", "lib/adhearsion/core_extensions/thread_safety.rb", "lib/adhearsion/core_extensions/time.rb", "lib/adhearsion/distributed/gateways/dbus_gateway.rb", "lib/adhearsion/distributed/gateways/osa_gateway.rb", "lib/adhearsion/distributed/gateways/rest_gateway.rb", "lib/adhearsion/distributed/gateways/soap_gateway.rb", "lib/adhearsion/distributed/gateways/xmlrpc_gateway.rb", "lib/adhearsion/distributed/peer_finder.rb", "lib/adhearsion/distributed/remote_cli.rb", "lib/adhearsion/events_support.rb", "lib/adhearsion/hooks.rb", "lib/adhearsion/host_definitions.rb", "lib/adhearsion/initializer.rb", "lib/adhearsion/initializer/asterisk.rb", "lib/adhearsion/initializer/configuration.rb", "lib/adhearsion/initializer/database.rb", "lib/adhearsion/initializer/drb.rb", "lib/adhearsion/initializer/freeswitch.rb", "lib/adhearsion/initializer/paths.rb", "lib/adhearsion/initializer/rails.rb", "lib/adhearsion/logging.rb", "lib/adhearsion/tasks.rb", "lib/adhearsion/tasks/database.rb", "lib/adhearsion/tasks/generating.rb", "lib/adhearsion/tasks/lint.rb", "lib/adhearsion/tasks/testing.rb", "lib/adhearsion/version.rb", "lib/adhearsion/voip/asterisk.rb", "lib/adhearsion/voip/asterisk/agi_server.rb", "lib/adhearsion/voip/asterisk/ami.rb", "lib/adhearsion/voip/asterisk/ami/actions.rb", "lib/adhearsion/voip/asterisk/ami/machine.rb", "lib/adhearsion/voip/asterisk/ami/machine.rl", "lib/adhearsion/voip/asterisk/ami/parser.rb", "lib/adhearsion/voip/asterisk/commands.rb", "lib/adhearsion/voip/asterisk/config_generators/agents.conf.rb", "lib/adhearsion/voip/asterisk/config_generators/config_generator.rb", "lib/adhearsion/voip/asterisk/config_generators/queues.conf.rb", "lib/adhearsion/voip/asterisk/config_generators/voicemail.conf.rb", "lib/adhearsion/voip/asterisk/config_manager.rb", "lib/adhearsion/voip/asterisk/special_dial_plan_managers.rb", "lib/adhearsion/voip/call.rb", "lib/adhearsion/voip/call_routing.rb", "lib/adhearsion/voip/commands.rb", "lib/adhearsion/voip/constants.rb", "lib/adhearsion/voip/conveniences.rb", "lib/adhearsion/voip/dial_plan.rb", "lib/adhearsion/voip/dsl/dialing_dsl.rb", "lib/adhearsion/voip/dsl/dialing_dsl/dialing_dsl_monkey_patches.rb", "lib/adhearsion/voip/dsl/dialplan/control_passing_exception.rb", "lib/adhearsion/voip/dsl/dialplan/dispatcher.rb", "lib/adhearsion/voip/dsl/dialplan/parser.rb", "lib/adhearsion/voip/dsl/dialplan/thread_mixin.rb", "lib/adhearsion/voip/dsl/numerical_string.rb", "lib/adhearsion/voip/freeswitch/basic_connection_manager.rb", "lib/adhearsion/voip/freeswitch/event_handler.rb", "lib/adhearsion/voip/freeswitch/freeswitch_dialplan_command_factory.rb", "lib/adhearsion/voip/freeswitch/inbound_connection_manager.rb", "lib/adhearsion/voip/freeswitch/oes_server.rb", "lib/adhearsion/voip/menu_state_machine/calculated_match.rb", "lib/adhearsion/voip/menu_state_machine/matchers.rb", "lib/adhearsion/voip/menu_state_machine/menu_builder.rb", "lib/adhearsion/voip/menu_state_machine/menu_class.rb", "spec/fixtures/dialplan.rb", "spec/initializer/test_configuration.rb", "spec/initializer/test_loading.rb", "spec/initializer/test_paths.rb", "spec/sample.rb", "spec/silence.rb", "spec/test_ahn_command.rb", "spec/test_code_quality.rb", "spec/test_component_manager.rb", "spec/test_constants.rb", "spec/test_drb.rb", "spec/test_events.rb", "spec/test_helper.rb", "spec/test_hooks.rb", "spec/test_host_definitions.rb", "spec/test_initialization.rb", "spec/test_logging.rb", "spec/test_relationship_properties.rb", "spec/voip/asterisk/ami_response_definitions.rb", "spec/voip/asterisk/config_file_generators/test_agents.rb", "spec/voip/asterisk/config_file_generators/test_queues.rb", "spec/voip/asterisk/config_file_generators/test_voicemail.rb", "spec/voip/asterisk/menu_command/test_calculated_match.rb", "spec/voip/asterisk/menu_command/test_matchers.rb", "spec/voip/asterisk/mock_ami_server.rb", "spec/voip/asterisk/test_agi_server.rb", "spec/voip/asterisk/test_ami.rb", "spec/voip/asterisk/test_commands.rb", "spec/voip/asterisk/test_config_manager.rb", "spec/voip/dsl/dispatcher_spec_helper.rb", "spec/voip/dsl/test_dialing_dsl.rb", "spec/voip/dsl/test_dispatcher.rb", "spec/voip/dsl/test_parser.rb", "spec/voip/freeswitch/test_basic_connection_manager.rb", "spec/voip/freeswitch/test_inbound_connection_manager.rb", "spec/voip/freeswitch/test_oes_server.rb", "spec/voip/test_call_routing.rb", "spec/voip/test_dialplan_manager.rb", "spec/voip/test_numerical_string.rb", "spec/voip/test_phone_number.rb", "test/test_ahn_generator.rb", "test/test_component_generator.rb", "test/test_generator_helper.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://adhearsion.com}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{adhearsion}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{Adhearsion, open-source telephony integrator.}
+  s.test_files = ["spec/initializer/test_configuration.rb", "spec/initializer/test_loading.rb", "spec/initializer/test_paths.rb", "spec/test_ahn_command.rb", "spec/test_code_quality.rb", "spec/test_component_manager.rb", "spec/test_constants.rb", "spec/test_drb.rb", "spec/test_events.rb", "spec/test_helper.rb", "spec/test_hooks.rb", "spec/test_host_definitions.rb", "spec/test_initialization.rb", "spec/test_logging.rb", "spec/test_relationship_properties.rb", "spec/voip/asterisk/config_file_generators/test_agents.rb", "spec/voip/asterisk/config_file_generators/test_queues.rb", "spec/voip/asterisk/config_file_generators/test_voicemail.rb", "spec/voip/asterisk/menu_command/test_calculated_match.rb", "spec/voip/asterisk/menu_command/test_matchers.rb", "spec/voip/asterisk/test_agi_server.rb", "spec/voip/asterisk/test_ami.rb", "spec/voip/asterisk/test_commands.rb", "spec/voip/asterisk/test_config_manager.rb", "spec/voip/dsl/test_dialing_dsl.rb", "spec/voip/dsl/test_dispatcher.rb", "spec/voip/dsl/test_parser.rb", "spec/voip/freeswitch/test_basic_connection_manager.rb", "spec/voip/freeswitch/test_inbound_connection_manager.rb", "spec/voip/freeswitch/test_oes_server.rb", "spec/voip/test_call_routing.rb", "spec/voip/test_dialplan_manager.rb", "spec/voip/test_numerical_string.rb", "spec/voip/test_phone_number.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<rubigen>, [">= 1.0.6"])
+      s.add_runtime_dependency(%q<log4r>, [">= 1.0.5"])
+      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
+    else
+      s.add_dependency(%q<rubigen>, [">= 1.0.6"])
+      s.add_dependency(%q<log4r>, [">= 1.0.5"])
+      s.add_dependency(%q<hoe>, [">= 1.7.0"])
+    end
+  else
+    s.add_dependency(%q<rubigen>, [">= 1.0.6"])
+    s.add_dependency(%q<log4r>, [">= 1.0.5"])
+    s.add_dependency(%q<hoe>, [">= 1.7.0"])
+  end
+end

data/app_generators/ahn/ahn_generator.rb

@@ -31,11 +31,12 @@ class AhnGenerator < RubiGen::Base
       
       m.file  *["config/startup.rb"]*2
       m.file  *["dialplan.rb"]*2
+      m.file  *["events.rb"]*2
       m.file  *["README"]*2
       m.file  *["Rakefile"]*2
       
-      m.dependency "install_rubigen_scripts", [destination_root, 'ahn', 'adhearsion', 'test_spec'], 
-        :shebang => options[:shebang], :collision => :force
+      # m.dependency "install_rubigen_scripts", [destination_root, 'ahn', 'adhearsion', 'test_spec'], 
+      #   :shebang => options[:shebang], :collision => :force
     end
   end
 

data/app_generators/ahn/templates/.ahnrc

@@ -1,5 +1,19 @@
 # Adhearsion Runtime Configuration.
 
+# You can use the "gems" section to force Adhearsion to load a particular version of a gem.
+# This is useful when a component require()s a gem, but you don't want it to use the latest one installed on the system.
+# For example, if a component require()s activerecord, sucking in the latest on the system, and then you enable a Rails app
+# which wants a particular version of activerecord, RubyGems will raise an error saying "you cannot activate two versions of
+# the same gem". Note: specifying the version and/or the source is optional, but you must include a : after the gem name.
+gems:
+#  twitter:
+#  hpricot:
+#  rack:
+#  activerecord:
+#    version: >= 2.1.0
+#  aasm:
+#    source: http://gems.github.com
+
 paths:
 
   # All paths are relative to this file's directory
@@ -7,6 +21,8 @@ paths:
 
   dialplan: dialplan.rb
 
+  events: events.rb
+
   models:
     directory: models
     pattern: "*.rb"

data/app_generators/ahn/templates/Rakefile

@@ -1,3 +1,18 @@
 require 'rubygems'
 require 'adhearsion'
 require 'adhearsion/tasks'
+
+desc "Writes a .gitignore file that ignores certain SCM annoyances such as log files"
+task :gitignore do
+  ignore_file = "#{Dir.pwd}/.gitignore"
+  if File.exists? ignore_file
+    STDERR.puts "File #{ignore_file} already exists!"
+  else
+    File.open ignore_file, 'w' do |file|
+      # Add other files to the Array below
+      %w[ log ].each do |pattern|
+        file.puts pattern
+      end
+    end
+  end
+end

data/app_generators/ahn/templates/events.rb

@@ -0,0 +1,6 @@
+# For a full description of what this file does, view the online
+# documentation at http://adhearsion.com
+
+events.asterisk.before_call.each do |event|
+  
+end

data/lib/adhearsion/cli.rb

@@ -67,7 +67,7 @@ USAGE
         
           def start(path, daemon=false, pid_file=nil)
             raise PathInvalid, path unless File.exists? path + "/.ahnrc"
-            Adhearsion::Initializer.new path, :daemon => daemon, :pid_file => pid_file
+            Adhearsion::Initializer.start path, :daemon => daemon, :pid_file => pid_file
           end
         
           def version

data/lib/adhearsion/events_support.rb

@@ -0,0 +1,262 @@
+require 'thread'
+module Adhearsion
+  module Events
+    
+    class << self
+      
+      def framework_events_container
+        defined?(@@framework_events_container) ? @@framework_events_container : reinitialize_framework_events_container!
+      end
+      
+      def load_definitions_from_files(*files)
+        files.each do |file|
+          framework_events_container.instance_eval File.read(file)
+        end
+      end
+      alias load_definitions_from_file load_definitions_from_files
+      
+      def namespace_registered?(*paths)
+        framework_events_container.namespace_registered?(*paths)
+      end
+      
+      def reinitialize_framework_events_container!
+        @@framework_events_container = EventsDefinitionContainer.new
+      end
+      
+      def register_namespace_path(*paths)
+        framework_events_container.register_namespace_path(*paths)
+      end
+      
+    end
+    
+    class EventsDefinitionContainer
+
+      attr_reader :root
+      def initialize
+        @root = RootEventNamespace.new
+      end
+      
+      def register_namespace_path(*paths)
+        inject_across_path(*paths) do |namespace, path|
+          namespace.namespace_registered?(path) ? namespace[path] : namespace.register_namespace(path)
+        end
+      end
+      
+      def events
+        root.capturer
+      end
+      
+      def namespace_registered?(*paths)
+        !! inject_across_path(*paths) { |namespace,path| namespace[path] }
+      rescue UndefinedEventNamespace
+        false
+      end
+      
+      def callbacks_at_path(*paths)
+        inject_across_path(*paths) { |namespace,path| namespace[path] }.callbacks
+      end
+      
+      private
+      
+      def inject_across_path(*paths, &block)
+        paths.map(&:to_sym).inject(root, &block)
+      end
+    end
+    
+    class NamespaceDefinitionCapturer
+      
+      attr_reader :namespace
+      def initialize(namespace)
+        @namespace = namespace
+      end
+      
+      def method_missing(name, *args)
+        super if name == :each # Added to prevent confusion
+        nested_namespace_or_registrar = namespace[name.to_sym]
+        raise UndefinedEventNamespace.new(name) unless nested_namespace_or_registrar
+        case nested_namespace_or_registrar
+          when EventCallbackRegistrar
+            nested_namespace_or_registrar
+          when RegisteredEventNamespace
+            nested_namespace_or_registrar.capturer
+        end
+      end
+    end
+    
+    class UndefinedEventNamespace < Exception
+      def initialize(name)
+        super "Undefined namespace '#{name}'"
+      end
+    end
+    
+    class AbstractEventNamespace
+      
+      attr_reader :children
+      def initialize
+        @children = {}
+      end
+      
+      def [](namespace_name)
+        raise UndefinedEventNamespace.new(namespace_name) unless namespace_registered? namespace_name
+        children[namespace_name]
+      end
+      
+      def namespace_registered?(namespace_name)
+        children.has_key?(namespace_name)
+      end
+      
+      def register_namespace(namespace)
+        children[namespace] = RegisteredEventNamespace.new(self)
+      end
+      
+      def root?
+        false
+      end
+      
+      def capturer
+        @capturer ||= NamespaceDefinitionCapturer.new(self)
+      end
+      
+    end
+
+    class RootEventNamespace < AbstractEventNamespace
+      
+      def parent
+        nil
+      end
+      
+      def root?
+        true
+      end
+    end
+    
+    class RegisteredEventNamespace < AbstractEventNamespace
+      attr_reader :parent
+      def initialize(parent)
+        super()
+        @parent = parent
+      end
+      
+      def register_callback_name(name, mode=:sync, &block)
+        children[name] = case mode
+          when :sync  then  SynchronousEventCallbackRegistrar
+          when :async then AsynchronousEventCallbackRegistrar
+          else
+            raise ArgumentError, "Unsupported mode #{mode.inspect} !"
+        end.new(self, &block)
+      end
+      
+    end
+
+    class EventCallbackRegistrar
+      
+      attr_reader   :namespace, :callbacks
+      attr_accessor :notified_on_new_callback
+      
+      
+      def initialize(namespace, &notified_on_new_callback)
+        @namespace = namespace
+        @callbacks = []
+        @mutex     = Mutex.new
+        @notified_on_new_callback = notified_on_new_callback
+      end
+      
+      # This is effectively called when you define a new callback with each()
+      def register_callback(&block)
+        returning RegisteredEventCallback.new(self, &block) do |callback|
+          with_lock { callbacks << callback }
+          notified_on_new_callback.call callback if notified_on_new_callback
+        end
+      end
+      alias each register_callback
+      
+      def <<(message)
+        raise NotImplementedError
+      end
+      
+      def remove_callback(callback)
+        with_lock { callbacks.delete callback }
+      end
+      
+      protected
+      
+      def with_lock(&block)
+        @mutex.synchronize(&block)
+      end
+      
+      def threadsafe_callback_collection
+        with_lock { callbacks.clone }
+      end
+            
+    end
+    
+    class SynchronousEventCallbackRegistrar < EventCallbackRegistrar
+      def <<(event)
+        threadsafe_callback_collection.each do |callback|
+          callback.run_with_event event
+        end
+      end
+    end
+    
+    class AsynchronousEventCallbackRegistrar < EventCallbackRegistrar
+      
+      attr_reader :thread
+      def initialize(namespace, &notified_on_new_callback)
+        super
+        @thread = AsynchronousEventCallbackRegistrar.new
+      end
+      
+      def <<(event)
+        threadsafe_callback_collection.each do |callback|
+          
+        end
+      end
+      
+      protected
+      
+      attr_reader :queue
+      
+      class AsynchronousEventHandlerThread < Thread
+        
+        def initialize(&block)
+          @queue = Queue.new
+          super do
+            loop { block.call @queue.pop }
+          end
+        end
+        
+        def <<(event)
+          @queue << event
+        end
+        
+      end
+      
+    end
+    
+    # A RegisteredEventCallback is stored away each time you call each() on an event namespace.
+    # It keeps a copy of the namespace 
+    class RegisteredEventCallback
+      
+      attr_reader :registrar, :args, :block
+      def initialize(registrar, *args, &block)
+        raise ArgumentError, "Must supply a callback in the form of a block!" unless block_given?
+        @registrar, @args, @block = registrar, args, block
+      end
+      
+      def run_with_event(event)
+        begin
+          block.call event
+        rescue => e
+          indenter = "\n" + (" " * 5)
+          ahn_log.events.error e.message + indenter + e.backtrace.join(indenter)
+        end
+      end
+      
+      def namespace
+        registrar.namespace
+      end
+      
+    end
+    
+  end
+end

data/lib/adhearsion/initializer.rb

@@ -41,9 +41,7 @@ module Adhearsion
     
     class << self
       def get_rules_from(location)
-        if File.directory? location
-          location = File.join location, ".ahnrc"
-        end
+        location = File.join location, ".ahnrc" if File.directory? location
         File.exists?(location) ? YAML.load_file(location) : nil
       end
       
@@ -55,17 +53,20 @@ module Adhearsion
         end
       end
       
+      def start(*args, &block)
+        new(*args, &block).start
+      end
+      
       def start_from_init_file(file, ahn_app_path)
         return if defined?(@@started) && @@started
-        new(ahn_app_path, :loaded_init_files => file)
+        start ahn_app_path, :loaded_init_files => file
       end
       
     end
   
     attr_reader :path, :daemon, :pid_file, :log_file, :ahn_app_log_directory
     
-    DEFAULT_RULES = { :pattern   => "*.rb",
-                      :directory => "helpers"}
+    DEFAULT_FRAMEWORK_EVENT_CALLBACK_NAMES = [:after_initialized, :shutdown]
     
     # Creation of pid_files
     #
@@ -80,10 +81,13 @@ module Adhearsion
     #    even in daemon mode by supplying "false".
     def initialize(path=nil, options={})
       @@started = true
-      @path              = path
-      @daemon            = options[:daemon]
-      @pid_file          = options[:pid_file].nil? ? ENV['PID_FILE'] : options[:pid_file]
-      @loaded_init_files = options[:loaded_init_files]
+      @path     = path
+      @daemon   = options[:daemon]
+      @pid_file = options[:pid_file].nil? ? ENV['PID_FILE'] : options[:pid_file]
+      @loaded_init_files  = options[:loaded_init_files]
+    end
+    
+    def start
       self.class.ahn_root = path
       resolve_pid_file_path
       resolve_log_file_path
@@ -96,11 +100,25 @@ module Adhearsion
       initialize_log_file
       create_pid_file if pid_file
       load_components
-      
+      init_events
       ahn_log "Adhearsion initialized!"
       
       trigger_after_initialized_hooks
       join_framework_threads
+      
+      self
+    end
+    
+    def init_events
+      if Paths.manager_for? "events"
+        framework = Events.register_namespace_path(:framework)
+        DEFAULT_FRAMEWORK_EVENT_CALLBACK_NAMES.each do |framework_event_callback_name|
+          framework.register_callback_name framework_event_callback_name
+        end
+        Events.load_definitions_from_files *all_events
+      else
+        ahn_log.events.warn 'No "events" section in .ahnrc. Skipping its initialization.'
+      end
     end
     
     def initialize_log_file
@@ -108,11 +126,11 @@ module Adhearsion
       file_logger = Log4r::FileOutputter.new("Main Adhearsion log file", :filename => log_file, :trunc => false)
       
       if should_daemonize?
-        Adhearsion::Logging::AdhearsionLogger.outputters  = file_logger
+        Logging::AdhearsionLogger.outputters  = file_logger
       else
-        Adhearsion::Logging::AdhearsionLogger.outputters << file_logger
+        Logging::AdhearsionLogger.outputters << file_logger
       end
-      Adhearsion::Logging::DefaultAdhearsionLogger.redefine_outputters
+      Logging::DefaultAdhearsionLogger.redefine_outputters
     end
     
     def resolve_log_file_path      
@@ -195,15 +213,27 @@ module Adhearsion
     end
     
     def bootstrap_rc
-      rules = Initializer.get_rules_from(AHN_ROOT) || DEFAULT_RULES
-      paths = rules['paths'] || DEFAULT_RULES
-      paths.each_pair do |k,v|
-        if v.kind_of? Hash
-          directory, pattern = v['directory'] || '.', v['pattern'] || '*'
-          Paths.manager_for k, :pattern => File.join(directory, pattern)
+      rules = self.class.get_rules_from AHN_ROOT
+      
+      paths = rules['paths']
+      paths.each_pair do |path_name, pattern_or_ruleset|
+        if pattern_or_ruleset.kind_of? Hash
+          directory, pattern = pattern_or_ruleset['directory'] || '.', pattern_or_ruleset['pattern'] || '*'
+          Paths.manager_for path_name, :pattern => File.join(directory, pattern)
         else
-          directory, pattern = '.', v
-          Paths.manager_for k, :pattern => File.join(directory,pattern)
+          directory, pattern = '.', pattern_or_ruleset
+          Paths.manager_for path_name, :pattern => File.join(directory,pattern)
+        end
+      end
+      
+      gems = rules['gems']
+      if gems.kind_of?(Hash) && gems.any? && respond_to?(:gem)
+        gems.each_pair do |gem_name,properties_hash|
+          if properties_hash && properties_hash["version"]
+            gem gem_name, properties_hash["version"]
+          else
+            gem gem_name
+          end
         end
       end
     end

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

@@ -47,7 +47,10 @@ module Adhearsion
             rescue => e
               ahn_log.agi.error e.inspect
               ahn_log.agi.error e.backtrace.map { |s| " " * 5 + s }.join("\n")
+            ensure
+              Adhearsion.remove_inactive_call call rescue nil
             end
+            
           end
          
           DEFAULT_OPTIONS = { :server_class => RubyServer, :port => 4573, :host => "0.0.0.0" } unless defined? DEFAULT_OPTIONS

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

@@ -639,7 +639,7 @@ module Adhearsion
           end
         
           def interruptable_play(*files)
-            files.each do |file|
+            files.flatten.each do |file|
               result = result_digit_from raw_response("EXEC BACKGROUND #{file}")
               return result if result != 0.chr
             end

data/lib/adhearsion/voip/asterisk.rb

@@ -1,4 +1,11 @@
 require File.dirname(__FILE__) + "/dsl/numerical_string"
 require File.dirname(__FILE__) + "/asterisk/agi_server"
 require File.dirname(__FILE__) + "/asterisk/ami"
-require File.dirname(__FILE__) + "/asterisk/commands"
+require File.dirname(__FILE__) + "/asterisk/commands"
+
+unless Adhearsion::Events.namespace_registered? :asterisk
+  asterisk_namespace = Adhearsion::Events.register_namespace_path :asterisk
+  [:before_call, :after_call, :hungup_call, :failed_call].each do |callback_name|
+    asterisk_namespace.register_callback_name callback_name
+  end
+end