hirefire-resource 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7d921ede6a7e56c74953e56112659b6ed54272
-  data.tar.gz: 6a2466a4b097cd936732538678f6bbfe3252a3a8
+  metadata.gz: 55b749a5f42d84e6bab55c403be81132b083753f
+  data.tar.gz: 60e1543b6a620b45cc4dc25e38ca07c671db7695
 SHA512:
-  metadata.gz: 1fd423e23b3ad9e5fdfd35c2c2fcce39b99cb833ffc75b0963e435c477777746ac54567717635c49f5c48602bc39b87fd757e1a07b711c65d5c6a2b1ade496d9
-  data.tar.gz: eef43f3a9173ae8a910f3142ba6725a2b77a1a06192384140c56c24ad59c2c7c0a9bd6ca7116b0059d8f4a88cc546e12e82bce19fbc25f2d51a53c67adbcaed2
+  metadata.gz: 9e6009e98f7debbda254a5632e5111127bd0f7fa56b59414c024e2cf9ebe1437925a9af14c2e4634dec0aa0d85b6412bd2ffa3d9b3a36b0a4c594566c9ac4e32
+  data.tar.gz: b2cd03832e203d95728ef05055f074c3056758da9bfd8bac0d89dd5d623df7a15aa5682b3fa3ae797e849ab8f01c918018457b68526c19e44d565168ff9a3bd8

data/hirefire-resource.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = "hirefire-resource"
-  gem.version = "0.3.8"
+  gem.version = "0.3.9"
   gem.platform = Gem::Platform::RUBY
   gem.authors = "Michael van Rooijen"
   gem.email = "michael@hirefire.io"

data/lib/hirefire/macro/sidekiq.rb

@@ -11,6 +11,8 @@ module HireFire
       #   HireFire::Macro::Sidekiq.queue # all queues
       #   HireFire::Macro::Sidekiq.queue("email") # only email queue
       #   HireFire::Macro::Sidekiq.queue("audio", "video") # audio and video queues
+      #   HireFire::Macro::Sidekiq.queue("email", skip_scheduled: true) # only email, will not count scheduled queue
+      #   HireFire::Macro::Sidekiq.queue("audio", skip_retries: true) # only audio, will not count the retries queue
       #
       # @param [Array] queues provide one or more queue names, or none for "all".
       # @return [Integer] the number of jobs in the queue(s).
@@ -18,7 +20,15 @@ module HireFire
       def queue(*queues)
         require "sidekiq/api"
 
-        queues = queues.flatten.map(&:to_s)
+        queues.flatten!
+
+        if queues.last.is_a?(Hash)
+          options = queues.pop
+        else
+          options = {}
+        end
+
+        queues = queues.map(&:to_s)
         queues = ::Sidekiq::Stats.new.queues.map { |name, _| name } if queues.empty?
 
         in_queues = queues.inject(0) do |memo, name|
@@ -26,14 +36,18 @@ module HireFire
           memo
         end
 
-        in_schedule = ::Sidekiq::ScheduledSet.new.inject(0) do |memo, job|
-          memo += 1 if queues.include?(job["queue"]) && job.at <= Time.now
-          memo
+        if !options[:skip_scheduled]
+          in_schedule = ::Sidekiq::ScheduledSet.new.inject(0) do |memo, job|
+            memo += 1 if queues.include?(job["queue"]) && job.at <= Time.now
+            memo
+          end
         end
 
-        in_retry = ::Sidekiq::RetrySet.new.inject(0) do |memo, job|
-          memo += 1 if queues.include?(job["queue"]) && job.at <= Time.now
-          memo
+        if !options[:skip_retries]
+          in_retry = ::Sidekiq::RetrySet.new.inject(0) do |memo, job|
+            memo += 1 if queues.include?(job["queue"]) && job.at <= Time.now
+            memo
+          end
         end
 
         i = ::Sidekiq::VERSION >= "3.0.0" ? 2 : 1
@@ -42,7 +56,7 @@ module HireFire
           memo
         end
 
-        in_queues + in_schedule + in_retry + in_progress
+        [in_queues, in_schedule, in_retry, in_progress].compact.inject(&:+)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Load-based scaling, schedule-based scaling, dyno crash recovery, for
   web- and worker dynos.
@@ -57,8 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Autoscaling for your Heroku dynos
 test_files: []
+has_rdoc: