resque-heroku-scaling-canary 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/resque/plugins/resque_heroku_scaling_canary.rb

@@ -10,7 +10,7 @@ module Resque
         n = self.respond_to?(:minimum_workers_needed) ? self.minimum_workers_needed : 1
         return if Config.heroku_client.info(Config.heroku_app)[:workers].to_i >= n
         Config.heroku_client.set_workers(Config.heroku_app, n)
-        Resque.enqueue(CanaryJob, Config.polling_interval) if CanaryJob.canary_jobs_pending == 0
+        Resque.enqueue(CanaryJob, Config.polling_interval) if CanaryJob.canary_jobs_outstanding == 0
       end
 
       def self.config

data/lib/resque/plugins/resque_heroku_scaling_canary/canary_job.rb

@@ -18,12 +18,12 @@ module Resque
           end
         end
 
-        def self.canary_jobs_pending
-          Resque.size(@queue)
+        def self.canary_jobs_outstanding
+          Resque.size(@queue) + Resque.workers.find_all{ |w| w.processing["queue"] == @queue }.count
         end
 
         def self.non_canary_jobs_pending
-          waiting = Resque.queues.inject(0){ |accum, item| accum += Resque.size(item) unless item == @queue }
+          waiting = Resque.queues.reject{ |q| q == @queue}.inject(0){ |accum, item| accum += Resque.size(item) }
           being_processed = Resque.workers.find_all{ |w| w.processing["queue"] and w.processing["queue"] != @queue }.count
           waiting + being_processed
         end

data/resque-heroku-scaling-canary.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-heroku-scaling-canary"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Windsor"]

data/spec/resque_heroku_scaling_canary_spec.rb

@@ -22,9 +22,9 @@ describe Resque::Plugins::ScalingCanary do
   before(:each) do
     @mock_heroku_client = Object.new
     Resque::Plugins::ScalingCanary.config do |config|
-      config.heroku_user = "stub"
-      config.heroku_password = "stub"
-      config.heroku_app = "stub"
+      config.heroku_user = "stub-user"
+      config.heroku_password = "stub-password"
+      config.heroku_app = "stub-app"
       config.polling_interval = 0
       config.stub(:heroku_client) { @mock_heroku_client }
     end
@@ -36,14 +36,14 @@ describe Resque::Plugins::ScalingCanary do
   
   describe "after_enqueue_ensure_heroku_workers" do
     it "should scale workers up to 1 if no :minimum_workers_needed method is implemented" do
-      @mock_heroku_client.should_receive(:set_workers).with(1).once
-      @mock_heroku_client.should_receive(:set_workers).with(0).once
+      @mock_heroku_client.should_receive(:set_workers).with("stub-app", 1).once
+      @mock_heroku_client.should_receive(:set_workers).with("stub-app", 0).once
       @mock_heroku_client.stub(:info) { {:workers => 0} }
       Resque.enqueue SmallBatchJob
     end
     it "should scale workers up to the number specified by :minimum_workers_needed if an implementation is provided" do
-      @mock_heroku_client.should_receive(:set_workers).with(20).once
-      @mock_heroku_client.should_receive(:set_workers).with(0).once
+      @mock_heroku_client.should_receive(:set_workers).with("stub-app", 20).once
+      @mock_heroku_client.should_receive(:set_workers).with("stub-app", 0).once
       @mock_heroku_client.stub(:info) { {:workers => 0} }
       Resque.enqueue LargeBatchJob
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-heroku-scaling-canary
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2154765260 !ruby/object:Gem::Requirement
+  requirement: &2154772420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.9'
   type: :runtime
   prerelease: false
-  version_requirements: *2154765260
+  version_requirements: *2154772420
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2154764780 !ruby/object:Gem::Requirement
+  requirement: &2154771940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.18'
   type: :runtime
   prerelease: false
-  version_requirements: *2154764780
+  version_requirements: *2154771940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154764300 !ruby/object:Gem::Requirement
+  requirement: &2154771460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2154764300
+  version_requirements: *2154771460
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &2154763820 !ruby/object:Gem::Requirement
+  requirement: &2154770980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2154763820
+  version_requirements: *2154770980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154763340 !ruby/object:Gem::Requirement
+  requirement: &2154770500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2154763340
+  version_requirements: *2154770500
 description: Auto-scale Heroku workers for Resque
 email: aaron.windsor@gmail.com
 executables: []
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2508096092828040406
+      hash: 1965787200204254741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: