lib/adhearsion/console.rb in adhearsion-2.0.0.alpha1 vs lib/adhearsion/console.rb in adhearsion-2.0.0.alpha2

@@ -1,60 +1,79 @@
 require 'pry'
 
 module Adhearsion
-  module Console
+  class Console
     include Adhearsion
+    include Singleton
 
     class << self
       ##
-      # Start the Adhearsion console
-      #
-      def run
-        Pry.prompt = [
-                        proc do |*args|
-                          obj, nest_level, pry_instance = args
-                          "AHN#{'  ' * nest_level}> "
-                        end,
-                        proc do |*args|
-                          obj, nest_level, pry_instance = args
-                          "AHN#{'  ' * nest_level}? "
-                        end
-                      ]
-        Pry.config.command_prefix = "%"
-        if libedit?
-          logger.error "Cannot start. You are running Adhearsion on Ruby with libedit. You must use readline for the console to work."
-        else
-          logger.info "Starting up..."
-          pry
-        end
+      # Include another external functionality into the console
+      def mixin(mod)
+        include mod
       end
 
-      def calls
-        Adhearsion.active_calls
+      def method_missing(method, *args, &block)
+        instance.send method, *args, &block
       end
+    end
 
-      def use(call)
-        unless call.is_a? Adhearsion::Call
-          raise ArgumentError unless Adhearsion.active_calls[call]
-          call = Adhearsion.active_calls[call]
-        end
-        Pry.prompt = [ proc { "AHN<#{call.channel}> " },
-                       proc { "AHN<#{call.channel}? " }  ]
+    ##
+    # Start the Adhearsion console
+    #
+    def run
+      Pry.prompt = [
+                      proc do |*args|
+                        obj, nest_level, pry_instance = args
+                        "AHN#{'  ' * nest_level}> "
+                      end,
+                      proc do |*args|
+                        obj, nest_level, pry_instance = args
+                        "AHN#{'  ' * nest_level}? "
+                      end
+                    ]
+      Pry.config.command_prefix = "%"
+      if libedit?
+        logger.error "Cannot start. You are running Adhearsion on Ruby with libedit. You must use readline for the console to work."
+      else
+        logger.info "Starting up..."
+        @pry_thread = Thread.current
+        binding.pry
+      end
+    end
 
-        # Pause execution of the thread currently controlling the call
-        call.with_command_lock do
-          CallWrapper.new(call).pry
-        end
+    def stop
+      return unless @pry_thread
+      @pry_thread.kill
+      @pry_thread = nil
+      logger.info "Shutting down"
+    end
+
+    def calls
+      Adhearsion.active_calls
+    end
+
+    def use(call)
+      unless call.is_a? Adhearsion::Call
+        raise ArgumentError unless Adhearsion.active_calls[call]
+        call = Adhearsion.active_calls[call]
       end
+      Pry.prompt = [ proc { "AHN<#{call.channel}> " },
+                     proc { "AHN<#{call.channel}? " }  ]
 
-      def libedit?
-        begin
-          # If NotImplemented then this might be libedit
-          Readline.emacs_editing_mode
-          false
-        rescue NotImplementedError
-          true
-        end
+      # Pause execution of the thread currently controlling the call
+      call.with_command_lock do
+        CallWrapper.new(call).pry
+      end
+    end
+
+    def libedit?
+      begin
+        # If NotImplemented then this might be libedit
+        Readline.emacs_editing_mode
+        false
+      rescue NotImplementedError
+        true
       end
     end
 
     class CallWrapper
       attr_accessor :call