hirefire-resource 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e973c6cacc949a2272e34b4e7d198a0eacf2b6f64c45cd68992365606eacb08
-  data.tar.gz: fb11287cb45d6d310396dce3b847b9d188bf8cea4ebae0fb83deecc45ac4093a
+  metadata.gz: a7b610268d577eb8e6f9a45e515e01484f15a6d8ad57c82073dac2ccd89ae84f
+  data.tar.gz: 2bf77a2f62178e7f77b956d81344005aff9b247b09252e577f669a685c599417
 SHA512:
-  metadata.gz: a30817796fceb776b6439e9c5d56c4663ff2619fdb0c5efdf88a53b0427d6fed277488bf15f2af0defb089a482702cc3daffcc11351143b091c4fe46905b21a3
-  data.tar.gz: ee5a162079121d899877b8fdee63b8bb288b1ab7670d5e849e0652d513c463712ad3acfff5bd41249cf1198208bbecc6b22a44507a5138aa0e1c6a7504837142
+  metadata.gz: 42acb0f1d897f2ad80305d4618943d55e1b8a47bd7caad542ed799e52862572f6e97c247440955b6b80ddd4062df64e35635754bf3e053df63910820f88599fd
+  data.tar.gz: 99706744f9945b01b8498fb19408785df2351367e8358f505e153462f582ef32f413855e75b99e428cf9fd1fa692cf8e00ef9c0850e4745aa4ea3fdf6320edf2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.0.2
+
+* Add support for dashes in `HireFire::Worker` names to match the Procfile process naming format. `HireFire::Worker` is implicitly used when configuring HireFire using the `HireFire::Configuration#dyno` method.
+
+## v1.0.1
+
+* Fix issue where jobs that were enqueued using `sidekiq < 7.2.1` and then processed with `sidekiq >= 7.2.1` (after updating) resulted in a `NoMethodError: undefined method 'queue' for Hash` error during checkups.
+
 ## v1.0.0
 
 * `HireFire`:

data/lib/hirefire/macro/deprecated/sidekiq.rb

@@ -122,10 +122,10 @@ module HireFire
 
           if !options[:skip_working]
             in_progress = ::Sidekiq::Workers.new.count do |key, tid, job|
-              if Gem::Version.new(::Sidekiq::VERSION) >= Gem::Version.new("7.0.0")
-                queues.include?(job.queue) && job.run_at <= now
-              else
+              if job.is_a?(Hash) # Sidekiq < 7.2.1
                 queues.include?(job["queue"]) && job["run_at"] <= now_as_i
+              else # Sidekiq >= 7.2.1
+                queues.include?(job.queue) && job.run_at <= now
               end
             end
           end

data/lib/hirefire/macro/sidekiq.rb

@@ -223,10 +223,10 @@ module HireFire
           now_as_i = now.to_i
 
           ::Sidekiq::Workers.new.count do |key, tid, job|
-            if Gem::Version.new(::Sidekiq::VERSION) >= Gem::Version.new("7.0.0")
-              (queues.empty? || queues.include?(job.queue)) && job.run_at <= now
-            else
+            if job.is_a?(Hash) # Sidekiq < 7.2.1
               (queues.empty? || queues.include?(job["queue"])) && job["run_at"] <= now_as_i
+            else # Sidekiq >= 7.2.1
+              (queues.empty? || queues.include?(job.queue)) && job.run_at <= now
             end
           end
         end

data/lib/hirefire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HireFire
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/lib/hirefire/worker.rb

@@ -6,7 +6,7 @@ module HireFire
 
     class MissingDynoBlockError < StandardError; end
 
-    PROCESS_NAME_PATTERN = /\A[a-zA-Z][a-zA-Z0-9_]{0,29}\z/
+    PROCESS_NAME_PATTERN = /\A[a-zA-Z][a-zA-Z0-9_-]{0,29}\z/
 
     attr_reader :name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal