ruby_ami 1.0.1 → 1.1.1

data/.travis.yml

@@ -3,10 +3,10 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  # - rbx-19mode
   - ruby-head
 before_install:
-  - wget http://ftp.us.debian.org/debian/pool/main/r/ragel/ragel_6.7-1_i386.deb
-  - sudo dpkg -i ragel_6.7-1_i386.deb
+  - wget http://ftp.us.debian.org/debian/pool/main/r/ragel/ragel_6.7-1.1_i386.deb
+  - sudo dpkg -i ragel_6.7-1.1_i386.deb
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-# develop
+# [develop](https://github.com/adhearsion/ruby_ami)
+
+# [1.1.1](https://github.com/adhearsion/ruby_ami/compare/v1.1.0...v1.1.1) - [2012-06-25](https://rubygems.org/gems/ruby_ami/versions/1.1.1)
+  * v1.1.0 re-released with fixed celluloid-io dependency
+
+# [1.1.0](https://github.com/adhearsion/ruby_ami/compare/v1.0.1...v1.1.0) - [2012-06-16](https://rubygems.org/gems/ruby_ami/versions/1.1.0)
+  * Change: Switch from EventMachine to Celluloid & CelluloidIO for better JRuby compatability and performance (action and events connections are now in separate threads)
 
 # 1.0.1 - 2012-04-25
   * Bugfix: Actions which do not receive a response within 10s will allow further actions to be executed. Synchronous originate has a 60s timeout.

data/lib/ruby_ami.rb

@@ -1,18 +1,10 @@
 %w{
-  active_support/dependencies/autoload
-  active_support/core_ext/object/blank
-  active_support/core_ext/numeric/time
-  active_support/core_ext/numeric/bytes
-  active_support/hash_with_indifferent_access
-
   uuidtools
-  eventmachine
   future-resource
   logger
   girl_friday
   countdownlatch
-
-  ruby_ami/metaprogramming
+  celluloid/io
 }.each { |f| require f }
 
 class Logger
@@ -20,14 +12,16 @@ class Logger
 end
 
 module RubyAMI
-  extend ActiveSupport::Autoload
-
-  autoload :Action
-  autoload :Client
-  autoload :Error
-  autoload :Event
-  autoload :Lexer
-  autoload :Response
-  autoload :Stream
-  autoload :Version
 end
+
+%w{
+  action
+  client
+  error
+  event
+  lexer
+  metaprogramming
+  response
+  stream
+  version
+}.each { |f| require "ruby_ami/#{f}" }

data/lib/ruby_ami/action.rb

@@ -9,7 +9,7 @@ module RubyAMI
 
     def initialize(name, headers = {}, &block)
       @name       = name.to_s.downcase.freeze
-      @headers    = headers.stringify_keys.freeze
+      @headers    = headers.freeze
       @action_id  = UUIDTools::UUID.random_create.to_s
       @response   = FutureResource.new
       @response_callback = block
@@ -121,7 +121,7 @@ module RubyAMI
     alias :== :eql?
 
     def sync_timeout
-      name.downcase == 'originate' && !headers['async'] ? 60 : 10
+      name.downcase == 'originate' && !headers[:async] ? 60 : 10
     end
 
     ##

data/lib/ruby_ami/client.rb

@@ -41,16 +41,20 @@ module RubyAMI
     end
 
     def start
-      EventMachine.run do
-        yield if block_given?
-        @events_stream  = start_stream lambda { |event| @event_processor << event }
-        @actions_stream = start_stream lambda { |message| @message_processor << message }
-        @state = :started
-      end
+      @events_stream  = start_stream lambda { |event| @event_processor << event }
+      @actions_stream = start_stream lambda { |message| @message_processor << message }
+      @state = :started
+      streams.each(&:join)
     end
 
     def stop
-      streams.each { |s| s.close_connection_after_writing }
+      streams.each do |stream|
+        begin
+          stream.terminate
+        rescue => e
+          logger.error e if logger
+        end
+      end
     end
 
     def send_action(action, headers = {}, &block)
@@ -68,7 +72,7 @@ module RubyAMI
         login_actions
       when Stream::Disconnected
         stop_writing_actions
-        unbind
+        stop
       when Event
         action = @current_action_with_causal_events
         if action
