heroku_resque_autoscaler 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a613c71641b59071fcd4c1fc538a68f9cfda9319
-  data.tar.gz: 360442559f1a22ebf96ce90de9007c8769845de2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWZhN2Y4MjRjOWE1YTAzZWZmMzkzMTdmZTJjOWQ2MjQ1ZmRiMjdlOQ==
+  data.tar.gz: !binary |-
+    Yjc4N2QzOTBlN2QyYjhjZTFjYTY2ZTdlMWM2MTIyYjBkOTQ1NTQ2Nw==
 SHA512:
-  metadata.gz: b6a60327b925f9e11f0c482c3ba0d6f94595bef48882e96ccf7688637b053fa3430583ef08666ede7d3f404da676564073d663cc06ed8b70853ca687efd71bc3
-  data.tar.gz: cf96ced05969bc7635932249af6609579df5bcf2ef0e7ad55ee310d307e57cbfd60e98213e6f288e913485172e4f687b5de411379e92fb41c5f965f9d27b6a39
+  metadata.gz: !binary |-
+    YTQ4MjFjYmM1YjhmOTUzMzE2MDRjMzBiNWZmYjZiODA5YjE2NDFjMDhmMTg1
+    NTliODM1NDMzMzk3OGU2YmZhY2E0MWI2NTlhMjRmNjQ5ZTE1YTE4Y2I0ZTJh
+    ZmZmZjM0NDFlYzUzNmU1YThlMzhlYjIwMmNjODIzODQwMGUwYmM=
+  data.tar.gz: !binary |-
+    NDZjYzE3NGM4ZDY0NTM5MDU0OWMwNDdjYTc0MzhiODIyMzEyMGUzYWY1NWI0
+    N2I4YmYzNmUwOTNmMjFmNjQyODU3MWY4OWQyYWRkNzA5MTIwODllOTQzMzJk
+    NWM2Mjk1ZmUxNDJiOTE0OTdmMGFmMmJmY2JkYTUyNTc0Y2U1NGM=

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 1.9.3

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in heroku_resque_autoscaler.gemspec
-gemspec
+gemspec

data/README.md

