moparisthebest
/
mailcatcher
mirror of https://github.com/moparisthebest/mailcatcher
1
0
Fork 0
Code Issues Releases Wiki Activity

Load all of ActiveSupport 

ActiveSupport has weird load order problems when loading only the
core extensions now.

For instance, active_support/core_ext/numeric/conversions.rb now
loads active_support/number_helper which needs
ActiveSupport::Autoload but doesn't require it, so causes a missing
constant error in MailCatcher.

Also tightening up the version constraint because I can't guarantee
backward compatibility now.
This commit is contained in:
Samuel Cochran 2014-06-05 21:27:47 +10:00
parent ed72712daa
commit e3e7dec757
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Gemfile.lock
View File

@ -2,7 +2,7 @@ PATH
remote: . remote: .
specs: specs:
mailcatcher (0.6.0) mailcatcher (0.6.0)
activesupport (>= 3.0.0, < 5) activesupport (>= 4.0.0, < 5)
eventmachine (~> 1.0.0) eventmachine (~> 1.0.0)
haml (>= 3.1, < 4.1) haml (>= 3.1, < 4.1)
mail (~> 2.3) mail (~> 2.3)
@ -41,13 +41,11 @@ GEM
hike (1.2.3) hike (1.2.3)
i18n (0.6.9) i18n (0.6.9)
json (1.8.1) json (1.8.1)
mail (2.5.4) mail (2.6.0)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8) mime-types (2.3)
mime-types (1.25.1)
minitest (5.3.1) minitest (5.3.1)
multi_json (1.9.2) multi_json (1.9.2)
polyglot (0.3.5)
rack (1.5.2) rack (1.5.2)
rack-protection (1.5.3) rack-protection (1.5.3)
rack rack
@ -85,9 +83,6 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.1) tzinfo (1.2.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.0) uglifier (2.5.0)

2
lib/mail_catcher.rb
View File

@ -2,7 +2,7 @@ require "open3"
require "optparse" require "optparse"
require "rbconfig" require "rbconfig"
require "active_support/core_ext" require "active_support"
require "eventmachine" require "eventmachine"
require "thin" require "thin"

2
mailcatcher.gemspec
View File

@ -30,7 +30,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 1.8.7' s.required_ruby_version = '>= 1.8.7'
s.add_dependency "activesupport", ">= 3.0.0", "< 5" s.add_dependency "activesupport", ">= 4.0.0", "< 5"
s.add_dependency "eventmachine", "~> 1.0.0" s.add_dependency "eventmachine", "~> 1.0.0"
s.add_dependency "haml", ">= 3.1", "< 4.1" s.add_dependency "haml", ">= 3.1", "< 4.1"
s.add_dependency "mail", "~> 2.3" s.add_dependency "mail", "~> 2.3"