matrioska 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 97fa774330c3c99750e07cba0a43977c191e18bb
+  data.tar.gz: 7ae46033c383b6b3e2fd17aae1f16fabe3b8df6d
+SHA512:
+  metadata.gz: 6e4b7426ee636edb6ec407ea7c7a8932f1e1ab0369f5083a82d303c6cc7b6223a731408669f29674a5873d3090dd83908e1ce10baf11547745a82df69c0d9874
+  data.tar.gz: 4315f6b5bebcf743733c52eb2fe3c3b1ea54d0a851794cc116d0872930144154c91f77003b9bdc726555e0f2113839ef44ea5e2863d315decbe0509c17c80671

data/.gitignore

@@ -1 +1,21 @@
-pkg
+# Gem related stuff
+*.gem
+/pkg
+/.bundle
+/Gemfile.lock
+/vendor
+
+# RBX stuff
+/.rbx/
+
+# Editor temp/backup files
+*~
+.*.sw?
+
+# General
+/nbproject
+.DS_Store
+/.rvmrc
+/.yardoc
+/doc
+/tmp

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 # develop
 
+# Version 0.1.0
+  * Added DialWithApps for a simple integration with `#dial`
+  * Bugfixes
+  * Minor cleanup
+
 # Version 0.0.2
   * Downgraded Adhearsion version requirement to 2.1
 
 # Version 0.0.1
-  * First official release
+  * First official release

data/Gemfile

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

data/Guardfile

@@ -1,24 +1,5 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec' do
+guard 'rspec', cli: '--format documentation', all_on_start: true do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec/" }
 end
-

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2012 Adhearsion Foundation Inc.
+Copyright (c) 2013 Adhearsion Foundation Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -7,17 +7,13 @@ By mapping controllers or blocks to the desired applications, a listener object
 ## Usage Example
 
 ```ruby
-#inside your controller
+# inside your controller
 runner = Matrioska::AppRunner.new self
 runner.map_app 3 do
   logger.info "hi there!"
 end
 runner.map_app 5, AppController
 
-call.on_end do
-  runner.stop
-end
-
 runner.start
 ```
 
@@ -42,4 +38,4 @@ Original author: [Luca Pradovera](https://github.com/polysics)
 
 ### Copyright
 
-Copyright (c) 2013 Adhearsion Foundation Inc. MIT license (see LICENSE for details).
+Copyright (c) 2013 Adhearsion Foundation Inc. MIT license (see LICENSE for details).

data/lib/matrioska/app_runner.rb

@@ -5,25 +5,22 @@ module Matrioska
     def initialize(call)
       @call = call
       @app_map = {}
+      @running = false
     end
 
     def start
-      component = Punchblock::Component::Input.new({ :mode => :dtmf,
-          :grammar => {
-            :value => grammar_accept
-          }
-      })
-      component.register_event_handler Punchblock::Event::Complete do |event|
-        handle_input_complete event
+      logger.debug "MATRIOSKA START CALLED"
+      unless @running
+        component = Punchblock::Component::Input.new mode: :dtmf, grammar: { value: grammar_accept }
+        logger.debug "MATRIOSKA STARTING LISTENER"
+        component.register_event_handler Punchblock::Event::Complete do |event|
+          handle_input_complete event
+        end
+        @call.write_and_await_response component if @call.active?
       end
-      @call.write_and_await_response component
     end
 
-    def app_map
-      @app_map
-    end
-
-    def map_app(digit, controller=nil, &block)
+    def map_app(digit, controller = nil, &block)
       digit = digit.to_s
       range = "1234567890*#"
 
@@ -42,24 +39,48 @@ module Matrioska
       @app_map[digit] = payload
     end
 
+    def handle_input_complete(event)
+      logger.debug "MATRIOSKA HANDLING INPUT"
+      result = event.reason.respond_to?(:utterance) ? event.reason.utterance : nil
+      digit = parse_dtmf result
+      match_and_run digit unless @running
+    end
+
+    private
+
+    def app_map
+      @app_map
+    end
+
     def match_and_run(digit)
       if match = @app_map[digit]
-        Adhearsion.logger.info "#match_and_run called with #{digit}"
-        callback = lambda {|call| start }
-        
-        @call.execute_controller(nil, callback, &match) if match.is_a? Proc
+        logger.debug "MATRIOSKA #match_and_run called with #{digit}"
+        @running = true
+        callback = lambda do |call|
+          @running = false
+          logger.debug "MATRIOSKA CALLBACK RESTARTING LISTENER"
+          if call.active?
+            start
+          else
+            logger.debug "MATRIOSKA CALLBACK NOT DOING ANYTHING BECAUSE CALL IS DEAD"
+          end
+        end
+
+        if match.is_a? Proc
+          logger.debug "MATRIOSKA EXECUTING #{match} AS BLOCK"
+          @call.execute_controller(nil, callback, &match)
+        end
+
         if match.is_a? Class
           payload = match.new(@call)
+          logger.debug "MATRIOSKA EXECUTING #{payload.to_s} AS CONTROLLER"
           @call.execute_controller(payload, callback)
         end
+      else
+        start
       end
-      start
-    end
-
-    def handle_input_complete(event)
-      result = event.reason.respond_to?(:utterance) ? event.reason.utterance : nil
-      digit = parse_dtmf result
-      match_and_run digit
+    rescue Adhearsion::Call::Hangup
+      logger.debug "Matrioska terminated because the call was disconnected"
     end
   end
 end

data/lib/matrioska/dial_with_apps.rb

@@ -0,0 +1,37 @@
+module Matrioska
+  module DialWithApps
+    def dial_with_local_apps(to, options = {}, &block)
+      dial = Adhearsion::CallController::Dial::ParallelConfirmationDial.new to, options, call
+
+      runner = Matrioska::AppRunner.new call
+      yield runner, dial
+      runner.start
+
+      dial.track_originating_call
+      dial.prep_calls
+      dial.place_calls
+      dial.await_completion
+      dial.cleanup_calls
+      dial.status
+    end
+
+    def dial_with_remote_apps(to, options = {}, &block)
+      dial = Adhearsion::CallController::Dial::ParallelConfirmationDial.new to, options, call
+
+      dial.track_originating_call
+
+      dial.prep_calls do |new_call|
+        new_call.on_joined call do
+          runner = Matrioska::AppRunner.new new_call
+          yield runner, dial
+          runner.start
+        end
+      end
+
+      dial.place_calls
+      dial.await_completion
+      dial.cleanup_calls
+      dial.status
+    end
+  end
+end

data/lib/matrioska/plugin.rb

@@ -1,29 +1,12 @@
 module Matrioska
   class Plugin < Adhearsion::Plugin
-    # Actions to perform when the plugin is loaded
-    #
-    init :matrioska do
-      logger.warn "Matrioska has been loaded"
-    end
-
-    # Basic configuration for the plugin
-    #
-    config :matrioska 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 :matrioska do
-        desc "Prints the PluginTemplate information"
-        task :info do
+        desc "Prints the Matrioska plugin version"
+        task :version do
           STDOUT.puts "Matrioska plugin v. #{VERSION}"
         end
       end
     end
-
   end
 end

data/lib/matrioska/version.rb

@@ -1,3 +1,3 @@
 module Matrioska
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/matrioska.gemspec

@@ -7,9 +7,10 @@ Gem::Specification.new do |s|
   s.version     = Matrioska::VERSION
   s.authors     = ["Luca Pradovera"]
   s.email       = ["lpradovera@mojolingo.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/polysics/matrioska"
   s.summary     = %q{Adhearsion plugin for in-call apps}
   s.description = %q{Adhearsion plugin for in-call apps. Provides a features-style interface to run applications in calls.}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "matrioska"
 
@@ -17,8 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<adhearsion>, ["~> 2.1"]
-  s.add_runtime_dependency %q<activesupport>, [">= 3.0.10"]
+  s.add_runtime_dependency %q<adhearsion>, ["~> 2.4"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]
   s.add_development_dependency %q<rspec>, ["~> 2.5"]

data/spec/matrioska/app_runner_spec.rb

@@ -2,35 +2,40 @@ require 'spec_helper'
 
 module Matrioska
   describe AppRunner do
-    let(:mock_call) { mock('Call') }
-    subject { AppRunner.new mock_call }
-    class MockController < Adhearsion::CallController; end
+    let(:call_id) { SecureRandom.uuid }
+    let(:call)    { Adhearsion::Call.new }
+
+    before do
+      double call, write_command: true, id: call_id
+    end
+
+    subject { AppRunner.new call }
+
+    class MockController < Adhearsion::CallController
+      def run
+        call.do_stuff_from_a_class
+      end
+    end
 
     describe "#start" do
       let(:grxml) {
-          RubySpeech::GRXML.draw :mode => 'dtmf', :root => 'inputdigits' do
-            rule id: 'inputdigits', scope: 'public' do
-              one_of do
-                0.upto(9) { |d| item { d.to_s } }
-                item { "#" }
-                item { "*" }
-              end
+        RubySpeech::GRXML.draw mode: 'dtmf', root: 'inputdigits' do
+          rule id: 'inputdigits', scope: 'public' do
+            one_of do
+              0.upto(9) { |d| item { d.to_s } }
+              item { "#" }
+              item { "*" }
             end
           end
-        }
+        end
+      }
 
       let(:input_component) {
-        Punchblock::Component::Input.new(
-          { :mode => :dtmf,
-            :grammar => {
-              :value => grxml.to_s
-            }
-          }
-        )
+        Punchblock::Component::Input.new mode: :dtmf, grammar: { value: grxml }
       }
 
       it "should start the appropriate component" do
-        mock_call.should_receive(:write_and_await_response).with(input_component)
+        call.should_receive(:write_and_await_response).with(input_component)
         subject.start
       end
     end
@@ -39,61 +44,60 @@ module Matrioska
       context "with invalid input" do
         let(:too_long) { "ab" }
         let(:wrong) { "a" }
+
         it "should raise if the first argument is not a single digit string in the range" do
-          expect { subject.map_app(too_long){} }.to raise_error ArgumentError, "The first argument should be a single digit String or number in the range 1234567890*#"
-          expect { subject.map_app(wrong){} }.to raise_error ArgumentError, "The first argument should be a single digit String or number in the range 1234567890*#"
+          expect { subject.map_app(too_long) {} }.to raise_error ArgumentError, "The first argument should be a single digit String or number in the range 1234567890*#"
+          expect { subject.map_app(wrong) {} }.to raise_error ArgumentError, "The first argument should be a single digit String or number in the range 1234567890*#"
         end
 
         it "raises if called without either a class or a block" do
-           expect { subject.map_app 1 }.to raise_error ArgumentError, "You need to provide a block or a controller name."
+          expect { subject.map_app 1 }.to raise_error ArgumentError, "You need to provide a block or a controller name."
         end
 
         it "raises if passed both a class and a block" do
-           expect { subject.map_app(1, Object){} }.to raise_error ArgumentError, "You cannot specify both a block and a controller name."
+          expect { subject.map_app(1, Object) {} }.to raise_error ArgumentError, "You cannot specify both a block and a controller name."
         end
       end
+    end
 
-      context "with valid input" do
-        it "properly sets the map for a block" do
-          subject.map_app(3) { p "foo" }
-          subject.app_map["3"].should be_a Proc
-        end
-        it "properly sets the map for a class" do
-          subject.map_app(3, Object)
-          subject.app_map["3"].should be_a Class
-        end
+    describe "#handle_input_complete" do
+      def mock_event(digit)
+        double 'Event', reason: double('Reason', utterance: "dtmf-#{digit}")
       end
-    end
 
-    describe "#match_and_run" do
       before do
-        subject.map_app(3) { p "foo" }
+        subject.map_app(3) { call.do_stuff_from_a_block }
         subject.map_app(5, MockController)
       end
 
-      it "does nothing if there is no match, and restarts the launcher" do
-        mock_call.should_receive(:execute_controller).never
-        subject.should_receive(:start).once
-        subject.match_and_run("4")
+      context "if there is no match" do
+        it "does nothing, and restarts the launcher" do
+          call.should_receive(:execute_controller).never
+          subject.should_receive(:start).once
+          subject.handle_input_complete mock_event("4")
+        end
+
+        context "if the call has been hung up" do
+          before { call.should_receive(:write_and_await_response).and_raise Adhearsion::Call::Hangup }
+
+          it "should not raise Hangup but stop cleanly" do
+            subject.handle_input_complete mock_event("4")
+          end
+        end
       end
 
       it "executes the block if the payload is a Proc" do
-        mock_call.should_receive(:execute_controller).once.with(&subject.app_map["3"])
+        call.should_receive(:do_stuff_from_a_block).once
         subject.should_receive(:start).once
-        subject.match_and_run("3")
+        subject.handle_input_complete mock_event("3")
+        sleep 0.1 # Give the controller time to finish and the callback to fire
       end
+
       it "executes the controller if the payload is a Class" do
-        mock_call.should_receive(:execute_controller).once.with(kind_of(MockController), kind_of(Proc))
+        call.should_receive(:do_stuff_from_a_class).once
         subject.should_receive(:start).once
-        subject.match_and_run("5")
-      end
-    end
-
-    describe "#handle_input_complete" do
-      let(:mock_event) { mock('Event', :reason => mock('Reason', :utterance => "dtmf-5")) }
-      it "runs #match_and_run" do
-        subject.should_receive(:match_and_run).with("5").once
-        subject.handle_input_complete(mock_event)
+        subject.handle_input_complete mock_event("5")
+        sleep 0.1 # Give the controller time to finish and the callback to fire
       end
     end
   end

data/spec/matrioska/dial_with_apps_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+require 'matrioska/dial_with_apps'
+
+describe Matrioska::DialWithApps do
+  let(:call_id)           { SecureRandom.uuid }
+  let(:call)              { Adhearsion::Call.new }
+  let(:controller_class)  { Class.new Adhearsion::CallController }
+  let(:controller)        { controller_class.new call }
+
+  let(:to)              { 'sip:foo@bar.com' }
+  let(:other_call_id)   { SecureRandom.uuid }
+  let(:other_mock_call) { Adhearsion::OutboundCall.new }
+
+  let(:second_to)               { 'sip:baz@bar.com' }
+  let(:second_other_call_id)    { SecureRandom.uuid }
+  let(:second_other_mock_call)  { Adhearsion::OutboundCall.new }
+
+  let(:mock_answered) { Punchblock::Event::Answered.new }
+
+  before do
+    controller_class.mixin described_class
+    call.wrapped_object.stub id: call_id, write_command: true
+    other_mock_call.wrapped_object.stub id: other_call_id, write_command: true
+    second_other_mock_call.wrapped_object.stub id: second_other_call_id, write_command: true
+  end
+
+  def mock_end(reason = :hangup_command)
+    Punchblock::Event::End.new.tap { |event| event.stub reason: reason }
+  end
+
+  describe "#dial_with_local_apps" do
+    it "starts an app listener on the originating call using the passed block, dials the call to the correct endpoint, and returns a dial status object" do
+      mock_app_runner = Matrioska::AppRunner.new call
+      Matrioska::AppRunner.should_receive(:new).once.with(call).and_return mock_app_runner
+      mock_app_runner.should_receive(:foo).once.with(instance_of(Adhearsion::CallController::Dial::ParallelConfirmationDial))
+      mock_app_runner.should_receive(:start).once
+
+      Adhearsion::OutboundCall.should_receive(:new).and_return other_mock_call
+      other_mock_call.should_receive(:dial).with(to, :from => 'foo').once
+
+      dial_thread = Thread.new do
+        status = controller.dial_with_local_apps(to, :from => 'foo') do |runner, dial|
+          runner.foo dial
+        end
+
+        status.should be_a Adhearsion::CallController::Dial::DialStatus
+        joined_status = status.joins[status.calls.first]
+        joined_status.duration.should == 0.0
+        joined_status.result.should == :no_answer
+      end
+
+      sleep 0.1
+      other_mock_call << mock_end
+      dial_thread.join.should be_true
+    end
+  end
+
+  describe "#dial_with_remote_apps" do
+    it "starts an app listener on the joined call using the passed block, dials the call to the correct endpoint, and returns a dial status object" do
+      call.should_receive(:answer).once
+
+      mock_app_runner = Matrioska::AppRunner.new other_mock_call
+
+      Matrioska::AppRunner.should_receive(:new).once.with(second_other_mock_call).and_return mock_app_runner
+      mock_app_runner.should_receive(:foo).once.with(instance_of(Adhearsion::CallController::Dial::ParallelConfirmationDial))
+      mock_app_runner.should_receive(:start).once
+
+      Adhearsion::OutboundCall.should_receive(:new).and_return other_mock_call, second_other_mock_call
+
+      other_mock_call.should_receive(:dial).with(to, :from => 'foo').once
+      other_mock_call.should_receive(:hangup).once.and_return do
+        other_mock_call << mock_end
+      end
+
+      second_other_mock_call.should_receive(:dial).with(second_to, :from => 'foo').once
+      second_other_mock_call.should_receive(:join).once.and_return do
+        second_other_mock_call << Punchblock::Event::Joined.new(call_uri: call_id)
+      end
+
+      dial_thread = Thread.new do
+        status = controller.dial_with_remote_apps([to, second_to], :from => 'foo') do |runner, dial|
+          runner.foo dial
+        end
+
+        status.should be_a Adhearsion::CallController::Dial::DialStatus
+        joined_status = status.joins[status.calls.first]
+        joined_status.duration.should == 0.0
+        joined_status.result.should == :no_answer
+      end
+
+      sleep 0.1
+      second_other_mock_call << Punchblock::Event::Answered.new
+      second_other_mock_call << mock_end
+      dial_thread.join.should be_true
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,7 +5,10 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.tty = true
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
-end
 
+  config.before :suite do
+    Adhearsion::Logging.start Adhearsion::Logging.default_appenders, :trace, Adhearsion.config.platform.logging.formatter
+  end
+end

metadata

@@ -1,52 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: matrioska
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Luca Pradovera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.10
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,33 +55,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Adhearsion plugin for in-call apps. Provides a features-style interface
@@ -119,43 +92,44 @@ files:
 - .rspec
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/matrioska.rb
 - lib/matrioska/app_runner.rb
+- lib/matrioska/dial_with_apps.rb
 - lib/matrioska/plugin.rb
 - lib/matrioska/version.rb
 - matrioska.gemspec
 - spec/matrioska/app_runner_spec.rb
+- spec/matrioska/dial_with_apps_spec.rb
 - spec/spec_helper.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/polysics/matrioska
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: matrioska
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adhearsion plugin for in-call apps
 test_files:
 - spec/matrioska/app_runner_spec.rb
+- spec/matrioska/dial_with_apps_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/Gemfile.lock

@@ -1,131 +0,0 @@
-PATH
-  remote: .
-  specs:
-    matrioska (0.0.1)
-      activesupport (>= 3.0.10)
-      adhearsion (~> 2.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.10)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    adhearsion (2.2.0)
-      activesupport (~> 3.0)
-      adhearsion-loquacious (~> 1.9)
-      bundler (~> 1.0)
-      celluloid (~> 0.12, >= 0.12.1)
-      countdownlatch
-      deep_merge
-      ffi (~> 1.0)
-      future-resource (~> 1.0)
-      girl_friday
-      has-guarded-handlers (~> 1.5)
-      logging (~> 1.8)
-      pry
-      punchblock (~> 1.4)
-      rake
-      ruby_speech (~> 1.0)
-      thor
-    adhearsion-loquacious (1.9.3)
-    blather (0.8.2)
-      activesupport (>= 2.3.11)
-      eventmachine (>= 1.0.0)
-      girl_friday
-      niceogiri (~> 1.0)
-      nokogiri (~> 1.5, >= 1.5.6)
-    celluloid (0.12.4)
-      facter (>= 1.6.12)
-      timers (>= 1.0.0)
-    celluloid-io (0.12.1)
-      celluloid (~> 0.12.0)
-      nio4r (>= 0.4.0)
-    coderay (1.0.8)
-    connection_pool (0.9.3)
-    countdownlatch (1.0.0)
-    deep_merge (1.0.0)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    facter (1.6.17)
-    ffi (1.2.0)
-    future-resource (1.0.0)
-    girl_friday (0.11.1)
-      connection_pool (~> 0.9.0)
-      rubinius-actor
-    guard (1.5.0)
-      listen (>= 0.4.2)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.1.0)
-      guard (>= 1.1)
-      rspec (~> 2.11)
-    has-guarded-handlers (1.5.0)
-    i18n (0.6.1)
-    json (1.7.5)
-    listen (0.5.3)
-    little-plugger (1.1.3)
-    logging (1.8.1)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.3.6)
-    lumberjack (1.0.2)
-    method_source (0.8.1)
-    multi_json (1.5.0)
-    niceogiri (1.1.1)
-      nokogiri (~> 1.5)
-    nio4r (0.4.3)
-    nokogiri (1.5.6)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    punchblock (1.7.1)
-      activesupport (~> 3.0)
-      blather (>= 0.7.0)
-      celluloid (~> 0.12, >= 0.12.3)
-      future-resource (~> 1.0)
-      has-guarded-handlers (~> 1.5)
-      niceogiri (~> 1.1)
-      ruby_ami (~> 1.2, >= 1.2.1)
-      ruby_fs (~> 1.0)
-      ruby_speech (~> 1.0)
-      state_machine (~> 1.0)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rubinius-actor (0.0.2)
-      rubinius-core-api
-    rubinius-core-api (0.0.1)
-    ruby_ami (1.2.6)
-      celluloid-io (~> 0.12.0)
-      countdownlatch (~> 1.0)
-      future-resource
-      girl_friday
-    ruby_fs (1.0.3)
-      celluloid-io (~> 0.12.0)
-      json
-    ruby_speech (1.0.2)
-      activesupport (>= 3.0.7)
-      niceogiri (~> 1.1, >= 1.1.1)
-      nokogiri (~> 1.5, >= 1.5.6)
-    slop (3.3.3)
-    state_machine (1.1.2)
-    thor (0.16.0)
-    timers (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0)
-  guard-rspec
-  matrioska!
-  rake
-  rspec (~> 2.5)