heroku-qc-autoscale 0.0.3 → 0.0.4

data/README.md

@@ -26,9 +26,10 @@ Create config/initializers/qc_autoscale.rb
       c.api_key = ENV['HEROKU_API_KEY']
       c.app     = ENV['HEROKU_APP']
       c.scale   = [1, 15, 30, 40, 50]
-      c.active  = Rails.env.production?
     end
 
+    Autoscale.activate! if Rails.env.production?
+
 Queue jobs as normal with QueueClassic. Based on your scale table, it will recalculate the 
 workers required after each QC#enqueue, and QC#delete.
 

data/lib/autoscale/heroku.rb

@@ -8,7 +8,7 @@ module Autoscale
       end
 
       def workers=(qty)
-        client.put_workers(app, qty) 
+        client.post_ps_scale(app, "worker", qty)
       end
 
       def job_count

data/lib/heroku-qc-autoscale/version.rb

@@ -1,7 +1,7 @@
 module Heroku
   module QC
     module Autoscale
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/lib/heroku-qc-autoscale.rb

@@ -9,16 +9,15 @@ require "autoscale/queue_classic/callbacks"
 require "heroku-qc-autoscale/version"
 
 module Autoscale
-  mattr_accessor :api_key, :app, :mock, :scale, :active
+  mattr_accessor :api_key, :app, :mock, :scale
 
   # config and activate QC bindings
   def self.config(&block)
     yield(self)
-    activate if active == true
   end
 
   # activate QC queue callbacks
-  def self.activate
+  def self.activate!
     QC::Queue.send(:include, Autoscale::QueueClassic::QueueCallbacks)
   end
 end

data/test/autoscale/heroku_test.rb

@@ -1,69 +1,76 @@
 require_relative "../test_helper"
 
+# mock class
+class Autoscale::Heroku
+  def self.workers
+    @@workers ||= 0
+  end
+
+  def self.workers=(qty)
+    @@workers = qty
+  end
+end
+
+# stub heroku api call to scale
+Excon.stub(:expects => 200, :method => :post, :path => %r{^/apps/([^/]+)/ps/scale}) do |params|
+  {body: params[:query][:qty], status: 200 } 
+end
+
 describe Autoscale::Heroku do
   include QCHelper
 
   subject { Autoscale::Heroku }
+  before { subject.workers = 0 }
 
   it "job_count should be 0" do
     subject.job_count.must_equal(0)
   end
 
   it "#workers" do
-    with_app do |app|
-      subject.workers = 1
-      subject.workers.must_equal(1)
+    subject.workers = 1
+    subject.workers.must_equal(1)
 
-      subject.workers = 2
-      subject.workers.must_equal(2)
-    end
+    subject.workers = 2
+    subject.workers.must_equal(2)
   end
 
   describe "scaling up" do
     it "with 5 jobs" do
-      with_app do |app|
-        5.times{ QC.enqueue("Time.now") }
-        subject.workers.must_equal(1)
-      end
+      5.times{ QC.enqueue("Time.now") }
+      subject.job_count.must_equal(5)
+      subject.workers.must_equal(1)
     end
 
     it "with 16 jobs" do
-      with_app do |app|
-        16.times{ QC.enqueue("Time.now") }
-        subject.workers.must_equal(2)
-      end
+      16.times{ QC.enqueue("Time.now") }
+      subject.job_count.must_equal(16)
+      subject.workers.must_equal(2)
     end
 
     it "with 31 jobs" do
-      with_app do |app|
-        31.times{ QC.enqueue("Time.now") }
-        subject.workers.must_equal(3)
-      end
+      31.times{ QC.enqueue("Time.now") }
+      subject.job_count.must_equal(31)
+      subject.workers.must_equal(3)
     end
 
     it "with 131 jobs" do
-      with_app do |app|
-        131.times{ QC.enqueue("Time.now") }
-        subject.workers.must_equal(5)
-      end
+      131.times{ QC.enqueue("Time.now") }
+      subject.job_count.must_equal(131)
+      subject.workers.must_equal(5)
     end
   end
 
   describe "scaling down" do
-
     it "from 31 workers" do
-      with_app do |app|
-        # add jobs to queue
-        31.times{ QC.enqueue("Time.now") }
-        subject.workers.must_equal(3)
-        
-        # do work and scale back down
-        31.times{ QC::Worker.new.work }
-        subject.job_count.must_equal(0)
-        subject.workers.must_equal(0)
-      end
+      # add jobs to queue
+      31.times{ QC.enqueue("Time.now") }
+      subject.workers.must_equal(3)
+      
+      # do work and scale back down
+      31.times{ QC::Worker.new.work }
+      subject.job_count.must_equal(0)
+      subject.workers.must_equal(0)
     end
-
   end
 
 end

data/test/autoscale_test.rb

@@ -15,8 +15,4 @@ describe Autoscale do
     subject.scale.must_equal [1, 15, 30, 40, 50]
   end
 
-  it "should have active" do
-    subject.active.must_equal true
-  end
-
 end

data/test/test_helper.rb

@@ -17,23 +17,6 @@ Autoscale.config do |c|
   c.app     = "racehq-test"
   c.mock    = true
   c.scale   = [1, 15, 30, 40, 50]
-  c.active  = true
 end
 
-# borrowed from heroku-api test helper
-def with_app(params={}, &block)
-  params.merge!('name' => Autoscale.app) unless params.key?("name")
-  heroku = Autoscale::Heroku.client
-  
-  begin
-    data = heroku.post_app(params).body
-    @name = data['name']
-    ready = false
-    until ready
-      ready = heroku.request(:method => :put, :path => "/apps/#{@name}/status").status == 201
-    end
-    yield(data)
-  ensure
-    heroku.delete_app(@name) rescue nil
-  end
-end
+Autoscale.activate!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-qc-autoscale
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3927445807195802384
+      hash: 3252771501108507673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3927445807195802384
+      hash: 3252771501108507673
 requirements: []
 rubyforge_project: heroku-qc-autoscale
 rubygems_version: 1.8.21