Update how we eager load Rails applications, #1791

Changes.md

@@ -1,3 +1,8 @@
+3.2.0
+-----------
+
+- Update how Sidekiq eager loads Rails application code [#1791, jonleighton]
+
 3.1.4
 -----------
 

lib/sidekiq/cli.rb

@@ -221,10 +221,10 @@ module Sidekiq
       raise ArgumentError, "#{options[:require]} does not exist" unless File.exist?(options[:require])
 
       if File.directory?(options[:require])
-        require 'rails'
+        require File.expand_path("#{options[:require]}/config/application.rb")
+        Rails.application.config.eager_load = true
         require 'sidekiq/rails'
         require File.expand_path("#{options[:require]}/config/environment.rb")
-        ::Rails.application.eager_load!
         options[:tag] ||= default_tag
       else
         require options[:require]

lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.1.4"
+  VERSION = "3.2.0"
 end