heroku_resque_autoscaler 0.0.1 → 0.0.2

data/README.md

@@ -8,7 +8,7 @@ Inspired by [@darkhelmet](https://github.com/darkhelmet)'s
 
 ## Current Version
 
-0.0.1
+0.0.2
 
 
 ## Requirements

data/heroku_resque_autoscaler.gemspec

@@ -8,15 +8,15 @@ Gem::Specification.new do |gem|
   gem.email         = ["jlsuttles@gmail.com"]
   gem.description   = %q{Uses Resque Job Hooks and the Heroku API gem to autoscale Heroku Resque workers}
   gem.summary       = %q{Uses Resque Job Hooks and the Heroku API gem to autoscale Heroku Resque workers}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/G5/heroku_resque_autoscaler"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "heroku-api", "~> 0.3.5"
-  gem.add_runtime_dependency "resque", "~> 1.23.0"
+  gem.add_dependency "heroku-api", "~> 0.3.5"
+  gem.add_dependency "resque", "~> 1.23.0"
   
   gem.add_development_dependency "rspec", "~> 2.11.0"
   gem.add_development_dependency "guard-rspec", "~> 2.1.0"

data/lib/heroku_resque_autoscaler.rb

@@ -3,6 +3,14 @@ require "heroku_resque_autoscaler/configuration"
 require "heroku_resque_autoscaler/scaler"
 
 module HerokuResqueAutoscaler
+    WORKER_SCALE = [
+      { :workers => 1, :job_count => 1 },
+      { :workers => 2, :job_count => 15 },
+      { :workers => 3, :job_count => 25 },
+      { :workers => 4, :job_count => 40 },
+      { :workers => 5, :job_count => 60 }
+    ]
+
   class << self
     # A HerokuResqueAutoscaler configuration object. Must act like a hash and 
     # return sensible values for all HerokuResqueAutoscaler configuration options.
@@ -28,4 +36,24 @@ module HerokuResqueAutoscaler
       yield(configuration)
     end
   end
+
+  def after_enqueue_scale_up(*args)
+    desired_workers = num_desired_heroku_workers
+    if Scaler.workers < desired_workers
+      Scaler.workers = desired_workers
+    end
+  end
+
+  def after_perform_scale_down(*args)
+    # Scale everything down if we have no pending jobs and one working job (this one)
+    Scaler.workers = 0 if Scaler.job_count.zero? && Scaler.working_job_count == 1
+  end
+
+  def num_desired_heroku_workers(*args)
+    WORKER_SCALE.reverse_each do |scale_info|
+      if Scaler.job_count >= scale_info[:job_count]
+        return scale_info[:workers]
+      end
+    end
+  end
 end

data/lib/heroku_resque_autoscaler/scaler.rb

@@ -4,8 +4,9 @@ require "resque"
 module HerokuResqueAutoscaler
   module Scaler
     class << self
-      # TODO: use HerokuResqueAutoscaler.configuration for api_key
-      @@heroku = Heroku::API.new(api_key: ENV["HEROKU_API_KEY"])
+      def heroku
+        @heroku ||= Heroku::API.new(api_key: api_key)
+      end
 
       def api_key
         HerokuResqueAutoscaler.configuration["heroku_api_key"]
@@ -16,13 +17,13 @@ module HerokuResqueAutoscaler
       end
 
       def workers
-        @@heroku.get_ps(app_name).body.keep_if do |ps|
+        heroku.get_ps(app_name).body.keep_if do |ps|
           ps["process"] =~ /worker/
         end.length.to_i
       end
 
       def workers=(qty)
-        @@heroku.post_ps_scale(app_name, :worker, qty)
+        heroku.post_ps_scale(app_name, :worker, qty)
       end
 
       def job_count
@@ -34,45 +35,4 @@ module HerokuResqueAutoscaler
       end
     end
   end
-
-  def after_perform_scale_down(*args)
-    # Scale everything down if we have no pending jobs and one working job (this one)
-    Scaler.workers = 0 if Scaler.job_count.zero? && Scaler.working_job_count == 1
-  end
-
-  def num_desired_heroku_workers(*args)
-    [
-      {
-        :workers => 1, # This many workers
-        :job_count => 1 # For this many jobs or more, until the next level
-      },
-      {
-        :workers => 2,
-        :job_count => 15
-      },
-      {
-        :workers => 3,
-        :job_count => 25
-      },
-      {
-        :workers => 4,
-        :job_count => 40
-      },
-      {
-        :workers => 5,
-        :job_count => 60
-      }
-    ].reverse_each do |scale_info|
-      if Scaler.job_count >= scale_info[:job_count]
-        return scale_info[:workers]
-      end
-    end
-  end
-
-  def after_enqueue_scale_up(*args)
-    desired_workers = num_desired_heroku_workers
-    if Scaler.workers < desired_workers
-      Scaler.workers = desired_workers
-    end
-  end
 end

data/lib/heroku_resque_autoscaler/version.rb

@@ -1,3 +1,3 @@
 module HerokuResqueAutoscaler
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/heroku_resque_autoscaler/scaler_spec.rb

@@ -11,18 +11,25 @@ end
 describe HerokuResqueAutoscaler do
   before :each do
     @heroku = mock(Heroku::API)
-    HerokuResqueAutoscaler::Scaler.class_variable_set(:@@heroku, @heroku)
+    HerokuResqueAutoscaler::Scaler.stub(:heroku).and_return(@heroku)
   end
 
   let(:heroku_app) {ENV['HEROKU_APP_NAME']}
 
   context "#workers" do
     it "returns the number of workers from the Heroku application" do
-      @heroku.should_receive(:get_ps).with(heroku_app).and_return([
-        {"process" => "web.1"},
-        {"process" => "worker.1"},
-        {"process" => "worker.1"},
-      ])
+      Excon.stub(method: :get) do |params|
+        { status: 200,
+          body: [
+            {"process" => "web.1"},
+            {"process" => "worker.1"},
+            {"process" => "worker.2"},
+          ]
+        }
+      end
+      connection = Excon.new("http://example.com", mock: true)
+      response = connection.request(method: :get)
+      @heroku.should_receive(:get_ps).with(heroku_app).and_return(response)
       HerokuResqueAutoscaler::Scaler.workers.should == 2
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_resque_autoscaler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -130,7 +130,7 @@ files:
 - spec/lib/heroku_resque_autoscaler/scaler_spec.rb
 - spec/lib/heroku_resque_autoscaler_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/G5/heroku_resque_autoscaler
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4159626300690751562
+      hash: 1281113482684956416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4159626300690751562
+      hash: 1281113482684956416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24