resque-director 2.1.0 → 2.1.1

data/Gemfile

@@ -7,4 +7,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "yajl-ruby", "~>0.8.2", :platforms => :mri
+  gem "json", "~>1.5.3", :platforms => :jruby
 end

data/README.rdoc

@@ -41,9 +41,9 @@ For Example:
 
 === Start/Stop Options
 
-<b>start_override</b>:: This option takes a lambda closure that accepts the queue as an argument, the block you pass in will be responsible for starting a SINGLE worker allowing you to fully customize the starting of a worker. By default to start a worker the system command "QUEUE=queue_name rake resque:work &" is run, where queue_name is whatever queue the job is running.
+<b>start_override</b>:: This option takes a lambda closure that accepts the queue as an argument, the block you pass in will be responsible for starting a SINGLE worker allowing you to fully customize the starting of a worker. If your block returns false then that signifies that a worker was not started and the last scaled time will not be set. By default to start a worker the system command "QUEUE=queue_name rake resque:work &" is run, where queue_name is whatever queue the job is running.
 
-<b>stop_override</b>:: This option takes a lambda closure that accepts the queue as an argument, the block you pass in will be responsible for stopping a SINGLE worker allowing you to fully customize the stopping of a worker. By default a to stop a worker the worker process on that host is sent a QUIT signal.
+<b>stop_override</b>:: This option takes a lambda closure that accepts the queue as an argument, the block you pass in will be responsible for stopping a SINGLE worker allowing you to fully customize the stopping of a worker. If your block returns false then that signifies that a worker was not stopped and the last scaled time will not be set. By default a to stop a worker the worker process on that host is sent a QUIT signal.
 
 ===	Customized Starting/Stopping Workers Example
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

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

@@ -38,8 +38,9 @@ module Resque
           
           def scaling(number_of_workers=1)
             return unless time_to_scale? && number_of_workers > 0
-            yield
-            Resque.redis.set("last_scaled_#{Config.queue}", Time.now.utc.to_i)
+            unless yield == false
+              Resque.redis.set("last_scaled_#{Config.queue}", Time.now.utc.to_i)
+            end
           end
         
           private

data/resque-director.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-director}
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   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-01}
+  s.date = %q{2011-09-02}
   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 = [
@@ -54,12 +54,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
+      s.add_development_dependency(%q<json>, ["~> 1.5.3"])
     else
       s.add_dependency(%q<resque>, ["~> 1.10"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
+      s.add_dependency(%q<json>, ["~> 1.5.3"])
     end
   else
     s.add_dependency(%q<resque>, ["~> 1.10"])
@@ -67,6 +71,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, ["~> 0.8.2"])
+    s.add_dependency(%q<json>, ["~> 1.5.3"])
   end
 end
 

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

@@ -48,6 +48,24 @@ describe Resque::Plugins::Director::Scaler do
       2.times { subject.scaling { @times_scaled += 1 } }
       @times_scaled.should == 2
     end
+    
+    describe "last_scaled_test" do
+      
+      before do
+        @now = Time.now
+        Time.stub(:now => @now)
+      end
+    
+      it "should set the last scaled time" do
+        subject.scaling { true }
+        Resque.redis.get("last_scaled_test").to_i.should == @now.utc.to_i
+      end
+    
+      it "should not set last scaled time if scaling block returns false" do
+        subject.scaling { false }
+        Resque.redis.get("last_scaled_test").should be_nil
+      end
+    end
   end
   
   describe "#scale_down_to_minimum" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-director
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 1
-  - 0
-  version: 2.1.0
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Nolan Frausto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 Z
+date: 2011-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -94,6 +94,38 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 8
+        - 2
+        version: 0.8.2
+  version_requirements: *id006
+  name: yajl-ruby
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  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: []