heroku-scalr 0.2.4 → 0.3.0

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    heroku-scalr (0.2.4)
-      heroku-api (~> 0.3.8)
+    heroku-scalr (0.3.0)
+      heroku-api (~> 0.3.12)
       timers
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.4)
-    crack (0.3.2)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
     diff-lcs (1.2.4)
-    excon (0.21.0)
-    heroku-api (0.3.10)
-      excon (~> 0.21.0)
+    excon (0.23.0)
+    heroku-api (0.3.12)
+      excon (~> 0.23.0)
     rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -23,6 +24,7 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
+    safe_yaml (0.9.3)
     timers (1.1.0)
     webmock (1.11.0)
       addressable (>= 2.2.7)

data/heroku-scalr.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = File.basename(__FILE__, '.gemspec')
   s.summary     = "Watch and scale your dynos!"
   s.description = "Issues recurring 'pings' to your Heroku apps and scales dynos up or down depending on pre-defined rules"
-  s.version     = "0.2.4"
+  s.version     = "0.3.0"
 
   s.authors     = ["Black Square Media"]
   s.email       = "info@blacksquaremedia.com"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.add_dependency "timers"
-  s.add_dependency "heroku-api", '~> 0.3.8'
+  s.add_dependency "heroku-api", '~> 0.3.12'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bundler"

data/lib/heroku/scalr/app.rb

@@ -9,12 +9,13 @@ class Heroku::Scalr::App
     ping_low: 200,
     ping_high: 500,
     metric: :ping,
-    min_frequency: 60
+    cool_freq: 180,
+    heat_freq: 60,
   }.freeze
 
   attr_reader :name, :url, :api_key, :interval, :min_dynos, :max_dynos,
               :metric, :wait_low, :wait_high, :ping_low, :ping_high,
-              :min_frequency, :last_scaled_at
+              :cool_freq, :heat_freq, :last_scaled_at
 
   # @param [String] name Heroku app name
   # @param [Hash] opts options
@@ -28,8 +29,14 @@ class Heroku::Scalr::App
   #   lowers the number of dynos if queue wait time is less than `wait_low` ms, default: 10
   # @option opts [Integer] :wait_high
   #   lowers the number of dynos if queue wait time is more than `wait_high` ms, default: 100
-  # @option opts [Integer] :min_frequency
-  #   leave at least `min_frequency` seconds before scaling again, default: 60
+  # @option opts [Integer] :ping_low
+  #   lowers the number of dynos if ping time is less than `ping_low` ms, default: 200
+  # @option opts [Integer] :ping_high
+  #   lowers the number of dynos if ping time is more than `ping_high` ms, default: 500
+  # @option opts [Integer] :cool_freq
+  #   leave at least `cool_freq` seconds before scaling down again, default: 180
+  # @option opts [Integer] :heat_freq
+  #   leave at least `heat_freq` seconds before scaling up again, default: 60
   # @option opts [String] :api_key
   #   the Heroku account's API key
   def initialize(name, opts = {})
@@ -51,20 +58,22 @@ class Heroku::Scalr::App
     @ping_low  = opts[:ping_low].to_i
     @ping_high = opts[:ping_high].to_i
     @metric    = Heroku::Scalr::Metric.new(opts[:metric], self)
-    @min_frequency  = opts[:min_frequency].to_i
+    @cool_freq = opts[:cool_freq].to_i
+    @heat_freq = opts[:heat_freq].to_i
     @last_scaled_at = Time.at(0)
   end
 
   # Scales the app
   def scale!
-    scale_at = next_scale_attempt
+    scale_at = last_scaled_at + [cool_freq, heat_freq].min
     now      = Time.now
     if now < scale_at
       log :debug, "skip check, next attempt in #{(scale_at - now).to_i}s"
       return
     end
 
-    do_scale(metric.by)
+    by = metric.by
+    do_scale(by) if must_scale?(by, now)
   rescue => e
     msg = "#{e.class}: #{e.to_s}"
     msg << "\n\t" << e.backtrace.join("\n\t") if e.backtrace
@@ -80,15 +89,25 @@ class Heroku::Scalr::App
 
   protected
 
+    def must_scale?(by, now)
+      scale_dn = last_scaled_at + cool_freq
+      scale_up = last_scaled_at + heat_freq
+
+      if by < 0 && now < scale_dn
+        log :debug, "skip scaling, next down attempt in #{(scale_dn - now).to_i}s"
+        return false
+      elsif by > 0 && now < scale_up
+        log :debug, "skip scaling, next up attempt in #{(scale_up - now).to_i}s"
+        return false
+      elsif by == 0
+        log :debug, "no scaling required"
+        return false
+      end
 
-    # @return [Time] the next scale attempt
-    def next_scale_attempt
-      last_scaled_at + min_frequency
+      true
     end
 
     def do_scale(by)
-      return if by.zero?
-
       api  = Heroku::API.new(api_key: api_key)
       info = api.get_app(name)
       unless info.status == 200

data/spec/heroku/scalr/app_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Heroku::Scalr::App do
 
-  subject    { described_class.new('name', api_key: 'key', max_dynos: 3) }
+  subject    { described_class.new('name', api_key: 'key', max_dynos: 3, heat_freq: 30) }
 
   def mock_response(status, body)
     mock "APIResponse", status: status, headers: {}, body: body
@@ -20,7 +20,8 @@ describe Heroku::Scalr::App do
   its(:wait_high)       { should be(100) }
   its(:ping_low)        { should be(200) }
   its(:ping_high)       { should be(500) }
-  its(:min_frequency)   { should be(60) }
+  its(:heat_freq)       { should be(30) }
+  its(:cool_freq)       { should be(180) }
   its(:last_scaled_at)  { should == Time.at(0)}
 
 
@@ -82,6 +83,7 @@ describe Heroku::Scalr::App do
     context "down" do
 
       it "should return the new number of dynos" do
+        subject.instance_variable_set :@last_scaled_at, (Time.now - 185)
         mock_api.should_receive(:post_ps_scale).with("name", "web", 1).and_return mock_response(200, "")
         subject.scale!.should == 1
       end
@@ -92,6 +94,12 @@ describe Heroku::Scalr::App do
         subject.scale!.should be_nil
       end
 
+      it "should skip if scaled too recently" do
+        subject.instance_variable_set :@last_scaled_at, (Time.now - 175)
+        mock_api.should_not_receive(:post_ps_scale)
+        subject.scale!.should be_nil
+      end
+
     end
 
     context "up" do
@@ -99,6 +107,7 @@ describe Heroku::Scalr::App do
       before { subject.metric.stub by: 1 }
 
       it "should return the new number of dynos" do
+        subject.instance_variable_set :@last_scaled_at, (Time.now - 35)
         mock_api.should_receive(:post_ps_scale).with("name", "web", 3).and_return mock_response(200, "")
         subject.scale!.should == 3
       end
@@ -109,6 +118,12 @@ describe Heroku::Scalr::App do
         subject.scale!.should be_nil
       end
 
+      it "should skip if scaled too recently" do
+        subject.instance_variable_set :@last_scaled_at, (Time.now - 25)
+        mock_api.should_not_receive(:post_ps_scale)
+        subject.scale!.should be_nil
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-scalr
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 0.3.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement