sidekiq 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdef31a4d431682169e826c2f7e1817f4392ca5b
-  data.tar.gz: 93a6c396de18207948950ee7d8e1a52a7c81b18f
+  metadata.gz: 39626a2f12ce1c55fc3b6aec763a780fbbf3afe3
+  data.tar.gz: d4edda55a00c8ee2fa5f67a102b71b3ee24cac18
 SHA512:
-  metadata.gz: 681bee80c219bf1bdac44797c4353ae1bead8495cec2dc0f4055b150e751007e1805eda4aabcd83fe3b273df4d7f403d0b244b4f37b374895c9d42ed24cb6c5e
-  data.tar.gz: c85781ce1ce3549d57640b50fe54c5ca0e5433122dfcb1793a8a31db5c06baa6dd10b31bebf2d355156c574b1481937cf68f826c30af6e13eba741d4161dd489
+  metadata.gz: f4ca3aea1d5c28672337e784d9f34531f8d495f210e6a3f6c6aef56a34a91546f4bc77e8d89fedf655514b18bafff9209a3e0cc959a533ebc3c696f78a46c132
+  data.tar.gz: b64813b493d5672027cdeeac9ff981d1aa6f2a2faab92a08b6e08a318205e1ec857c9abb500f8ce3a9b8908378988e10de147a8a43402f10071af5b0c528509b

data/Changes.md

@@ -1,3 +1,9 @@
+3.2.1
+-----------
+
+- Revert eager loading change for Rails 3.x apps, as it broke a few edge
+  cases.
+
 3.2.0
 -----------
 

data/lib/sidekiq/cli.rb

@@ -221,13 +221,20 @@ module Sidekiq
       raise ArgumentError, "#{options[:require]} does not exist" unless File.exist?(options[:require])
 
       if File.directory?(options[:require])
-        # Painful contortions, see 1791 for discussion
-        require File.expand_path("#{options[:require]}/config/application.rb")
-        ::Rails::Application.initializer "sidekiq.eager_load" do
-          ::Rails.application.config.eager_load = true
+        require 'rails'
+        if ::Rails::VERSION::MAJOR < 4
+          require 'sidekiq/rails'
+          require File.expand_path("#{options[:require]}/config/environment.rb")
+          ::Rails.application.eager_load!
+        else
+          # Painful contortions, see 1791 for discussion
+          require File.expand_path("#{options[:require]}/config/application.rb")
+          ::Rails::Application.initializer "sidekiq.eager_load" do
+            ::Rails.application.config.eager_load = true
+          end
+          require 'sidekiq/rails'
+          require File.expand_path("#{options[:require]}/config/environment.rb")
         end
-        require 'sidekiq/rails'
-        require File.expand_path("#{options[:require]}/config/environment.rb")
         options[:tag] ||= default_tag
       else
         require options[:require]

data/lib/sidekiq/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis