dyno_scaler 0.1.0 → 0.2.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3-p0@dyno_scaler --create
+rvm use 1.9.3@dyno_scaler --create

data/Gemfile.lock

@@ -1,117 +1,76 @@
 PATH
   remote: .
   specs:
-    dyno_scaler (0.1.0)
+    dyno_scaler (0.2.0)
       activesupport
       heroku-api
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (0.6.1)
+      actionpack (>= 0.9.5)
+    actionpack (1.4.0)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bouncy-castle-java (1.5.0146.1)
+    bouncy-castle-java (1.5.0147)
     builder (3.0.4)
     columnize (0.3.6)
-    connection_pool (0.9.3)
-    debugger (1.2.2)
+    connection_pool (1.0.0)
+    debugger (1.6.0)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.5)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.5)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    excon (0.16.10)
-    girl_friday (0.11.1)
-      connection_pool (~> 0.9.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.2)
+    diff-lcs (1.2.4)
+    excon (0.22.1)
+    girl_friday (0.11.2)
+      connection_pool (~> 1.0)
       rubinius-actor
-    heroku-api (0.3.7)
-      excon (~> 0.16.10)
-    hike (1.2.1)
+    heroku-api (0.3.11)
+      excon (~> 0.22.1)
     i18n (0.6.1)
-    journey (1.0.4)
-    jruby-openssl (0.8.2)
-      bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.5)
-    json (1.7.5-java)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-protection (1.3.2)
-      rack
-    rack-ssl (1.3.2)
+    jruby-openssl (0.8.8)
+      bouncy-castle-java (>= 1.5.0147)
+    mono_logger (1.1.0)
+    multi_json (1.7.4)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
+    rails (0.9.5)
+      actionmailer (>= 0.6.1)
+      actionpack (>= 1.4.0)
+      activerecord (>= 1.6.0)
+      rake (>= 0.4.15)
+    rake (10.0.4)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
-    resque (1.23.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
     rubinius-actor (0.0.2)
       rubinius-core-api
     rubinius-core-api (0.0.1)
@@ -124,21 +83,12 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.4.1)
+    tzinfo (0.3.37)
     vegas (0.1.11)
       rack (>= 1.0.0)
 

data/README.md

@@ -70,7 +70,7 @@ pending jobs, and working jobs.
 When deploying to heroku you'll want to add these two configuration keys:
 
     HEROKU_API_KEY=<YOUR-API-KEY-HERE>
-    HEROKU_APPLICATION=<THE-NAME-OF-YOUR-APP-ON-HEROKU-HERE>
+    HEROKU_APP=<THE-NAME-OF-YOUR-APP-ON-HEROKU-HERE>
 
 They are used by the [heroku-api](https://github.com/heroku/heroku.rb) gem to
 scale dynos of your application.
@@ -92,7 +92,9 @@ hash that can be passed to the `DynoScaler::Manager#scale_with` method, like so:
       DynoScaler.manager.scale_with(options)
     end
 
-    config.dyno_scaler.async { MY_QUEUE << options }
+    config.dyno_scaler.async do |options|
+      MY_QUEUE << options
+    end
 
 ## Contributing
 

data/lib/dyno_scaler/heroku.rb

@@ -2,19 +2,26 @@
 
 module DynoScaler
   class Heroku
-    attr_accessor :application
+    attr_accessor :application, :options
 
-    def initialize(application)
+    def initialize(application, options={})
       self.application = application
+      self.options     = options || {}
     end
 
     def scale_workers(quantity)
       heroku_client.post_ps_scale(application, 'worker', quantity)
     end
 
+    def running_workers
+      heroku_client.get_ps(application).body.select do |process|
+        process['process'].start_with?('worker')
+      end.count
+    end
+
     protected
       def heroku_client
-        @heroku_client ||= ::Heroku::API.new
+        @heroku_client ||= ::Heroku::API.new(options)
       end
   end
 end

data/lib/dyno_scaler/manager.rb

@@ -37,6 +37,10 @@ module DynoScaler
       send(action, options) if action
     end
 
+    def running_workers
+      heroku.running_workers
+    end
+
     protected
       def config
         DynoScaler.configuration

data/lib/dyno_scaler/version.rb

@@ -1,3 +1,3 @@
 module DynoScaler
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/dyno_scaler/heroku_spec.rb

@@ -2,15 +2,16 @@ require "spec_helper"
 
 describe DynoScaler::Heroku do
   let(:application) { 'my-application-on-heroku' }
-  subject(:heroku_client) { DynoScaler::Heroku.new application }
+  let(:options) { nil }
+  subject(:heroku_client) { DynoScaler::Heroku.new application, options }
 
-  let(:heroku_api) { mock(::Heroku::API, :post_ps_scale => false) }
+  describe "scaling workers" do
+    let(:heroku_api) { mock(::Heroku::API, :post_ps_scale => false) }
 
-  before do
-    ::Heroku::API.stub!(:new).and_return(heroku_api)
-  end
+    before do
+      ::Heroku::API.stub!(:new).and_return(heroku_api)
+    end
 
-  describe "scaling workers" do
     let(:quantity) { 2 }
 
     it "scales workers of the application to the given number of workers" do
@@ -18,5 +19,25 @@ describe DynoScaler::Heroku do
       heroku_client.scale_workers(quantity)
     end
   end
+
+  describe "getting number of running workers" do
+    let(:options) { { mock: true } } # Mock Excon http requests
+
+    before { Excon.stub({method: :get}, {body: body, status: 200}) }
+
+    context "when there are running workers" do
+      let(:body) do
+        [{"process"=>"web.1"}, {"process"=>"worker.1"}, {"process"=>"worker.2"}]
+      end
+
+      its(:running_workers) { should eq(2) }
+    end
+
+    context "when there are no running workers" do
+      let(:body) { [{"process"=>"web.1"}] }
+
+      its(:running_workers) { should be_zero }
+    end
+  end
 end
 

data/spec/dyno_scaler/manager_spec.rb

@@ -346,4 +346,10 @@ describe DynoScaler::Manager do
       end
     end
   end
+
+  describe "running workers" do
+    let(:heroku) { mock(DynoScaler::Heroku, scale_workers: false, running_workers: 2) }
+
+    its(:running_workers) { should eq(heroku.running_workers) }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyno_scaler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -134,15 +134,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2224126621468173424
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2224126621468173424
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Scale your dyno workers on Heroku as needed