adhearsion 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ef70103a6c0eadf344f944bb236e74a6c1e8116
-  data.tar.gz: 2f0705427413a8bb1965be2dd6325287d028854c
+  metadata.gz: f016136353daef3f5147c6aaf41345af3b9c82ca
+  data.tar.gz: 24e4268df718960405ab9475c9bd4864763d78ce
 SHA512:
-  metadata.gz: e850ffe24ecbe3052ad61472740a94e131a36e0ba7e6d9079f54935aa147d4b4139386120a9df399aea47d1dee2369af3c0b63b06602710a4af56bbbe548d268
-  data.tar.gz: 1cc9eec318b364d111496940502d3027163aa22b06c286a6cfb1886c85b6b82dce96c4d26181e3ff51f3bffb9229db1a208b38a5437c193764ce2de2d2d015f9
+  metadata.gz: 809fe06dee2ee0873ace49874c852e10d2cc40b057ac2978336a826852500424a589eec77377ee2ef20060759dbf4e8864bda0b556345112e658e5c6ee22f594
+  data.tar.gz: 4c7ab3f38feb787c356637aadda684a45d95c038be18b8396077a3823d63a2f0a0424940414d89d9bd24dfcc53016255142f9103807a03c7bbe93034fa1f3b69

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.6.2](https://github.com/adhearsion/adhearsion/compare/v2.6.1...v2.6.2) - [2015-06-16](https://rubygems.org/gems/adhearsion/versions/2.6.2)
+  * Bugfix: Properly load application bundle. This requires the spawning removed in [#534](https://github.com/adhearsion/adhearsion/pull/534).
+
 # [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

data/bin/ahn

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

data/lib/adhearsion/cli.rb

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

@@ -8,28 +8,25 @@ module Adhearsion
     RUBY = File.join(*RbConfig::CONFIG.values_at("bindir", "ruby_install_name")) + RbConfig::CONFIG["EXEEXT"]
     SCRIPT_AHN = File.join('script', 'ahn')
 
-    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
+    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
       end
-      nil
+    rescue SystemCallError
+      # could not chdir, no problem just return
     end
 
-    def self.in_ahn_application?(path = nil)
-      return File.exists? SCRIPT_AHN unless path
+    def self.in_ahn_application?(path = '.')
       Dir.chdir(path) { File.exists? SCRIPT_AHN }
     end
 
-    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)
+    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)
     end
   end
 end

data/lib/adhearsion/version.rb

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

metadata

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