adhearsion 2.0.0.alpha2 → 2.0.0.alpha3

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

@@ -0,0 +1,4 @@
+class <%= @controller_name %> < Adhearsion::CallController
+  def run
+  end
+end  

data/lib/adhearsion/generators/controller/templates/spec/controller_spec.rb

@@ -0,0 +1,3 @@
+describe <%= @controller_name %> do
+
+end

data/lib/adhearsion/generators/generator.rb

@@ -0,0 +1,77 @@
+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 Generator < Thor::Group
+      include Thor::Actions
+
+      argument :generate_command, :type => :string
+      argument :generator_name, :type => :string
+
+      # Returns the source root for this generator using default_source_root as default.
+      def self.source_root(path = nil)
+        @_source_root = path if path
+        @_source_root ||= default_source_root
+      end
+
+      # Tries to get the description from a USAGE file one folder above the source
+      # root otherwise uses a default description.
+      def self.desc(description = nil)
+        return super if description
+        usage = source_root && File.expand_path("../USAGE", source_root)
+
+        @desc ||= if usage && File.exist?(usage)
+          ERB.new(File.read(usage)).result(binding)
+        else
+          "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
+        end
+      end
+
+      # Convenience method to get the namespace from the class name. It's the
+      # same as Thor default except that the Generator at the end of the class
+      # is removed.
+      def self.namespace(name = nil)
+        return super if name
+        @namespace ||= super.sub(/_generator$/, '').sub(/:generators:/, ':')
+      end
+
+      # Returns the default source root for a given generator. This is used internally
+      # by adhearsion to set its generators source root. If you want to customize your source
+      # root, you should use source_root.
+      def self.default_source_root
+        return unless generator_name
+        path = File.expand_path File.join(generator_name, 'templates'), base_root
+        path if File.exists?(path)
+      end
+
+      # Returns the base root for a common set of generators. This is used to dynamically
+      # guess the default source root.
+      def self.base_root
+        File.dirname __FILE__
+      end
+
+      protected
+
+      # Removes the namespaces and get the generator name. For example,
+      # Adhearsion::Generators::ModelGenerator will return "model" as generator name.
+      #
+      def self.generator_name
+        @generator_name ||= begin
+          if generator = name.to_s.split('::').last
+            generator.sub! /Generator$/, ''
+            generator.underscore
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/adhearsion/generators/plugin/plugin_generator.rb

@@ -0,0 +1,33 @@
+module Adhearsion
+  module Generators
+    class PluginGenerator < Generator
+
+      argument :plugin_name, :type => :string
+
+
+      def create_plugin
+        @plugin_file = @plugin_name.underscore
+        self.destination_root = '.'
+        
+        empty_directory @plugin_file
+        empty_directory "#{@plugin_file}/lib"
+        empty_directory "#{@plugin_file}/lib/#{@plugin_file}"
+        empty_directory "#{@plugin_file}/spec"
+
+        template 'plugin-template.gemspec.tt', "#{@plugin_file}/#{@plugin_file}.gemspec"
+        template 'Rakefile.tt', "#{@plugin_file}/Rakefile"
+        template 'README.md.tt', "#{@plugin_file}/README.md"
+        template 'Gemfile.tt', "#{@plugin_file}/Gemfile"
+
+        template 'lib/plugin-template.rb.tt', "#{@plugin_file}/lib/#{@plugin_file}.rb"
+        template 'lib/plugin-template/version.rb.tt', "#{@plugin_file}/lib/#{@plugin_file}/version.rb"
+        template 'lib/plugin-template/plugin.rb.tt', "#{@plugin_file}/lib/#{@plugin_file}/plugin.rb"
+        template 'lib/plugin-template/controller_methods.rb.tt', "#{@plugin_file}/lib/#{@plugin_file}/controller_methods.rb"
+
+        template 'spec/spec_helper.rb.tt', "#{@plugin_file}/spec/spec_helper.rb"
+        template 'spec/plugin-template/controller_methods_spec.rb.tt', "#{@plugin_file}/spec/#{@plugin_file}/controller_methods_spec.rb"
+      end
+
+    end
+  end
+end

data/lib/adhearsion/generators/plugin/templates/.gitignore

@@ -0,0 +1,9 @@
+*.swp
+*.swo
+Gemfile.lock
+coverage/
+vendor/
+.bundle/
+.DS_Store
+pkg/*
+*.gem

data/lib/adhearsion/generators/plugin/templates/Gemfile.tt

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in plugin-template.gemspec
+gemspec

data/lib/adhearsion/generators/plugin/templates/README.md.tt

@@ -0,0 +1,2 @@
+<%= @plugin_name %>
+==========================

data/lib/adhearsion/generators/plugin/templates/Rakefile.tt

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

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

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

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

@@ -0,0 +1,10 @@
+module <%= @plugin_name %>
+  module ControllerMethods
+    # The methods are defined in a normal method the user will then mix in their CallControllers
+    # The following also contains an example of configuration usage
+    #
+    def greet(name)
+      play "#{Adhearsion.config[:<%= @plugin_file %>].greeting}, #{name}"
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module <%= @plugin_name %>
+  class Plugin < Adhearsion::Plugin
+    # Actions to perform when the plugin is loaded
+    #
+    init :<%= @plugin_file %> do
+      logger.warn "<%= @plugin_name %> has been loaded"
+    end
+
+    # Basic configuration for the plugin
+    #
+    config :<%= @plugin_file %> do
+      greeting "Hello", :desc => "What to use to greet users"
+    end
+
+    # Defining a Rake task is easy
+    # The following can be invoked with:
+    #   rake plugin_demo:info
+    #
+    tasks do
+      namespace :<%= @plugin_file %> do
+        desc "Prints the PluginTemplate information"
+        task :info do
+          STDOUT.puts "<%= @plugin_name %> plugin v. #{VERSION}"
+        end
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,3 @@
+module <%= @plugin_name %>
+  VERSION = "0.0.1"
+end

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

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "<%= @plugin_name.underscore %>/version"
+
+Gem::Specification.new do |s|
+  s.name        = "<%= @plugin_name.underscore %>"
+  s.version     = <%= @plugin_name %>::VERSION
+  s.authors     = ["Plugin Author"]
+  s.email       = ["author@plugin.com"]
+  s.homepage    = ""
+  s.summary     = %q{TODO: Write a gem summary}
+  s.description = %q{TODO: Write a gem description}
+
+  s.rubyforge_project = "<%= @plugin_name.underscore %>"
+
+  # Use the following if using Git
+  # s.files         = `git ls-files`.split("\n")
+  # s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = Dir.glob("{lib}/**/*") + %w( README.md Rakefile Gemfile)
+  s.test_files    = Dir.glob("{spec}/**/*")
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency %q<adhearsion>, [">= <%= Adhearsion::VERSION %>"]
+  s.add_runtime_dependency %q<activesupport>, [">= 3.0.10"]
+
+  s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
+  s.add_development_dependency %q<rspec>, [">= 2.5.0"]
+  s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
+  s.add_development_dependency %q<simplecov>, [">= 0"]
+  s.add_development_dependency %q<simplecov-rcov>, [">= 0"]
+  s.add_development_dependency %q<yard>, ["~> 0.6.0"]
+  s.add_development_dependency %q<rake>, [">= 0"]
+  s.add_development_dependency %q<mocha>, [">= 0"]
+  s.add_development_dependency %q<guard-rspec>
+ end

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module <%= @plugin_name %>
+  describe ControllerMethods do
+    describe "mixed in to a CallController" do
+
+      class TestController < Adhearsion::CallController
+        include <%= @plugin_name %>::ControllerMethods
+      end
+
+      let(:mock_call) { mock 'Call' }
+
+      subject do
+        TestController.new mock_call
+      end
+
+      describe "#greet" do
+        it "greets with the correct parameter" do
+          subject.expects(:play).once.with("Hello, Luca")
+          subject.greet "Luca"
+        end
+      end
+
+    end
+  end
+end

data/lib/adhearsion/generators/plugin/templates/spec/spec_helper.rb.tt

@@ -0,0 +1,13 @@
+require 'adhearsion'
+require 'mocha'
+require '<%= @plugin_file %>'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.tty = true
+
+  config.mock_with :mocha
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end
+

data/lib/adhearsion/initializer.rb

@@ -4,16 +4,14 @@ require 'adhearsion/linux_proc_name'
 module Adhearsion
   class Initializer
 
-    extend ActiveSupport::Autoload
-
-    autoload :Logging
-
     class << self
       def start(*args, &block)
         new(*args, &block).start
       end
     end
 
+    DEFAULT_PID_FILE_NAME = 'adhearsion.pid'
+
     attr_reader :path, :daemon, :pid_file
 
     # Creation of pid_files
@@ -47,17 +45,18 @@ module Adhearsion
       catch_termination_signal
       create_pid_file
       set_ahn_proc_name
-      logger.info "Loaded config in <#{Adhearsion.config.platform.environment}> environment"
       initialize_exception_logger
       update_rails_env_var
       init_plugins
 
-      logger.info "Adhearsion v#{Adhearsion::VERSION} initialized!"
-      Adhearsion::Process.booted
-
       run_plugins
       trigger_after_initialized_hooks
 
+      if Adhearsion.status == :booting
+        Adhearsion::Process.booted
+        logger.info "Adhearsion v#{Adhearsion::VERSION} initialized with environment <#{Adhearsion.config.platform.environment}>!"
+      end
+
       # This method will block until all important threads have finished.
       # When it does, the process will exit.
       join_important_threads
@@ -67,10 +66,10 @@ module Adhearsion
     def update_rails_env_var
       env = ENV['AHN_ENV']
       if env && Adhearsion.config.valid_environment?(env.to_sym)
-        if ENV['RAILS_ENV'] == env
-          logger.info "Using the configured value for RAILS_ENV : <#{env}>"
+        if ENV['RAILS_ENV']
+          logger.info "Using provided RAILS_ENV value of <#{ENV['RAILS_ENV']}>"
         else
-          logger.warn "Updating AHN_RAILS variable to <#{env}>"
+          logger.warn "Setting RAILS_ENV variable to <#{env}>"
           ENV['RAILS_ENV'] = env
         end
       else
@@ -79,7 +78,7 @@ module Adhearsion
           logger.info "Using the configured value for RAILS_ENV : <#{env}>"
         else
           env = Adhearsion.config.platform.environment.to_s
-          logger.info "Defining AHN_RAILS variable to <#{env}>"
+          logger.info "Defining RAILS_ENV variable to <#{env}>"
           ENV['RAILS_ENV'] = env
         end
       end
@@ -87,7 +86,7 @@ module Adhearsion
     end
 
     def default_pid_path
-      File.join Adhearsion.config.root, 'adhearsion.pid'
+      File.join Adhearsion.config.root, DEFAULT_PID_FILE_NAME
     end
 
     def resolve_pid_file_path
@@ -174,14 +173,7 @@ module Adhearsion
       if should_daemonize?
         appenders
       else
-        stdout = ::Logging.appenders.stdout(
-                            'stdout',
-                            :layout => ::Logging.layouts.pattern(
-                              :pattern => Adhearsion::Logging.adhearsion_pattern,
-                              :color_scheme => 'bright'
-                            )
-                          )
-        appenders << stdout
+        appenders += Adhearsion::Logging.default_appenders
       end
     end
 
@@ -238,7 +230,7 @@ module Adhearsion
 
     def start_logging
       outputters = init_get_logging_appenders
-      Logging.start outputters, Adhearsion.config.platform.logging.level, Adhearsion.config.platform.logging.formatter
+      Adhearsion::Logging.start outputters, Adhearsion.config.platform.logging.level, Adhearsion.config.platform.logging.formatter
     end
 
     def initialize_exception_logger

data/lib/adhearsion/logging.rb

@@ -36,25 +36,40 @@ module Adhearsion
         ::Logging.reset
       end
 
-      def start
+      def init
         ::Logging.init LOG_LEVELS
-        ::Logging::Logger[:root].level = :info
-        ::Logging.logger.root.appenders = [::Logging.appenders.stdout('stdout')]
-        self.send :_set_formatter, ::Logging::Layouts.basic(:format_as => :string, :backtrace => true)
 
         LOG_LEVELS.each do |level|
           Adhearsion::Logging.const_defined?(level) or Adhearsion::Logging.const_set(level, ::Logging::LEVELS[::Logging.levelify(level)])
         end
       end
 
+      def start(_appenders = nil, level = :info, formatter = nil)
+        ::Logging.logger.root.appenders = _appenders.nil? ? default_appenders : _appenders
+
+        ::Logging.logger.root.level = level
+
+        formatter = formatter if formatter
+      end
+
+      def default_appenders
+        [::Logging.appenders.stdout(
+           'stdout',
+           :layout => ::Logging.layouts.pattern(
+             :pattern => adhearsion_pattern,
+             :color_scheme => 'bright'
+           )
+         )]
+      end
+
       def logging_level=(new_logging_level)
-        ::Logging::Logger[:root].level = new_logging_level
+        ::Logging.logger.root.level = new_logging_level
       end
 
       alias :level= :logging_level=
 
       def logging_level
-        ::Logging::Logger[:root].level
+        ::Logging.logger.root.level
       end
 
       def get_logger(logger_name)
@@ -80,7 +95,9 @@ module Adhearsion
       alias :appenders :outputters
 
       def formatter=(formatter)
-        _set_formatter(formatter)
+        ::Logging.logger.root.appenders.each do |appender|
+          appender.layout = formatter
+        end
       end
 
       alias :layout= :formatter=
@@ -91,16 +108,8 @@ module Adhearsion
 
       alias :layout :formatter
 
-      private
-
-      def _set_formatter(formatter)
-        ::Logging.logger.root.appenders.each do |appender|
-          appender.layout = formatter
-        end
-      end
-
     end
 
-    start unless ::Logging.const_defined? :MAX_LEVEL_LENGTH
+    init unless ::Logging.const_defined? :MAX_LEVEL_LENGTH
   end
 end