Merge pull request #735 from thecartercenter/fix_eventmachine

Explicitly require eventmachine (for homebrew)
thecartercenter · May 28, 2020 · 622a8b7 · 622a8b7
2 parents 1b9f99c + 5dca92a
commit 622a8b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,7 @@ gem "dalli", "~> 2.7.4" # memcache
 gem "delayed_job_active_record", "~> 4.1.3"
 gem "descriptive_statistics", "~> 2.5.1", require: "descriptive_statistics/safe" # mean, median, etc.
 gem "draper", "~> 3.0.1"
+gem "eventmachine", "~> 1.2", platform: :ruby
 gem "exception_notification", "~> 4.2"
 gem "fog-aws", "~> 3.3.0"
 gem "friendly_id", "~> 5.1.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -607,6 +607,7 @@ DEPENDENCIES
   draper (~> 3.0.1)
   draper-cancancan (~> 1.1)
   dropzonejs-rails (~> 0.7.3)
+  eventmachine (~> 1.2)
   exception_notification (~> 4.2)
   factory_girl_rails (~> 4.5.0)
   faker (~> 1.6)

diff --git a/config/application.rb b/config/application.rb
@@ -5,6 +5,10 @@
 require "rails/all"
 require "coffee_script"
 
+# This may be required on Mac with Homebrew.
+# https://github.com/oneclick/rubyinstaller2/issues/96#issuecomment-548249647
+require "em/pure_ruby" unless defined?(EventMachine)
+
 Bundler.require(*Rails.groups)
 
 module ELMO