adhearsion 2.0.0.rc5 → 2.0.0

data/lib/adhearsion/call_controller/utility.rb

@@ -9,7 +9,9 @@ module Adhearsion
       # @param [Integer] Number of digits to accept in the grammar.
       # @return [RubySpeech::GRXML::Grammar] A grammar suitable for use in SSML prompts
       #
-      def grammar_digits(digits = 1) # :nodoc:
+      # @private
+      #
+      def grammar_digits(digits = 1)
         RubySpeech::GRXML.draw :mode => 'dtmf', :root => 'inputdigits' do
           rule id: 'inputdigits', scope: 'public' do
             item repeat: digits.to_s do
@@ -19,14 +21,16 @@ module Adhearsion
             end
           end
         end
-      end # grammar_digits
+      end
 
       # Utility method to create a single-digit grammar to accept only some digits
       #
       # @param [String] String representing the digits to accept
       # @return [RubySpeech::GRXML::Grammar] A grammar suitable for use in SSML prompts
       #
-      def grammar_accept(digits = '0123456789#*') # :nodoc:
+      # @private
+      #
+      def grammar_accept(digits = '0123456789#*')
         allowed_digits = '0123456789#*'
         gram_digits = digits.chars.select { |x| allowed_digits.include? x }
 
@@ -45,7 +49,9 @@ module Adhearsion
       # @param [String] the tone string to be parsed
       # @return [String] the digit in case input was 0-9, * or # if star or pound respectively
       #
-      def parse_single_dtmf(result) # :nodoc:
+      # @private
+      #
+      def parse_single_dtmf(result)
         return if result.nil?
         case tone = result.split('-')[1]
         when 'star'
@@ -57,6 +63,6 @@ module Adhearsion
         end
       end
 
-    end#module
+    end
   end
 end

data/lib/adhearsion/cli_commands.rb

@@ -8,11 +8,12 @@ require 'adhearsion/generators/plugin/plugin_generator'
 Adhearsion::Generators.add_generator :controller, Adhearsion::Generators::ControllerGenerator
 Adhearsion::Generators.add_generator :plugin, Adhearsion::Generators::PluginGenerator
 
+# @private
 class Thor
   class Task
     protected
 
-    def sans_backtrace(backtrace, caller) #:nodoc:
+    def sans_backtrace(backtrace, caller)
       saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) }
       saned -= caller
     end

data/lib/adhearsion/generators.rb

@@ -21,7 +21,7 @@ module Adhearsion
 
       def invoke(generator_name, args = ARGV)
         klass = Generators.mappings[generator_name.to_sym]
-        raise UnknownGeneratorError, generator_name unless klass
+        raise CLI::UnknownGeneratorError, generator_name unless klass
 
         args << "--help" if args.empty? && klass.arguments.any?(&:required?)
 

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

@@ -11,7 +11,7 @@ Edit `extensions.conf` to include the following:
 exten => _.,1,AGI(agi:async)
 ```
 
-and setup a user in `manager.conf` with read/write access to `all`.
+and setup a user in `manager.conf` with read/write access to `all`, `dialplan` and `agi`.
 
 ## Voxeo PRISM
 
@@ -23,7 +23,7 @@ In `config/adhearsion.rb` you'll need to set the VoIP platform you're using, alo
 
 ## Ready, set, go!
 
-Start your new app with "ahn start /path/to/your/app". You'll get a lovely console and should be presented with the SimonGame
+Start your new app with "ahn start". You'll get a lovely console and should be presented with the SimonGame when you call in.
 
 ### Running your app on heroku
 
@@ -34,4 +34,6 @@ heroku ps:scale web=0
 heroku ps:scale ahn=1
 ```
 
