hirefireapp 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77f454e1a4cbf917e951745f223cb11b71dbc52
-  data.tar.gz: a325cea5826ed2f9da7e3e049e960968de71d55a
+  metadata.gz: 09ece4ab764a8b91c0f9c27c7e4a204a47dd86de
+  data.tar.gz: 99e0c0b349e1569248c39ec944f3ef0a3373b923
 SHA512:
-  metadata.gz: d4c918545f57406bacb79f2fa7bd8002332d2e55fbd467bbd105c28ed57083351abf3bf01cdfc29459d8e49560096903ef854239ab83da52dd399637f5294378
-  data.tar.gz: 1b8771df7f8b519eb3473dc634c8c114d12bb088d10ac28bbaa1aa90133c143282f47377d17e2015b69910542c60aec8b74ffe7b42840bcfd8b56bb308e595e0
+  metadata.gz: 0bf29825cbd84054ab4a4b25fb26bc27b9eb3576de0a9af60b03ada2ec847d60a6b36a11dca4a51cb27b96dd326edddcb9199e28d91bc9c688c9b41e2d524e49
+  data.tar.gz: 49c80645f395a935b8fcedae2c90d17bdb0232fc0bce725e2cf487c4d438821bc9f18a7b2fb432266f4f8f0df4e31d964f6c970aaeed64f6196ccd07dc6b189c

data/hirefireapp.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |gem|
 
   # General configuration / information
   gem.name        = 'hirefireapp'
-  gem.version     = '0.1.2'
+  gem.version     = '0.2.0'
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = 'Michael van Rooijen'
   gem.email       = 'michael@hirefire.io'

data/lib/hirefireapp/middleware.rb

@@ -9,7 +9,7 @@ module HireFireApp
     #
     def initialize(app)
       @app   = app
-      @token = ENV['HIREFIREAPP_TOKEN']
+      @token = ENV['HIREFIREAPP_TOKEN'] || "development"
     end
 
     ##
@@ -129,8 +129,19 @@ module HireFireApp
     #  the number of jobs pending + the amount of workers currently working
     #
     def count_resque
-      info = Resque.info
-      info[:pending].to_i + info[:working].to_i
+      queues = ::Resque.queues
+
+      in_queues = queues.inject(0) do |memo, queue|
+        memo += ::Resque.size(queue)
+        memo
+      end
+
+      in_progress = ::Resque::Worker.all.inject(0) do |memo, worker|
+        memo += 1 if queues.include?(worker.job["queue"])
+        memo
+      end
+
+      in_queues + in_progress
     end
 
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefireapp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies: []
 description: HireFire.io - The Heroku Dyno Manager - Autoscaling your web and worker
   dynos saving you time and money!