@@ -103,7 +107,7 @@ module RubyAMI
       when Stream::Connected
         login_events
       when Stream::Disconnected
-        unbind
+        stop
       else
         pass_event event
       end
@@ -117,10 +121,6 @@ module RubyAMI
       action
     end
 
-    def unbind
-      EM.reactor_running? && EM.stop
-    end
-
     private
 
     def pass_event(event)
@@ -179,7 +179,7 @@ module RubyAMI
     end
 
     def start_stream(callback)
-      Stream.start @options[:host], @options[:port], callback
+      Stream.new @options[:host], @options[:port], callback
     end
 
     def logger

data/lib/ruby_ami/error.rb

@@ -3,7 +3,7 @@ module RubyAMI
     attr_accessor :message, :action
 
     def initialize
-      @headers = HashWithIndifferentAccess.new
+      @headers = Hash.new
     end
 
     def [](key)

data/lib/ruby_ami/event.rb

@@ -1,3 +1,5 @@
+require 'ruby_ami/response'
+
 module RubyAMI
   class Event < Response
     attr_reader :name
@@ -6,5 +8,9 @@ module RubyAMI
       super()
       @name = name
     end
+
+    def inspect_attributes
+      [:name] + super
+    end
   end
 end # RubyAMI

data/lib/ruby_ami/lexer.rl.rb

@@ -1,7 +1,8 @@
 module RubyAMI
   class Lexer
 
-    BUFFER_SIZE = 128.kilobytes unless defined? BUFFER_SIZE
+    KILOBYTE = 1024
+    BUFFER_SIZE = 128 * KILOBYTE unless defined? BUFFER_SIZE
 
     ##
     # IMPORTANT! See method documentation for adjust_pointers!

data/lib/ruby_ami/response.rb

@@ -18,7 +18,7 @@ module RubyAMI
     attr_reader   :events
 
     def initialize
-      @headers = HashWithIndifferentAccess.new
+      @headers = Hash.new
     end
 
     def has_text_body?
@@ -30,15 +30,28 @@ module RubyAMI
     end
 
     def [](arg)
-      @headers[arg]
+      @headers[arg.to_s]
     end
 
     def []=(key,value)
-      @headers[key] = value
+      @headers[key.to_s] = value
     end
 
     def action_id
       @headers['ActionID']
     end
+
+    def inspect
+      "#<#{self.class} #{inspect_attributes.map { |c| "#{c}=#{self.__send__(c).inspect rescue nil}" }.compact * ', '}>"
+    end
+
+    def inspect_attributes
+      [:headers, :text_body, :events, :action]
+    end
+
+    def eql?(o, *fields)
+      o.is_a?(self.class) && (fields + inspect_attributes).all? { |f| self.__send__(f) == o.__send__(f) }
+    end
+    alias :== :eql?
   end
 end # RubyAMI

data/lib/ruby_ami/stream.rb

@@ -1,5 +1,5 @@
 module RubyAMI
-  class Stream < EventMachine::Connection
+  class Stream
     class ConnectionStatus
       def eql?(other)
         other.is_a? self.class
@@ -11,50 +11,64 @@ module RubyAMI
     Connected = Class.new ConnectionStatus
     Disconnected = Class.new ConnectionStatus
 
-    def self.start(host, port, event_callback)
-      EM.connect host, port, self, event_callback
-    end
+    include Celluloid::IO
 
-    def initialize(event_callback)
+    def initialize(host, port, event_callback)
       super()
       @event_callback = event_callback
-      @logger = Logger.new($stdout)
-      @logger.level = Logger::FATAL
-      @logger.debug "Starting up..."
+      logger.debug "Starting up..."
       @lexer = Lexer.new self
+      @socket = TCPSocket.from_ruby_socket ::TCPSocket.new(host, port)
+      post_init
+      run!
     end
 
     [:started, :stopped, :ready].each do |state|
       define_method("#{state}?") { @state == state }
     end
 
+    def run
+      loop { receive_data @socket.readpartial(4096) }
+    rescue EOFError
+      logger.info "Client socket closed!"
+      current_actor.terminate!
+    end
+
     def post_init
       @state = :started
       @event_callback.call Connected.new
     end
 
+    def send_data(data)
+      @socket.write data
+    end
+
     def send_action(action)
-      @logger.debug "[SEND] #{action.to_s}"
+      logger.debug "[SEND] #{action.to_s}"
       send_data action.to_s
     end
 
     def receive_data(data)
-      @logger.debug "[RECV] #{data}"
+      logger.debug "[RECV] #{data}"
       @lexer << data
     end
 
     def message_received(message)
-      @logger.debug "[RECV] #{message.inspect}"
+      logger.debug "[RECV] #{message.inspect}"
       @event_callback.call message
     end
 
     alias :error_received :message_received
 
-    # Called by EM when the connection is closed
-    # @private
-    def unbind
+    def finalize
+      logger.debug "Finalizing stream"
+      @socket.close if @socket
       @state = :stopped
       @event_callback.call Disconnected.new
     end
+
+    def logger
+      Logger
+    end
   end
 end

data/lib/ruby_ami/version.rb

@@ -1,3 +1,3 @@
 module RubyAMI
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

data/ruby_ami.gemspec

@@ -18,13 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<activesupport>, ["~> 3.0"]
   s.add_runtime_dependency %q<uuidtools>, [">= 0"]
-  s.add_runtime_dependency %q<eventmachine>, [">= 0"]
+  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.11.0"]
   s.add_runtime_dependency %q<future-resource>, [">= 0"]
   s.add_runtime_dependency %q<girl_friday>, [">= 0"]
   s.add_runtime_dependency %q<countdownlatch>, ["~> 1.0"]
-  s.add_runtime_dependency %q<i18n>, [">= 0"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]
   s.add_development_dependency %q<rspec>, [">= 2.5.0"]

data/spec/ruby_ami/client_spec.rb

@@ -26,11 +26,11 @@ module RubyAMI
 
     describe 'starting up' do
       before do
-        MockServer.any_instance.stubs :receive_data
-        subject.start do
-          EM.start_server options[:host], options[:port], ServerMock
-          EM.add_timer(0.5) { EM.stop if EM.reactor_running? }
-        end
+        ms = MockServer.new
+        ms.expects(:receive_data).at_least_once
+        s = ServerMock.new options[:host], options[:port], ms
+        Thread.new { subject.start }
+        sleep 0.2
       end
 
       it { should be_started }
@@ -89,8 +89,8 @@ module RubyAMI
     end
 
     describe 'when the events stream disconnects' do
-      it 'should unbind' do
-        subject.expects(:unbind).once
+      it 'should stop' do
+        subject.expects(:stop).once
         subject.handle_event Stream::Disconnected.new
         event_handler.should be_empty
       end
@@ -117,8 +117,8 @@ module RubyAMI
         action.should be_new
       end
 
-      it 'should unbind' do
-        subject.expects(:unbind).once
+      it 'should stop' do
+        subject.expects(:stop).once
         subject.handle_message Stream::Disconnected.new
       end
     end
@@ -340,27 +340,9 @@ module RubyAMI
       end
 
       it 'should close both streams' do
-        streams.each { |s| s.expects :close_connection_after_writing }
+        streams.each { |s| s.expects :terminate }
         subject.stop
       end
     end
-
-    describe '#unbind' do
-      context 'if EM is running' do
-        it 'shuts down EM' do
-          EM.expects(:reactor_running?).returns true
-          EM.expects(:stop)
-          subject.unbind
-        end
-      end
-
-      context 'if EM is not running' do
-        it 'does nothing' do
-          EM.expects(:reactor_running?).returns false
-          EM.expects(:stop).never
-          subject.unbind
-        end
-      end
-    end
   end
 end

data/spec/ruby_ami/event_spec.rb

@@ -2,6 +2,72 @@ require 'spec_helper'
 
 module RubyAMI
   describe Event do
-    pending
+    describe "equality" do
+      context "with the same name and the same headers" do
+        let :event1 do
+          Event.new('Hangup').tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        let :event2 do
+          Event.new('Hangup').tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        it "should be equal" do
+          event1.should be == event2
+        end
+      end
+
+      context "with a different name and the same headers" do
+        let :event1 do
+          Event.new('Hangup').tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        let :event2 do
+          Event.new('Foo').tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        it "should not be equal" do
+          event1.should_not be == event2
+        end
+      end
+
+      context "with the same name and different headers" do
+        let :event1 do
+          Event.new('Hangup').tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        let :event2 do
+          Event.new('Hangup').tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '1'
+          end
+        end
+
+        it "should not be equal" do
+          event1.should_not be == event2
+        end
+      end
+    end
   end # Event
 end # RubyAMI

data/spec/ruby_ami/response_spec.rb

@@ -2,6 +2,50 @@ require 'spec_helper'
 
 module RubyAMI
   describe Response do
-    pending
+    describe "equality" do
+      context "with the same headers" do
+        let :event1 do
+          Response.new.tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        let :event2 do
+          Response.new.tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        it "should be equal" do
+          event1.should be == event2
+        end
+      end
+
+      context "with different headers" do
+        let :event1 do
+          Response.new.tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '0'
+          end
+        end
+
+        let :event2 do
+          Response.new.tap do |e|
+            e['Channel'] = 'SIP/101-3f3f'
+            e['Uniqueid'] = '1094154427.10'
+            e['Cause'] = '1'
+          end
+        end
+
+        it "should not be equal" do
+          event1.should_not be == event2
+        end
+      end
+    end
   end # Response
 end # RubyAMI

data/spec/ruby_ami/stream_spec.rb

@@ -2,21 +2,33 @@ require 'spec_helper'
 
 module RubyAMI
   describe Stream do
-    def mocked_server(times = nil, fake_client = nil, &block)
-      MockServer.any_instance.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
-      EventMachine::run {
-        EM.add_timer(0.5) { EM.stop if EM.reactor_running? }
+    let(:server_port) { 50000 - rand(1000) }
 
-        port = 50000 - rand(1000)
+    before do
+      def client.message_received(message)
+        @messages ||= Queue.new
+        @messages << message
+      end
 
-        # Mocked server
-        EventMachine::start_server '127.0.0.1', port, ServerMock
+      def client.messages
+        @messages
+      end
+    end
 
-        # Stream connection
-        EM.connect('127.0.0.1', port, Stream, lambda { |m| client.message_received m }) {|c| @stream = c}
+    let :client_messages do
+      messages = []
+      messages << client.messages.pop until client.messages.empty?
+      messages
+    end
 
-        fake_client.call if fake_client.respond_to? :call
-      }
+    def mocked_server(times = nil, fake_client = nil, &block)
+      mock_target = MockServer.new
+      mock_target.expects(:receive_data).send(*(times ? [:times, times] : [:at_least, 1])).with &block
+      s = ServerMock.new '127.0.0.1', server_port, mock_target
+      @stream = Stream.new '127.0.0.1', server_port, lambda { |m| client.message_received m }
+      fake_client.call if fake_client.respond_to? :call
+      s.join
+      @stream.join
     end
 
     def expect_connected_event
@@ -29,22 +41,11 @@ module RubyAMI
 
     before { @sequence = 1 }
 
-    it 'can be started' do
-      EM.expects(:connect).with do |*params|
-        params[0].should == 'example.com'
-        params[1].should == 1234
-        params[2].should == Stream
-        params[3].should be_a Proc
-      end
-
-      Stream.start 'example.com', 1234, lambda {}
-    end
-
     describe "after connection" do
       it "should be started" do
         expect_connected_event
         expect_disconnected_event
-        mocked_server(1, lambda { @stream.send_data 'Foo' }) do |val, server|
+        mocked_server(0) do |val, server|
           @stream.started?.should be_true
         end
       end
@@ -60,23 +61,6 @@ module RubyAMI
     end
 
     it 'sends events to the client when the stream is ready' do
-      client.expects(:message_received).times(3).with do |e|
-        case @sequence
-        when 1
-          e.should be_a Stream::Connected
-        when 2
-          EM.stop
-          e.should be_a Event
-          e.name.should == 'Hangup'
-          e['Channel'].should == 'SIP/101-3f3f'
-          e['Uniqueid'].should == '1094154427.10'
-          e['Cause'].should == '0'
-        when 3
-          e.should be_a Stream::Disconnected
-        end
-        @sequence += 1
-      end
-
       mocked_server(1, lambda { @stream.send_data 'Foo' }) do |val, server|
         server.send_data <<-EVENT
 Event: Hangup
@@ -86,24 +70,19 @@ Cause: 0
 
         EVENT
       end
+
+      client_messages.should be == [
+        Stream::Connected.new,
+        Event.new('Hangup').tap do |e|
+          e['Channel'] = 'SIP/101-3f3f'
+          e['Uniqueid'] = '1094154427.10'
+          e['Cause'] = '0'
+        end,
+        Stream::Disconnected.new
+      ]
     end
 
     it 'sends responses to the client when the stream is ready' do
-      client.expects(:message_received).times(3).with do |r|
-        case @sequence
-        when 1
-          r.should be_a Stream::Connected
-        when 2
-          EM.stop
-          r.should be_a Response
-          r['ActionID'].should == 'ee33eru2398fjj290'
-          r['Message'].should == 'Authentication accepted'
-        when 3
-          r.should be_a Stream::Disconnected
-        end
-        @sequence += 1
-      end
-
       mocked_server(1, lambda { @stream.send_data 'Foo' }) do |val, server|
         server.send_data <<-EVENT
 Response: Success
@@ -112,6 +91,15 @@ Message: Authentication accepted
 
         EVENT
       end
+
+      client_messages.should be == [
+        Stream::Connected.new,
+        Response.new.tap do |r|
+          r['ActionID'] = 'ee33eru2398fjj290'
+          r['Message'] = 'Authentication accepted'
+        end,
+        Stream::Disconnected.new
+      ]
     end
 
     it 'sends error to the client when the stream is ready and a bad command was send' do
@@ -120,7 +108,6 @@ Message: Authentication accepted
         when 1
           r.should be_a Stream::Connected
         when 2
-          EM.stop
           r.should be_a Error
           r['ActionID'].should == 'ee33eru2398fjj290'
           r['Message'].should == 'You stupid git'
@@ -144,10 +131,9 @@ Message: You stupid git
       expect_connected_event
       expect_disconnected_event
       mocked_server(1, lambda { @stream.send_data 'Foo' }) do |val, server|
-        EM.stop
         @stream.stopped?.should be false
       end
-      @stream.stopped?.should be true
+      @stream.alive?.should be false
     end
   end
 end

data/spec/support/mock_server.rb

@@ -1,13 +1,41 @@
 MockServer = Class.new
 
-module ServerMock
+class ServerMock
+  include Celluloid::IO
+
+  def initialize(host, port, mock_target = MockServer.new)
+    puts "*** Starting echo server on #{host}:#{port}"
+    @server = TCPServer.new host, port
+    @mock_target = mock_target
+    @clients = []
+    run!
+  end
+
+  def finalize
+    Logger.debug "ServerMock finalizing"
+    @server.close if @server
+    @clients.each(&:close)
+  end
+
+  def run
+    after(0.5) { terminate }
+    loop { handle_connection! @server.accept }
+  end
+
+  def handle_connection(socket)
+    @clients << socket
+    _, port, host = socket.peeraddr
+    puts "*** Received connection from #{host}:#{port}"
+    loop { receive_data socket.readpartial(4096) }
+  end
+
   def receive_data(data)
-    @server ||= MockServer.new
-    @server.receive_data data, self
+    Logger.debug "ServerMock receiving data: #{data}"
+    @mock_target.receive_data data, self
   end
 
   def send_data(data)
-    super data.gsub("\n", "\r\n")
+    @clients.each { |client| client.write data.gsub("\n", "\r\n") }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -44,21 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: future-resource
   requirement: !ruby/object:Gem::Requirement
@@ -107,22 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +292,6 @@ files:
 - features/support/introspective_lexer.rb
 - features/support/lexer_helper.rb
 - lib/ruby_ami.rb
-- lib/ruby_ami/Guardfile
 - lib/ruby_ami/action.rb
 - lib/ruby_ami/client.rb
 - lib/ruby_ami/error.rb
@@ -359,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2979332282969643621
+      hash: 3703213424052847614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -368,10 +335,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2979332282969643621
+      hash: 3703213424052847614
 requirements: []
 rubyforge_project: ruby_ami
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Futzing with AMI so you don't have to

data/lib/ruby_ami/Guardfile

@@ -1,6 +0,0 @@
-ENV['SKIP_RCOV'] = 'true'
-guard 'rspec', :version => 2, :cli => '--format documentation' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec/" }
-end