@@ -11,7 +11,7 @@ Inspired by [@darkhelmet](https://github.com/darkhelmet)'s
 
 ## Current Version
 
-0.1.1
+0.1.2
 
 
 ## Requirements
@@ -69,11 +69,19 @@ class AutoscaledJob
 end
 ```
 
+You can optionally configure a maximum number of workers to scale up to in your configuration block.
+
+```ruby
+HerokuResqueAutoscaler.configure do |config|
+  config.max_resque_workers  = ENV["MAX_RESQUE_WORKERS"] 
+end
+```
 
 ## Authors
 
   * Jessica Lynn Suttles / [@jlsuttles](https://github.com/jlsuttles)
   * Bookis Smuin / [@bookis](https://github.com/bookis)
+  * Chris Stringer / [@jcstringer](https://github.com/jcstringer)
 
 
 ## Contributing

data/lib/heroku_resque_autoscaler.rb

@@ -3,13 +3,13 @@ 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 }
-    ]
+  DEFAULT_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 
@@ -50,7 +50,7 @@ module HerokuResqueAutoscaler
   end
 
   def num_desired_heroku_workers(*args)
-    WORKER_SCALE.reverse_each do |scale_info|
+    worker_scale.reverse_each do |scale_info|
       if Scaler.job_count >= scale_info[:job_count]
         return scale_info[:workers]
       end
@@ -58,4 +58,13 @@ module HerokuResqueAutoscaler
 
     0
   end
+
+  private
+
+  def worker_scale
+    ## Respect a max number of workers if this is configured
+    DEFAULT_WORKER_SCALE.reject do |w| 
+      w[:workers] > Scaler.max_resque_workers
+    end  
+  end  
 end

data/lib/heroku_resque_autoscaler/configuration.rb

@@ -3,6 +3,7 @@ module HerokuResqueAutoscaler
     OPTIONS = {
       heroku_api_key: ENV["HEROKU_API_KEY"],
       heroku_app_name: ENV["HEROKU_APP_NAME"],
+      max_resque_workers: ENV["MAX_RESQUE_WORKERS"]
     }
 
     # Defines accessors for all OPTIONS
@@ -10,7 +11,7 @@ module HerokuResqueAutoscaler
       attr_accessor key
     end
 
-    # Initializes defaults to be the environment varibales of the same names
+    # Initializes defaults to be the environment variables of the same names
     def initialize
       OPTIONS.each_pair do |key, value|
         self.send("#{key}=", value)

data/lib/heroku_resque_autoscaler/scaler.rb

@@ -16,6 +16,11 @@ module HerokuResqueAutoscaler
         HerokuResqueAutoscaler.configuration["heroku_app_name"]
       end
 
+      def max_resque_workers
+        return Float::INFINITY unless HerokuResqueAutoscaler.configuration["max_resque_workers"]
+        HerokuResqueAutoscaler.configuration["max_resque_workers"].to_i
+      end
+
       def workers
         heroku.get_ps(app_name).body.keep_if do |ps|
           ps["process"] =~ /worker/

data/lib/heroku_resque_autoscaler/version.rb

@@ -1,3 +1,3 @@
 module HerokuResqueAutoscaler
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/lib/heroku_resque_autoscaler/configuration_spec.rb

@@ -11,6 +11,10 @@ describe HerokuResqueAutoscaler::Configuration do
     assert_config_default :heroku_api_key, ENV["HEROKU_API_KEY"]
   end
 
+  it "defaults to no max resque workers" do
+    assert_config_default :max_resque_workers, nil
+  end  
+
   it "allows values to be overwritten" do
     assert_config_overridable :heroku_api_key
   end

data/spec/lib/heroku_resque_autoscaler/scaler_spec.rb

@@ -9,13 +9,16 @@ class HerokuResqueAutoscalerTestClass
 end
 
 describe HerokuResqueAutoscaler do
-  before :each do
+  let(:max_resque_workers) { nil }
+
+  before do
     @heroku = mock(Heroku::API)
     HerokuResqueAutoscaler::Scaler.stub(:heroku).and_return(@heroku)
 
     HerokuResqueAutoscaler.configure do |config|
       config.heroku_api_key = "api-key"
       config.heroku_app_name = "app-name"
+      config.max_resque_workers = max_resque_workers
     end
   end
 
@@ -33,6 +36,14 @@ describe HerokuResqueAutoscaler do
     end
   end
 
+  context ".max_resque_workers" do
+    let(:max_resque_workers) { "2" }
+
+    it "returns a count" do
+      HerokuResqueAutoscaler::Scaler.max_resque_workers.should == 2
+    end
+  end
+
   context ".workers" do
     it "returns the number of workers from the Heroku application" do
       Excon.stub(method: :get) do |params|
@@ -123,6 +134,19 @@ describe HerokuResqueAutoscaler do
   end
 
   context ".after_enqueue_scale_up" do
+    context "with max_resque_workers set" do
+      let(:max_resque_workers) { 5 }
+
+      it "scales with a max" do
+        num_workers = 5
+        num_desired_workers = 6
+        HerokuResqueAutoscaler::Scaler.stub(:workers).and_return(num_workers)
+        HerokuResqueAutoscaler::Scaler.stub(:job_count).and_return(num_workers)
+        HerokuResqueAutoscaler::Scaler.should_not_receive(:workers=).with(num_desired_workers)
+        HerokuResqueAutoscalerTestClass.after_enqueue_scale_up
+      end  
+    end  
+
     it "ups the amount of workers if there are not enough" do
       num_workers = 5
       num_desired_workers = 6

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: heroku_resque_autoscaler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jessica Lynn Suttles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Uses Resque Job Hooks and the Heroku API gem to autoscale Heroku Resque
@@ -102,9 +102,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -127,17 +127,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Uses Resque Job Hooks and the Heroku API gem to autoscale Heroku Resque workers