adhearsion 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd9595f782bf66bc47865e7738e5da1c973d842
-  data.tar.gz: 916b8a0a4a2a07b0a7464f281c05d9a096043acf
+  metadata.gz: 2ef70103a6c0eadf344f944bb236e74a6c1e8116
+  data.tar.gz: 2f0705427413a8bb1965be2dd6325287d028854c
 SHA512:
-  metadata.gz: 0114fe9c93594187df01011c321e33f754cb6d438d68d6d6bf670b63d926f0cbdae3c59929974c177d37bc724e664e465f0baa0d9b77797f33291bb193a0c77f
-  data.tar.gz: cddca9472cccaa2e7a7a526d7bdd8a57f95ab2e5fa3bc171ef26463dcd4dbcacc289ab8947a7628e349f4e345295b79f6f4d1543ed56fbea1a59560e0664860f
+  metadata.gz: e850ffe24ecbe3052ad61472740a94e131a36e0ba7e6d9079f54935aa147d4b4139386120a9df399aea47d1dee2369af3c0b63b06602710a4af56bbbe548d268
+  data.tar.gz: 1cc9eec318b364d111496940502d3027163aa22b06c286a6cfb1886c85b6b82dce96c4d26181e3ff51f3bffb9229db1a208b38a5437c193764ce2de2d2d015f9

data/.travis.yml

@@ -6,6 +6,9 @@ rvm:
   - jruby
   - rbx-2.1.1
   - ruby-head
+jdk:
+  - openjdk7 # for jruby
+before_script: export JRUBY_OPTS="--server -J-Xss1024k -J-Xmx652m -J-XX:+UseConcMarkSweepGC"
 matrix:
   allow_failures:
     - rvm: rbx-2.1.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.6.1](https://github.com/adhearsion/adhearsion/compare/v2.6.0...v2.6.1) - [2015-06-15](https://rubygems.org/gems/adhearsion/versions/2.6.1)
+  * Bugfix: Improve Call initialization performance. Use an ActorProxy (subclass) instead of a method_missing definition on every Call.new. This considerably improves Call.new performance; benchmarks show approximately a 30-40% improvement: https://gist.github.com/kares/3576e272250204eb66d1
+  * Bugfix: Executing ahn commands (such as start) won't spawn any sub-rubies underneath
+  * Bugfix: Allow a generated app to execute Rake tasks with only production dependencies installed
+
 # [2.6.0](https://github.com/adhearsion/adhearsion/compare/v2.5.4...v2.6.0) - [2015-02-01](https://rubygems.org/gems/adhearsion/versions/2.6.0)
   * Feature: `Call#after_hangup_lifetime` optionally overrides `Adhearsion.config.platform.after_hangup_lifetime` ([#537](https://github.com/adhearsion/adhearsion/pull/537))
   * Feature: Accept a `:cleanup` parameter in Dial options, which specifies a controller to be run on each outbound call before cleanup. ([#484](https://github.com/adhearsion/adhearsion/pull/484))

data/bin/ahn

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'adhearsion/cli'
-Adhearsion::CLI::AhnCommand.start
+# when script/ahn gets loaded it does AhnCommand.start
+Adhearsion::ScriptAhnLoader.load_script_ahn || Adhearsion::CLI::AhnCommand.start

data/lib/adhearsion/call.rb

@@ -16,22 +16,23 @@ module Adhearsion
     CommandTimeout  = Class.new Adhearsion::Error
     ExpiredError    = Class.new Celluloid::DeadActorError
 
+    # @private
+    class ActorProxy < Celluloid::ActorProxy
+      def method_missing(meth, *args, &block)
+        super(meth, *args, &block)
+      rescue ::Celluloid::DeadActorError
+        raise ExpiredError, "This call is expired and is no longer accessible. See http://adhearsion.com/docs/calls for further details."
+      end
+    end
+
     include Celluloid
     include HasGuardedHandlers
 
+    proxy_class Call::ActorProxy
+
     execute_block_on_receiver :register_handler, :register_tmp_handler, :register_handler_with_priority, :register_handler_with_options, :register_event_handler, :on_joined, :on_unjoined, :on_end, :execute_controller, *execute_block_on_receiver
     finalizer :finalize
 
-    def self.new(*args, &block)
-      super.tap do |proxy|
-        def proxy.method_missing(*args)
-          super
-        rescue Celluloid::DeadActorError
-          raise ExpiredError, "This call is expired and is no longer accessible. See http://adhearsion.com/docs/calls for further details."
-        end
-      end
-    end
-
     # @return [Symbol] the reason for the call ending
     attr_reader :end_reason
 
@@ -518,11 +519,15 @@ module Adhearsion
     #
     # Execute a call controller asynchronously against this call.
     #
+    # To block and wait until the controller completes, call `#join` on the result of this method.
+    #
     # @param [Adhearsion::CallController] controller an instance of a controller initialized for this call
     # @param [Proc] a callback to be executed when the controller finishes execution
     #
     # @yield execute the current block as the body of a controller by specifying no controller instance
     #
+    # @return [Celluloid::ThreadHandle]
+    #
     def execute_controller(controller = nil, completion_callback = nil, &block)
       raise ArgumentError, "Cannot supply a controller and a block at the same time" if controller && block_given?
       controller ||= CallController.new current_actor, &block

data/lib/adhearsion/cli.rb

@@ -1,10 +1,4 @@
 # encoding: utf-8
 
-require 'adhearsion/script_ahn_loader'
-
-# If we are inside an Adhearsion application this method performs an exec and thus
-# the rest of this script is not run.
-Adhearsion::ScriptAhnLoader.exec_script_ahn!
-
 require 'adhearsion'
 require 'adhearsion/cli_commands'

data/lib/adhearsion/cli_commands/ahn_command.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'adhearsion/script_ahn_loader'
+
 module Adhearsion
   module CLI
     class AhnCommand < Thor
@@ -100,32 +102,25 @@ module Adhearsion
 
       def start_app(path, mode, pid_file = nil)
         path = execute_from_app_dir! path
-        say "Starting Adhearsion server at #{Dir.pwd}"
+        say "Starting Adhearsion server at #{path}"
         Adhearsion::Initializer.start :mode => mode, :pid_file => pid_file
       end
 
       def execute_from_app_dir!(path)
-        if in_app? and running_script_ahn?
-          return Dir.pwd
-        end
+        return Dir.pwd if in_app?
 
+        path = nil if path && path.empty?
         path ||= Dir.pwd if in_app?
 
-        raise PathRequired, ARGV[0] if path.nil? or path.empty?
+        raise PathRequired, ARGV[0] if path.nil?
+        raise PathInvalid, path unless File.directory?(path)
 
-        Dir.chdir path do
-          raise PathInvalid, path unless ScriptAhnLoader.in_ahn_application?
-          args = ARGV.dup
-          args[1] = '.'
-          ScriptAhnLoader.exec_script_ahn! args
-        end
+        raise PathInvalid, path unless ScriptAhnLoader.in_ahn_application?(path)
+        # load script/ahn which than boots the Rails environment :
+        Dir.chdir(path) { ScriptAhnLoader.load_script_ahn(path) }
         path
       end
 
-      def running_script_ahn?
-        $0.to_s == "script/ahn"
-      end
-
       def in_app?
         ScriptAhnLoader.in_ahn_application? or ScriptAhnLoader.in_ahn_application_subdirectory?
       end

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

@@ -8,7 +8,7 @@ Edit `extensions.conf` to include the following:
 
 ```
 [your_context_name]
-exten => _.,1,AGI(agi:async)
+exten => _X.,1,AGI(agi:async)
 
 [adhearsion-redirect]
 exten => 1,1,AGI(agi:async)

data/lib/adhearsion/generators/app/templates/Rakefile

@@ -4,7 +4,10 @@ require File.expand_path('../config/environment',  __FILE__)
 
 require 'adhearsion/tasks'
 
-task :default => :spec
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+rescue LoadError
+  task :default => :about
+end

data/lib/adhearsion/script_ahn_loader.rb

@@ -8,25 +8,28 @@ module Adhearsion
     RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
     SCRIPT_AHN = File.join('script', 'ahn')
 
-    def self.exec_script_ahn!(args = ARGV)
-      cwd = Dir.pwd
-      return unless in_ahn_application? || in_ahn_application_subdirectory?
-      exec RUBY, SCRIPT_AHN, *args if in_ahn_application?
-      Dir.chdir("..") do
-        # Recurse in a chdir block: if the search fails we want to be sure
-        # the application is generated in the original working directory.
-        exec_script_ahn! unless cwd == Dir.pwd
+    def self.load_script_ahn(path = Dir.pwd)
+      path = Pathname.new(path).expand_path
+      until path.root?
+        script = File.join(path, SCRIPT_AHN)
+        if File.exists?(script)
+          load script
+          return true
+        end
+        path = path.parent
       end
-    rescue SystemCallError
-      # could not chdir, no problem just return
+      nil
     end
 
-    def self.in_ahn_application?(path = '.')
+    def self.in_ahn_application?(path = nil)
+      return File.exists? SCRIPT_AHN unless path
       Dir.chdir(path) { File.exists? SCRIPT_AHN }
     end
 
-    def self.in_ahn_application_subdirectory?(path = Pathname.new(Dir.pwd))
-      File.exists?(File.join(path, SCRIPT_AHN)) || !path.root? && in_ahn_application_subdirectory?(path.parent)
+    def self.in_ahn_application_subdirectory?(path = nil)
+      path = Pathname.new(path.nil? ? Dir.pwd : path)
+      File.exists?(File.join(path, SCRIPT_AHN)) ||
+        ! path.root? && in_ahn_application_subdirectory?(path.parent)
     end
   end
 end

data/lib/adhearsion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport