em-synchrony-moped 1.0.0.beta.1 → 1.0.0.beta.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM1ZDFhNzU0ZWE3ZjM2MWQ2YTAwODlmOWMzOTliZTU5OTMwZTc2Yg==
+    YzlmYzgxNjFkMDA3MjZmY2RkYjQwMjU5NjBkMTQ4Nzc1Yzk0ZjY2NQ==
   data.tar.gz: !binary |-
-    MDIxYTY0M2Q1Zjg4NGRjNzBjYjMyZTlmOTEyN2FhOTlhNTk5MTQwOQ==
+    ZjM4ZmMxNTJlZTU1MWQ1YTJhNDU3YjY3OTE3MzVhMGM2YjMzYTA5Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZGJhNzU3NmZlM2I3YTcxNWM5NmUzMDk4OWRiNTQwNDExMTA3M2U0NjVlYjFh
-    MDhkMjE5YmViNTZkNDIxY2MwMGFhNDhkZGJkMDBiNjc0ZjgwZmIyNTIzNDZi
-    MDY4Y2ZhZWIwNmE2YmRjZjUzMzE4MjcyMDczYzE2ZmI4MTE5MmI=
+    MTgyMzg5YTI5NmE0ZTI0MWU5NTA0Y2UzYjc0ZTc0M2ZlZDA1OGE1NzQ1MTlj
+    YTEyY2IwM2UxMjIxYmFmYzRjNzQ0NDQzYmYwN2ZlYjUzYTJmODNmZTZkM2Ex
+    ZmIyOTAzY2IyODMxZjlmZjljMmVhOTUxZDNhZTRhYjE5ZDc4NTU=
   data.tar.gz: !binary |-
-    MTM0OTE2NTk1MzI4NGZhYmFiMGRmNzM2ZGQ3MjlmMzI0MjlkNWJhZmRlMmI1
-    MTU2YmE3ZDViOTA0MTVkYmIzMDk1M2U1NWJkNzYyNWQyZWIyMDBkNTI3OGU4
-    ZDEzMTBlNGJmNTMyY2RkYjI0MGY5MGNiODBlNjI4ODMyNjU0Yjc=
+    YmVkZTRhOTYwNjBmMjc1MjdlZDM4MTIxNzAxNzhmMThjZDdmYjJkYjdjNTFj
+    NGFmMGUxNWMwNGQ0YjcwNmM5YjhmMjZiMjJhMGZjZjdhMzc4ZGFjNmJjZmU0
+    MGRmZGQ0ZDRmYzhhNGJiNWVkOTdlNWExODk4NWJkOGExZWFkOWI=

data/.travis.yml

@@ -0,0 +1,5 @@
+env: TIMEOUT_HOST=www.google.com
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gemspec
 
-
+gem 'coveralls', require: false

data/Guardfile

@@ -8,7 +8,7 @@ end
 
 guard 'rubocop' do
   watch(%r{.+\.rb$})
-  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  #watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end
 
 guard 'bundler' do

data/README.md

@@ -1,8 +1,14 @@
-# EM-Synchrony-Moped
+EM-Synchrony-Moped
+=====
+[![Gem Version](https://badge.fury.io/rb/em-synchrony-moped.png)](http://badge.fury.io/rb/em-synchrony-moped) [![Dependency Status](https://gemnasium.com/alebsack/em-synchrony-moped.png)](https://gemnasium.com/alebsack/em-synchrony-moped) [![Build Status](https://travis-ci.org/alebsack/em-synchrony-moped.png?branch=master)](https://travis-ci.org/alebsack/em-synchrony-moped) [![Coverage Status](https://coveralls.io/repos/alebsack/em-synchrony-moped/badge.png?branch=master)](https://coveralls.io/r/alebsack/em-synchrony-moped?branch=master) [![Code Climate](https://codeclimate.com/github/alebsack/em-synchrony-moped.png)](https://codeclimate.com/github/alebsack/em-synchrony-moped)
 
-EM-Synchrony-Moped is a [Moped](https://github.com/mongoid/mongoid) driver patch for [EM-Synchrony](http://github.com/igrigorik/em-synchrony).  Moped is the MongoDB driver for the [Mongoid](http://github.com/mongoid/mongoid) ORM.
+EM-Synchrony-Moped is a [Moped](https://github.com/mongoid/moped) driver patch for [EM-Synchrony](http://github.com/igrigorik/em-synchrony).  Moped is the MongoDB driver for the [Mongoid](http://github.com/mongoid/mongoid) ORM.
 
- * Supports SSL connections
+## Features
+ * Supports SSL connections and server certificate checking
+ * Uses an EventMachine-aware DNS lookup
+ * Can be included in threaded applications
+ * Unit tested against the threaded (original driver) behavior
 
 ## Usage
 

data/em-synchrony-moped.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'em-synchrony-moped'
-  s.version = "1.0.0.beta.1"
+  s.version = "1.0.0.beta.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Lebsack"]
@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'eventmachine',      '~> 1.0'
-  s.add_runtime_dependency 'em-synchrony',      '~> 1.0'
+  s.add_runtime_dependency 'em-synchrony',      '~> 1.0.3'
   s.add_runtime_dependency 'moped',             '~> 1.5.1'
-  s.add_runtime_dependency 'em-resolv-replace', '~> 1.1.3'
+  s.add_runtime_dependency 'em-resolv-replace'
 
-  s.add_development_dependency 'rspec',         '~> 2.12.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'guard-bundler'

data/lib/em-synchrony/moped/cluster.rb

@@ -4,7 +4,7 @@ require 'moped/cluster'
 
 module Moped
   # Our patches to Moped::Cluster
-  module EventedCluster
+  class Cluster
     def sleep(seconds)
       if EventMachine.reactor_thread?
         EM::Synchrony.sleep(seconds)
@@ -13,8 +13,4 @@ module Moped
       end
     end
   end
-
-  class Cluster
-    include EventedCluster
-  end
 end

data/lib/em-synchrony/moped/connection.rb

@@ -1,26 +1,24 @@
 # encoding: utf-8
 
+require 'moped/connection'
+
 module Moped
+  # Em-Synchrony overrides for Moped::Connection
   class Connection
+    alias_method :super_connect, :connect
     def connect
-      if EventMachine.reactor_thread?
-        if !!options[:ssl]
-          @sock = Sockets::EmSSL.em_connect(host, port, timeout, options)
-        else
-          @sock = Sockets::EmTCP.em_connect(host, port, timeout, options)
-        end
-      else # use old driver
-        if !!options[:ssl]
-          @sock = Sockets::SSL.connect(host, port, timeout)
-        else
-          @sock = Sockets::TCP.connect(host, port, timeout)
-        end
+      return super_connect unless EventMachine.reactor_thread?
+      if !!options[:ssl]
+        @sock = Sockets::EmSSL.em_connect(host, port, timeout, options)
+      else
+        @sock = Sockets::EmTCP.em_connect(host, port, timeout, options)
       end
     end
-  end # class Cnnection
+  end
 
   module Sockets
     module Connectable
+      # Class methods to extend the Connectable Class
       module ClassMethods
         def em_connect(host, port, timeout, options)
           socket = EventMachine.connect(host, port, self) do |c|
@@ -36,10 +34,9 @@ module Moped
             fail SocketError, socket.unbind_reason
           end
           socket
-
         rescue Errno::ETIMEDOUT
-          fail Errors::ConnectionFailure,
-               "Timed out connection to Mongo on #{host}:#{port}"
+          raise Errors::ConnectionFailure,
+                "Timed out connection to Mongo on #{host}:#{port}"
         rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE,
                Errno::ECONNRESET, IOError => error
           fail Errors::ConnectionFailure,
@@ -48,10 +45,6 @@ module Moped
         rescue SocketError => error
           fail Errors::ConnectionFailure,
                "#{host}:#{port}: #{error.class.name}: #{error.message}"
-        rescue OpenSSL::SSL::SSLError => error
-          fail Errors::ConnectionFailure,
-               "#{host}:#{port}: #{error.class.name} (#{error.errno}): " +
-               "#{error.message}"
         end
       end
     end
@@ -59,11 +52,7 @@ module Moped
     # The EM-Synchrony flavor of Moped::Sockets::TCP
     class EmTCP < EventMachine::Synchrony::TCPSocket
       include Connectable
-
-      # TODO: re-evaluate the options call.  Can't we pass the caller
-      # up to the connection or something?
       attr_accessor :options
-
       def alive?
         !closed?
       end
@@ -73,50 +62,49 @@ module Moped
     class EmSSL < EmTCP
       def connection_completed
         @verified = false
-        if @options[:ssl].is_a?(Hash)
-          start_tls(@options[:ssl])
-        else
-          start_tls
+        @cert_store = ssl_options.delete(:cert_store)
+        @cert_store ||= OpenSSL::X509::Store.new
+        if (cert_file = ssl_options.delete(:verify_cert))
+          @cert_store.add_file(cert_file)
         end
+        start_tls(ssl_options)
       end
 
       def ssl_verify_peer(pem)
-        unless (cert_store = @options[:ssl][:cert_store])
-          cert_store = OpenSSL::X509::Store.new
-          cert_store.add_file(@options[:ssl][:verify_cert])
-        end
-
-        if (cert = OpenSSL::X509::Certificate.new(pem) rescue nil)
-          if cert_store.verify(cert)
-
-            cert.extensions.each do |e|
-              if e.oid == 'basicConstraints' && e.value == 'CA:TRUE'
-                return true
-              end
-            end
-
-            host = @options[:ssl][:verify_host]
-            if OpenSSL::SSL.verify_certificate_identity(cert, host)
-              @verified = true
-              return true
-            end
+        return true unless ssl_options[:verify_peer]
+        if (cert = certificate(pem)) && @cert_store.verify(cert)
+          # bypass hostname checking for this cert if it's a CA
+          return true if cert.extensions.find do |e|
+            e.oid == 'basicConstraints' && e.value == 'CA:TRUE'
           end
+
+          @verified = true if (host = ssl_options[:verify_host]) &&
+            OpenSSL::SSL.verify_certificate_identity(cert, host)
         end
 
+        # Always return true.  We will evaluate the certificate chain in
+        # ssl_handshake_completed.
         true
-      rescue
-        unbind 'Failed to verify SSL certificate of peer'
-        false
       end
 
       def ssl_handshake_completed
-        if @options[:ssl][:verify_peer] && !@verified
+        if ssl_options[:verify_peer] && !@verified
           unbind 'Failed to verify SSL certificate of peer'
         else
           @opening = false
           @in_req.succeed self
         end
       end
-    end
+
+      private
+
+      def ssl_options
+        @ssl_options ||= @options[:ssl] == true ? {} : @options[:ssl] || {}
+      end
+
+      def certificate(pem)
+        OpenSSL::X509::Certificate.new(pem)
+      end
+    end # EmSSL
   end
 end

data/lib/em-synchrony/moped/node.rb

@@ -5,15 +5,16 @@ require 'em-dns-resolver'
 require 'fiber'
 
 module Moped
-  # Our monkey patches to Moped::Node
-  module EventedNode
+  # # Our monkey patches to Moped::Node
+  class Node
+    alias_method :super_parse_address, :parse_address
     # Override to support non-blocking DNS requests
     def parse_address
-      return super if EM.reactor_thread?
+      return super_parse_address unless EventMachine.reactor_thread?
       host, port = address.split(':')
       @port = (port || 27_017).to_i
 
-      @ip_address = em_lookup_address(host)
+      @ip_address = em_lookup_address(host).grep(/(::){0}/).first
       fail SocketError unless @ip_address
       @resolved_address = "#{@ip_address}:#{@port}"
     rescue Resolv::ResolvError
@@ -24,7 +25,7 @@ module Moped
       # Lookup in /etc/hosts
       result = []
       @hosts ||= Resolv::Hosts.new
-      @hosts.send(:each_address, value) { |x| result << x.to_s }
+      @hosts.send(:each_address, value) { |x| result << x.to_s if x !~ /::/ }
       return result unless result.empty?
 
       # Nothing, hit DNS
@@ -34,15 +35,11 @@ module Moped
         fiber.resume(a)
       end
       df.errback do |*a|
-        fiber.resume(ResolvError.new(a.inspect))
+        fiber.resume(Resolv::ResolvError.new(a.inspect))
       end
       result = Fiber.yield
-      raise result if result.is_a?(StandardError)
+      fail result if result.is_a?(StandardError)
       result
     end
   end
-
-  class Node
-    include EventedNode
-  end
 end

data/spec/lib/em-synchrony/moped/connection_spec.rb

@@ -4,12 +4,9 @@ require 'spec_helper'
 require 'moped'
 require 'em-synchrony/moped'
 
-# TODO: clean up a bit.  we're basically testing Connection through Node.
-# we should be able to test Connection by itself.
-
 describe Moped::Connection do
   it 'should have patches included' do
-    expect { Moped::Sockets::EmTCP }.not_to raise_error(NameError)
+    expect { Moped::Sockets::EmTCP }.not_to raise_error
   end
 
   let(:mongod_options) { {} }
@@ -17,56 +14,48 @@ describe Moped::Connection do
   let(:server_port) { server.port }
   after { server.stop }
 
-  let(:node_options) { {} }
-  let(:node) do
-    options = node_options.merge(timeout: 1)
-    host = options.delete(:host) || 'localhost'
-    Moped::Node.new("#{host}:#{server_port}", options)
+  let(:options) { {} }
+  let(:conn) do
+    timeout = 1
+    host = options.delete(:host) || '127.0.0.1'
+    port = options.delete(:port) || server_port
+    Moped::Connection.new(host, port, timeout, options)
   end
 
   shared_context 'common connection' do
     context 'with a running server' do
       it 'should connect' do
-        node.refresh
-        node.should be_primary
-        node.should be_connected
+        expect(conn.connect).to be_a(connection_class)
       end
+     end
 
-      it 'should detect a disconnect' do
-        node.refresh
-        node.should be_primary
-        node.should be_connected
-        server.stop
-        expect do
-          node.command('admin', ismaster: 1)
-        end.to raise_error(
-          Moped::Errors::ConnectionFailure # TODO: check the message
-        )
-        node.should_not be_connected
-      end
-    end
-
-    context 'with an unpresponsive host' do
+    context 'with an unresponsive host' do
       # 127.0.0.2 seems to timeout for my tests...
-      let(:node_options) { { host: '127.0.0.2' } }
+      let(:options) { { host: ENV['TIMEOUT_HOST'] } }
       it 'should raise a timeout error' do
-        expect { node.refresh }.to raise_error(
+        expect { conn.connect }.to raise_error(
           Moped::Errors::ConnectionFailure,
           /^Timed out connection to Mongo on/)
       end
     end
 
     context 'without a server' do
+      let(:options) { { port: 2 } }
       it 'should raise a connection error on connection refused' do
         server.stop
-        expect { node.refresh }.to raise_error(
+        expect { conn.connect }.to raise_error(
           Moped::Errors::ConnectionFailure, /ECONNREFUSED/)
       end
     end
   end
 
-  shared_context 'common connection ssl' do
-    context 'with ssl server' do
+  context 'evented' do
+    include_context 'with em-synchrony'
+    let(:connection_class) { Moped::Sockets::EmTCP }
+    include_context 'common connection'
+    context 'with ssl' do
+      let(:ssl_options) { nil }
+      let(:options) { { ssl: ssl_options } }
       let(:mongod_options) do
         {
           ssl: {
@@ -77,60 +66,196 @@ describe Moped::Connection do
         }
       end
 
-      context 'without verifying peer' do
-        let(:node_options) { { ssl: { verify_peer: false } } }
-        it 'should connect' do
-          node.refresh
-          node.should be_primary
+      context 'without specifying ssl' do
+        let(:ssl_options) { nil }
+        let(:options) { {} }
+        it 'should connect (though comms will fail later)' do
+          expect(conn.connect).to be_a(Moped::Sockets::EmTCP)
         end
       end
 
-      context 'when verifying peer' do
-        let(:node_options) do
-          { ssl: {
-              verify_peer: true,
-              verify_cert: "#{SSL_DIR}/ca_cert.pem",
-              verify_host: 'localhost'
+      context 'and a server with a trusted certificate' do
+        context 'when specifying ssl: true' do
+          let(:ssl_options) { true }
+          it 'should connect' do
+            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+          end
+        end
+
+        context 'when specifying ssl: {}' do
+          let(:ssl_options) { {} }
+          it 'should connect' do
+            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+          end
+        end
+
+        context 'when not verifying peer' do
+          let(:ssl_options) { { verify_peer: false } }
+          it 'should connect' do
+            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+          end
+        end
+
+        context 'when verifying peer' do
+          context 'and no certificate provided' do
+            let(:ssl_options) { { verify_peer: true } }
+            it 'should raise an error' do
+              expect { conn.connect }
+                .to raise_error(
+                  Moped::Errors::ConnectionFailure,
+                  /Failed to verify SSL certificate of peer/
+                )
+            end
+          end
+
+          context 'and a certificate is provided' do
+            context 'and verify_host is not provided' do
+              let(:ssl_options) do
+                {
+                  verify_peer: true,
+                  verify_cert: "#{SSL_DIR}/ca_cert.pem"
+                }
+              end
+              it 'should raise an error' do
+                expect { conn.connect }
+                  .to raise_error(
+                    Moped::Errors::ConnectionFailure,
+                    /Failed to verify SSL certificate of peer/
+                  )
+              end
+            end
+            context 'and verify_host does not match the server cert' do
+              let(:ssl_options) do
+                {
+                  verify_peer: true,
+                  verify_cert: "#{SSL_DIR}/ca_cert.pem",
+                  verify_host: 'remotehost'
+                }
+              end
+              it 'should raise an error' do
+                expect { conn.connect }
+                  .to raise_error(
+                    Moped::Errors::ConnectionFailure,
+                    /Failed to verify SSL certificate of peer/
+                  )
+              end
+            end
+            context 'and verify_host matches the server cert' do
+              let(:ssl_options) do
+                {
+                  verify_peer: true,
+                  verify_cert: "#{SSL_DIR}/ca_cert.pem",
+                  verify_host: 'localhost'
+                }
+              end
+              it 'should connect' do
+                expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+              end
+            end
+          end # 'and a certificate is provided'
+        end # 'when verifying peer'
+      end # server with a trusted certificate
+      context 'and a server with an untrusted certificate' do
+        let(:mongod_options) do
+          {
+            ssl: {
+              private_key_file: "#{SSL_DIR}/untrusted.key",
+              cert_chain_file: "#{SSL_DIR}/untrusted.crt",
+              verify_peer: false
             }
           }
         end
-        it 'should connect' do
-          node.refresh
-          node.should be_primary
+
+        context 'when specifying ssl: true' do
+          let(:ssl_options) { true }
+          it 'should connect' do
+            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
+          end
         end
 
-        context 'with untrusted key on server' do
-          let(:mongod_options) do
-            {
-              ssl: {
-                private_key_file: "#{SSL_DIR}/untrusted.key",
-                cert_chain_file: "#{SSL_DIR}/untrusted.crt",
-                verify_peer: false
-              }
-            }
+        context 'when specifying ssl: {}' do
+          let(:ssl_options) { {} }
+          it 'should connect' do
+            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
           end
+        end
 
-          it 'should connect and fail to verify peer' do
-            expect do
-              node.refresh
-              node.should be_primary
-            end.to raise_error(
-              Moped::Errors::ConnectionFailure,
-              /Failed to verify SSL certificate of peer/
-            )
+        context 'when not verifying peer' do
+          let(:ssl_options) { { verify_peer: false } }
+          it 'should connect' do
+            expect(conn.connect).to be_a(Moped::Sockets::EmSSL)
           end
         end
-      end
-    end
-  end
 
-  context 'evented' do
-    include_context 'with em-synchrony'
-    include_context 'common connection'
-    include_context 'common connection ssl'
-  end
+        context 'when verifying peer' do
+          context 'and no certificate provided' do
+            let(:ssl_options) { { verify_peer: true } }
+            it 'should raise an error' do
+              expect { conn.connect }
+                .to raise_error(
+                  Moped::Errors::ConnectionFailure,
+                  /Failed to verify SSL certificate of peer/
+                )
+            end
+          end
+
+          context 'and a certificate is provided' do
+            context 'and verify_host is not provided' do
+              let(:ssl_options) do
+                {
+                  verify_peer: true,
+                  verify_cert: "#{SSL_DIR}/ca_cert.pem"
+                }
+              end
+              it 'should raise an error' do
+                expect { conn.connect }
+                  .to raise_error(
+                    Moped::Errors::ConnectionFailure,
+                    /Failed to verify SSL certificate of peer/
+                  )
+              end
+            end
+            context 'and verify_host does not match the server cert' do
+              let(:ssl_options) do
+                {
+                  verify_peer: true,
+                  verify_cert: "#{SSL_DIR}/ca_cert.pem",
+                  verify_host: 'remotehost'
+                }
+              end
+              it 'should raise an error' do
+                expect { conn.connect }
+                  .to raise_error(
+                    Moped::Errors::ConnectionFailure,
+                    /Failed to verify SSL certificate of peer/
+                  )
+              end
+            end
+            context 'and verify_host matches the server cert' do
+              let(:ssl_options) do
+                {
+                  verify_peer: true,
+                  verify_cert: "#{SSL_DIR}/ca_cert.pem",
+                  verify_host: 'localhost'
+                }
+              end
+              it 'should raise an error' do
+                expect { conn.connect }
+                  .to raise_error(
+                    Moped::Errors::ConnectionFailure,
+                    /Failed to verify SSL certificate of peer/
+                  )
+              end
+            end
+          end # 'and a certificate is provided'
+        end # 'when verifying peer'
+      end # 'and a server with an untrusted certificate'
+    end # 'with ssl'
+  end # 'evented'
+
   context 'threaded' do
     include_context 'without em-synchrony'
+    let(:connection_class) { Moped::Sockets::TCP }
     include_context 'common connection'
   end
 

data/spec/lib/em-synchrony/moped/node_spec.rb

@@ -14,7 +14,8 @@ describe Moped::Node do
   let(:node) do
     options = node_options.merge(timeout: 1)
     host = options.delete(:host) || 'localhost'
-    Moped::Node.new("#{host}:#{server_port}", options)
+    port = options.delete(:port) || server_port
+    Moped::Node.new("#{host}:#{port}", options)
   end
 
   shared_context 'common node' do
@@ -39,9 +40,9 @@ describe Moped::Node do
       end
     end
 
-    context 'with an unpresponsive host' do
+    context 'with an unresponsive host' do
       # 127.0.0.2 seems to timeout for my tests...
-      let(:node_options) { { host: '127.0.0.2' } }
+      let(:node_options) { { host: ENV['TIMEOUT_HOST'] } }
       it 'should raise a timeout error' do
         expect { node.refresh }.to raise_error(
           Moped::Errors::ConnectionFailure,
@@ -58,6 +59,7 @@ describe Moped::Node do
     end
 
     context 'without a server' do
+      let(:node_options) { { port: 2 } }
       it 'should raise a connection error on connection refused' do
         server.stop
         expect { node.refresh }.to raise_error(

data/spec/spec_helper.rb

@@ -10,8 +10,16 @@ Spork.prefork do
   # if you change any configuration or code from libraries loaded here, you'll
   # need to restart spork for it take effect.
 
+  ENV['TIMEOUT_HOST'] ||= 'www.google.com'
+
   require 'rspec'
   require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
   SimpleCov.start do
     add_group 'Lib', 'lib'
     add_filter '/spec/'

data/spec/support/contexts.rb

@@ -5,11 +5,12 @@ shared_context 'with em-synchrony' do
     require 'em-synchrony'
     EventMachine.error_handler do |e|
       puts "Error in Eventmachine: #{e.inspect}"
-      EM.stop
+      puts e.backtrace.join("\n")
+      EventMachine.stop
     end
     EventMachine.synchrony do
       example.run
-      EM.stop if EM.reactor_running?
+      EventMachine.stop if EventMachine.reactor_running?
     end
   end
 end
@@ -18,7 +19,8 @@ shared_context 'without em-synchrony' do
   before(:each) do
     EventMachine.error_handler do |e|
       puts "Error in Eventmachine: #{e.inspect}"
-      EM.stop
+      puts e.backtrace.join("\n")
+      EventMachine.stop
     end
     queue = Queue.new
     @em_thread = Thread.new { EventMachine.run { queue << true } }
@@ -26,7 +28,7 @@ shared_context 'without em-synchrony' do
   end
 
   after(:each) do
-    EM.stop
+    EventMachine.stop
     @em_thread.join
   end
 end

data/spec/support/simulated_mongod.rb

@@ -134,7 +134,7 @@ class FakeMongodServer
     ensure_reactor do
       @server = EventMachine.start_server(
         @host, 0, FakeMongod, @options, self)
-      @port = Socket.unpack_sockaddr_in(EM.get_sockname(@server))[0]
+      @port = Socket.unpack_sockaddr_in(EventMachine.get_sockname(@server))[0]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony-moped
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+  version: 1.0.0.beta.2
 platform: ruby
 authors:
 - Adam Lebsack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,44 @@ dependencies:
   name: em-resolv-replace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +201,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.md