resque_stuck_queue 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: c61972d3ea6fbc28feaf6b720c24fa48c3d78ce06967e2b00762fb5dd3dd6d6ad1014616300b37299ee693b9c4a25dcddfc30a923b85285b35d24fe383639a6c
-  metadata.gz: f3e6cb7aeb0843612de8ccaccd6fcea4efab227d525ca3dcfca053d70e13a229ddd24ae8b43dc4cdc9b5c6bf3bd940fd1fa26dc8657f2ba248fc3fdbe85c590d
 SHA1: 
-  data.tar.gz: 1347fccc7e4b37ea0a0626a176d904c223c4d21b
-  metadata.gz: 9f217dadd17a7ff267b66b858330218c1e9f24fc
+  metadata.gz: 2021e2bdbc288908d56f88f56999a9a059ad3ed1
+  data.tar.gz: 05ec2dbecf9dc7349ab57cff706643f506651577
+SHA512: 
+  metadata.gz: 8e2a1730aade6ca73b6f4d73c132af0826e80f6d9918c94a630683cd577557aac75c7a12becb1cabe8f7c5f13c09da48bf0a4383e7d3e1b5a25ce227f42fc419
+  data.tar.gz: 69ec4f75eb76a026529ee1a34768db1fe081360c2267e67937ecda4224ddebd223bd67e295775bd45fd75121c04f3e2acbb2af9d916b3a6b56c77ee5113e6227

data/lib/resque_stuck_queue.rb

@@ -25,7 +25,7 @@ module Resque
       end
 
       def redis
-        @redis ||= (config[:redis] || raise(Config::NoConfigError, "Must configure a redis instance to use. Please set a Redis or Redis::Namespace."))
+        @redis ||= config[:redis]
         HeartbeatJob.redis = @redis
       end
 
@@ -65,6 +65,7 @@ module Resque
         @running = true
         @stopped = false
         @threads = []
+        config.validate_required_keys!
         config.freeze
 
         reset_keys

data/lib/resque_stuck_queue/config.rb

@@ -41,10 +41,19 @@ module Resque
         super(k)
       end
 
+      REQUIRED_KEYS = [:redis]
+      def validate_required_keys!
+        REQUIRED_KEYS.each do |k|
+          if self[k].nil?
+            raise NoConfigError, "You must set config[:#{k}]"
+          end
+        end
+      end
+
       class NoConfigError < StandardError; end
 
       def validate_key_exists!(k)
-        if ! OPTIONS.include?(k)
+        if !OPTIONS.include?(k)
           raise NoConfigError, "no such config key #{k} exists!"
         end
       end

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/test/test_config.rb

@@ -8,6 +8,11 @@ class TestConfig < Minitest::Test
     Resque::StuckQueue.config[:trigger_timeout] = 1
     Resque::StuckQueue.config[:heartbeat] = 1
     Resque::StuckQueue.config[:abort_on_exception] = true
+    Resque::StuckQueue.config[:redis] = Redis.new
+  end
+
+  def teardown
+    Resque::StuckQueue.reset!
   end
 
   def test_config_has_descriptions
@@ -25,10 +30,21 @@ class TestConfig < Minitest::Test
     puts "#{__method__}"
     begin
       Resque::StuckQueue.config[:logger] = Logger.new($stdout)
-      start_and_stop_loops_after(2)
+      start_and_stop_loops_after(1)
       assert true, "should not have raised"
-    rescue
-      assert false, "should have succeeded with good logger"
+    rescue => e
+      assert false, "should have succeeded with good logger: #{e.inspect}\n#{e.backtrace.join("\n")}"
+    end
+  end
+
+  def test_must_set_redis
+    puts "#{__method__}"
+    Resque::StuckQueue.config[:redis] = nil
+    begin
+      start_and_stop_loops_after(1)
+      assert false, "redis cannot be nil"
+    rescue Resque::StuckQueue::Config::NoConfigError => e
+      assert true, "redis cannot be nil: #{e.inspect}\n#{e.backtrace.join("\n")}"
     end
   end
 

data/test/test_integration.rb

@@ -45,10 +45,10 @@ class TestIntegration < Minitest::Test
   end
 
   def teardown
+    Resque::StuckQueue.reset!
     if self.class.tests_done?
       hax_kill_resque
       Process.waitall
-      return
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-29 00:00:00 Z
+date: 2014-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis-mutex