punchblock-console 0.1.0 → 0.1.1

data/.gitignore

@@ -1,3 +1,14 @@
-Gemfile.lock
 .*.swp
 .*.swo
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.rvmrc
+.yardoc
+doc
+log/*
+spec/reports
+vendor
+.rbx/
+*.rbc

data/Gemfile

@@ -1,4 +1,2 @@
 source :rubygems
 gemspec
-
-gem 'punchblock', :path => '/Users/bklang/src/punchblock'

data/Rakefile

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/bin/pbconsole

@@ -1,17 +1,14 @@
 #!/usr/bin/env ruby
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
-require 'punchblock'
-require 'pry'
 require 'logger'
 require 'optparse'
-require 'punchblock/console/commands'
+require 'punchblock/console/cli'
 
-include Punchblock
-
-Thread.abort_on_exception = true
-
-options = { :username => 'usera@127.0.0.1', :password => '1', :auto_reconnect => false }
+options = { :username         => 'usera@127.0.0.1',
+            :password         => '1',
+            :auto_reconnect   => false,
+            :connection_class => Connection::XMPP }
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: punchblock-console [-u usera@127.0.0.1] [-p abc123]"
@@ -30,6 +27,14 @@ option_parser = OptionParser.new do |opts|
   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
   end
+  opts.on("--asterisk", "Use Asterisk") do |tlf|
+    options[:connection_class] = Connection::Asterisk
+    options[:host] = '127.0.0.1'
+    options[:port] = 5038
+  end
+  opts.on("--prompt", "Provide a prompt immediately") do |tlf|
+    options[:prompt] = true
+  end
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -47,77 +52,4 @@ rescue
   option_parser.parse '--help'
 end
 
-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
-
-connection = Connection::XMPP.new options
-client = Client.new :connection => connection
-
-[:INT, :TERM].each do |signal|
-  trap signal do
-    puts "Shutting down!"
-    client.stop
-  end
-end
-
-client_thread = Thread.new do
-  begin
-    client.run
-  rescue => e
-    puts "Exception in XMPP thread! #{e.message}"
-    puts e.backtrace.join("\t\n")
-  end
-end
-
-CALL_QUEUES = {}
-
-### DISPATCHER THREAD
-# This thread multiplexes the event stream from the underlying connection
-# handler and routes them to the correct queue for each call.  It also starts
-# a call handler, the run_call method) after creating the queue.
-Thread.new do
-  loop do
-    event = client.event_queue.pop
-    case event
-    when Punchblock::Connection::Connected
-      puts "Punchblock connected!"
-    when Event::Offer
-      raise "Duplicate call ID for #{event.call_id}" if CALL_QUEUES.has_key?(event.call_id)
-      CALL_QUEUES[event.call_id] = Queue.new
-      CALL_QUEUES[event.call_id].push event
-      run_call client, event
-    when Event
-      CALL_QUEUES[event.call_id].push event
-    else
-      puts "Unknown event: #{event.inspect}"
-    end
-  end
-end
-
-def run_call(client, offer)
-  ### CALL THREAD
-  # One thread is spun up to handle each call.
-  Thread.new do
-    raise "Unknown call #{offer.call_id}" unless CALL_QUEUES.has_key?(offer.call_id)
-    queue = CALL_QUEUES[offer.call_id]
-    call = queue.pop
-    commands = PunchblockConsole::Commands.new client, offer.call_id, queue
-
-    puts "Incoming offer to #{offer.to} from #{offer.headers_hash[:from]} #{offer}"
-    commands.pry
-
-    # Clean up the queue.
-    CALL_QUEUES[offer.call_id] = nil
-  end
-end
-
-client_thread.join
+PunchblockConsole::CLI.new(options).run

data/lib/punchblock/console/cli.rb

@@ -0,0 +1,107 @@
+require 'punchblock'
+require 'pry'
+require 'punchblock/console/commands'
+
+include Punchblock
+
+Thread.abort_on_exception = true
+
+module PunchblockConsole
+  class CLI
+    attr_reader :options, :connection, :client, :call_queues
+
+    def initialize(options)
+      @options = options
+      setup_logging
+      @prompt       = options.delete(:prompt)
+      @connection   = options.delete(:connection_class).new options
+      @client       = Client.new :connection => connection
+      @call_queues  = {}
+
+      [:INT, :TERM].each do |signal|
+        trap signal do
+          puts "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
+      pry if @prompt
+      client_thread.join
+    end
+
+    def run_client
+      Thread.new do
+        begin
+          client.run
+        rescue => e
+          puts "Exception in Punchblock client thread! #{e.message}"
+          puts e.backtrace.join("\t\n")
+        end
+      end
+    end
+
+    def run_dispatcher
+      ### DISPATCHER THREAD
+      # This thread multiplexes the event stream from the underlying connection
+      # handler and routes them to the correct queue for each call.  It also starts
+      # a call handler, the run_call method) after creating the queue.
+      Thread.new do
+        loop do
+          event = client.event_queue.pop
+          case event
+          when Connection::Connected
+            puts "Punchblock connected!"
+          when Event::Offer
+            raise "Duplicate call ID for #{event.call_id}" if call_queues.has_key?(event.call_id)
+            call_queues[event.call_id] = Queue.new
+            call_queues[event.call_id].push event
+            run_call client, event
+          when Event
+            if event.call_id
+              call_queues[event.call_id].push event
+            else
+              puts "Ad-hoc event: #{event.inspect}"
+            end
+          else
+            puts "Unknown event: #{event.inspect}"
+          end
+        end
+      end
+    end
+
+    def run_call(client, offer)
+      ### CALL THREAD
+      # One thread is spun up to handle each call.
+      Thread.new do
+        raise "Unknown call #{offer.call_id}" unless call_queues.has_key?(offer.call_id)
+        queue = call_queues[offer.call_id]
+        call = queue.pop
+
+        puts "Incoming offer to #{offer.to} from #{offer.headers_hash[:from]} #{offer}"
+
+        PunchblockConsole::Commands.new(client, offer.call_id, queue).pry
+
+        # Clean up the queue.
+        call_queues[offer.call_id] = nil
+      end
+    end
+  end
+end

data/lib/punchblock/console/version.rb

@@ -1,3 +1,3 @@
 module PunchblockConsole
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock-console
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000 Z
+date: 2011-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2151883000 !ruby/object:Gem::Requirement
+  requirement: &2152927980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151883000
+  version_requirements: *2152927980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151877900 !ruby/object:Gem::Requirement
+  requirement: &2152927340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151877900
+  version_requirements: *2152927340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151876080 !ruby/object:Gem::Requirement
+  requirement: &2152925960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2151876080
+  version_requirements: *2152925960
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2151873160 !ruby/object:Gem::Requirement
+  requirement: &2152966460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2151873160
+  version_requirements: *2152966460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151871300 !ruby/object:Gem::Requirement
+  requirement: &2152965960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2151871300
+  version_requirements: *2152965960
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151867980 !ruby/object:Gem::Requirement
+  requirement: &2152965440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151867980
+  version_requirements: *2152965440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151864940 !ruby/object:Gem::Requirement
+  requirement: &2152964760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151864940
+  version_requirements: *2152964760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151860240 !ruby/object:Gem::Requirement
+  requirement: &2152964020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151860240
+  version_requirements: *2152964020
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151858800 !ruby/object:Gem::Requirement
+  requirement: &2152963240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151858800
+  version_requirements: *2152963240
 description: This gem provides a simple interactive console for troubleshooting and
   debugging the Rayo protocol via Punchblock.
 email: punchblock@adhearsion.com
@@ -124,7 +124,9 @@ files:
 - Gemfile
 - LICENSE.txt
 - README
+- Rakefile
 - bin/pbconsole
+- lib/punchblock/console/cli.rb
 - lib/punchblock/console/commands.rb
 - lib/punchblock/console/version.rb
 - punchblock-console.gemspec
@@ -154,3 +156,4 @@ signing_key:
 specification_version: 3
 summary: An interactive debugging console for Punchblock
 test_files: []
+has_rdoc: