adhearsion 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,3 +1,35 @@
+1.0.1
+ NOTE for Ruby 1.9 users: The behavior of Ruby 1.9 and case statements has changed
+      in a way that renders NumericalString objects incompatible with
+      case statements.  The suggested workaround is to cast the NumericalString
+      to a string and then compare.  Example:
+
+      obj = NumericalString.new("0987")
+      case obj.to_s
+      when "0987" then true
+      else false
+      end
+
+      Or, if you need to ignore the leading zero:
+      case obj.to_i
+      when 987 then true
+      else false
+      end
+
+      See https://adhearsion.lighthouseapp.com/projects/5871/tickets/127-ruby-19-and-numericalstring-comparisons-in-case-statements
+ - Add say_chars command.
+ - Add say_phonetic command.
+ - Update play_time to accept format and timezone paramenters. This allows you to read back any particular section of the Time object.  (i.e. Using format => 'IMp' would result in "eleven twenty-three" being said.)
+ - Update play_time to allow using Date objects.
+ - QueueAgentsListProxy#new now returns an AgentProxy instance if the agent was added successfully.
+ - Add state_interface parameter to QueueAgentsListProxy#new.  This allows you to specify a separate interface to watch for state changes on.  (i.e. Your agents log in with Local channel extensions, but you want to check their direct SIP exten for state.)
+ - Fixed issue with Queue#join! that would raise a QueueDoesNotExist error if the call was completed successfully.
+ - Add support for AGI script parameter to Queue#join!
+ - Migrate unit tests to RSpec 2
+ - New components now include RubyGems skeleton files
+ - Fix support for setting Caller ID name on AGI dial() command
+ - Generate new apps with Bundler support, including auto-requiring of all gems
+
 1.0.0
  - Fall back to using Asterisk's context if the AGI URI context is not found
  - Enable configuration of :auto_reconnect parameter for AMI
@@ -17,13 +49,13 @@
   required to match the Adhearsion context in dialplan.rb.  Starting in 0.8.5 if
   an application path is passed in on the AGI URI, it will be preferred over the
   context name.  For example:
-  
+
   [stuff]
   exten => _X.,1,AGI(agi://localhost/myapp)
-  
+
   AHN 0.8.4- will execute the "stuff" context in dialplan.rb
   AHN 0.8.5+ will execute the "myapp" context in dialplan.rb
-  
+
   If you followed the documentation and did not specify an application path in
   the URI (eg. agi://localhost) you will not be impacted by this change.
 

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Rakefile

@@ -2,15 +2,16 @@
 ENV['RUBY_FLAGS'] = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 require 'date'
 
 begin
-  gem 'rspec', '~> 1.3.0'
-  require 'spec/rake/spectask'
+  gem 'rspec', '>= 2.3.0'
+  require 'rspec/core/rake_task'
 rescue LoadError
-  abort "You must install RSpec 1.3: sudo gem install rspec -v'<2.0.0'"
+  abort "You must install RSpec: sudo gem install rspec"
 end
 
 begin
@@ -22,9 +23,10 @@ rescue LoadError
   STDERR.puts "\nCould not require() YARD! Install with 'gem install yard' to get the 'yardoc' task\n\n"
 end
 
-require 'lib/adhearsion/version'
+require 'adhearsion/version'
 
 AHN_TESTS     = ['spec/**/test_*.rb']
+#AHN_TESTS     = ['spec/test_ahn_command.rb']
 GEMSPEC       = eval File.read("adhearsion.gemspec")
 RAGEL_FILES   = %w[lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb]
 THEATRE_TESTS = 'theatre-spec/**/*_spec.rb'
@@ -41,15 +43,20 @@ rescue LoadError
   STDERR.puts "Could not load rcov tasks -- rcov does not appear to be installed. Continuing anyway."
 end
 
-Rake::GemPackageTask.new(GEMSPEC).define
+task :gem => :build
 
 # YARD::Rake::YardocTask.new do |t|
 #   t.files   = ['lib/**/*.rb']   # optional
 #   # t.options = ['--any', '--extra', '--opts'] # optional
 # end
 
-Rake::TestTask.new('spec') do |t|
-  t.verbose = true
+#Rake::TestTask.new('spec') do |t|
+#  t.libs << File.dirname(__FILE__)
+#  t.verbose = true
+#  t.pattern = AHN_TESTS
+#end
+
+RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = AHN_TESTS
 end
 
@@ -63,6 +70,12 @@ task :check_ragel_version do
   if big < 6 || (big == 6 && small < 3)
     abort "Please upgrade Ragel! You're on version #{ragel_version_match[0]} and must be on 6.3 or later"
   end
+  if (big == 6 && small < 7)
+    puts "WARNING: A change to Ruby since 1.9 affects the Ragel generated code."
+    puts "WARNING: You MUST be using Ragel version 6.7 or have patched it using"
+    puts "WARNING: the patch found at:"
+    puts "WARNING: http://www.mail-archive.com/ragel-users@complang.org/msg00440.html"
+  end
 end
 
 desc "Used to regenerate the AMI source code files. Note: requires Ragel 6.3 or later be installed on your system"
@@ -85,13 +98,12 @@ task :visualize_ragel => :check_ragel_version do
 end
 
 desc "Run all RSpecs for Theatre"
-Spec::Rake::SpecTask.new("theatre_specs") do |t|
-  t.spec_files = FileList[THEATRE_TESTS]
+RSpec::Core::RakeTask.new(:theatre_specs) do |t|
+  t.pattern = FileList[THEATRE_TESTS]
 end
 
 desc "Compares Adhearsion's files with those listed in adhearsion.gemspec"
 task :check_gemspec_files do
-
   files_from_gemspec    = ADHEARSION_FILES
   files_from_filesystem = Dir.glob(File.dirname(__FILE__) + "/**/*").map do |filename|
     filename[0...Dir.pwd.length] == Dir.pwd ? filename[(Dir.pwd.length+1)..-1] : filename
@@ -106,7 +118,6 @@ task :check_gemspec_files do
   puts '##########################################'
   puts((files_from_filesystem - files_from_gemspec).map { |f| "  " + f })
 
-
   puts '##########################################'
   puts '## Files in gemspec not in the filesystem:'
   puts '##########################################'
@@ -121,10 +132,3 @@ task :debug_gem do
   Thread.new { spec = eval("$SAFE = 3\n#{gemspec}") }.join
   puts "SUCCESS: Gemspec runs at the $SAFE level 3."
 end
-
-desc 'Install the package as a gem.'
-task :install_gem => [:clobber_package, :package] do
-  windows = /djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM
-  gem = Dir['pkg/*.gem'].first
-  sh "#{'sudo ' unless windows}gem install --local #{gem}"
-end

data/adhearsion.gemspec

@@ -1,120 +1,6 @@
-ADHEARSION_FILES = %w{
-  adhearsion.gemspec
-  app_generators/ahn/ahn_generator.rb
-  app_generators/ahn/templates/.ahnrc
-  app_generators/ahn/templates/components/ami_remote/ami_remote.rb
-  app_generators/ahn/templates/components/disabled/HOW_TO_ENABLE
-  app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.yml
-  app_generators/ahn/templates/components/disabled/stomp_gateway/README.markdown
-  app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.rb
-  app_generators/ahn/templates/components/disabled/sandbox/sandbox.rb
-  app_generators/ahn/templates/components/disabled/sandbox/sandbox.yml
-  app_generators/ahn/templates/components/disabled/restful_rpc/restful_rpc.yml
-  app_generators/ahn/templates/components/disabled/restful_rpc/example-client.rb
-  app_generators/ahn/templates/components/disabled/restful_rpc/README.markdown
-  app_generators/ahn/templates/components/disabled/restful_rpc/restful_rpc.rb
-  app_generators/ahn/templates/components/disabled/restful_rpc/spec/restful_rpc_spec.rb
-  app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.rb
-  app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.yml
-  app_generators/ahn/templates/components/disabled/xmpp_gateway/README.markdown
-  app_generators/ahn/templates/components/simon_game/simon_game.rb
-  app_generators/ahn/templates/config/startup.rb
-  app_generators/ahn/templates/dialplan.rb
-  app_generators/ahn/templates/events.rb
-  app_generators/ahn/templates/Rakefile
-  app_generators/ahn/templates/README
-  app_generators/ahn/USAGE
-  bin/ahn
-  bin/ahnctl
-  bin/jahn
-  CHANGELOG
-  EVENTS
-  examples/asterisk_manager_interface/standalone.rb
-  lib/adhearsion.rb
-  lib/adhearsion/cli.rb
-  lib/adhearsion/component_manager.rb
-  lib/adhearsion/component_manager/component_tester.rb
-  lib/adhearsion/component_manager/spec_framework.rb
-  lib/adhearsion/events_support.rb
-  lib/adhearsion/foundation/all.rb
-  lib/adhearsion/foundation/blank_slate.rb
-  lib/adhearsion/foundation/custom_daemonizer.rb
-  lib/adhearsion/foundation/event_socket.rb
-  lib/adhearsion/foundation/future_resource.rb
-  lib/adhearsion/foundation/metaprogramming.rb
-  lib/adhearsion/foundation/numeric.rb
-  lib/adhearsion/foundation/pseudo_guid.rb
-  lib/adhearsion/foundation/relationship_properties.rb
-  lib/adhearsion/foundation/string.rb
-  lib/adhearsion/foundation/synchronized_hash.rb
-  lib/adhearsion/foundation/thread_safety.rb
-  lib/adhearsion/host_definitions.rb
-  lib/adhearsion/initializer.rb
-  lib/adhearsion/initializer/asterisk.rb
-  lib/adhearsion/initializer/configuration.rb
-  lib/adhearsion/initializer/database.rb
-  lib/adhearsion/initializer/ldap.rb
-  lib/adhearsion/initializer/drb.rb
-  lib/adhearsion/initializer/freeswitch.rb
-  lib/adhearsion/initializer/rails.rb
-  lib/adhearsion/initializer/xmpp.rb
-  lib/adhearsion/logging.rb
-  lib/adhearsion/tasks.rb
-  lib/adhearsion/tasks/components.rb
-  lib/adhearsion/tasks/database.rb
-  lib/adhearsion/tasks/deprecations.rb
-  lib/adhearsion/tasks/generating.rb
-  lib/adhearsion/tasks/lint.rb
-  lib/adhearsion/tasks/testing.rb
-  lib/adhearsion/version.rb
-  lib/adhearsion/voip/asterisk.rb
-  lib/adhearsion/voip/asterisk/agi_server.rb
-  lib/adhearsion/voip/asterisk/commands.rb
-  lib/adhearsion/voip/asterisk/config_generators/agents.conf.rb
-  lib/adhearsion/voip/asterisk/config_generators/config_generator.rb
-  lib/adhearsion/voip/asterisk/config_generators/queues.conf.rb
-  lib/adhearsion/voip/asterisk/config_generators/voicemail.conf.rb
-  lib/adhearsion/voip/asterisk/config_manager.rb
-  lib/adhearsion/voip/asterisk/manager_interface.rb
-  lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb
-  lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb
-  lib/adhearsion/voip/asterisk/manager_interface/ami_messages.rb
-  lib/adhearsion/voip/asterisk/manager_interface/ami_protocol_lexer_machine.rl
-  lib/adhearsion/voip/asterisk/special_dial_plan_managers.rb
-  lib/adhearsion/voip/asterisk/super_manager.rb
-  lib/adhearsion/voip/call.rb
-  lib/adhearsion/voip/call_routing.rb
-  lib/adhearsion/voip/commands.rb
-  lib/adhearsion/voip/constants.rb
-  lib/adhearsion/voip/conveniences.rb
-  lib/adhearsion/voip/dial_plan.rb
-  lib/adhearsion/voip/dsl/dialing_dsl.rb
-  lib/adhearsion/voip/dsl/dialing_dsl/dialing_dsl_monkey_patches.rb
-  lib/adhearsion/voip/dsl/dialplan/control_passing_exception.rb
-  lib/adhearsion/voip/dsl/dialplan/dispatcher.rb
-  lib/adhearsion/voip/dsl/dialplan/parser.rb
-  lib/adhearsion/voip/dsl/dialplan/thread_mixin.rb
-  lib/adhearsion/voip/dsl/numerical_string.rb
-  lib/adhearsion/voip/freeswitch/basic_connection_manager.rb
-  lib/adhearsion/voip/freeswitch/event_handler.rb
-  lib/adhearsion/voip/freeswitch/freeswitch_dialplan_command_factory.rb
-  lib/adhearsion/voip/freeswitch/inbound_connection_manager.rb
-  lib/adhearsion/voip/freeswitch/oes_server.rb
-  lib/adhearsion/voip/menu_state_machine/calculated_match.rb
-  lib/adhearsion/voip/menu_state_machine/matchers.rb
-  lib/adhearsion/voip/menu_state_machine/menu_builder.rb
-  lib/adhearsion/voip/menu_state_machine/menu_class.rb
-  lib/adhearsion/xmpp/connection.rb
-  lib/theatre.rb
-  lib/theatre/callback_definition_loader.rb
-  lib/theatre/guid.rb
-  lib/theatre/invocation.rb
-  lib/theatre/namespace_manager.rb
-  lib/theatre/README.markdown
-  lib/theatre/version.rb
-  LICENSE
-  Rakefile
-}
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "adhearsion/version"
 
 Gem::Specification.new do |s|
   s.name = "adhearsion"
@@ -128,7 +14,125 @@ Gem::Specification.new do |s|
   s.email = "dev&Adhearsion.com"
   s.executables = ["ahn", "ahnctl", "jahn"]
 
-  s.files = ADHEARSION_FILES
+  s.files = %w{
+    adhearsion.gemspec
+    app_generators/ahn/ahn_generator.rb
+    app_generators/ahn/templates/.ahnrc
+    app_generators/ahn/templates/components/ami_remote/ami_remote.rb
+    app_generators/ahn/templates/components/disabled/HOW_TO_ENABLE
+    app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.yml
+    app_generators/ahn/templates/components/disabled/stomp_gateway/README.markdown
+    app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.rb
+    app_generators/ahn/templates/components/disabled/sandbox/sandbox.rb
+    app_generators/ahn/templates/components/disabled/sandbox/sandbox.yml
+    app_generators/ahn/templates/components/disabled/restful_rpc/restful_rpc.yml
+    app_generators/ahn/templates/components/disabled/restful_rpc/example-client.rb
+    app_generators/ahn/templates/components/disabled/restful_rpc/README.markdown
+    app_generators/ahn/templates/components/disabled/restful_rpc/restful_rpc.rb
+    app_generators/ahn/templates/components/disabled/restful_rpc/spec/restful_rpc_spec.rb
+    app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.rb
+    app_generators/ahn/templates/components/disabled/xmpp_gateway/xmpp_gateway.yml
+    app_generators/ahn/templates/components/disabled/xmpp_gateway/README.markdown
+    app_generators/ahn/templates/components/simon_game/simon_game.rb
+    app_generators/ahn/templates/config/startup.rb
+    app_generators/ahn/templates/dialplan.rb
+    app_generators/ahn/templates/events.rb
+    app_generators/ahn/templates/Rakefile
+    app_generators/ahn/templates/Gemfile
+    app_generators/ahn/templates/README
+    app_generators/ahn/USAGE
+    bin/ahn
+    bin/ahnctl
+    bin/jahn
+    CHANGELOG
+    EVENTS
+    examples/asterisk_manager_interface/standalone.rb
+    lib/adhearsion.rb
+    lib/adhearsion/cli.rb
+    lib/adhearsion/component_manager.rb
+    lib/adhearsion/component_manager/component_tester.rb
+    lib/adhearsion/component_manager/spec_framework.rb
+    lib/adhearsion/events_support.rb
+    lib/adhearsion/foundation/all.rb
+    lib/adhearsion/foundation/blank_slate.rb
+    lib/adhearsion/foundation/custom_daemonizer.rb
+    lib/adhearsion/foundation/event_socket.rb
+    lib/adhearsion/foundation/future_resource.rb
+    lib/adhearsion/foundation/metaprogramming.rb
+    lib/adhearsion/foundation/numeric.rb
+    lib/adhearsion/foundation/pseudo_guid.rb
+    lib/adhearsion/foundation/relationship_properties.rb
+    lib/adhearsion/foundation/string.rb
+    lib/adhearsion/foundation/synchronized_hash.rb
+    lib/adhearsion/foundation/thread_safety.rb
+    lib/adhearsion/host_definitions.rb
+    lib/adhearsion/initializer.rb
+    lib/adhearsion/initializer/asterisk.rb
+    lib/adhearsion/initializer/configuration.rb
+    lib/adhearsion/initializer/database.rb
+    lib/adhearsion/initializer/ldap.rb
+    lib/adhearsion/initializer/drb.rb
+    lib/adhearsion/initializer/freeswitch.rb
+    lib/adhearsion/initializer/rails.rb
+    lib/adhearsion/initializer/xmpp.rb
+    lib/adhearsion/logging.rb
+    lib/adhearsion/tasks.rb
+    lib/adhearsion/tasks/components.rb
+    lib/adhearsion/tasks/database.rb
+    lib/adhearsion/tasks/deprecations.rb
+    lib/adhearsion/tasks/generating.rb
+    lib/adhearsion/tasks/lint.rb
+    lib/adhearsion/tasks/testing.rb
+    lib/adhearsion/version.rb
+    lib/adhearsion/voip/asterisk.rb
+    lib/adhearsion/voip/asterisk/agi_server.rb
+    lib/adhearsion/voip/asterisk/commands.rb
+    lib/adhearsion/voip/asterisk/config_generators/agents.conf.rb
+    lib/adhearsion/voip/asterisk/config_generators/config_generator.rb
+    lib/adhearsion/voip/asterisk/config_generators/queues.conf.rb
+    lib/adhearsion/voip/asterisk/config_generators/voicemail.conf.rb
+    lib/adhearsion/voip/asterisk/config_manager.rb
+    lib/adhearsion/voip/asterisk/manager_interface.rb
+    lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rb
+    lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb
+    lib/adhearsion/voip/asterisk/manager_interface/ami_messages.rb
+    lib/adhearsion/voip/asterisk/manager_interface/ami_protocol_lexer_machine.rl
+    lib/adhearsion/voip/asterisk/special_dial_plan_managers.rb
+    lib/adhearsion/voip/asterisk/super_manager.rb
+    lib/adhearsion/voip/call.rb
+    lib/adhearsion/voip/call_routing.rb
+    lib/adhearsion/voip/commands.rb
+    lib/adhearsion/voip/constants.rb
+    lib/adhearsion/voip/conveniences.rb
+    lib/adhearsion/voip/dial_plan.rb
+    lib/adhearsion/voip/dsl/dialing_dsl.rb
+    lib/adhearsion/voip/dsl/dialing_dsl/dialing_dsl_monkey_patches.rb
+    lib/adhearsion/voip/dsl/dialplan/control_passing_exception.rb
+    lib/adhearsion/voip/dsl/dialplan/dispatcher.rb
+    lib/adhearsion/voip/dsl/dialplan/parser.rb
+    lib/adhearsion/voip/dsl/dialplan/thread_mixin.rb
+    lib/adhearsion/voip/dsl/numerical_string.rb
+    lib/adhearsion/voip/freeswitch/basic_connection_manager.rb
+    lib/adhearsion/voip/freeswitch/event_handler.rb
+    lib/adhearsion/voip/freeswitch/freeswitch_dialplan_command_factory.rb
+    lib/adhearsion/voip/freeswitch/inbound_connection_manager.rb
+    lib/adhearsion/voip/freeswitch/oes_server.rb
+    lib/adhearsion/voip/menu_state_machine/calculated_match.rb
+    lib/adhearsion/voip/menu_state_machine/matchers.rb
+    lib/adhearsion/voip/menu_state_machine/menu_builder.rb
+    lib/adhearsion/voip/menu_state_machine/menu_class.rb
+    lib/adhearsion/xmpp/connection.rb
+    lib/theatre.rb
+    lib/theatre/callback_definition_loader.rb
+    lib/theatre/guid.rb
+    lib/theatre/invocation.rb
+    lib/theatre/namespace_manager.rb
+    lib/theatre/README.markdown
+    lib/theatre/version.rb
+    LICENSE
+    Rakefile
+    Gemfile
+  }
 
   s.has_rdoc = true
   s.homepage = "http://adhearsion.com"
@@ -136,17 +140,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "adhearsion"
   s.rubygems_version = "1.2.0"
   s.summary = "Adhearsion, open-source telephony development framework"
-  s.post_install_message =<<-EOM
-    *******************************************************************
-    * NOTE: You must manually install the "rubigen" gem to create     *
-    * new Adhearsion applications.                                    *
-    *                                                                 *
-    * The Rubigen package is no longer automatically installed due to *
-    * dependency conflicts with ActiveSupport 3.0.                    *
-    * Users of existing Adhearsion applications can safely ignore     *
-    * this message.                                                   *
-    *******************************************************************
-  EOM
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -154,20 +147,27 @@ Gem::Specification.new do |s|
 
     if current_version >= 3 then
       # Runtime dependencies
+      s.add_runtime_dependency("bundler", [">= 1.0.10"])
       s.add_runtime_dependency("log4r", [">= 1.0.5"])
       s.add_runtime_dependency("activesupport", [">= 2.1.0"])
+      # i18n is only strictly a dependency for ActiveSupport >= 3.0.0
+      # Since it doesn't conflict with <3.0.0 we'll require it to be
+      # on the safe side.
+      s.add_runtime_dependency("i18n")
+      s.add_runtime_dependency("rubigen", [">= 1.5.6"])
 
       # Development dependencies
-      s.add_development_dependency('rubigen', [">= 1.0.6"])
-      s.add_development_dependency('rspec', ["< 2.0.0"])
-      s.add_development_dependency('test-unit')
+      s.add_development_dependency('rubigen', [">= 1.5.6"])
+      s.add_development_dependency('rspec', [">= 2.4.0"])
       s.add_development_dependency('flexmock')
-      s.add_development_dependency('active_record')
+      s.add_development_dependency('activerecord')
     else
+      s.add_dependency("bundler", [">= 1.0.10"])
       s.add_dependency("log4r", [">= 1.0.5"])
       s.add_dependency("activesupport", [">= 2.1.0"])
     end
   else
+    s.add_dependency("bundler", [">= 1.0.10"])
     s.add_dependency("log4r", [">= 1.0.5"])
     s.add_dependency("activesupport", [">= 2.1.0"])
   end