punchblock-console 0.1.2 → 0.1.3

data/bin/pbconsole

@@ -21,11 +21,8 @@ option_parser = OptionParser.new do |opts|
   opts.on("-d", "--rayo-domain DOMAIN", String, "Specify the domain Rayo is running on") do |d|
     options[:rayo_domain] = d
   end
-  opts.on("--wire-log-file log/wirelog.log", String, "Specify the file to which the wire log should be written") do |wlf|
-    options[:wire_log_file] = wlf
-  end
-  opts.on("--transport-log-file log/transportlog.log", String, "Specify the file to which the transport log should be written") do |tlf|
-    options[:transport_log_file] = tlf
+  opts.on("--log-file log/punchblock.log", String, "Specify the file to which the log should be written") do |lf|
+    options[:log_file] = lf
   end
   opts.on("--asterisk", "Use Asterisk") do |tlf|
     options[:connection_class] = Connection::Asterisk

data/lib/punchblock/console/cli.rb

@@ -1,6 +1,7 @@
 require 'punchblock'
 require 'pry'
 require 'punchblock/console/commands'
+require 'punchblock/console/logging'
 
 include Punchblock
 
@@ -12,7 +13,8 @@ module PunchblockConsole
 
     def initialize(options)
       @options = options
-      setup_logging
+      PunchblockConsole::Logging.start @options.delete(:log_file)
+      logger.info "Starting up..."
       @prompt       = options.delete(:prompt)
       @connection   = options.delete(:connection_class).new options
       @client       = Client.new :connection => connection
@@ -20,26 +22,12 @@ module PunchblockConsole
 
       [:INT, :TERM].each do |signal|
         trap signal do
-          puts "Shutting down!"
+          logger.info "Shutting down!"
           client.stop
         end
       end
     end
 
-    def setup_logging
-      if options.has_key? :wire_log_file
-        options[:wire_logger] = Logger.new options.delete(:wire_log_file)
-        options[:wire_logger].level = Logger::DEBUG
-        options[:wire_logger].debug "Starting up..."
-      end
-
-      if options.has_key? :transport_log_file
-        options[:transport_logger] = Logger.new options.delete(:transport_log_file)
-        options[:transport_logger].level = Logger::DEBUG
-        options[:transport_logger].debug "Starting up..."
-      end
-    end
-
     def run
       run_dispatcher
       client_thread = run_client
@@ -52,8 +40,8 @@ module PunchblockConsole
         begin
           client.run
         rescue => e
-          puts "Exception in Punchblock client thread! #{e.message}"
-          puts e.backtrace.join("\t\n")
+          logger.error "Exception in Punchblock client thread! #{e.message}"
+          logger.error e.backtrace.join("\t\n")
         end
       end
     end
@@ -79,10 +67,10 @@ module PunchblockConsole
             if event.call_id
               call_queues[event.call_id].push event
             else
-              puts "Ad-hoc event: #{event.inspect}"
+              # puts "Ad-hoc event: #{event.inspect}"
             end
           else
-            puts "Unknown event: #{event.inspect}"
+            logger.warn "Unknown event: #{event.inspect}"
           end
         end
       end
@@ -96,7 +84,7 @@ module PunchblockConsole
         queue = call_queues[offer.call_id]
         call = queue.pop
 
-        puts "Incoming offer to #{offer.to} from #{offer.headers_hash[:from]} #{offer}"
+        puts "Incoming offer to #{offer.to} from #{offer.from} #{offer}"
 
         PunchblockConsole::Commands.new(client, offer.call_id, queue).pry
 

data/lib/punchblock/console/commands.rb

@@ -28,12 +28,22 @@ module PunchblockConsole
       write Component::Record.new(options)
     end
 
-    def say(string, type = :text) # :nodoc:
-      component = Component::Tropo::Say.new(type => string)
+    def say(string)
+      output string, :text
+    end
+
+    def output(string, type = :text) # :nodoc:
+      component = Component::Output.new(type => string)
       write component
       component.complete_event.resource
     end
 
+    def agi(command, params = {})
+      component = Component::Asterisk::AGI::Command.new :name => command, :params => params
+      write component
+      puts component.complete_event.resource
+    end
+
     def write(command) # :nodoc:
       @client.execute_command command, :call_id => @call_id, :async => false
     end

data/lib/punchblock/console/logging.rb

