From 75a09cd750dcf94c6fc77fc8b0f147bd5670ca84 Mon Sep 17 00:00:00 2001 From: tsakamiya Date: Thu, 26 Nov 2015 03:29:48 -0600 Subject: [PATCH] update eventmachine --- lib/mail_catcher.rb | 2 +- mailcatcher.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mail_catcher.rb b/lib/mail_catcher.rb index 0c3c770..c13b44d 100644 --- a/lib/mail_catcher.rb +++ b/lib/mail_catcher.rb @@ -6,7 +6,7 @@ require "active_support/all" require "eventmachine" require "thin" -if EventMachine::VERSION.in? ["1.0.4", "1.0.5"] +if Gem.loaded_specs["eventmachine"].version >= Gem::Version.new("1.0.4") module EventMachine # Monkey patch fix for 10deb4 # See https://github.com/eventmachine/eventmachine/issues/569 diff --git a/mailcatcher.gemspec b/mailcatcher.gemspec index 59e5dce..c47c1f9 100644 --- a/mailcatcher.gemspec +++ b/mailcatcher.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.7' s.add_dependency "activesupport", ">= 4.0.0", "< 5" - s.add_dependency "eventmachine", "~> 1.0.0", "<= 1.0.5" + s.add_dependency "eventmachine", "~> 1.0.0", "<= 1.0.8" s.add_dependency "mail", "~> 2.3" s.add_dependency "sinatra", "~> 1.2" s.add_dependency "sqlite3", "~> 1.3"