resque-heroku-autoscaler 0.2.2 → 0.2.3

data/GEMFILE

@@ -6,7 +6,6 @@ gem 'heroku', '1.11.0'
 group :development do
   gem "rspec", "~> 2.0"
   gem 'rr', '1.0.2'
-  gem 'echoe'
   gem 'rake'
 end
 

data/README.md

@@ -54,6 +54,15 @@ Per default RHA will only start a single worker, no matter how many jobs are pen
 
 When calculating the new number of required workers the block given to new_worker_count will be called. Thus the example will result in starting one additional worker for every 5 pending jobs.
 
+You might want to turn off scaling of your workers in development modus. You can do that by setting _scaling_disabled_ to true in your init script:
+
+    if (Rails.env == 'development')
+      Resque::Plugins::HerokuAutoscaler.config do |c|
+        c.scaling_disabled = true
+      end
+    end
+
+
 
 [dh]: http://blog.darkhax.com/2010/07/30/auto-scale-your-resque-workers-on-heroku
 [rq]: http://github.com/defunkt/resque

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

@@ -4,6 +4,13 @@ module Resque
       module Config
         extend self
 
+        @scaling_disabled = false
+
+        attr_writer :scaling_disabled
+        def scaling_disabled?
+          @scaling_disabled
+        end
+
         @new_worker_count = Proc.new {|pending| pending >0 ? 1 : 0}
 
         attr_writer :heroku_user
@@ -28,6 +35,11 @@ module Resque
             @new_worker_count.call(pending, *payload)
           end
         end
+
+        def reset
+          @scaling_disabled = false
+          @new_worker_count = Proc.new {|pending| pending >0 ? 1 : 0}
+        end
       end
     end
   end

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

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

data/lib/resque/plugins/resque_heroku_autoscaler.rb

@@ -39,8 +39,20 @@ module Resque
       private
 
       def calculate_and_set_workers
+        if Resque::Plugins::HerokuAutoscaler::Config.scaling_disabled?
+          log "Scaling workers disabled. Skipping."
+          return
+        end
         set_workers(Resque::Plugins::HerokuAutoscaler::Config.new_worker_count(Resque.info[:pending]))
       end
+
+      def log(message)
+        if defined?(Rails)
+          Rails.logger.info(message)
+        else
+          puts message
+        end
+      end
     end
   end
 end

data/spec/config_spec.rb

@@ -43,6 +43,16 @@ describe Resque::Plugins::HerokuAutoscaler::Config do
     end
   end
 
+  describe ".scaling_disabled?" do
+
+    it{ Resque::Plugins::HerokuAutoscaler::Config.scaling_disabled?.should be_false}
+
+    it "sets scaling to disabled" do
+      subject.scaling_disabled = true
+      subject.scaling_disabled?.should be_true
+    end
+  end
+
   describe ".new_worker_count" do
     before do
       @original_method = Resque::Plugins::HerokuAutoscaler::Config.instance_variable_get(:@new_worker_count)

data/spec/resque_heroku_autoscaler_spec.rb

@@ -24,6 +24,8 @@ describe Resque::Plugins::HerokuAutoscaler do
     @fake_heroku_client = Object.new
     stub(@fake_heroku_client).set_workers
     stub(@fake_heroku_client).info { {:workers => 0} }
+    stub(TestJob).log
+    Resque::Plugins::HerokuAutoscaler::Config.reset
   end
 
   it "should be a valid Resque plugin" do
@@ -69,6 +71,19 @@ describe Resque::Plugins::HerokuAutoscaler do
         TestJob.after_enqueue_scale_workers_up
       end
     end
+
+    context "when scaling workers is disabled" do
+      before do
+        subject.config do |c|
+          c.scaling_disabled = true
+        end
+      end
+
+      it "should not use the heroku client" do
+        dont_allow(TestJob).heroku_client
+        TestJob.after_enqueue_scale_workers_up
+      end
+    end
   end
 
   describe ".after_perform_scale_workers_down" do
@@ -128,6 +143,19 @@ describe Resque::Plugins::HerokuAutoscaler do
         TestJob.after_perform_scale_workers_down
       end
     end
+
+    context "when scaling workers is disabled" do
+      before do
+        subject.config do |c|
+          c.scaling_disabled = true
+        end
+      end
+
+      it "should not use the heroku client" do
+        dont_allow(TestJob).heroku_client
+        TestJob.after_perform_scale_workers_down
+      end
+    end
   end
 
   describe ".on_failure_scale_workers" do
@@ -187,6 +215,19 @@ describe Resque::Plugins::HerokuAutoscaler do
         TestJob.on_failure_scale_workers
       end
     end
+
+    context "when scaling workers is disabled" do
+      before do
+        subject.config do |c|
+          c.scaling_disabled = true
+        end
+      end
+
+      it "should not use the heroku client" do
+        dont_allow(TestJob).heroku_client
+        TestJob.on_failure_scale_workers
+      end
+    end
   end
 
   describe ".set_workers" do
@@ -196,7 +237,7 @@ describe Resque::Plugins::HerokuAutoscaler do
       end
 
       stub(TestJob).current_workers {0}
-      mock(TestJob).heroku_client { p "returning"; mock(@fake_heroku_client).set_workers('some_app_name', 10) }
+      mock(TestJob).heroku_client { mock(@fake_heroku_client).set_workers('some_app_name', 10) }
       TestJob.set_workers(10)
     end
   end

metadata

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