adhearsion 1.2.6 → 2.0.0.alpha1

data/spec/adhearsion_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Adhearsion do
+  describe "while accessing the config method" do
+    it "should return a Configuration instance" do
+      subject.config.should be_instance_of Adhearsion::Configuration
+    end
+
+    it "should execute a block" do
+      foo = Object.new
+      flexmock(foo).should_receive(:bar).once
+      Adhearsion.config do |config|
+        foo.bar
+      end
+    end
+  end
+
+  describe "#router" do
+    its(:router) { should be_a Adhearsion::Router }
+
+    it "should always use the same router" do
+      Adhearsion.router.should be Adhearsion.router
+    end
+
+    it "should pass a block along to the router" do
+      foo = nil
+      Adhearsion.router do
+        foo = self
+      end
+
+      foo.should be Adhearsion.router
+    end
+  end
+
+  describe "while accessing the ahn_root= method" do
+    it "should update properly the config root variable" do
+      Adhearsion.ahn_root = "./"
+      Adhearsion.config[:platform].root.should == Dir.getwd
+    end
+
+    it "should update properly the config root variable when path is nil" do
+      Adhearsion.ahn_root = nil
+      Adhearsion.config[:platform].root.should be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,8 +3,8 @@ unless ENV['SKIP_RCOV']
   require 'simplecov-rcov'
   class SimpleCov::Formatter::MergedFormatter
     def format(result)
-       SimpleCov::Formatter::HTMLFormatter.new.format(result)
-       SimpleCov::Formatter::RcovFormatter.new.format(result)
+      SimpleCov::Formatter::HTMLFormatter.new.format(result)
+      SimpleCov::Formatter::RcovFormatter.new.format(result)
     end
   end
   SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
@@ -14,34 +14,34 @@ unless ENV['SKIP_RCOV']
   end
 end
 
-Dir.chdir File.join(File.dirname(__FILE__), '..')
-$:.push('.')
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$: << File.expand_path('lib')
-$: << File.dirname(__FILE__)
-
 %w{
   rubygems
-  rspec/core
   bundler/setup
   flexmock/rspec
   active_support
-  pp
   stringio
+  countdownlatch
   adhearsion
-  adhearsion/voip/asterisk
-  adhearsion/component_manager
 }.each { |f| require f }
 
+Bundler.require(:default, :test) if defined?(Bundler)
+
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_framework = :flexmock
-  config.filter_run_excluding :ignore => true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.color_enabled = true
+
+  config.before(:each) do
+    Adhearsion.router = nil
+  end
+end
+
+Adhearsion::Events.exeption do |e|
+  puts e.message
+  puts e.backtrace.join("\n")
 end
 
-Adhearsion::Initializer.ahn_root = File.dirname(__FILE__) + '/fixtures'
 Adhearsion::Logging.silence!

data/spec/support/call_controller_test_helpers.rb

@@ -0,0 +1,48 @@
+module CallControllerTestHelpers
+  include FlexMock::ArgumentTypes
+
+  def self.included(test_case)
+    test_case.let(:call_id) { rand }
+    test_case.let(:call)    { Adhearsion::Call.new }
+
+    test_case.subject do
+      case test_case.describes
+      when Class
+        test_case.describes
+      when Module
+        Class.new Adhearsion::CallController
+      end.new call, :doo => :dah
+    end
+
+    test_case.before do
+      flexmock Adhearsion::Plugin, :methods_scope => {:dialplan => Module.new { def foo; end}}
+      flexmock subject
+      flexmock call, :write_command => true, :id => call_id
+    end
+  end
+
+  def expect_message_waiting_for_response(message)
+    subject.should_receive(:write_and_await_response).once.with(message).and_return message
+    message.request!
+  end
+
+  def expect_component_execution(component)
+    subject.should_receive(:execute_component_and_await_completion).once.with(component).and_return(component)
+  end
+
+  def expect_component_execution_asynchronously(component)
+    subject.should_receive(:execute_component).once.with(component).and_return(component)
+  end
+
+  def mock_with_potential_matches(potential_matches)
+    Adhearsion::Punchblock::MenuDSL::CalculatedMatch.new :potential_matches => potential_matches
+  end
+
+  def mock_with_exact_matches(exact_matches)
+    Adhearsion::Punchblock::MenuDSL::CalculatedMatch.new :exact_matches => exact_matches
+  end
+
+  def mock_with_potential_and_exact_matches(potential_matches, exact_matches)
+    Adhearsion::Punchblock::MenuDSL::CalculatedMatch.new :potential_matches => potential_matches, :exact_matches => exact_matches
+  end
+end

data/spec/support/initializer_stubs.rb

@@ -1,28 +1,23 @@
 module InitializerStubs
-  DEFAULT_AHNRC_DATA_STRUCTURE = YAML.load_file(
-    File.dirname(__FILE__) + "/../../lib/adhearsion/generators/app/templates/.ahnrc"
-  ) unless defined? DEFAULT_AHNRC_DATA_STRUCTURE
-
   UNWANTED_BEHAVIOR = {
-    Adhearsion::Initializer => [:initialize_log_file, :switch_to_root_directory, :daemonize!, :load],
-    Adhearsion::Initializer.metaclass => { :get_rules_from => DEFAULT_AHNRC_DATA_STRUCTURE },
+    Adhearsion::Initializer => [:initialize_log_paths, :update_rails_env_var, :daemonize!, :require, :init_plugins, :load_lib_folder]
   } unless defined? UNWANTED_BEHAVIOR
 
   def stub_behavior_for_initializer_with_no_path_changing_behavior
-      stub_unwanted_behavior
-      yield if block_given?
-    ensure
-      unstub_directory_changing_behavior
+    stub_unwanted_behavior
+    yield if block_given?
+  ensure
+    unstub_directory_changing_behavior
   end
 
   def with_new_initializer_with_no_path_changing_behavior(&block)
     stub_behavior_for_initializer_with_no_path_changing_behavior do
-      block.call Adhearsion::Initializer.start('path does not matter')
+      block.call Adhearsion::Initializer.start
     end
   end
 
-  def stub_unwanted_behavior
-    UNWANTED_BEHAVIOR.each do |stub_victim_class, undesired_methods|
+  def stub_unwanted_behavior(unwanted_behavior = UNWANTED_BEHAVIOR)
+    unwanted_behavior.each do |stub_victim_class, undesired_methods|
       undesired_methods.each do |undesired_method_name_or_key_value_pair|
         undesired_method_name, method_implementation = case undesired_method_name_or_key_value_pair
           when Array

data/spec/support/punchblock_mocks.rb

@@ -0,0 +1,6 @@
+def mock_offer(id = nil, headers = {})
+  id ||= rand
+  flexmock("Offer: #{id}", :call_id => id, :headers_hash => headers).tap do |offer|
+    offer.should_ignore_missing
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 1.2.6
-  prerelease: 
+  version: 2.0.0.alpha1
+  prerelease: 6
 platform: ruby
 authors:
 - Jay Phillips
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157338940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,47 +24,65 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157338940
+- !ruby/object:Gem::Dependency
+  name: punchblock
+  requirement: &2157338400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 0.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157338400
 - !ruby/object:Gem::Dependency
-  name: log4r
-  requirement: !ruby/object:Gem::Requirement
+  name: logging
+  requirement: &2157337900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157337900
+- !ruby/object:Gem::Dependency
+  name: loquacious
+  requirement: &2157337400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157337400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157336880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157336880
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2157336420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157336420
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  name: json
+  requirement: &2157336020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,15 +90,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157336020
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2157335540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157335540
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2157335120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,15 +112,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157335120
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2157334680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157334680
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
+  name: uuid
+  requirement: &2157334240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,69 +134,76 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157334240
+- !ruby/object:Gem::Dependency
+  name: future-resource
+  requirement: &2157333700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157333700
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  name: ruby_speech
+  requirement: &2157333160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157333160
+- !ruby/object:Gem::Dependency
+  name: countdownlatch
+  requirement: &2157332780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157332780
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
+  name: has-guarded-handlers
+  requirement: &2157332180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157332180
+- !ruby/object:Gem::Dependency
+  name: girl_friday
+  requirement: &2157331740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157331740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157348260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  version_requirements: *2157348260
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157347840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -174,31 +211,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157347840
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157347260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157347260
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2157346840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157346840
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  name: simplecov-rcov
+  requirement: &2157346360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -206,15 +244,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157346360
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: &2157345940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157345940
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &2157345500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,15 +266,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157345500
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &2157345080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157345080
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
+  name: guard-cucumber
+  requirement: &2157344660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -238,15 +288,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157344660
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &2157344220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157344220
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: &2157343800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -254,186 +310,139 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157343800
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &2157343380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157343380
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
 - ahn
-- ahnctl
-- jahn
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- CHANGELOG
+- CHANGELOG.md
 - EVENTS
 - Gemfile
+- Guardfile
 - LICENSE
 - README.markdown
 - Rakefile
 - adhearsion.gemspec
 - bin/ahn
-- bin/ahnctl
-- bin/jahn
-- examples/asterisk_manager_interface/standalone.rb
+- cucumber.yml
+- features/app_generator.feature
+- features/cli.feature
+- features/step_definitions/app_generator_steps.rb
+- features/step_definitions/cli_steps.rb
+- features/support/aruba_helper.rb
+- features/support/env.rb
+- features/support/utils.rb
 - lib/adhearsion.rb
+- lib/adhearsion/call.rb
+- lib/adhearsion/call_controller.rb
+- lib/adhearsion/call_controller/dial.rb
+- lib/adhearsion/call_controller/input.rb
+- lib/adhearsion/call_controller/menu.rb
+- lib/adhearsion/call_controller/output.rb
+- lib/adhearsion/call_controller/record.rb
+- lib/adhearsion/call_controller/utility.rb
+- lib/adhearsion/calls.rb
 - lib/adhearsion/cli.rb
-- lib/adhearsion/commands.rb
-- lib/adhearsion/component_manager.rb
-- lib/adhearsion/component_manager/component_tester.rb
-- lib/adhearsion/component_manager/spec_framework.rb
+- lib/adhearsion/cli_commands.rb
+- lib/adhearsion/configuration.rb
 - lib/adhearsion/console.rb
-- lib/adhearsion/events_support.rb
+- lib/adhearsion/dialplan_controller.rb
+- lib/adhearsion/events.rb
 - lib/adhearsion/foundation/all.rb
-- lib/adhearsion/foundation/blank_slate.rb
 - lib/adhearsion/foundation/custom_daemonizer.rb
-- lib/adhearsion/foundation/event_socket.rb
-- lib/adhearsion/foundation/future_resource.rb
-- lib/adhearsion/foundation/metaprogramming.rb
-- lib/adhearsion/foundation/numeric.rb
+- lib/adhearsion/foundation/exception_handler.rb
 - lib/adhearsion/foundation/object.rb
-- lib/adhearsion/foundation/pseudo_guid.rb
-- lib/adhearsion/foundation/relationship_properties.rb
-- lib/adhearsion/foundation/string.rb
 - lib/adhearsion/foundation/synchronized_hash.rb
 - lib/adhearsion/foundation/thread_safety.rb
 - lib/adhearsion/generators.rb
 - lib/adhearsion/generators/app/USAGE
 - lib/adhearsion/generators/app/app_generator.rb
-- lib/adhearsion/generators/app/templates/.ahnrc
 - lib/adhearsion/generators/app/templates/Gemfile
-- lib/adhearsion/generators/app/templates/README
+- lib/adhearsion/generators/app/templates/Procfile
+- lib/adhearsion/generators/app/templates/README.md
 - lib/adhearsion/generators/app/templates/Rakefile
-- lib/adhearsion/generators/app/templates/components/ami_remote/ami_remote.rb
-- lib/adhearsion/generators/app/templates/components/disabled/HOW_TO_ENABLE
-- lib/adhearsion/generators/app/templates/components/disabled/stomp_gateway/README.markdown
-- lib/adhearsion/generators/app/templates/components/disabled/stomp_gateway/stomp_gateway.rb
-- lib/adhearsion/generators/app/templates/components/disabled/stomp_gateway/stomp_gateway.yml
-- lib/adhearsion/generators/app/templates/components/disabled/xmpp_gateway/README.markdown
-- lib/adhearsion/generators/app/templates/components/disabled/xmpp_gateway/xmpp_gateway.rb
-- lib/adhearsion/generators/app/templates/components/disabled/xmpp_gateway/xmpp_gateway.yml
-- lib/adhearsion/generators/app/templates/components/simon_game/simon_game.rb
+- lib/adhearsion/generators/app/templates/config/adhearsion.rb
 - lib/adhearsion/generators/app/templates/config/environment.rb
