adhearsion 2.0.0.alpha2 → 2.0.0.alpha3

data/lib/adhearsion/call_controller.rb

@@ -34,16 +34,13 @@ module Adhearsion
     end
 
     class << self
-      def exec(controller, fresh_call = true)
-        return unless controller
-
+      def exec(controller)
         new_controller = catch :pass_controller do
-          controller.skip_accept! unless fresh_call
           controller.execute!
           nil
         end
 
-        exec new_controller, false
+        exec new_controller if new_controller
       end
 
       ##
@@ -57,7 +54,7 @@ module Adhearsion
 
     delegate :[], :[]=, :to => :@metadata
     delegate :variables, :logger, :to => :call
-    delegate :write_and_await_response, :accept, :answer, :reject, :mute, :unmute, :join, :to => :call
+    delegate :write_and_await_response, :answer, :reject, :mute, :unmute, :join, :to => :call
 
     def initialize(call, metadata = nil, &block)
       @call, @metadata, @block = call, metadata || {}, block
@@ -65,7 +62,6 @@ module Adhearsion
 
     def execute!(*options)
       execute_callbacks :before_call
-      accept if auto_accept?
       run
     rescue Hangup
       logger.info "Call was hung up"
@@ -96,24 +92,12 @@ module Adhearsion
       end
     end
 
-    def skip_accept!
-      @skip_accept = true
-    end
-
-    def skip_accept?
-      @skip_accept || false
-    end
-
-    def auto_accept?
-      Adhearsion.config.platform.automatically_accept_incoming_calls && !skip_accept?
-    end
-
     def after_call
       @after_call ||= execute_callbacks :after_call
     end
 
     def hangup(headers = nil)
-      hangup_response = call.hangup! headers
+      hangup_response = call.hangup headers
       after_call unless hangup_response == false
     end
 

data/lib/adhearsion/call_controller/dial.rb

@@ -31,23 +31,43 @@ module Adhearsion
       #   dial "IAX2/my.id@voipjet/19095551234", :from => "John Doe <9095551234>"
       #
       def dial(to, options = {}, latch = nil)
-        latch ||= CountDownLatch.new 1
+        targets = Array(to)
+
+        latch ||= CountDownLatch.new targets.size
+
+        call.on_end { |_| latch.countdown! until latch.count == 0 }
 
         _for = options.delete :for
         options[:timeout] ||= _for if _for
 
-        calls = Array(to).map do |target|
+        options[:from] ||= call.from
+
+        calls = targets.map do |target|
           new_call = OutboundCall.new options
 
           new_call.on_answer do |event|
             calls.each do |call_to_hangup, target|
-              call_to_hangup.hangup! unless call_to_hangup.id == new_call.id
+              begin
+                next if call_to_hangup.id == new_call.id
+                logger.debug "Hanging up call #{call_to_hangup.id} because it was not the first to answer a #dial"
+                call_to_hangup.hangup
+              rescue Celluloid::DeadActorError
+                # This actor may previously have been shut down due to the call ending
+              end
+            end
+
+            new_call.register_event_handler Punchblock::Event::Unjoined, :other_call_id => call.id do |event|
+              new_call[:"dial_countdown_#{call.id}"] = true
+              latch.countdown!
+              throw :pass
             end
+
+            logger.debug "Joining call #{new_call.id} to #{call.id} due to a #dial"
             new_call.join call
           end
 
           new_call.on_end do |event|
-            latch.countdown!
+            latch.countdown! unless new_call[:"dial_countdown_#{call.id}"]
           end
 
           [new_call, target]
@@ -60,6 +80,16 @@ module Adhearsion
 
         timeout = latch.wait options[:timeout]
 
+        logger.debug "#dial finished. Hanging up #{calls.size} outbound calls #{calls.inspect}."
+        calls.each do |outbound_call|
+          begin
+            logger.debug "Hanging up #{outbound_call} because the #dial that created it is complete."
+            outbound_call.hangup
+          rescue Celluloid::DeadActorError
+            # This actor may previously have been shut down due to the call ending
+          end
+        end
+
         return timeout unless timeout
 
         calls.size == 1 ? calls.first : calls

data/lib/adhearsion/calls.rb

@@ -18,7 +18,10 @@ module Adhearsion
     end
 
     def <<(call)
-      atomically { calls[call.id] = call }
+      atomically do
+        calls[call.id] = call
+      end
+      self
     end
 
     def any?

data/lib/adhearsion/cli_commands.rb

@@ -28,9 +28,22 @@ module Adhearsion
 
       desc "create /path/to/directory", "Create a new Adhearsion application under the given path"
       def create(path)
-        require 'adhearsion/generators'
         require 'adhearsion/generators/app/app_generator'
-        Adhearsion::Generators::AppGenerator.start
+        Generators::AppGenerator.start
+      end
+
+      desc "generate [generator_name] arguments", "Invoke a generator"
+      def generate(generator_name = nil, *args)
+        require 'adhearsion/generators/controller/controller_generator'
+        Generators.add_generator :controller, Adhearsion::Generators::ControllerGenerator
+        require 'adhearsion/generators/plugin/plugin_generator'
+        Generators.add_generator :plugin, Adhearsion::Generators::PluginGenerator
+
+        if generator_name
+          Generators.invoke generator_name
+        else
+          Generators.help
+        end
       end
 
       desc "version", "Shows Adhearsion version"
@@ -55,13 +68,16 @@ module Adhearsion
       def stop(path = nil)
         execute_from_app_dir! path
 
+        path ||= '.'
+
         pid_file = if options[:pidfile]
-          File.expand_path File.exists?(File.expand_path(options[:pidfile])) ?
-          options[:pidfile] :
-          File.join(path, options[:pidfile])
+          File.exists?(File.expand_path(options[:pidfile])) ?
+            options[:pidfile] :
+            File.join(path, options[:pidfile])
         else
-          path + '/adhearsion.pid'
+          File.join path, Adhearsion::Initializer::DEFAULT_PID_FILE_NAME
         end
+        pid_file = File.expand_path pid_file
 
         begin
           pid = File.read(pid_file).to_i
@@ -79,6 +95,8 @@ module Adhearsion
           ::Process.kill "KILL", pid
         rescue Errno::ESRCH
         end
+
+        File.delete pid_file
       end
 
       desc "restart </path/to/directory>", "Restart the Adhearsion server"
@@ -144,6 +162,13 @@ module Adhearsion
       end
     end
 
+     class UnknownGeneratorError < Thor::Error
+      def initialize(gentype)
+        puts "Please specify generator to use (#{Adhearsion::Generators.mappings.keys.join(", ")})"
+        super "Unknown command: #{gentype}"
+      end
+    end
+
     class PathInvalid < Thor::Error
       def initialize(path)
         super "Directory #{path} does not belong to an Adhearsion project!"

data/lib/adhearsion/configuration.rb

@@ -21,15 +21,11 @@ module Adhearsion
         root nil, :desc => "Adhearsion application root folder"
 
         lib "lib", :desc => <<-__
-          Folder to include the own libraries to be used. Adhearsion loads any ruby file 
-          located into this folder during the bootstrap process. Set to nil if you do not 
+          Folder to include the own libraries to be used. Adhearsion loads any ruby file
+          located into this folder during the bootstrap process. Set to nil if you do not
           want these files to be loaded. This folder is relative to the application root folder.
         __
 
-        automatically_accept_incoming_calls true, :transform => Proc.new { |v| v == 'true' }, :desc => <<-__
-          Adhearsion will accept automatically any inbound call
-        __
-
         environment :development, :transform => Proc.new { |v| v.to_sym }, :desc => <<-__
           Active environment. Supported values: development, production, staging, test
         __

data/lib/adhearsion/console.rb

@@ -2,9 +2,10 @@ require 'pry'
 
 module Adhearsion
   class Console
-    include Adhearsion
     include Singleton
 
+    delegate :silence!, :unsilence!, :to => Adhearsion::Logging
+
     class << self
       ##
       # Include another external functionality into the console
@@ -17,6 +18,12 @@ module Adhearsion
       end
     end
 
+    attr_accessor :input
+
+    def initialize
+      @input = $stdin
+    end
+
     ##
     # Start the Adhearsion console
     #
@@ -48,21 +55,47 @@ module Adhearsion
       logger.info "Shutting down"
     end
 
+    def log_level(level = nil)
+      if level
+        Adhearsion::Logging.level = level
+      else
+        ::Logging::LEVELS.invert[Adhearsion::Logging.level].to_sym
+      end
+    end
+
+    def shutdown!
+      Process.shutdown!
+    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}? " }  ]
-
-      # Pause execution of the thread currently controlling the call
-      call.with_command_lock do
-        CallWrapper.new(call).pry
+    def take(call = nil)
+      case call
+      when Call
+        interact_with_call call
+      when String
+        if call = calls[call]
+          interact_with_call call
+        else
+          logger.error "An active call with that ID does not exist"
+        end
+      when nil
+        if calls.size == 1
+          interact_with_call calls.values.first
+        else
+          puts "Please choose a call:"
+          current_calls = calls.values
+          current_calls.each_with_index do |call, index|
+            puts "#{index}. (#{call.is_a?(OutboundCall) ? 'o' : 'i' }) #{call.id} from #{call.from} to #{call.to}"
+          end
+          index = input.gets.chomp.to_i
+          call = current_calls[index]
+          interact_with_call call
+        end
+      else
+        raise ArgumentError
       end
     end
 
@@ -76,12 +109,18 @@ module Adhearsion
       end
     end
 
-    class CallWrapper
-      attr_accessor :call
+    private
+
+    def interact_with_call(call)
+      Pry.prompt = [ proc { "AHN<#{call.id}> " },
+                     proc { "AHN<#{call.id}? " }  ]
+
+      CallController.exec InteractiveController.new(call)
+    end
 
-      def initialize(call)
-        @call = call
-        extend Adhearsion::Commands.for('asterisk')
+    class InteractiveController < CallController
+      def run
+        pry
       end
     end
   end

data/lib/adhearsion/generators.rb

@@ -1,5 +1,56 @@
 module Adhearsion
   module Generators
     extend ActiveSupport::Autoload
-  end
-end
+
+    autoload :Generator
+
+    class << self
+
+      # Show help message with available generators.
+      def help(command = 'generate')
+        puts "Usage: ahn #{command} GENERATOR_NAME [args] [options]"
+        puts
+        puts "Please choose a generator below."
+        puts
+
+        mappings.each_pair do |name, klass|
+          puts name
+        end
+      end
+
+      def invoke(generator_name, args = ARGV)
+        klass = Generators.mappings[generator_name.to_sym]
+        raise UnknownGeneratorError, generator_name unless klass
+
+        args << "--help" if args.empty? && klass.arguments.any?(&:required?)
+
+        klass.start args
+      end
+
+      ##
+      # Return a ordered list of task with their class
+      #
+      def mappings
+        @_mappings ||= Hash.new
+      end
+
+      ##
+      # Globally add a new generator class to +ahn generate+
+      #
+      # @param [Symbol] name
+      # key name for generator mapping
+      # @param [Class] klass
+      # class of generator
+      #
+      # @return [Hash] generator mappings
+      #
+      # @example
+      # Adhearsion::Generators.add_generator :myplugin, MyPluginGenerator
+      #
+      def add_generator(name, klass)
+        mappings[name] = klass
+      end
+
+    end#class << self
+  end#module
+end#module

data/lib/adhearsion/generators/app/app_generator.rb

@@ -1,33 +1,11 @@
-begin
-  require 'thor/group'
-rescue LoadError
-  puts "Thor is not available.\nIf you ran this command from a git checkout " \
-       "of Adhearsion, please make sure thor is installed,\nand run this command " \
-       "as `ruby #{$0} #{(ARGV | ['--dev']).join(" ")}`"
-  exit
-end
-
 module Adhearsion
   module Generators
-    class AppGenerator < Thor::Group
-      include Thor::Actions
+    class AppGenerator < Generator
 
       BASEDIRS = %w( config lib script )
 
-      argument :app_action, :type => :string
-      argument :app_path,   :type => :string
-
-      def self.source_root(path = nil)
-        path = File.join(base_root, 'templates')
-        path if File.exists?(path)
-      end
-
-      def self.base_root
-        File.dirname(__FILE__)
-      end
-
       def setup_project
-        self.destination_root = @app_path
+        self.destination_root = @generator_name
         BASEDIRS.each { |dir| directory dir }
         template "Gemfile.erb", "Gemfile"
         copy_file "gitignore", ".gitignore"

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

@@ -29,7 +29,7 @@ Adhearsion.config do |config|
   ##
   # Use with Asterisk
   #
-  # config.punchblock.platform = :asterisk # Your AMI username
+  # config.punchblock.platform = :asterisk # Use Asterisk
   # config.punchblock.username = "" # Your AMI username
   # config.punchblock.password = "" # Your AMI password
   # config.punchblock.host = "127.0.0.1" # Your AMI host

data/lib/adhearsion/generators/controller/controller_generator.rb

@@ -0,0 +1,18 @@
+module Adhearsion
+  module Generators
+    class ControllerGenerator < Generator
+
+      argument :controller_name, :type => :string
+
+      def create_controller
+        raise Exception, "Generator commands need to be run in an Adhearsion app directory" unless ScriptAhnLoader.in_ahn_application?('.')
+        self.destination_root = '.'
+        empty_directory 'lib'
+        empty_directory 'spec'
+        template 'lib/controller.rb', "lib/#{@controller_name.underscore}.rb"
+        template 'spec/controller_spec.rb', "spec/#{@controller_name.underscore}_spec.rb"
+      end
+
+    end
+  end
+end