@@ -0,0 +1,119 @@
+require 'logging'
+
+class Object
+  def pb_logger
+    logger
+  end
+
+  def logger
+    @logger ||= ::Logging.logger[self]
+  end
+end
+
+module PunchblockConsole
+  module Logging
+
+    LOG_LEVELS = %w(TRACE DEBUG INFO WARN ERROR FATAL)
+
+    class << self
+
+      ::Logging.color_scheme('bright',
+        :levels => {
+          :info  => :green,
+          :warn  => :yellow,
+          :error => :red,
+          :fatal => [:white, :on_red]
+        },
+        :date => :blue,
+        :logger => :cyan,
+        :message => :magenta
+      )
+
+      def silence!
+        self.logging_level = :fatal
+      end
+
+      def unsilence!
+        self.logging_level = :info
+      end
+
+      def reset
+        ::Logging.reset
+      end
+
+      def start(log_file = nil)
+        opts = {
+                  :layout => ::Logging.layouts.pattern(
+                    :pattern => '[%d] %-5l %c: %m\n',
+                    :color_scheme => 'bright'
+                  )
+                }
+        self.outputters = if log_file
+          ::Logging.appenders.file log_file, opts
+        else
+          ::Logging.appenders.stdout 'stdout', opts
+        end
+
+        ::Logging.init LOG_LEVELS
+
+        LOG_LEVELS.each do |level|
+          PunchblockConsole::Logging.const_defined?(level) or PunchblockConsole::Logging.const_set(level, ::Logging::LEVELS[::Logging.levelify(level)])
+        end
+      end
+
+      def logging_level=(new_logging_level)
+        ::Logging::Logger[:root].level = new_logging_level
+      end
+
+      alias :level= :logging_level=
+
+      def logging_level
+        ::Logging::Logger[:root].level
+      end
+
+      def get_logger(logger_name)
+        ::Logging::Logger[logger_name]
+      end
+
+      alias :level :logging_level
+
+      def sanitized_logger_name(name)
+        name.to_s.gsub(/\W/, '').downcase
+      end
+
+      def outputters=(outputters)
+        ::Logging.logger.root.appenders = Array(outputters)
+      end
+
+      alias :appenders= :outputters=
+
+      def outputters
+        ::Logging.logger.root.appenders
+      end
+
+      alias :appenders :outputters
+
+      def formatter=(formatter)
+        _set_formatter formatter
+      end
+
+      alias :layout= :formatter=
+
+      def formatter
+        ::Logging.logger.root.appenders.first.layout
+      end
+
+      alias :layout :formatter
+
+      private
+
+      def _set_formatter(formatter)
+        ::Logging.logger.root.appenders.each do |appender|
+          appender.layout = formatter
+        end
+      end
+
+    end
+
+  end
+end

data/lib/punchblock/console/version.rb

@@ -1,3 +1,3 @@
 module PunchblockConsole
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/punchblock-console.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.7") if s.respond_to? :required_rubygems_version=
 
-  s.add_runtime_dependency %q<punchblock>, [">= 0.6.1"]
+  s.add_runtime_dependency %q<punchblock>, [">= 0.6.2"]
+  s.add_runtime_dependency %q<logging>, [">= 1.6.1"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0.0"]
   s.add_development_dependency %q<rspec>, ["~> 2.3.0"]
@@ -30,4 +31,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<mocha>, [">= 0"]
   s.add_development_dependency %q<i18n>, [">= 0"]
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock-console
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2160423120 !ruby/object:Gem::Requirement
+  requirement: &2152231320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160423120
+  version_requirements: *2152231320
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: &2152227800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152227800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160422520 !ruby/object:Gem::Requirement
+  requirement: &2152226580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2160422520
+  version_requirements: *2152226580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160421800 !ruby/object:Gem::Requirement
+  requirement: &2152069700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2160421800
+  version_requirements: *2152069700
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2160118940 !ruby/object:Gem::Requirement
+  requirement: &2152066520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +67,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2160118940
+  version_requirements: *2152066520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2160118260 !ruby/object:Gem::Requirement
+  requirement: &2152064400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +78,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2160118260
+  version_requirements: *2152064400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2160117760 !ruby/object:Gem::Requirement
+  requirement: &2152050240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160117760
+  version_requirements: *2152050240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160117060 !ruby/object:Gem::Requirement
+  requirement: &2152041480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160117060
+  version_requirements: *2152041480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2160116380 !ruby/object:Gem::Requirement
+  requirement: &2152039040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160116380
+  version_requirements: *2152039040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160115600 !ruby/object:Gem::Requirement
+  requirement: &2152037560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +122,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160115600
+  version_requirements: *2152037560
 description: This gem provides a simple interactive console for troubleshooting and
   debugging the Rayo protocol via Punchblock.
 email: punchblock@adhearsion.com
@@ -128,6 +139,7 @@ files:
 - bin/pbconsole
 - lib/punchblock/console/cli.rb
 - lib/punchblock/console/commands.rb
+- lib/punchblock/console/logging.rb
 - lib/punchblock/console/version.rb
 - punchblock-console.gemspec
 homepage: https://github.com/adhearsion/punchblock