+More detail is available in the [deployment documentation](http://adhearsion.com/docs/best-practices/deployment).
+
 Check out [the Adhearsion website](http://adhearsion.com) for more details of where to go from here.

data/lib/adhearsion/generators/plugin/templates/lib/plugin-template.rb.tt

@@ -1,5 +1,4 @@
-module <%= @plugin_name %>
-  require "<%= @plugin_file %>/version"
-  require "<%= @plugin_file %>/plugin"
-  require "<%= @plugin_file %>/controller_methods"
-end
+<%= @plugin_name %> = Module.new
+require "<%= @plugin_file %>/version"
+require "<%= @plugin_file %>/plugin"
+require "<%= @plugin_file %>/controller_methods"

data/lib/adhearsion/linux_proc_name.rb

@@ -23,7 +23,7 @@ module Adhearsion
       def set_proc_name(name)
         $0 = name # process name in ps command
         if error
-          logger.warn error
+          logger.debug error
           return false
         end
         return false unless LibC.respond_to?(:prctl)
@@ -40,4 +40,4 @@ module Adhearsion
     end
 
   end
-end
+end

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
-module Adhearsion #:nodoc:
-  VERSION = '2.0.0.rc5'
+module Adhearsion
+  VERSION = '2.0.0'
 end

data/spec/adhearsion/call_controller/output_spec.rb

@@ -282,29 +282,27 @@ module Adhearsion
       describe "#say" do
         describe "with a RubySpeech document" do
           it 'plays the correct SSML' do
-            doc = RubySpeech::SSML.draw { string "Hello world" }
-            subject.should_receive(:play_ssml).once.with(doc, {}).and_return true
-            subject.should_receive(:output).never
-            subject.say(doc).should be true
+            ssml = RubySpeech::SSML.draw { string "Hello world" }
+            expect_component_execution Punchblock::Component::Output.new(:ssml => ssml)
+            subject.say(ssml).should be_a Punchblock::Component::Output
           end
         end
 
         describe "with a string" do
           it 'outputs the correct text' do
-            string = "Hello world"
-            subject.should_receive(:play_ssml).once.with(string, {})
-            subject.should_receive(:output).once.with(:text, string, {}).and_return true
-            subject.say(string).should be true
+            str = "Hello world"
+            ssml = RubySpeech::SSML.draw { string str }
+            expect_component_execution Punchblock::Component::Output.new(:ssml => ssml)
+            subject.say(str).should be_a Punchblock::Component::Output
           end
         end
 
         describe "converts the argument to a string" do
           it 'calls output with a string' do
-            expected_string = "123"
             argument = 123
-            subject.should_receive(:play_ssml).once.with(argument, {})
-            subject.should_receive(:output).once.with(:text, expected_string, {}).and_return true
-            subject.say(argument)
+            ssml = RubySpeech::SSML.draw { string '123' }
+            expect_component_execution Punchblock::Component::Output.new(:ssml => ssml)
+            subject.say(argument).should be_a Punchblock::Component::Output
           end
         end
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Jay Phillips
@@ -12,44 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2160082980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: *2160082980
-- !ruby/object:Gem::Dependency
-  name: punchblock
-  requirement: &2160085060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2160085060
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: &2160122360 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &2168665360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2160122360
+  version_requirements: *2168665360
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
-  requirement: &2160118660 !ruby/object:Gem::Requirement
+  requirement: &2168664720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,32 +35,32 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160118660
+  version_requirements: *2168664720
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &2160130100 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &2168663960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160130100
+  version_requirements: *2168663960
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &2160151980 !ruby/object:Gem::Requirement
+  name: celluloid
+  requirement: &2168663000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160151980
+  version_requirements: *2168663000
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2160150160 !ruby/object:Gem::Requirement
+  name: countdownlatch
+  requirement: &2168662120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160150160
+  version_requirements: *2168662120
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &2160148100 !ruby/object:Gem::Requirement
+  name: deep_merge
+  requirement: &2168661120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,32 +79,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160148100
+  version_requirements: *2168661120
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2160146860 !ruby/object:Gem::Requirement
+  name: ffi
+  requirement: &2168659800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2160146860
+  version_requirements: *2168659800
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &2160144620 !ruby/object:Gem::Requirement
+  name: future-resource
+  requirement: &2168659000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160144620
+  version_requirements: *2168659000
 - !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: &2160221660 !ruby/object:Gem::Requirement
+  name: girl_friday
+  requirement: &2168528540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,32 +112,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160221660
+  version_requirements: *2168528540
 - !ruby/object:Gem::Dependency
-  name: future-resource
-  requirement: &2160219300 !ruby/object:Gem::Requirement
+  name: has-guarded-handlers
+  requirement: &2168527220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160219300
+  version_requirements: *2168527220
 - !ruby/object:Gem::Dependency
-  name: ruby_speech
-  requirement: &2160216340 !ruby/object:Gem::Requirement
+  name: logging
+  requirement: &2168525580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160216340
+  version_requirements: *2168525580
 - !ruby/object:Gem::Dependency
-  name: countdownlatch
-  requirement: &2151956180 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &2168524680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,21 +145,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151956180
+  version_requirements: *2168524680
 - !ruby/object:Gem::Dependency
-  name: has-guarded-handlers
-  requirement: &2152014720 !ruby/object:Gem::Requirement
+  name: punchblock
+  requirement: &2168523120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152014720
+  version_requirements: *2168523120
 - !ruby/object:Gem::Dependency
-  name: girl_friday
-  requirement: &2152013300 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2168521780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,32 +167,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152013300
+  version_requirements: *2168521780
 - !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: &2152011820 !ruby/object:Gem::Requirement
+  name: ruby_speech
+  requirement: &2168587840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152011820
+  version_requirements: *2168587840
 - !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: &2152010660 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &2168587340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152010660
+  version_requirements: *2168587340
 - !ruby/object:Gem::Dependency
-  name: deep_merge
-  requirement: &2152009860 !ruby/object:Gem::Requirement
+  name: uuid
+  requirement: &2168586720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,21 +200,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152009860
+  version_requirements: *2168586720
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152008540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-  type: :development
-  prerelease: false
-  version_requirements: *2152008540
-- !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: &2152007520 !ruby/object:Gem::Requirement
+  name: aruba
+  requirement: &2168585940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,21 +211,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152007520
+  version_requirements: *2168585940
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &2152036300 !ruby/object:Gem::Requirement
+  name: ci_reporter
+  requirement: &2168585360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152036300
+  version_requirements: *2168585360
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &2152034420 !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: &2168584740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +233,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152034420
+  version_requirements: *2168584740
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: &2152031820 !ruby/object:Gem::Requirement
+  name: flexmock
+  requirement: &2168584160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,10 +244,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152031820
+  version_requirements: *2168584160
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: &2155914300 !ruby/object:Gem::Requirement
+  name: guard-cucumber
+  requirement: &2168583560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +255,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155914300
+  version_requirements: *2168583560
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2155910500 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &2168582980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,21 +266,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155910500
+  version_requirements: *2168582980
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &2155908700 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2168582240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2155908700
+  version_requirements: *2168582240
 - !ruby/object:Gem::Dependency
-  name: guard-cucumber
-  requirement: &2155922760 !ruby/object:Gem::Requirement
+  name: ruby_gntp
+  requirement: &2168581440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -321,10 +288,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155922760
+  version_requirements: *2168581440
 - !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: &2155917860 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &2168580760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -332,10 +299,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155917860
+  version_requirements: *2168580760
 - !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &2155953840 !ruby/object:Gem::Requirement
+  name: simplecov-rcov
+  requirement: &2168580140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -343,10 +310,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155953840
+  version_requirements: *2168580140
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: &2155951020 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &2168470660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -354,9 +321,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155951020
+  version_requirements: *2168470660
 description: Adhearsion is an open-source telephony development framework
-email: dev&Adhearsion.com
+email: dev@adhearsion.com
 executables:
 - ahn
 extensions: []
@@ -365,6 +332,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- .yardopts
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -520,13 +488,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -509637299476401617
+      hash: -3465123136377635342
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3465123136377635342
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10