our-eel-hacks 0.1.0 → 0.1.1

data/lib/our-eel-hacks/autoscaler.rb

@@ -72,7 +72,6 @@ module OurEelHacks
 
       @last_scaled = Time.at(0)
       @entered_soft = Time.at(0)
-      @last_reading = nil
 
       @app_name = nil
       @ps_type = nil
@@ -207,11 +206,10 @@ module OurEelHacks
 
     def update_dynos(new_value, moment)
       if new_value != dynos
-        @last_scaled = moment
         @entered_soft = moment
       end
       @dynos = new_value
-      @last_reading = moment
+      @last_scaled = moment
     end
 
     def clear_dyno_info

data/spec/autoscaler.rb

@@ -17,7 +17,7 @@ describe OurEelHacks::Autoscaler do
   end
 
   let :soft_dur do
-    5000
+    8000
   end
 
   let :ideal_value do
@@ -110,6 +110,7 @@ describe OurEelHacks::Autoscaler do
   def no_requests
     OurEelHacks::HerokuClient.processing_budget = 0
     heroku.should_not_receive(:ps_scale)
+    heroku.should_not_receive(:ps)
   end
 
   describe "scaling frequency" do
@@ -130,6 +131,17 @@ describe OurEelHacks::Autoscaler do
       heroku.should_receive(:ps_scale).with(app_name, "web", 4)
       autoscaler.scale(hard_high)
     end
+
+    it "should not reconsider scaling even if we don't scale" do
+      time_advance(expected_scale_frequency + 5)
+      expect do
+        autoscaler.scale(ideal_value)
+      end.to change(autoscaler, :last_scaled)
+
+      no_requests
+      time_advance(expected_scale_frequency - 10)
+      autoscaler.scale(ideal_value)
+    end
   end
 
   describe "hard limits" do
@@ -170,7 +182,7 @@ describe OurEelHacks::Autoscaler do
     describe "if soft_duration hasn't elapsed" do
       before :each do
         time_adjust((expected_scale_frequency * 2) + soft_dur - 5)
-        no_requests
+        heroku.should_not_receive(:ps_scale)
       end
 
       it "should not scale up" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: our-eel-hacks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &76255930 !ruby/object:Gem::Requirement
+  requirement: &78524700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *76255930
+  version_requirements: *78524700
 - !ruby/object:Gem::Dependency
   name: heroku-api
-  requirement: &76255010 !ruby/object:Gem::Requirement
+  requirement: &78523710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,7 +36,7 @@ dependencies:
         - 1
   type: :runtime
   prerelease: false
-  version_requirements: *76255010
+  version_requirements: *78523710
 description: ! "  Middleware for Rack and Sidekiq to scale heroku.\n\n  A heroku process
   knows everything it needs in order to scale itself.  A little configuration, and
   you're set.\n"
@@ -68,7 +68,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- our-eel-hacks-0.1.0 RDoc
+- our-eel-hacks-0.1.1 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 939575183
+      hash: -812621841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: