resque-director 2.2.1 → 2.2.2

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/lib/resque/plugins/director/scaler.rb

@@ -26,22 +26,25 @@ module Resque
           end
           
           def scale_within_requirements
-            number_of_workers = WorkerTracker.new.total_for_requirements
+            tracker = WorkerTracker.new
+            number_of_workers = tracker.total_for_requirements
             if number_of_workers > 0
-              scale_up(number_of_workers)
+              set_last_scaled unless start(number_of_workers) == false
             elsif number_of_workers < 0
-              scale_down(number_of_workers * -1)
+              set_last_scaled unless stop(tracker, number_of_workers * -1) == false
             end
           end
           
           def scaling(number_of_workers=1)
             return unless time_to_scale? && number_of_workers > 0
-            unless yield == false
-              Resque.redis.set("last_scaled_#{[Config.queue].flatten.join('')}", Time.now.utc.to_i)
-            end
+            set_last_scaled unless yield == false
           end
         
           private
+          
+          def set_last_scaled
+            Resque.redis.set("last_scaled_#{[Config.queue].flatten.join('')}", Time.now.utc.to_i)
+          end
          
           def time_to_scale?
             last_time = Resque.redis.get("last_scaled_#{[Config.queue].flatten.join('')}")

data/resque-director.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-director}
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Nolan Frausto}]
-  s.date = %q{2011-09-07}
+  s.date = %q{2011-09-09}
   s.description = %q{resque plugin for automatically scaling workers based on the amount of time it takes a job to go through the queue and/or the length of the queue }
   s.email = %q{nrfrausto@gmail.com}
   s.extra_rdoc_files = [
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/frausto/resque-director}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{A resque plugin for automatically scaling workers}
 
   if s.respond_to? :specification_version then

data/spec/resque/plugins/director/scaler_spec.rb

@@ -232,32 +232,61 @@ describe Resque::Plugins::Director::Scaler do
   describe "#scale_within_requirements" do
     it "should not scale up workers if the minumum number or greater are already running" do
       Resque::Worker.new(:test).register_worker
-      subject.should_not_receive(:scale_up)
+      subject.should_not_receive(:start)
+      subject.should_not_receive(:stop)
       subject.scale_within_requirements
     end
     
     it "should scale up the minimum number of workers if non are running" do
       Resque::Plugins::Director::Config.setup :min_workers => 2
-      subject.should_receive(:scale_up).with(2)
+      subject.should_receive(:start).with(2)
       subject.scale_within_requirements
     end
     
+    it "should scale workers ignoring the last scaled time" do
+      Resque::Plugins::Director::Config.setup :min_workers => 2, :wait_time => 60
+      subject.scaling { true }
+      subject.should_receive(:start).with(2)
+      subject.scale_within_requirements
+    end
+    
+    it "should set the last scaled time if scaling up" do
+      @now = Time.now
+      Time.stub(:now => @now)
+      Resque::Plugins::Director::Config.setup :min_workers => 1, :wait_time => 60
+      subject.should_receive(:start)
+      subject.scale_within_requirements
+      Resque.redis.get("last_scaled_test").to_i.should == @now.utc.to_i
+    end
+    
+    it "should set the last scaled time if scaling down" do
+      @now = Time.now
+      Time.stub(:now => @now)
+      Resque::Plugins::Director::Config.setup :max_workers => 1, :wait_time => 60
+      workers = 2.times.map { Resque::Worker.new(:test) }
+      Resque.should_receive(:workers).and_return(workers)
+      subject.should_receive(:stop)
+      
+      subject.scale_within_requirements
+      Resque.redis.get("last_scaled_test").to_i.should == @now.utc.to_i
+    end
+    
     it "should ensure at least one worker is running if min_workers is less than zero" do
       Resque::Plugins::Director::Config.setup :min_workers => -10
-      subject.should_receive(:scale_up).with(1)
+      subject.should_receive(:start).with(1)
       subject.scale_within_requirements
     end
     
     it "should ensure at least one worker is running if min_workers is zero" do
       Resque::Plugins::Director::Config.setup :min_workers => 0
-      subject.should_receive(:scale_up).with(1)
+      subject.should_receive(:start).with(1)
       subject.scale_within_requirements
     end
     
     it "should scale up the minimum number of workers if less than the minimum are running" do
       Resque::Plugins::Director::Config.setup :min_workers => 2
       Resque::Worker.new(:test).register_worker
-      subject.should_receive(:scale_up).with(1)
+      subject.should_receive(:start).with(1)
       subject.scale_within_requirements
     end
     
@@ -266,7 +295,7 @@ describe Resque::Plugins::Director::Scaler do
       workers = 2.times.map { Resque::Worker.new(:test) }
       Resque.should_receive(:workers).and_return(workers)
       
-      subject.should_receive(:scale_down).with(1)
+      subject.should_receive(:stop).with(anything, 1)
       subject.scale_within_requirements
     end
     
@@ -275,19 +304,19 @@ describe Resque::Plugins::Director::Scaler do
       workers = 1.times.map { Resque::Worker.new(:test) }
       Resque.should_receive(:workers).and_return(workers)
       
-      subject.should_not_receive(:scale_down)
+      subject.should_not_receive(:stop)
       subject.scale_within_requirements
     end
     
     it "should ignore workers from other queues" do
       Resque::Worker.new(:other).register_worker
-      subject.should_receive(:scale_up).with(1)
+      subject.should_receive(:start).with(1)
       subject.scale_within_requirements
     end
     
     it "should ignore workers on multiple queues" do
       Resque::Worker.new(:test, :other).register_worker
-      subject.should_receive(:scale_up).with(1)
+      subject.should_receive(:start).with(1)
       subject.scale_within_requirements
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-director
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Nolan Frausto
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 Z
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,8 +31,8 @@ dependencies:
   version_requirements: *id001
   name: resque
   prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,8 +47,8 @@ dependencies:
   version_requirements: *id002
   name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,8 +63,8 @@ dependencies:
   version_requirements: *id003
   name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,8 +79,8 @@ dependencies:
   version_requirements: *id004
   name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,8 +93,8 @@ dependencies:
   version_requirements: *id005
   name: rcov
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,8 +109,8 @@ dependencies:
   version_requirements: *id006
   name: yajl-ruby
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,6 +125,7 @@ dependencies:
   version_requirements: *id007
   name: json
   prerelease: false
+  type: :development
 description: "resque plugin for automatically scaling workers based on the amount of time it takes a job to go through the queue and/or the length of the queue "
 email: nrfrausto@gmail.com
 executables: []
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A resque plugin for automatically scaling workers