resque-heroku-autoscaler 0.2.1 → 0.2.2

data/lib/resque/plugins/heroku_autoscaler/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module HerokuAutoscaler
-      VERSION = "0.2.1"
+      VERSION = "0.2.2"
     end
   end
 end

data/lib/resque/plugins/resque_heroku_autoscaler.rb

@@ -6,11 +6,15 @@ module Resque
       @@heroku_client = nil
 
       def after_enqueue_scale_workers_up(*args)
-        set_workers(Resque::Plugins::HerokuAutoscaler::Config.new_worker_count(Resque.info[:pending]))
+        calculate_and_set_workers
       end
 
       def after_perform_scale_workers_down(*args)
-        set_workers(Resque::Plugins::HerokuAutoscaler::Config.new_worker_count(Resque.info[:pending]))
+        calculate_and_set_workers
+      end
+
+      def on_failure_scale_workers(*args)
+        calculate_and_set_workers
       end
 
       def set_workers(number_of_workers)
@@ -31,6 +35,12 @@ module Resque
       def self.config
         yield Resque::Plugins::HerokuAutoscaler::Config
       end
+
+      private
+
+      def calculate_and_set_workers
+        set_workers(Resque::Plugins::HerokuAutoscaler::Config.new_worker_count(Resque.info[:pending]))
+      end
     end
   end
 end

data/spec/resque_heroku_autoscaler_spec.rb

@@ -130,6 +130,65 @@ describe Resque::Plugins::HerokuAutoscaler do
     end
   end
 
+  describe ".on_failure_scale_workers" do
+    before do
+      stub(TestJob).heroku_client { @fake_heroku_client }
+    end
+
+    it "should add the hook" do
+      Resque::Plugin.failure_hooks(TestJob).should include("on_failure_scale_workers")
+    end
+
+    it "should take whatever args Resque hands in" do
+      Resque::Plugins::HerokuAutoscaler.class_eval("@@heroku_client = nil")
+      stub(Heroku::Client).new { stub!.set_workers }
+
+      lambda { TestJob.on_failure_scale_workers("some", "random", "aguments", 42) }.should_not raise_error
+    end
+
+    context "when the queue is empty" do
+      before do
+        stub(Resque).info { {:pending => 0} }
+      end
+
+      it "should set workers to 0" do
+        mock(TestJob).set_workers(0)
+        TestJob.on_failure_scale_workers
+      end
+    end
+
+    context "when the queue is not empty" do
+      before do
+        stub(Resque).info { {:pending => 1} }
+      end
+
+      it "should keep workers at 1" do
+        mock(TestJob).set_workers(1)
+        TestJob.on_failure_scale_workers
+      end
+    end
+
+    context "when new_worker_count was changed" do
+      before do
+        @original_method = Resque::Plugins::HerokuAutoscaler::Config.instance_variable_get(:@new_worker_count)
+        subject.config do |c|
+          c.new_worker_count do
+            2
+          end
+        end
+      end
+
+      after do
+        Resque::Plugins::HerokuAutoscaler::Config.instance_variable_set(:@new_worker_count, @original_method)
+      end
+
+      it "should use the given block" do
+        mock(TestJob).set_workers(2)
+        TestJob.on_failure_scale_workers
+      end
+    end
+  end
+
   describe ".set_workers" do
     it "should use the Heroku client to set the workers" do
       subject.config do |c|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-heroku-autoscaler
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Alexander Murmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency