hirefire-resource 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4f621ed62181e643001c9e2057a8d32eb46112c3
+  data.tar.gz: 9bf471379b5dcab6e181db0b0d176ecffcfd7248
+SHA512:
+  metadata.gz: ff6b0804b37d7383bd960e8e7e6d44b49609b2268d07aa021fe40f9c2205e6897f8757eaa323eb3c617dde66e1803ae0aa742c1d1372587e988047d52f92964e
+  data.tar.gz: 31189235aa84bd54f2004abf3d58dc48bdc6c0d25f4bedc1432a6ebccf27335f709cb65f983f271ce259977c80c454cd9475bd96b395448340158c095d60fddd

data/README.md

@@ -1,7 +1,4 @@
-# [HireFire](http://hirefireapp.com/) - The Heroku Dyno Manager
-
-*Note: This gem currently only applies to users that are using the [new HireFire beta](https://manager.hirefireapp.com/) program.
-Once out of beta, this will become the default gem for new users.*
+# [HireFire](http://hirefire.io/) - The Heroku Dyno Manager
 
 HireFire is a hosted service that manages / autoscales your [Heroku](http://heroku.com/) dynos.
 
@@ -77,5 +74,5 @@ dj_worker: QUEUES=encode,compress bundle exec rake jobs:work
 
 Now that HireFire will scale both of the these dyno types based on their individual queue sizes. To customize how they scale, log in to the HireFire web interface.
 
-Visit the [official website](http://hirefireapp.com/) for more information!
+Visit the [official website](http://hirefire.io/) for more information!
 

data/hirefire-resource.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |gem|
   gem.name        = "hirefire-resource"
-  gem.version     = "0.0.2"
+  gem.version     = "0.1.0"
   gem.platform    = Gem::Platform::RUBY
   gem.authors     = "Michael van Rooijen"
-  gem.email       = "michael@hirefireapp.com"
-  gem.homepage    = "http://hirefireapp.com/"
+  gem.email       = "michael@hirefire.io"
+  gem.homepage    = "http://hirefire.io/"
   gem.summary     = "HireFire - The Heroku Dyno Manager"
   gem.description = "HireFire - The Heroku Dyno Manager"
 

data/lib/hirefire/macro/resque.rb

@@ -16,9 +16,20 @@ module HireFire
       #
       # @return [Integer] the number of jobs in the queue(s).
       def queue(*queues)
-        return ::Resque.info[:pending].to_i if queues.empty?
         queues = queues.flatten.map(&:to_s)
-        queues.inject(0) { |memo, queue| memo += ::Resque.size(queue); memo }
+        queues = ::Resque.queues if queues.empty?
+
+        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
     end
   end

data/lib/hirefire/macro/sidekiq.rb

@@ -16,13 +16,20 @@ module HireFire
       #
       # @return [Integer] the number of jobs in the queue(s).
       def queue(*queues)
-        queues = ::Sidekiq.redis { |conn| conn.smembers("queues") } if queues.empty?
-        queues.
-          flatten.
-          inject(0) { |memo, queue|
-            memo += ::Sidekiq.redis { |conn| conn.llen("queue:#{queue}") }
-            memo
-          }
+        queues = queues.flatten.map(&:to_s)
+        queues = ::Sidekiq::Stats.new.queues.map { |name, _| name } if queues.empty?
+
+        in_queues = queues.inject(0) do |memo, name|
+          memo += ::Sidekiq::Queue.new(name).size
+          memo
+        end
+
+        in_progress = ::Sidekiq::Workers.new.inject(0) do |memo, job|
+          memo += 1 if queues.include?(job[1]["queue"]) && job[1]["run_at"] <= Time.now.to_i
+          memo
+        end
+
+        in_queues + in_progress
       end
     end
   end

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hirefire-resource
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-14 00:00:00 +01:00
-default_executable: 
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies: []
-
 description: HireFire - The Heroku Dyno Manager
-email: michael@hirefireapp.com
-executables: 
+email: michael@hirefire.io
+executables:
 - hirefire
 - hirefireapp
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - README.md
 - bin/hirefire
@@ -43,35 +33,28 @@ files:
 - lib/hirefire/middleware.rb
 - lib/hirefire/railtie.rb
 - lib/hirefire/resource.rb
-has_rdoc: true
-homepage: http://hirefireapp.com/
+homepage: http://hirefire.io/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HireFire - The Heroku Dyno Manager
 test_files: []
-
+has_rdoc: