heroku_dj_auto_scale 0.0.7 → 0.0.8

data/lib/heroku_dj_auto_scale/version.rb

@@ -1,3 +1,3 @@
 module HerokuDjAutoScale
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/heroku_dj_auto_scale.rb

@@ -5,18 +5,40 @@ module HerokuDjAutoScale
   module Scaler
     class << self
       
-      def get_heroku
-        @heroku = Heroku::Client.new(ENV['HEROKU_USER'], ENV['HEROKU_PASS']) if ENV['USE_HEROKU_SCALING'] == 'true'
+      def heroku
+        @heroku ||= Heroku::Client.new(ENV['HEROKU_USER'], ENV['HEROKU_PASS']) if ENV['USE_HEROKU_SCALING'] == 'true'
       end
-        
-      def workers
-        get_heroku
-        ENV['USE_HEROKU_SCALING'] == 'true' ? @heroku.info(ENV['HEROKU_APP'])[:workers].to_i : 1
+      
+      def stack
+        if ENV['USE_HEROKU_SCALING'] == 'true'
+          heroku.list_stacks(ENV['HEROKU_APP']).inject("") do |current,stack| 
+            stack["current"] ? stack["name"] : current
+          end
+        else
+          "current"
+        end
       end
-
+      
+      def get_workers
+        if ENV['USE_HEROKU_SCALING'] == 'true'
+          if stack == "cedar"
+            heroku.ps(ENV['HEROKU_APP']).count { |p| p["process"] =~ /worker\.\d?/ }
+          else
+            heroku.info(ENV['HEROKU_APP'])[:workers].to_i
+          end
+        else
+          1
+        end
+      end
+      
       def workers=(qty)
-        get_heroku
-        @heroku.set_workers(ENV['HEROKU_APP'], qty) if ENV['USE_HEROKU_SCALING'] == 'true'
+        if ENV['USE_HEROKU_SCALING'] == 'true'
+          if stack == "cedar"
+            heroku.ps_scale(ENV['HEROKU_APP'], :type => 'worker', :qty => qty)
+          else
+            heroku.set_workers(ENV['HEROKU_APP'], qty)
+          end
+        end
       end
 
       def job_count

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_dj_auto_scale
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors: 
 - Joel Basson
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +02:00
+date: 2011-12-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -40,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -54,13 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424057
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 6
         version: 1.0.0.rc.6
   type: :development
   version_requirements: *id003
@@ -96,25 +78,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: heroku_dj_auto_scale
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Allows auto-scaling of delayed job workers in Heroku