adhearsion 2.0.0.alpha2 → 2.0.0.alpha3

data/spec/adhearsion/initializer_spec.rb

@@ -10,7 +10,7 @@ describe Adhearsion::Initializer do
   describe "#start" do
     before do
       Adhearsion::Logging.reset
-      flexmock(Adhearsion::Initializer::Logging).should_receive(:start).once.and_return('')
+      flexmock(Adhearsion::Logging).should_receive(:start).once.and_return('')
       flexmock(::Logging::Appenders::File).should_receive(:assert_valid_logfile).and_return(true)
       flexmock(::Logging::Appenders).should_receive(:file).and_return(nil)
       Adhearsion.config = nil
@@ -22,7 +22,7 @@ describe Adhearsion::Initializer do
 
     after :all do
       Adhearsion::Logging.reset
-      Adhearsion::Initializer::Logging.start
+      Adhearsion::Logging.start
       Adhearsion::Logging.silence!
     end
 
@@ -145,7 +145,7 @@ describe Adhearsion::Initializer do
 
     after :all do
       Adhearsion::Logging.reset
-      Adhearsion::Initializer::Logging.start
+      Adhearsion::Logging.start
       Adhearsion::Logging.silence!
       Adhearsion::Events.reinitialize_queue!
     end
@@ -153,7 +153,7 @@ describe Adhearsion::Initializer do
     it "should start logging with valid parameters" do
       stub_behavior_for_initializer_with_no_path_changing_behavior do
         flexmock(File).should_receive(:open).with(File.join(path, 'adhearsion.pid'), 'w', Proc).at_least.once
-        flexmock(Adhearsion::Initializer::Logging).should_receive(:start).once.with(Array, :info, nil).and_return('')
+        flexmock(Adhearsion::Logging).should_receive(:start).once.with(Array, :info, nil).and_return('')
         Adhearsion::Initializer.start :pid_file => true
       end
     end
@@ -192,7 +192,7 @@ describe "Updating RAILS_ENV variable" do
 
   before do
     Adhearsion::Logging.reset
-    flexmock(Adhearsion::Initializer::Logging).should_receive(:start).once.and_return('')
+    flexmock(Adhearsion::Logging).should_receive(:start).once.and_return('')
     flexmock(::Logging::Appenders::File).should_receive(:assert_valid_logfile).and_return(true)
     flexmock(::Logging::Appenders).should_receive(:file).and_return(nil)
     Adhearsion.config = nil
@@ -227,23 +227,27 @@ describe "Updating RAILS_ENV variable" do
       ENV['RAILS_ENV'] = "test"
     end
 
-    it "should preserve the RAILS_ENV value if AHN_ENV is unset" do
-      ahn = nil
-      stub_behavior_for_initializer_with_no_path_changing_behavior do
-        ahn = Adhearsion::Initializer.start
+    context "if AHN_ENV is set" do
+      it "should preserve the RAILS_ENV value" do
+        ENV['AHN_ENV'] = "production"
+        ahn = nil
+        stub_behavior_for_initializer_with_no_path_changing_behavior do
+          ahn = Adhearsion::Initializer.start
+        end
+        ahn.update_rails_env_var
+        ENV['RAILS_ENV'].should == "test"
       end
-      ahn.update_rails_env_var
-      ENV['RAILS_ENV'].should == "test"
     end
 
-    it "should update the RAILS_ENV value with the AHN_ENV value" do
-      ENV['AHN_ENV'] = "production"
-      ahn = nil
-      stub_behavior_for_initializer_with_no_path_changing_behavior do
-        ahn = Adhearsion::Initializer.start
+    context "if AHN_ENV is unset" do
+      it "should preserve the RAILS_ENV value" do
+        ahn = nil
+        stub_behavior_for_initializer_with_no_path_changing_behavior do
+          ahn = Adhearsion::Initializer.start
+        end
+        ahn.update_rails_env_var
+        ENV['RAILS_ENV'].should == "test"
       end
-      ahn.update_rails_env_var
-      ENV['RAILS_ENV'].should == "production"
     end
   end
 

data/spec/adhearsion/logging_spec.rb

@@ -2,9 +2,18 @@ require 'spec_helper'
 
 describe Adhearsion::Logging do
 
+  before :all do
+    ::Logging.shutdown
+    Adhearsion::Logging.reset
+    Adhearsion::Logging.init
+  end
+
   before do
-    defined?(Logging) and Logging.reset
-    Adhearsion::Initializer::Logging.start
+    Adhearsion::Logging.start
+    Adhearsion::Logging.silence!
+  end
+
+  after :all do
     Adhearsion::Logging.silence!
   end
 
@@ -12,12 +21,12 @@ describe Adhearsion::Logging do
     Foo.should respond_to(:logger)
   end
 
-  it 'should created the predefined set of log levels' do
-    ::Logging::LEVELS.length.should eql(Adhearsion::Logging::LOG_LEVELS.length)
+  it 'should be added to any Object instance' do
+    Foo.new.should respond_to :logger
   end
 
-  it 'should be added to any Object instance' do
-    Foo.new.should respond_to(:logger)
+  it 'should create the predefined set of log levels' do
+    ::Logging::LEVELS.keys.should == Adhearsion::Logging::LOG_LEVELS.map(&:downcase)
   end
 
   it "should log to the Object logger when given arguments" do
@@ -41,60 +50,81 @@ describe Adhearsion::Logging do
     ::Logging::Repository.instance[FooBar].should_not be_nil
   end
 
-end
-
-# Essential for running the tests
-describe 'Logger level changing' do
-
-  before do
-    defined?(Logging) and Logging.reset
-    Adhearsion::Initializer::Logging.start
+    it "initializes properly a Logging object" do
+    ::Logging.logger.root.appenders.length.should eql(1)
+    ::Logging.logger.root.appenders.select{|a| a.is_a?(::Logging::Appenders::Stdout)}.length.should eql(1)
   end
 
-  after do
-    Adhearsion::Logging.logging_level = :info
+  it "initializes properly a Logging object with appenders as parameter" do
+    Adhearsion::Logging.start([::Logging.appenders.stdout, ::Logging.appenders.file('example.log')])
+    ::Logging.logger.root.appenders.length.should eql(2)
+    ::Logging.logger.root.appenders.select{|a| a.is_a?(::Logging::Appenders::Stdout)}.length.should eql(1)
+    ::Logging.logger.root.appenders.select{|a| a.is_a?(::Logging::Appenders::File)}.length.should eql(1)
   end
 
-  after :all do
-    Adhearsion::Logging.logging_level = :fatal # Silence them again
+  it "initializes properly a Logging object with appenders and log level as parameter" do
+    Adhearsion::Logging.start([::Logging.appenders.stdout, ::Logging.appenders.file('example.log')], :debug)
+    ::Logging.logger.root.appenders.length.should eql(2)
+    ::Logging.logger.root.appenders.select{|a| a.is_a?(::Logging::Appenders::Stdout)}.length.should eql(1)
+    ::Logging.logger.root.appenders.select{|a| a.is_a?(::Logging::Appenders::File)}.length.should eql(1)
+    ::Logging.logger.root.level.should eql(::Logging::LEVELS["debug"])
   end
 
-  it 'changing the logging level should affect all loggers' do
-    loggers = [::Foo.logger, ::Foo::Bar.logger]
-    loggers.map(&:level).should_not == [::Logging::LEVELS["debug"]] * 2
-    loggers.map(&:level).should == [::Logging::LEVELS["info"]] * 2
-    Adhearsion::Logging.logging_level = :warn
-    loggers.map(&:level).should == [::Logging::LEVELS["warn"]] * 2
+  it "should create only a Logging object per Class (reuse per all the instances)" do
+    _logger = Foo.new.logger
+    10.times do
+      Foo.new.logger.object_id.should eql(_logger.object_id)
+    end
   end
 
-  it 'changing the logging level, using level=, should affect all loggers' do
-    loggers = [Foo.logger, ::Foo::Bar.logger]
-    loggers.map(&:level).should_not == [::Logging::LEVELS["debug"]] * 2
-    loggers.map(&:level).should == [::Logging::LEVELS["info"]] * 2
-    Adhearsion::Logging.level = :warn
-    loggers.map(&:level).should == [::Logging::LEVELS["warn"]] * 2
+  it "should reuse a Logging instance in all Class instances but not with child instances" do
+    _foo_logger = Foo.new.logger
+    _bar_logger = Foo::Bar.new.logger
+    _foo_logger.object_id.should_not eql(_bar_logger)
   end
 
-  it 'should change all the Logger instance level' do
-    Foo.logger.level.should be Adhearsion::Logging::INFO
-    Adhearsion::Logging.logging_level = :fatal
-    Foo.logger.level.should be Adhearsion::Logging::FATAL
-  end
+  describe 'level changing' do
 
-  it 'a new logger should have the :root logging level' do
-    Foo.logger.level.should be Adhearsion::Logging::INFO
-    Adhearsion::Logging.logging_level = :fatal
-    Foo::Bar.logger.level.should be Adhearsion::Logging::FATAL
-  end
+    before  { Adhearsion::Logging.unsilence! }
+    after   { Adhearsion::Logging.unsilence! }
 
-  it '#silence!() should change the level to be FATAL' do
-    Adhearsion::Logging.silence!
-    Adhearsion::Logging.logging_level.should be(Adhearsion::Logging::FATAL)
-  end
+    it 'changing the logging level should affect all loggers' do
+      loggers = [::Foo.logger, ::Foo::Bar.logger]
+      loggers.map(&:level).should_not == [Adhearsion::Logging::DEBUG] * 2
+      loggers.map(&:level).should == [Adhearsion::Logging::INFO] * 2
+      Adhearsion::Logging.logging_level = :warn
+      loggers.map(&:level).should == [Adhearsion::Logging::WARN] * 2
+    end
 
-  it '#unsilence!() should change the level to be INFO' do
-    Adhearsion::Logging.unsilence!
-    Adhearsion::Logging.logging_level.should be(Adhearsion::Logging::INFO)
-  end
+    it 'changing the logging level, using level=, should affect all loggers' do
+      loggers = [Foo.logger, ::Foo::Bar.logger]
+      loggers.map(&:level).should_not == [::Logging::LEVELS["debug"]] * 2
+      loggers.map(&:level).should == [::Logging::LEVELS["info"]] * 2
+      Adhearsion::Logging.level = :warn
+      loggers.map(&:level).should == [::Logging::LEVELS["warn"]] * 2
+    end
 
+    it 'should change all the Logger instance level' do
+      Foo.logger.level.should be Adhearsion::Logging::INFO
+      Adhearsion::Logging.logging_level = :fatal
+      Foo.logger.level.should be Adhearsion::Logging::FATAL
+    end
+
+    it 'a new logger should have the :root logging level' do
+      Foo.logger.level.should be Adhearsion::Logging::INFO
+      Adhearsion::Logging.logging_level = :fatal
+      Foo::Bar.logger.level.should be Adhearsion::Logging::FATAL
+    end
+
+    it '#silence! should change the level to be FATAL' do
+      Adhearsion::Logging.silence!
+      Adhearsion::Logging.logging_level.should be(Adhearsion::Logging::FATAL)
+    end
+
+    it '#unsilence! should change the level to be INFO' do
+      Adhearsion::Logging.unsilence!
+      Adhearsion::Logging.logging_level.should be(Adhearsion::Logging::INFO)
+    end
+
+  end
 end

data/spec/adhearsion/outbound_call_spec.rb

@@ -20,27 +20,18 @@ module Adhearsion
 
       let(:mock_call) { OutboundCall.new }
 
-      def mock_dial
-        flexmock(OutboundCall).new_instances.should_receive(:dial).and_return true
-      end
-
-      it "should create a new call and return it" do
-        mock_dial
-        OutboundCall.originate(to).should be_a OutboundCall
-      end
-
-      it "should dial the call to the correct endpoint" do
+      it "should dial the call to the correct endpoint and return it" do
         mock_call
         flexmock(OutboundCall).should_receive(:new).and_return mock_call
-        flexmock(mock_call).should_receive(:dial).with(to, :from => 'foo').once
-        OutboundCall.originate to, :from => 'foo'
+        flexmock(mock_call.wrapped_object).should_receive(:dial).with(to, :from => 'foo').once
+        OutboundCall.originate(to, :from => 'foo').should be mock_call
       end
 
       it "should run through the router when the call is answered" do
         mock_call
 
         flexmock(OutboundCall).should_receive(:new).and_return mock_call
-        flexmock(mock_call).should_receive(:dial).once
+        flexmock(mock_call.wrapped_object).should_receive(:dial).once
 
         mock_dispatcher = flexmock 'dispatcher'
         mock_dispatcher.should_receive(:call).once.with mock_call
@@ -66,7 +57,7 @@ module Adhearsion
 
     describe "#dial" do
       def expect_message_waiting_for_response(message)
-        flexmock(subject).should_receive(:write_and_await_response).once.with(message, 60).and_return do
+        flexmock(subject.wrapped_object).should_receive(:write_and_await_response).once.with(message, 60).and_return do
           message.call_id = call_id
           message
         end
@@ -115,7 +106,7 @@ module Adhearsion
 
     describe "basic control commands" do
       def expect_no_message_waiting_for_response
-        flexmock(subject).should_receive(:write_and_await_response).never
+        flexmock(subject.wrapped_object).should_receive(:write_and_await_response).never
       end
 
       describe '#accept' do

data/spec/adhearsion/plugin_spec.rb

@@ -376,4 +376,22 @@ describe Adhearsion::Plugin do
 
   end
 
+  describe "registering generators" do
+    TestGenerator1 = Class.new Adhearsion::Generators::Generator
+    TestGenerator2 = Class.new Adhearsion::Generators::Generator
+
+    after do
+      defined?(FooBar) and Object.send(:remove_const, :"FooBar")
+    end
+
+    it "should add the generator to the index" do
+      FooBar = Class.new Adhearsion::Plugin do
+        generators :gen1 => TestGenerator1, :gen2 => TestGenerator2
+      end
+
+      Adhearsion::Generators.mappings[:gen1].should be TestGenerator1
+      Adhearsion::Generators.mappings[:gen2].should be TestGenerator2
+    end
+  end
+
 end

data/spec/adhearsion/process_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 module Adhearsion
   describe Adhearsion::Process do
+    before :all do
+      Adhearsion.active_calls.clear!
+    end
+
     before :each do
       Adhearsion::Process.reset
     end
@@ -23,7 +27,12 @@ module Adhearsion
       flexmock(Adhearsion).should_receive(:active_calls).and_return calls
       flexmock(Adhearsion::Process.instance).should_receive(:final_shutdown).once
       calls = []
-      3.times { calls << Thread.new { sleep 1; calls.pop } }
+      3.times do
+        calls << Thread.new do
+          sleep 1
+          calls.pop
+        end
+      end
       Adhearsion::Process.stop_when_zero_calls
       calls.each { |thread| thread.join }
     end

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -37,7 +37,7 @@ module Adhearsion
           config.reconnect_timer    = options[:reconnect_timer] if options.has_key?(:reconnect_timer)
         end
 
-        Initializer.start
+        Initializer.init
         Adhearsion.config[:punchblock]
       end
 
@@ -105,7 +105,7 @@ module Adhearsion
           mock_connection.should_receive(:register_event_handler).once
           flexmock(::Punchblock::Client).should_receive(:new).once.and_return mock_connection
           flexmock(mock_connection).should_receive(:run).once
-          t = Thread.new { Initializer.start }
+          t = Thread.new { Initializer.init; Initializer.run }
           t.join 5
           t.status.should == "sleep"
           Events.trigger_immediately :punchblock, ::Punchblock::Connection::Connected.new
@@ -191,6 +191,10 @@ module Adhearsion
         context "when when Adhearsion::Process is in :running" do
           let(:process_state) { :running }
 
+          it "should accept the call" do
+            mock_call.should_receive(:accept).once
+          end
+
           it "should execute the dispatcher provided by the router" do
             controller = Class.new
             Adhearsion.router do
@@ -236,7 +240,6 @@ module Adhearsion
 
       describe "dispatching a call event" do
         let(:mock_event)  { flexmock 'Event', :call_id => call_id }
-        let(:latch)       { CountDownLatch.new 1 }
 
         describe "with an active call" do
           before do
@@ -250,9 +253,8 @@ module Adhearsion
           end
 
           it "should place the event in the call's inbox" do
-            mock_call.should_receive(:<<).once.with(mock_event)
-            Initializer.dispatch_call_event mock_event, latch
-            latch.wait(10).should be_true
+            mock_call.should_receive(:deliver_message!).once.with(mock_event)
+            Initializer.dispatch_call_event mock_event
           end
         end
 

data/spec/spec_helper.rb

@@ -46,7 +46,6 @@ end
 
 Adhearsion::Logging.silence!
 
-
 # Test modules for #mixin methods
 module TestBiscuit
   def throwadogabone
@@ -58,4 +57,8 @@ module MarmaladeIsBetterThanJam
   def sobittersweet
     true
   end
-end
+end
+
+def new_uuid
+  UUID.new.generate.to_s
+end

data/spec/support/call_controller_test_helpers.rb

@@ -2,7 +2,7 @@ module CallControllerTestHelpers
   include FlexMock::ArgumentTypes
 
   def self.included(test_case)
-    test_case.let(:call_id) { rand }
+    test_case.let(:call_id) { new_uuid }
     test_case.let(:call)    { Adhearsion::Call.new }
     test_case.let(:block)   { nil }
 

data/spec/support/initializer_stubs.rb

@@ -1,6 +1,6 @@
 module InitializerStubs
   UNWANTED_BEHAVIOR = {
-    Adhearsion::Initializer => [:initialize_log_paths, :update_rails_env_var, :daemonize!, :require, :init_plugins, :load_lib_folder]
+    Adhearsion::Initializer => [:initialize_log_paths, :update_rails_env_var, :daemonize!, :require, :init_plugins, :run_plugins, :load_lib_folder]
   } unless defined? UNWANTED_BEHAVIOR
 
   def stub_behavior_for_initializer_with_no_path_changing_behavior

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha3
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156512600 !ruby/object:Gem::Requirement
+  requirement: &2171040300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156512600
+  version_requirements: *2171040300
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2156510520 !ruby/object:Gem::Requirement
+  requirement: &2171038740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156510520
+  version_requirements: *2171038740
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2156507840 !ruby/object:Gem::Requirement
+  requirement: &2171037040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156507840
+  version_requirements: *2171037040
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
-  requirement: &2156520680 !ruby/object:Gem::Requirement
+  requirement: &2171035680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156520680
+  version_requirements: *2171035680
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156519300 !ruby/object:Gem::Requirement
+  requirement: &2171033860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156519300
+  version_requirements: *2171033860
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156517360 !ruby/object:Gem::Requirement
+  requirement: &2171032700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156517360
+  version_requirements: *2171032700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156515880 !ruby/object:Gem::Requirement
+  requirement: &2171031740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156515880
+  version_requirements: *2171031740
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156515300 !ruby/object:Gem::Requirement
+  requirement: &2171030940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156515300
+  version_requirements: *2171030940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156513900 !ruby/object:Gem::Requirement
+  requirement: &2171029980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156513900
+  version_requirements: *2171029980
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2156526580 !ruby/object:Gem::Requirement
+  requirement: &2171029320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156526580
+  version_requirements: *2171029320
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2156524260 !ruby/object:Gem::Requirement
+  requirement: &2171028220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156524260
+  version_requirements: *2171028220
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2156522060 !ruby/object:Gem::Requirement
+  requirement: &2171026980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156522060
+  version_requirements: *2171026980
 - !ruby/object:Gem::Dependency
   name: ruby_speech
-  requirement: &2156535940 !ruby/object:Gem::Requirement
+  requirement: &2171025760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156535940
+  version_requirements: *2171025760
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2156531620 !ruby/object:Gem::Requirement
+  requirement: &2171024940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +167,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156531620
+  version_requirements: *2171024940
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2156548760 !ruby/object:Gem::Requirement
+  requirement: &2171023680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156548760
+  version_requirements: *2171023680
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2156546880 !ruby/object:Gem::Requirement
+  requirement: &2171022800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +189,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156546880
+  version_requirements: *2171022800
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2156544980 !ruby/object:Gem::Requirement
+  requirement: &2171019620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +200,21 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2156544980
+  version_requirements: *2171019620
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: &2171018040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2171018040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156543340 !ruby/object:Gem::Requirement
+  requirement: &2171016200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -211,10 +222,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156543340
+  version_requirements: *2171016200
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2156557680 !ruby/object:Gem::Requirement
+  requirement: &2171015400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,10 +233,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156557680
+  version_requirements: *2171015400
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156555880 !ruby/object:Gem::Requirement
+  requirement: &2171014100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -233,10 +244,10 @@ dependencies:
         version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *2156555880
+  version_requirements: *2171014100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156554720 !ruby/object:Gem::Requirement
+  requirement: &2171012660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,10 +255,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156554720
+  version_requirements: *2171012660
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2156553700 !ruby/object:Gem::Requirement
+  requirement: &2171010880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -255,10 +266,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156553700
+  version_requirements: *2171010880
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156551580 !ruby/object:Gem::Requirement
+  requirement: &2171010080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +277,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156551580
+  version_requirements: *2171010080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156550720 !ruby/object:Gem::Requirement
+  requirement: &2171009420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,10 +288,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156550720
+  version_requirements: *2171009420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156568080 !ruby/object:Gem::Requirement
+  requirement: &2171008880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +299,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156568080
+  version_requirements: *2171008880
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2156562800 !ruby/object:Gem::Requirement
+  requirement: &2170971440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,10 +310,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156562800
+  version_requirements: *2170971440
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2156587720 !ruby/object:Gem::Requirement
+  requirement: &2170970720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -310,10 +321,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156587720
+  version_requirements: *2170970720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156585660 !ruby/object:Gem::Requirement
+  requirement: &2170969740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -321,10 +332,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156585660
+  version_requirements: *2170969740
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2156584040 !ruby/object:Gem::Requirement
+  requirement: &2170968180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -332,7 +343,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156584040
+  version_requirements: *2170968180
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
@@ -354,7 +365,14 @@ files:
 - bin/ahn
 - cucumber.yml
 - features/app_generator.feature
-- features/cli.feature
+- features/cli_basic.feature
+- features/cli_create.feature
+- features/cli_daemon.feature
+- features/cli_generate.feature
+- features/cli_start.feature
+- features/cli_stop.feature
+- features/controller_generator.feature
+- features/plugin_generator.feature
 - features/step_definitions/app_generator_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/support/aruba_helper.rb
@@ -393,8 +411,23 @@ files:
 - lib/adhearsion/generators/app/templates/gitignore
 - lib/adhearsion/generators/app/templates/lib/simon_game.rb
 - lib/adhearsion/generators/app/templates/script/ahn
+- lib/adhearsion/generators/controller/controller_generator.rb
+- lib/adhearsion/generators/controller/templates/lib/controller.rb
+- lib/adhearsion/generators/controller/templates/spec/controller_spec.rb
+- lib/adhearsion/generators/generator.rb
+- lib/adhearsion/generators/plugin/plugin_generator.rb
+- lib/adhearsion/generators/plugin/templates/.gitignore
+- lib/adhearsion/generators/plugin/templates/Gemfile.tt
+- lib/adhearsion/generators/plugin/templates/README.md.tt
+- lib/adhearsion/generators/plugin/templates/Rakefile.tt
+- lib/adhearsion/generators/plugin/templates/lib/plugin-template.rb.tt
+- lib/adhearsion/generators/plugin/templates/lib/plugin-template/controller_methods.rb.tt
+- lib/adhearsion/generators/plugin/templates/lib/plugin-template/plugin.rb.tt
+- lib/adhearsion/generators/plugin/templates/lib/plugin-template/version.rb.tt
+- lib/adhearsion/generators/plugin/templates/plugin-template.gemspec.tt
+- lib/adhearsion/generators/plugin/templates/spec/plugin-template/controller_methods_spec.rb.tt
+- lib/adhearsion/generators/plugin/templates/spec/spec_helper.rb.tt
 - lib/adhearsion/initializer.rb
-- lib/adhearsion/initializer/logging.rb
 - lib/adhearsion/linux_proc_name.rb
 - lib/adhearsion/logging.rb
 - lib/adhearsion/menu_dsl.rb
@@ -433,7 +466,7 @@ files:
 - spec/adhearsion/configuration_spec.rb
 - spec/adhearsion/console_spec.rb
 - spec/adhearsion/events_spec.rb
-- spec/adhearsion/initializer/logging_spec.rb
+- spec/adhearsion/generators_spec.rb
 - spec/adhearsion/initializer_spec.rb
 - spec/adhearsion/logging_spec.rb
 - spec/adhearsion/menu_dsl/calculated_match_collection_spec.rb
@@ -472,7 +505,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2359996897687755183
+      hash: -1198285695907666216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -487,7 +520,14 @@ specification_version: 3
 summary: Adhearsion, open-source telephony development framework
 test_files:
 - features/app_generator.feature
-- features/cli.feature
+- features/cli_basic.feature
+- features/cli_create.feature
+- features/cli_daemon.feature
+- features/cli_generate.feature
+- features/cli_start.feature
+- features/cli_stop.feature
+- features/controller_generator.feature
+- features/plugin_generator.feature
 - features/step_definitions/app_generator_steps.rb
 - features/step_definitions/cli_steps.rb
 - features/support/aruba_helper.rb
@@ -504,7 +544,7 @@ test_files:
 - spec/adhearsion/configuration_spec.rb
 - spec/adhearsion/console_spec.rb
 - spec/adhearsion/events_spec.rb
-- spec/adhearsion/initializer/logging_spec.rb
+- spec/adhearsion/generators_spec.rb
 - spec/adhearsion/initializer_spec.rb
 - spec/adhearsion/logging_spec.rb
 - spec/adhearsion/menu_dsl/calculated_match_collection_spec.rb