heroku-scalr 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-scalr (0.2.3)
+    heroku-scalr (0.2.4)
       heroku-api (~> 0.3.8)
       timers
 

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.3"
+  s.version     = "0.2.4"
 
   s.authors     = ["Black Square Media"]
   s.email       = "info@blacksquaremedia.com"

data/lib/heroku/scalr/app.rb

@@ -12,7 +12,7 @@ class Heroku::Scalr::App
     min_frequency: 60
   }.freeze
 
-  attr_reader :name, :url, :api, :interval, :min_dynos, :max_dynos,
+  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
 
@@ -41,9 +41,8 @@ class Heroku::Scalr::App
     fail("max_dynos must be at least 1") unless opts[:max_dynos] >= 1
     fail("interval must be at least 10") unless opts[:interval] >= 10
 
-    @url = opts[:url] || "http://#{@name}.herokuapp.com/robots.txt"
-    @api = Heroku::API.new api_key: opts[:api_key]
-
+    @url       = opts[:url] || "http://#{@name}.herokuapp.com/robots.txt"
+    @api_key   = opts[:api_key]
     @interval  = opts[:interval].to_i
     @min_dynos = opts[:min_dynos].to_i
     @max_dynos = opts[:max_dynos].to_i
@@ -59,8 +58,9 @@ class Heroku::Scalr::App
   # Scales the app
   def scale!
     scale_at = next_scale_attempt
-    if Time.now < scale_at
-      log :debug, "skip scaling, next attempt in #{(scale_at - Time.now).to_i}s"
+    now      = Time.now
+    if now < scale_at
+      log :debug, "skip check, next attempt in #{(scale_at - now).to_i}s"
       return
     end
 
@@ -89,6 +89,7 @@ class Heroku::Scalr::App
     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
         log :warn, "error fetching app info, responded with #{info.status}"

data/lib/heroku/scalr/core_ext.rb

@@ -0,0 +1,11 @@
+class Logger
+
+  def reopen
+    return unless @logdev && @logdev.filename
+
+    @logdev.dev.reopen(@logdev.filename, "a")
+    @logdev.dev.sync = true
+    self
+  end
+
+end unless Logger.public_instance_methods.include?(:reopen)

data/lib/heroku/scalr/runner.rb

@@ -23,6 +23,7 @@ class Heroku::Scalr::Runner
     SIGNALS.each do |sig|
       Signal.trap(sig) { stop! }
     end
+    Signal.trap("USR1") { Heroku::Scalr.logger.reopen }
 
     loop { timers.wait }
   end

data/lib/heroku/scalr.rb

@@ -28,6 +28,6 @@ module Heroku::Scalr
 
 end
 
-%w|config app runner metric|.each do |name|
+%w|core_ext config app runner metric|.each do |name|
   require "heroku/scalr/#{name}"
 end

data/spec/heroku/scalr/app_spec.rb

@@ -10,7 +10,7 @@ describe Heroku::Scalr::App do
 
   its(:name)            { should == 'name' }
   its(:url)             { should == 'http://name.herokuapp.com/robots.txt' }
-  its(:api)             { should be_instance_of(Heroku::API) }
+  its(:api_key)         { should == 'key' }
   its(:metric)          { should be_instance_of(Heroku::Scalr::Metric::Ping) }
 
   its(:interval)        { should be(30) }
@@ -43,8 +43,13 @@ describe Heroku::Scalr::App do
   end
 
   describe "scaling" do
+
+    let :mock_api do
+      mock "Heroku::API", get_app: mock_response(200, { "dynos" => 2 }), post_ps_scale: mock_response(200, "")
+    end
+
     before do
-      subject.api.stub get_app: mock_response(200, { "dynos" => 2 }), post_ps_scale: mock_response(200, "")
+      Heroku::API.stub new: mock_api
       subject.metric.stub by: -1
     end
 
@@ -54,7 +59,7 @@ describe Heroku::Scalr::App do
     end
 
     it "should log errors" do
-      subject.api.should_receive(:get_app).and_raise(RuntimeError, "API Error")
+      mock_api.should_receive(:get_app).and_raise(RuntimeError, "API Error")
       Heroku::Scalr.logger.should_receive(:error)
       subject.scale!.should be_nil
     end
@@ -70,20 +75,20 @@ describe Heroku::Scalr::App do
     end
 
     it "should check current number of dynos" do
-      subject.api.should_receive(:get_app).with("name").and_return mock_response(200, { "dynos" => 2 })
+      mock_api.should_receive(:get_app).with("name").and_return mock_response(200, { "dynos" => 2 })
       subject.scale!.should == 1
     end
 
     context "down" do
 
       it "should return the new number of dynos" do
-        subject.api.should_receive(:post_ps_scale).with("name", "web", 1).and_return mock_response(200, "")
+        mock_api.should_receive(:post_ps_scale).with("name", "web", 1).and_return mock_response(200, "")
         subject.scale!.should == 1
       end
 
       it "should skip if min number of dynos reached" do
-        subject.api.should_receive(:get_app).with("name").and_return mock_response(200, { "dynos" => 1 })
-        subject.api.should_not_receive(:post_ps_scale)
+        mock_api.should_receive(:get_app).with("name").and_return mock_response(200, { "dynos" => 1 })
+        mock_api.should_not_receive(:post_ps_scale)
         subject.scale!.should be_nil
       end
 
@@ -94,13 +99,13 @@ describe Heroku::Scalr::App do
       before { subject.metric.stub by: 1 }
 
       it "should return the new number of dynos" do
-        subject.api.should_receive(:post_ps_scale).with("name", "web", 3).and_return mock_response(200, "")
+        mock_api.should_receive(:post_ps_scale).with("name", "web", 3).and_return mock_response(200, "")
         subject.scale!.should == 3
       end
 
       it "should skip if max number of dynos reached" do
-        subject.api.should_receive(:get_app).with("name").and_return mock_response(200, { "dynos" => 3 })
-        subject.api.should_not_receive(:post_ps_scale)
+        mock_api.should_receive(:get_app).with("name").and_return mock_response(200, { "dynos" => 3 })
+        mock_api.should_not_receive(:post_ps_scale)
         subject.scale!.should be_nil
       end
 

data/spec/heroku/scalr/config_spec.rb

@@ -11,7 +11,7 @@ describe Heroku::Scalr::Config do
   it 'should merge defaults into app configurations' do
     app = subject.apps.first
     app.should be_instance_of(Heroku::Scalr::App)
-    app.api.instance_variable_get(:@api_key).should == "API_KEY"
+    app.api_key.should == "API_KEY"
   end
 
 end

data/spec/heroku/scalr/core_ext_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe Logger do
+
+  describe "#reopen" do
+
+    let(:path) { Tempfile.new(["heroku-scalr", "logger"]).path }
+    subject    { Logger.new(path) }
+
+    it "should reopen files" do
+      subject.info "Line 1"
+      FileUtils.mv(path, "#{path}.1")
+      subject.info "Line 2"
+      subject.reopen.should be(subject)
+      subject.info "Line 3"
+
+      File.read("#{path}.1").should have(2).lines
+      File.read(path).should have(1).lines
+    end
+
+    it "should skip streams" do
+      logger = Logger.new(STDERR)
+      logger.reopen.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.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -142,11 +142,13 @@ files:
 - lib/heroku/scalr/app.rb
 - lib/heroku/scalr/cli.rb
 - lib/heroku/scalr/config.rb
+- lib/heroku/scalr/core_ext.rb
 - lib/heroku/scalr/metric.rb
 - lib/heroku/scalr/runner.rb
 - spec/fixtures/config_a.rb
 - spec/heroku/scalr/app_spec.rb
 - spec/heroku/scalr/config_spec.rb
+- spec/heroku/scalr/core_ext_spec.rb
 - spec/heroku/scalr/metric_spec.rb
 - spec/heroku/scalr/runner_spec.rb
 - spec/heroku/scalr_spec.rb