Make eventmachine requirement explicit

This commit is contained in:
Samuel Cochran 2015-12-14 13:53:38 +11:00
parent 885f0d95d8
commit d32b8465ba
3 changed files with 18 additions and 17 deletions

View File

@ -3,7 +3,7 @@ PATH
specs:
mailcatcher (0.6.1)
activesupport (>= 4.0.0, < 5)
eventmachine (~> 1.0.0, <= 1.0.5)
eventmachine (= 1.0.8)
mail (~> 2.3)
sinatra (~> 1.2)
skinny (~> 0.2.3)
@ -13,7 +13,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.0)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -38,8 +38,8 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
daemons (1.1.9)
eventmachine (1.0.5)
daemons (1.2.3)
eventmachine (1.0.8)
execjs (2.2.2)
ffi (1.9.6)
hike (1.2.3)
@ -47,7 +47,7 @@ GEM
json (1.8.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.4.3)
mime-types (2.99)
minitest (5.5.1)
multi_json (1.10.1)
rack (1.6.0)
@ -66,10 +66,10 @@ GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
sinatra (1.4.5)
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
tilt (>= 1.3, < 3)
skinny (0.2.3)
eventmachine (~> 1.0.0)
thin (~> 1.5.0)
@ -83,12 +83,12 @@ GEM
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
sqlite3 (1.3.10)
sqlite3 (1.3.11)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
@ -113,3 +113,6 @@ DEPENDENCIES
sprockets-helpers
sprockets-sass
uglifier
BUNDLED WITH
1.10.6

View File

@ -6,13 +6,11 @@ require "active_support/all"
require "eventmachine"
require "thin"
if EventMachine::VERSION.in? ["1.0.4", "1.0.5"]
module EventMachine
# Monkey patch fix for 10deb4
# See https://github.com/eventmachine/eventmachine/issues/569
def self.reactor_running?
(@reactor_running || false)
end
module EventMachine
# Monkey patch fix for 10deb4
# See https://github.com/eventmachine/eventmachine/issues/569
def self.reactor_running?
(@reactor_running || false)
end
end

View File

@ -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.8"
s.add_dependency "eventmachine", "1.0.8"
s.add_dependency "mail", "~> 2.3"
s.add_dependency "sinatra", "~> 1.2"
s.add_dependency "sqlite3", "~> 1.3"