heroku-qc-autoscale 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+
+notifications:
+  email: false
+  webhooks:
+    on_success: always
+    on_failure: always
+
+rvm:
+  - 1.9.2
+  - 1.9.3
+
+script: bundle exec rake test
+
+before_script:
+  - psql -c 'create database queue_classic_test;' -U postgres
+  

data/README.md

@@ -5,6 +5,9 @@ Add to a Rails 3.x project to auto scale QueueClassic workers on heroku.
 
 **WARNING: USE AT OWN RISK! THIS GEM IS CONSIDERED EXTREME ALPHA!**
 
+[![Build Status](https://secure.travis-ci.org/zerobearing2/heroku-qc-autoscale.png)](http://travis-ci.org/zerobearing2/heroku-qc-autoscale)
+
+
 Usage
 -----
 
@@ -19,7 +22,7 @@ Add to Gemfile
 
 Create config/initializers/qc_autoscale.rb
 
-    Heroku::QC::Autoscale.config do |c|
+    Autoscale.config do |c|
       c.api_key = ENV['HEROKU_API_KEY']
       c.app     = ENV['HEROKU_APP']
       c.scale   = [1, 15, 30, 40, 50]

data/Rakefile

@@ -1,8 +1,11 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
+task :default => [:test]
+
 Rake::TestTask.new do |t|
   t.libs.push "lib"
   t.test_files = FileList[File.expand_path('../test/**/*_test.rb', __FILE__)]
   t.verbose = true
 end
+

data/heroku-qc-autoscale.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "queue_classic",   "~> 2.0.1"
 
   s.add_development_dependency "minitest", "~> 3.3.0"
+  s.add_development_dependency 'rake'
   s.add_development_dependency "pry"
 end

data/lib/autoscale/heroku.rb

@@ -0,0 +1,63 @@
+module Autoscale
+  class Heroku
+    
+    class << self
+
+      def workers
+        client.get_app(app).body.fetch("workers", 0).to_i
+      end
+
+      def workers=(qty)
+        client.put_workers(app, qty) 
+      end
+
+      def job_count
+        QC::Queries.count.to_i
+      end
+
+      # scale workers based on scale
+      def up
+        unless calculate_required_workers <= workers
+          QC.log(action: :scale, workers: calculate_required_workers)
+          self.workers = calculate_required_workers
+        end
+      end
+
+      # shutdown if no jobs exist
+      def down
+        if job_count < 1
+          QC.log(action: :scale, workers: 0)
+          self.workers = 0
+        end
+      end
+
+      def calculate_required_workers
+        scale.rindex{|x| x <= job_count} + 1
+      end
+
+      def params
+        {
+          api_key: Autoscale.api_key  || ENV['HEROKU_API_KEY'],
+          mock:    Autoscale.mock     || false
+        }
+      end
+      
+      # the app to scale
+      def app
+        Autoscale.app
+      end
+
+      # the scale
+      def scale
+        Autoscale.scale || [1, 15, 30, 40, 50]
+      end
+
+      # heroku api client
+      def client
+        @@client ||= ::Heroku::API.new( params )
+      end
+    end
+
+  end
+  
+end

data/lib/autoscale/queue_classic/callbacks.rb

@@ -0,0 +1,42 @@
+module Autoscale
+  module QueueClassic
+  
+    class ScaleObserver
+      def after_enqueue(caller)
+        Autoscale::Heroku.up
+      end
+
+      def after_delete(caller)
+        Autoscale::Heroku.down
+      end
+    end
+
+    module QueueCallbacks
+      extend ActiveSupport::Concern
+
+      included do
+        include ActiveSupport::Callbacks
+        define_callbacks :enqueue, :delete, :scope => [:kind, :name]
+        set_callback :enqueue, :after, ScaleObserver.new
+        set_callback :delete, :after, ScaleObserver.new
+        
+        alias_method_chain :enqueue, :callbacks
+        alias_method_chain :delete, :callbacks
+      end
+
+      def enqueue_with_callbacks(method, *args)
+        run_callbacks :enqueue do
+          enqueue_without_callbacks(method, *args)
+        end
+      end
+
+      def delete_with_callbacks(id)
+        run_callbacks :delete do
+          delete_without_callbacks(id)
+        end
+      end
+    end
+
+  end
+end
+

data/lib/heroku-qc-autoscale.rb

@@ -4,32 +4,21 @@ require 'active_support/core_ext/module'
 require 'queue_classic'
 require 'heroku-api'
 
+require "autoscale/heroku"
+require "autoscale/queue_classic/callbacks"
 require "heroku-qc-autoscale/version"
 
-require "qc/callbacks"
-require "qc/auto_scale"
-require "heroku/scaler"
+module Autoscale
+  mattr_accessor :api_key, :app, :mock, :scale, :active
 
-module Heroku
-  module QC
-    module Autoscale
-      mattr_accessor :api_key, :app, :mock, :scale, :active
-
-      def self.config(&block)
-        yield(self)
-        activate if active == true
-      end
-
-      def self.activate
-        ::QC::Queue.send(:include, ::QC::QueueCallbacks)
-      end
+  # config and activate QC bindings
+  def self.config(&block)
+    yield(self)
+    activate if active == true
+  end
 
-      def self.heroku_params
-        {
-          api_key: self.api_key  || ENV['HEROKU_API_KEY'],
-          mock:    self.mock     || false
-        }
-      end
-    end
+  # activate QC queue callbacks
+  def self.activate
+    QC::Queue.send(:include, Autoscale::QueueClassic::QueueCallbacks)
   end
 end

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

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

data/test/{heroku/scaler_test.rb → autoscale/heroku_test.rb}

@@ -1,11 +1,9 @@
 require_relative "../test_helper"
 
-describe Heroku::Scaler do
+describe Autoscale::Heroku do
   include QCHelper
 
-  QC.define_singleton_method :log do |*args| nil; end # silence QC logger
-
-  subject { Heroku::Scaler }
+  subject { Autoscale::Heroku }
 
   it "job_count should be 0" do
     subject.job_count.must_equal(0)

data/test/{qc/queue_test.rb → autoscale/queue_classic/callbacks_test.rb}

@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "../../test_helper"
 
 describe QC::Queue do
   subject { QC::Queue.new("default-test") }

data/test/autoscale_test.rb

@@ -1,23 +1,22 @@
 require_relative "./test_helper"
 
-describe Heroku::QC::Autoscale do
-  
-  before do
-    Heroku::QC::Autoscale.config do |c|
-      c.api_key = "123456"
-    end
-  end
-  
-  subject { Heroku::QC::Autoscale }
+describe Autoscale do
+  subject { Autoscale }
 
   it "should have api_key" do
     subject.api_key.must_equal("123456")
   end
 
-  it "should change api_key at runtime" do
-    subject.api_key.must_equal("123456")
-    subject.api_key = "654321"    
-    subject.api_key.must_equal("654321")
+  it "should have app name" do
+    subject.app.must_match /racehq-test/
+  end
+
+  it "should have scale" 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/support/qc_helper.rb

@@ -2,12 +2,17 @@ module QCHelper
 
   def setup
     init_db
+    silence_logger
   end
 
   def teardown
     QC.delete_all
   end
 
+  def silence_logger
+    QC.define_singleton_method :log do |*args| nil; end # silence QC logger
+  end
+
   def init_db(table_name="queue_classic_jobs")
     QC::Conn.execute("SET client_min_messages TO 'warning'")
     QC::Setup.drop

data/test/test_helper.rb

@@ -12,7 +12,7 @@ require 'time'
 require 'heroku-qc-autoscale'
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
-Heroku::QC::Autoscale.config do |c|
+Autoscale.config do |c|
   c.api_key = "123456"
   c.app     = "racehq-test"
   c.mock    = true
@@ -22,8 +22,8 @@ end
 
 # borrowed from heroku-api test helper
 def with_app(params={}, &block)
-  params.merge!('name' => Heroku::QC::Autoscale.app) unless params.key?("name")
-  heroku = Heroku::Scaler.client
+  params.merge!('name' => Autoscale.app) unless params.key?("name")
+  heroku = Autoscale::Heroku.client
   
   begin
     data = heroku.post_app(params).body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-qc-autoscale
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -116,18 +132,18 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - heroku-qc-autoscale.gemspec
+- lib/autoscale/heroku.rb
+- lib/autoscale/queue_classic/callbacks.rb
 - lib/heroku-qc-autoscale.rb
 - lib/heroku-qc-autoscale/version.rb
-- lib/heroku/scaler.rb
-- lib/qc/auto_scale.rb
-- lib/qc/callbacks.rb
+- test/autoscale/heroku_test.rb
+- test/autoscale/queue_classic/callbacks_test.rb
 - test/autoscale_test.rb
-- test/heroku/scaler_test.rb
-- test/qc/queue_test.rb
 - test/support/qc_helper.rb
 - test/test_helper.rb
 homepage: ''
@@ -144,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4344916143927784136
+      hash: 3927445807195802384
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4344916143927784136
+      hash: 3927445807195802384
 requirements: []
 rubyforge_project: heroku-qc-autoscale
 rubygems_version: 1.8.21
@@ -162,8 +178,8 @@ specification_version: 3
 summary: Auto scale your QueueClassic workers on Heroku. Inspired by mirthlab's Resque
   auto scale gem.
 test_files:
+- test/autoscale/heroku_test.rb
+- test/autoscale/queue_classic/callbacks_test.rb
 - test/autoscale_test.rb
-- test/heroku/scaler_test.rb
-- test/qc/queue_test.rb
 - test/support/qc_helper.rb
 - test/test_helper.rb

data/lib/heroku/scaler.rb

@@ -1,49 +0,0 @@
-module Heroku
-  class Scaler
-    
-    class << self
-      def workers
-        client.get_app(app).body.fetch("workers", 0).to_i
-      end
-
-      def workers=(qty)
-        client.put_workers(app, qty) 
-      end
-
-      def job_count
-        ::QC::Queries.count.to_i
-      end
-
-      # scale workers based on scale
-      def up
-        self.workers = calculate_required_workers unless calculate_required_workers <= workers
-      end
-
-      # shutdown if no jobs exist
-      def down
-        self.workers = 0 if job_count < 1
-      end
-
-      def calculate_required_workers
-        scale.rindex{|x| x <= job_count} + 1
-      end
-
-      # the app to scale
-      def app
-        ::Heroku::QC::Autoscale.app
-      end
-
-      # the scale
-      def scale
-        ::Heroku::QC::Autoscale.scale || [1, 15, 30, 40, 50]
-      end
-
-      # heroku api client
-      def client
-        @@client ||= ::Heroku::API.new( ::Heroku::QC::Autoscale.heroku_params )
-      end
-    end
-
-  end
-  
-end

data/lib/qc/auto_scale.rb

@@ -1,13 +0,0 @@
-module QC
-  class AutoScale
-
-    def after_enqueue(caller)
-      Heroku::Scaler.up
-    end
-
-    def after_delete(caller)
-      Heroku::Scaler.down
-    end
-
-  end
-end

data/lib/qc/callbacks.rb

@@ -1,28 +0,0 @@
-module QC
-  module QueueCallbacks
-    extend ActiveSupport::Concern
-
-    included do
-      include ActiveSupport::Callbacks
-      define_callbacks :enqueue, :delete, :scope => [:kind, :name]
-      set_callback :enqueue, :after, QC::AutoScale.new
-      set_callback :delete, :after, QC::AutoScale.new
-      
-      alias_method_chain :enqueue, :callbacks
-      alias_method_chain :delete, :callbacks
-    end
-
-    def enqueue_with_callbacks(method, *args)
-      run_callbacks :enqueue do
-        enqueue_without_callbacks(method, *args)
-      end
-    end
-
-    def delete_with_callbacks(id)
-      run_callbacks :delete do
-        delete_without_callbacks(id)
-      end
-    end
-  end
-end
-