-- lib/adhearsion/generators/app/templates/config/startup.rb
-- lib/adhearsion/generators/app/templates/dialplan.rb
-- lib/adhearsion/generators/app/templates/events.rb
+- lib/adhearsion/generators/app/templates/lib/simon_game.rb
 - lib/adhearsion/generators/app/templates/script/ahn
-- 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/ldap.rb
-- lib/adhearsion/initializer/rails.rb
-- lib/adhearsion/initializer/xmpp.rb
+- lib/adhearsion/initializer/logging.rb
 - lib/adhearsion/logging.rb
+- lib/adhearsion/menu_dsl.rb
+- lib/adhearsion/menu_dsl/calculated_match.rb
+- lib/adhearsion/menu_dsl/calculated_match_collection.rb
+- lib/adhearsion/menu_dsl/fixnum_match_calculator.rb
+- lib/adhearsion/menu_dsl/match_calculator.rb
+- lib/adhearsion/menu_dsl/menu.rb
+- lib/adhearsion/menu_dsl/menu_builder.rb
+- lib/adhearsion/menu_dsl/range_match_calculator.rb
+- lib/adhearsion/menu_dsl/string_match_calculator.rb
+- lib/adhearsion/outbound_call.rb
+- lib/adhearsion/plugin.rb
+- lib/adhearsion/plugin/collection.rb
+- lib/adhearsion/plugin/initializer.rb
+- lib/adhearsion/plugin/methods_container.rb
+- lib/adhearsion/process.rb
+- lib/adhearsion/punchblock_plugin.rb
+- lib/adhearsion/punchblock_plugin/initializer.rb
+- lib/adhearsion/router.rb
+- lib/adhearsion/router/route.rb
 - lib/adhearsion/script_ahn_loader.rb
 - lib/adhearsion/tasks.rb
-- lib/adhearsion/tasks/components.rb
-- lib/adhearsion/tasks/database.rb
-- lib/adhearsion/tasks/deprecations.rb
-- lib/adhearsion/tasks/generating.rb
-- lib/adhearsion/tasks/lint.rb
+- lib/adhearsion/tasks/configuration.rb
+- lib/adhearsion/tasks/plugins.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/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/manager_interface.rb
-- lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb
-- lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb
-- lib/adhearsion/voip/asterisk/manager_interface/ami_messages.rb
-- lib/adhearsion/voip/asterisk/manager_interface/ami_protocol_lexer_machine.rl
-- 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
-- lib/adhearsion/xmpp/connection.rb
-- lib/theatre.rb
-- lib/theatre/README.markdown
-- lib/theatre/callback_definition_loader.rb
-- lib/theatre/guid.rb
-- lib/theatre/invocation.rb
-- lib/theatre/namespace_manager.rb
-- lib/theatre/version.rb
-- spec/adhearsion/cli_spec.rb
-- spec/adhearsion/component_manager_spec.rb
-- spec/adhearsion/constants_spec.rb
-- spec/adhearsion/drb_spec.rb
-- spec/adhearsion/fixtures/dialplan.rb
-- spec/adhearsion/foundation/event_socket_spec.rb
-- spec/adhearsion/host_definitions_spec.rb
-- spec/adhearsion/initializer/configuration_spec.rb
-- spec/adhearsion/initializer/loading_spec.rb
-- spec/adhearsion/initializer/paths_spec.rb
+- spec/adhearsion/call_controller/dial_spec.rb
+- spec/adhearsion/call_controller/input_spec.rb
+- spec/adhearsion/call_controller/menu_spec.rb
+- spec/adhearsion/call_controller/output_spec.rb
+- spec/adhearsion/call_controller/record_spec.rb
+- spec/adhearsion/call_controller_spec.rb
+- spec/adhearsion/call_spec.rb
+- spec/adhearsion/calls_spec.rb
+- spec/adhearsion/configuration_spec.rb
+- spec/adhearsion/dialplan_controller_spec.rb
+- spec/adhearsion/events_spec.rb
+- spec/adhearsion/initializer/logging_spec.rb
 - spec/adhearsion/initializer_spec.rb
 - spec/adhearsion/logging_spec.rb
-- spec/adhearsion/relationship_properties_spec.rb
-- spec/adhearsion/voip/asterisk/agi_server_spec.rb
-- spec/adhearsion/voip/asterisk/ami/ami_spec.rb
-- spec/adhearsion/voip/asterisk/ami/lexer/ami_fixtures.yml
-- spec/adhearsion/voip/asterisk/ami/lexer/lexer_story
-- spec/adhearsion/voip/asterisk/ami/lexer/lexer_story.rb
-- spec/adhearsion/voip/asterisk/ami/lexer/story_helper.rb
-- spec/adhearsion/voip/asterisk/commands_spec.rb
-- spec/adhearsion/voip/asterisk/config_file_generators/agents_spec.rb
-- spec/adhearsion/voip/asterisk/config_file_generators/queues_spec.rb
-- spec/adhearsion/voip/asterisk/config_file_generators/voicemail_spec.rb
-- spec/adhearsion/voip/asterisk/config_manager_spec.rb
-- spec/adhearsion/voip/asterisk/menu_command/calculated_match_spec.rb
-- spec/adhearsion/voip/asterisk/menu_command/matchers_spec.rb
-- spec/adhearsion/voip/call_routing_spec.rb
-- spec/adhearsion/voip/dialplan_manager_spec.rb
-- spec/adhearsion/voip/dsl/dialing_dsl_spec.rb
-- spec/adhearsion/voip/dsl/dispatcher_spec.rb
-- spec/adhearsion/voip/dsl/dispatcher_spec_helper.rb
-- spec/adhearsion/voip/dsl/parser_spec.rb
-- spec/adhearsion/voip/freeswitch/basic_connection_manager_spec.rb
-- spec/adhearsion/voip/freeswitch/inbound_connection_manager_spec.rb
-- spec/adhearsion/voip/freeswitch/oes_server_spec.rb
-- spec/adhearsion/voip/numerical_string_spec.rb
-- spec/adhearsion/voip/phone_number_spec.rb
+- spec/adhearsion/menu_dsl/calculated_match_collection_spec.rb
+- spec/adhearsion/menu_dsl/calculated_match_spec.rb
+- spec/adhearsion/menu_dsl/fixnum_match_calculator_spec.rb
+- spec/adhearsion/menu_dsl/match_calculator_spec.rb
+- spec/adhearsion/menu_dsl/menu_builder_spec.rb
+- spec/adhearsion/menu_dsl/menu_spec.rb
+- spec/adhearsion/menu_dsl/range_match_calculator_spec.rb
+- spec/adhearsion/menu_dsl/string_match_calculator_spec.rb
+- spec/adhearsion/menu_dsl_spec.rb
+- spec/adhearsion/outbound_call_spec.rb
+- spec/adhearsion/plugin_spec.rb
+- spec/adhearsion/process_spec.rb
+- spec/adhearsion/punchblock_plugin/initializer_spec.rb
+- spec/adhearsion/router/route_spec.rb
+- spec/adhearsion/router_spec.rb
+- spec/adhearsion_spec.rb
 - spec/spec_helper.rb
+- spec/support/call_controller_test_helpers.rb
 - spec/support/initializer_stubs.rb
-- spec/support/the_following_code.rb
-- spec/theatre/dsl_examples/simple_before_call.rb
-- spec/theatre/dsl_spec.rb
-- spec/theatre/invocation_spec.rb
-- spec/theatre/namespace_spec.rb
-- spec/theatre/spec_helper_spec.rb
-- spec/theatre/theatre_class_spec.rb
+- spec/support/punchblock_mocks.rb
 homepage: http://adhearsion.com
 licenses: []
 post_install_message: 
@@ -448,66 +457,59 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1033038213187391653
+      hash: -364475193702133580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1033038213187391653
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Adhearsion, open-source telephony development framework
 test_files:
-- spec/adhearsion/cli_spec.rb
-- spec/adhearsion/component_manager_spec.rb
-- spec/adhearsion/constants_spec.rb
-- spec/adhearsion/drb_spec.rb
-- spec/adhearsion/fixtures/dialplan.rb
-- spec/adhearsion/foundation/event_socket_spec.rb
-- spec/adhearsion/host_definitions_spec.rb
-- spec/adhearsion/initializer/configuration_spec.rb
-- spec/adhearsion/initializer/loading_spec.rb
-- spec/adhearsion/initializer/paths_spec.rb
+- features/app_generator.feature
+- features/cli.feature
+- features/step_definitions/app_generator_steps.rb
+- features/step_definitions/cli_steps.rb
+- features/support/aruba_helper.rb
+- features/support/env.rb
+- features/support/utils.rb
+- spec/adhearsion/call_controller/dial_spec.rb
+- spec/adhearsion/call_controller/input_spec.rb
+- spec/adhearsion/call_controller/menu_spec.rb
+- spec/adhearsion/call_controller/output_spec.rb
+- spec/adhearsion/call_controller/record_spec.rb
+- spec/adhearsion/call_controller_spec.rb
+- spec/adhearsion/call_spec.rb
+- spec/adhearsion/calls_spec.rb
+- spec/adhearsion/configuration_spec.rb
+- spec/adhearsion/dialplan_controller_spec.rb
+- spec/adhearsion/events_spec.rb
+- spec/adhearsion/initializer/logging_spec.rb
 - spec/adhearsion/initializer_spec.rb
 - spec/adhearsion/logging_spec.rb
-- spec/adhearsion/relationship_properties_spec.rb
-- spec/adhearsion/voip/asterisk/agi_server_spec.rb
-- spec/adhearsion/voip/asterisk/ami/ami_spec.rb
-- spec/adhearsion/voip/asterisk/ami/lexer/ami_fixtures.yml
-- spec/adhearsion/voip/asterisk/ami/lexer/lexer_story
-- spec/adhearsion/voip/asterisk/ami/lexer/lexer_story.rb
-- spec/adhearsion/voip/asterisk/ami/lexer/story_helper.rb
-- spec/adhearsion/voip/asterisk/commands_spec.rb
-- spec/adhearsion/voip/asterisk/config_file_generators/agents_spec.rb
-- spec/adhearsion/voip/asterisk/config_file_generators/queues_spec.rb
-- spec/adhearsion/voip/asterisk/config_file_generators/voicemail_spec.rb
-- spec/adhearsion/voip/asterisk/config_manager_spec.rb
-- spec/adhearsion/voip/asterisk/menu_command/calculated_match_spec.rb
-- spec/adhearsion/voip/asterisk/menu_command/matchers_spec.rb
-- spec/adhearsion/voip/call_routing_spec.rb
-- spec/adhearsion/voip/dialplan_manager_spec.rb
-- spec/adhearsion/voip/dsl/dialing_dsl_spec.rb
-- spec/adhearsion/voip/dsl/dispatcher_spec.rb
-- spec/adhearsion/voip/dsl/dispatcher_spec_helper.rb
-- spec/adhearsion/voip/dsl/parser_spec.rb
-- spec/adhearsion/voip/freeswitch/basic_connection_manager_spec.rb
-- spec/adhearsion/voip/freeswitch/inbound_connection_manager_spec.rb
-- spec/adhearsion/voip/freeswitch/oes_server_spec.rb
-- spec/adhearsion/voip/numerical_string_spec.rb
-- spec/adhearsion/voip/phone_number_spec.rb
+- spec/adhearsion/menu_dsl/calculated_match_collection_spec.rb
+- spec/adhearsion/menu_dsl/calculated_match_spec.rb
+- spec/adhearsion/menu_dsl/fixnum_match_calculator_spec.rb
+- spec/adhearsion/menu_dsl/match_calculator_spec.rb
+- spec/adhearsion/menu_dsl/menu_builder_spec.rb
+- spec/adhearsion/menu_dsl/menu_spec.rb
+- spec/adhearsion/menu_dsl/range_match_calculator_spec.rb
+- spec/adhearsion/menu_dsl/string_match_calculator_spec.rb
+- spec/adhearsion/menu_dsl_spec.rb
+- spec/adhearsion/outbound_call_spec.rb
+- spec/adhearsion/plugin_spec.rb
+- spec/adhearsion/process_spec.rb
+- spec/adhearsion/punchblock_plugin/initializer_spec.rb
+- spec/adhearsion/router/route_spec.rb
+- spec/adhearsion/router_spec.rb
+- spec/adhearsion_spec.rb
 - spec/spec_helper.rb
+- spec/support/call_controller_test_helpers.rb
 - spec/support/initializer_stubs.rb
-- spec/support/the_following_code.rb
-- spec/theatre/dsl_examples/simple_before_call.rb
-- spec/theatre/dsl_spec.rb
-- spec/theatre/invocation_spec.rb
-- spec/theatre/namespace_spec.rb
-- spec/theatre/spec_helper_spec.rb
-- spec/theatre/theatre_class_spec.rb
+- spec/support/punchblock_mocks.rb
+has_rdoc: