hirefire-resource 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f27c2bce684da854821e548240133957ec7ceb4723a909e59b07d90309c1581
-  data.tar.gz: 22d7df5921dee7c79b0655bb5515b0242c52ca8dab659811e1569e1b372bb8b9
+  metadata.gz: 2c7c314af60ca51b3e19880d4f676a5e07ecb5625d8078b7200827a9b2c9338b
+  data.tar.gz: 486392f48c5986bdf100c03a2047496a840c788ffc2af2e27712d41ce6c6cc0b
 SHA512:
-  metadata.gz: fd2aeca7665ccf846ab9f23cba0fd0db16b993b60c91c62e57ec88dfadad50bb06b2db6395cd5e54506d0a79b568472cffdfebb13f93f0a9f592e719693c0d9c
-  data.tar.gz: 3e6bef9dead3feb4848c3bf448a049572c2671840e5487ac0ab37e79abf2f1716a5d53018055fb3d9715626112d47132e54e9db456bf0f2ab6fe60523302dbb2
+  metadata.gz: c10d31c05160fcd258c804e9e7e1ca9d4e608d71ef0a579255f03cac37c2f50b5a81e4c8ea9c24abf57179c3e0e86c5616a0855cee52561eb793d2957608edd2
+  data.tar.gz: b44fd34a1ec5395d2734745e1f72b6a189f37aa285d67177e19764619de1c4770d6a6f40d133cc02e6e3285cc781761df03b9cfb63916974731d2de02325d023

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## v0.7.4/Master
+## v0.7.5/Master
+
+* Fix compatibility issue with Que 1.x (backwards-compatible with Que 0.x).
+
+## v0.7.4
 
 * Attempt to fix an issue where the STDOUT IO Stream has been closed for an unknown reason.
   * This resulted in errors in an application with `log_queue_metrics` enabled after a random period of time.

data/hirefire-resource.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = "hirefire-resource"
-  gem.version = "0.7.4"
+  gem.version = "0.7.5"
   gem.platform = Gem::Platform::RUBY
   gem.authors = "Michael van Rooijen"
   gem.email = "michael@hirefire.io"
@@ -10,6 +10,12 @@ Gem::Specification.new do |gem|
   gem.summary = "Autoscaling for your Heroku dynos"
   gem.description = "Load- and schedule-based scaling for web- and worker dynos"
   gem.licenses = ["Apache License"]
+  gem.metadata = {
+    "homepage_uri" => "https://www.hirefire.io",
+    "changelog_uri" => "https://github.com/hirefire/hirefire-resource/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/hirefire/hirefire-resource/",
+    "bug_tracker_uri" => "https://github.com/hirefire/hirefire-resource/issues",
+  }
 
   gem.files = %x[git ls-files].split("\n")
   gem.executables = ["hirefire", "hirefireapp"]

data/lib/hirefire/macro/que.rb

@@ -19,10 +19,17 @@ FROM que_jobs WHERE run_at < now() }.freeze
       # @param [String] queue the queue name to count. (default: nil # gets all queues)
       # @return [Integer] the number of jobs in the queue(s).
       #
-      def queue(queue = nil)
-        query = queue ? "#{QUERY} AND queue = '#{queue}'" : QUERY
+      def queue(*queues)
+        query = case
+        when queues.none? then QUERY
+        when queues.one? then "#{QUERY} AND queue = '#{queues.first}'"
+        else
+          queue_names = queues.map { |queue| "'#{queue}'" }.join(', ')
+          %Q{#{QUERY} AND queue IN (#{queue_names})}
+        end
+
         results = ::Que.execute(query).first
-        results["total"].to_i
+        (results[:total] || results["total"]).to_i
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Michael van Rooijen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies: []
 description: Load- and schedule-based scaling for web- and worker dynos
 email: michael@hirefire.io
@@ -41,8 +41,12 @@ files:
 homepage: https://www.hirefire.io
 licenses:
 - Apache License
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://www.hirefire.io
+  changelog_uri: https://github.com/hirefire/hirefire-resource/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/hirefire/hirefire-resource/
+  bug_tracker_uri: https://github.com/hirefire/hirefire-resource/issues
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Autoscaling for your Heroku dynos
 test_files: []