adhearsion 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.0.1](https://github.com/adhearsion/adhearsion/compare/v2.0.0...v2.0.1) - [2012-06-04](https://rubygems.org/gems/adhearsion/versions/2.0.1)
+  * Bugfix: Avoid infinitely recursive exception handlers
+  * Bugfix: Don't require rubygems where we don't need it
+  * Bugfix: Patch method name conflict with new Celluloid release
+  * Bugfix: Generated applications are now locked to Adhearsion major version
+  * Bugfix: Ensure the `#logger` method is defined more robustly on all objects
+  * Bugfix: Ensure actor (call) loggers are accessible outside the object
+  * Cleanup: Remove old invalid rake tasks, improve some documentation
+
 # [2.0.0](https://github.com/adhearsion/adhearsion/compare/v1.2.1...v2.0.0) - [2012-04-11](https://rubygems.org/gems/adhearsion/versions/2.0.0)
 
 ## Major architectural changes

data/Rakefile

@@ -1,7 +1,6 @@
 # -*- ruby -*-
 ENV['RUBY_FLAGS'] = "-I#{%w(lib ext bin spec).join(File::PATH_SEPARATOR)}"
 
-require 'rubygems'
 require 'bundler/gem_tasks'
 require 'bundler/setup'
 

data/lib/adhearsion/call.rb

@@ -22,6 +22,10 @@ module Adhearsion
         rescue Celluloid::DeadActorError
           raise ExpiredError, "This call is expired and is no longer accessible"
         end
+
+        def proxy.join(*args)
+          Actor.call @mailbox, :join, *args
+        end
       end
     end
 
@@ -270,11 +274,6 @@ module Adhearsion
       "#{self.class}: #{id}"
     end
 
-    # @private
-    def logger
-      super
-    end
-
     # @private
     def to_ary
       [current_actor]

data/lib/adhearsion/call_controller/record.rb

@@ -8,8 +8,16 @@ module Adhearsion
       #
       # Start a recording
       #
+      # @example Record in a blocking way and use result
+      #   record_result = record :start_beep => true, :max_duration => 60_000
+      #   logger.info "Recording saved to #{record_result.complete_event.recording.uri}"
+      # @example Asynchronous recording, execution of the controller will continue
+      #   record :async => true do |event|
+      #     logger.info "Async recording saved to #{event.recording.uri}"
+      #   end
+      #
       # @param [Hash] options
-      # @param [Block] block to process result of the record method
+      # @param [Block] block to process result of the record method, it will receive the complete Event for the method.
       # @option options [Boolean, Optional] :async Execute asynchronously. Defaults to false
       # @option options [Boolean, Optional] :start_beep Indicates whether subsequent record will be preceded with a beep. Default is true.
       # @option options [Boolean, Optional] :start_paused Whether subsequent record will start in PAUSE mode. Default is false.
@@ -19,7 +27,7 @@ module Adhearsion
       # @option options [String, Optional] :initial_timeout Controls how long (milliseconds) the recognizer should wait after the end of the prompt for the caller to speak before sending a Recorder event.
       # @option options [String, Optional] :final_timeout Controls the length (milliseconds) of a period of silence after callers have spoken to conclude they finished.
       #
-      # @return Punchblock::Component::Record::Recording
+      # @return Punchblock::Component::Record
       #
       def record(options = {})
         async = options.delete :async

data/lib/adhearsion/events.rb

@@ -47,14 +47,17 @@ module Adhearsion
       GirlFriday.shutdown! if queue?
       # TODO: Extract number of threads to use from Adhearsion.config
       @queue = GirlFriday::WorkQueue.new 'main_queue', :error_handler => ErrorHandler do |message|
-        begin
-          handle_message message
-        rescue Exception => e
-          ErrorHandler.new.handle e
-        end
+        work message
       end
     end
 
+    def work(message)
+      handle_message message
+    rescue => e
+      raise if message.type == :exception
+      trigger :exception, e
+    end
+
     def handle_message(message)
       trigger_handler message.type, message.object
     end
@@ -82,7 +85,8 @@ module Adhearsion
 
     class ErrorHandler
       def handle(exception)
-        Events.trigger :exception, exception
+        logger.error "Exception encountered in exception handler!"
+        logger.error exception
       end
     end
 

data/lib/adhearsion/foundation/object.rb

@@ -3,29 +3,18 @@
 require 'adhearsion/logging'
 
 class Object
+  include Adhearsion::Logging::HasLogger
+
   undef :pb_logger
   def pb_logger
     logger
   end
+end
 
-  def logger_id
-    self
-  end
-
-  def method_missing(method_id, *arguments, &block)
-    if method_id == Adhearsion::Logging::METHOD
-      self.class.send :define_method, method_id do
-        Logging.logger[logger_id]
-      end
-      Logging.logger[logger_id]
-    else
-      super
+module Celluloid
+  class ActorProxy
+    def logger
+      Actor.call @mailbox, :logger
     end
   end
-
-  def respond_to?(method_id, include_private = false)
-    return true if method_id == Adhearsion::Logging::METHOD
-
-    super
-  end
 end

data/lib/adhearsion/generators/app/templates/Gemfile.erb

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "adhearsion", ">=<%= Adhearsion::VERSION %>"
+gem "adhearsion", "~> <%= Adhearsion::VERSION %>"
 
 #
 # Here are some example plugins you might like to use. Simply

data/lib/adhearsion/generators/app/templates/README.md

@@ -11,7 +11,9 @@ Edit `extensions.conf` to include the following:
 exten => _.,1,AGI(agi:async)
 ```
 
-and setup a user in `manager.conf` with read/write access to `all`, `dialplan` and `agi`.
+and setup a user in `manager.conf` with read/write access to `all`.
+
+If you are using Asterisk 1.8, you will need to add an additional context with the name `adhearsion-redirect`. On Asterisk 10 and above this is auto-provisioned.
 
 ## Voxeo PRISM
 

data/lib/adhearsion/generators/app/templates/config/environment.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-require 'rubygems'
 require 'bundler'
 Bundler.setup
 Bundler.require

data/lib/adhearsion/logging.rb

@@ -7,7 +7,15 @@ module Adhearsion
 
     LOG_LEVELS = %w(TRACE DEBUG INFO WARN ERROR FATAL)
 
-    METHOD = :logger
+    module HasLogger
+      def logger
+        ::Logging.logger[logger_id]
+      end
+
+      def logger_id
+        self
+      end
+    end
 
     class << self
 

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ unless ENV['SKIP_RCOV']
 end
 
 %w{
-  rubygems
   bundler/setup
   flexmock/rspec
   active_support

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168665360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2168665360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
-  requirement: &2168664720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168664720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168663960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +56,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168663960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2168663000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168663000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2168662120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +88,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168662120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &2168661120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +104,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168661120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2168659800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +120,15 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2168659800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2168659000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +136,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168659000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2168528540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +152,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168528540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2168527220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +168,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2168527220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2168525580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +184,15 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168525580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2168524680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +200,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168524680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2168523120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +216,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168523120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168521780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +232,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168521780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_speech
-  requirement: &2168587840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -178,10 +248,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168587840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2168587340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +264,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168587340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2168586720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +280,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168586720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2168585940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -211,10 +296,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168585940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2168585360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,10 +312,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168585360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2168584740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -233,10 +328,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168584740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2168584160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,10 +344,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168584160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2168583560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -255,10 +360,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168583560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2168582980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +376,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168582980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168582240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -277,10 +392,15 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2168582240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2168581440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +408,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168581440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2168580760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,10 +424,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168580760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2168580140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -310,10 +440,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168580140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168470660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -321,7 +456,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168470660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adhearsion is an open-source telephony development framework
 email: dev@adhearsion.com
 executables:
@@ -435,7 +575,6 @@ files:
 - lib/adhearsion/tasks/debugging.rb
 - lib/adhearsion/tasks/environment.rb
 - lib/adhearsion/tasks/plugins.rb
-- lib/adhearsion/tasks/testing.rb
 - lib/adhearsion/version.rb
 - pre-commit
 - spec/adhearsion/call_controller/dial_spec.rb
@@ -488,7 +627,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3465123136377635342
+      hash: 1504459880693852795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -497,10 +636,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3465123136377635342
+      hash: 1504459880693852795
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Adhearsion, open-source telephony development framework

data/lib/adhearsion/tasks/testing.rb

@@ -1,70 +0,0 @@
-# encoding: utf-8
-
-begin
-  require 'rspec/core/rake_task'
-rescue LoadError
-end
-
-desc 'Run app tests, including components'
-task :test => 'test:component'
-
-desc 'Run app specs, including components'
-task :spec => :test
-
-namespace :test do
-  desc "Run tests for a component specified by COMPONENT=<component_name>.  If no component is specified, tests will be executed for all components"
-  task :component do
-    component = ENV['COMPONENT']
-    components_to_test = component.nil? ? all_component_directories : [full_path_for(component)]
-    components_to_test.each do |component_name|
-      setup_and_execute component_name
-    end
-  end
-
-  private
-
-    def setup_and_execute(component_path)
-      task = create_test_task_for(component_path)
-      Rake::Task[task.name].execute if task
-    end
-
-    def create_test_task_for(component_path)
-      case task_type_for(component_path)
-      when :test_unit
-        Rake::TestTask.new task_name_for(component_path) do |t|
-          t.libs = ["lib", "test"].map { |subdir| File.join component_path, subdir }
-          t.test_files = FileList["#{component_path}/test/test_*.rb"]
-          t.verbose = true
-        end
-      when :rspec
-        if defined?(RSpec)
-          RSpec::Core::RakeTask.new task_name_for(component_path) do |spec|
-            spec.pattern = "#{component_path}/spec/**/*_spec.rb"
-            spec.rspec_opts = '--color'
-          end
-        else
-          puts "It looks like you have components with RSpec tests. You can run them by adding RSpec to your Gemfile."
-        end
-      end
-    end
-
-    def task_type_for(component_path)
-      if Dir.exists?("#{component_path}/test")
-        :test_unit
-      elsif Dir.exists?("#{component_path}/spec")
-        :rspec
-      end
-    end
-
-    def task_name_for(component_path)
-      "test_#{component_path.split(/\//).last}"
-    end
-
-    def all_component_directories
-      Dir['components/*']
-    end
-
-    def full_path_for(component)
-      component =~ /^components\// ? component : File.join("components", component)
-    end
-end