judoscale-sidekiq 1.0.0.rc2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9103d7d10e849e8d5eb34ddf7c1aa492960bf0f0b7c08158e41fb34649dd60
-  data.tar.gz: 6fb4a36ca8f1a9af55b46c9600fae5e10dfa42960de90c37d651dc1a614c8ae3
+  metadata.gz: a87224b3c99510a95cb79b06ad4b9704a25050882aacc0c354eb6cbb9eb72e34
+  data.tar.gz: 4beaea504302215ece19d10bd1c823b983415df01ae915ea6a430a8fd3110207
 SHA512:
-  metadata.gz: c7bbf28eb9bb70202f76d953faba2d6b7e1648303277083b69952f6b073e4afd9afeddbd5314d6dbac0b6be981904687c5882715fa32c3be88bbd46d94a7b1dc
-  data.tar.gz: 3e147a90c721376f6d6f0cbae43b1cfcb780d1ae83ca33baa5b6ed0ccb2abbc0eb9cc8e766b697b88d2734b04c1f9ed3a532e1b1c660a1f54be560b400644782
+  metadata.gz: d744a847de3c9b3f61a78d2dbdfc04941685838f7032991ec6373f11cbb287a0a7fea3232c6f67912d32664b10ca230e68ad5fafd509515638b2605cb5ad881b
+  data.tar.gz: 897e7bc4e4d7881e35b42c2465c3eef5d3fcfb288710de72d8db68e290dcbd6530e0ccde0149805012bf3f7081b229a6692609624d7b8aab79e9a24948726900

data/Gemfile

@@ -1,7 +1,10 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec name: "judoscale-sidekiq"
 
 gem "judoscale-ruby", path: "../judoscale-ruby"
+gem "sidekiq", "~> 7.0"
 gem "minitest"
 gem "rake"
+gem "rake-release"
+gem "debug"

data/Gemfile-sidekiq-5

@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec name: "judoscale-sidekiq"
 
 gem "judoscale-ruby", path: "../judoscale-ruby"
 gem "sidekiq", "~> 5.0"
 gem "minitest"
 gem "rake"
+gem "rake-release"

data/Gemfile.lock

@@ -1,27 +1,40 @@
 PATH
   remote: ../judoscale-ruby
   specs:
-    judoscale-ruby (1.0.0.rc2)
+    judoscale-ruby (1.3.0)
 
 PATH
   remote: .
   specs:
-    judoscale-sidekiq (1.0.0.rc2)
-      judoscale-ruby
+    judoscale-sidekiq (1.3.0)
+      judoscale-ruby (= 1.3.0)
       sidekiq (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    connection_pool (2.2.5)
-    minitest (5.15.0)
-    rack (2.2.4)
+    concurrent-ruby (1.2.0)
+    connection_pool (2.3.0)
+    debug (1.7.1)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
+    io-console (0.6.0)
+    irb (1.6.2)
+      reline (>= 0.3.0)
+    minitest (5.17.0)
+    rack (3.0.4.1)
     rake (13.0.6)
-    redis (4.7.1)
-    sidekiq (6.5.4)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.5.0)
+    rake-release (1.3.0)
+      bundler (>= 1.11, < 3)
+    redis-client (0.12.1)
+      connection_pool
+    reline (0.3.2)
+      io-console (~> 0.5)
+    sidekiq (7.0.3)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.11.0)
 
 PLATFORMS
   arm64-darwin-20
@@ -30,10 +43,13 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  debug
   judoscale-ruby!
   judoscale-sidekiq!
   minitest
   rake
+  rake-release
+  sidekiq (~> 7.0)
 
 BUNDLED WITH
    2.3.9

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require "rake/release"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|

data/judoscale-sidekiq.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
   spec.email = ["adam@adamlogic.com"]
 
-  spec.summary = "This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems to integrate Sidekiq with the Judoscale Heroku add-on."
+  spec.summary = "This gem provides Sidekiq integration with the Judoscale autoscaling add-on for Heroku."
   spec.homepage = "https://judoscale.com"
   spec.license = "MIT"
 
@@ -25,11 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.6.0"
 
-  spec.add_dependency "judoscale-ruby"
+  spec.add_dependency "judoscale-ruby", Judoscale::Sidekiq::VERSION
   spec.add_dependency "sidekiq", ">= 5.0"
-
-  spec.post_install_message = <<~EOS
-    `judoscale-sidekiq` is deprecated! Please migrate to `rails-autoscale-sidekiq`.
-    See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
-  EOS
 end

data/lib/judoscale/sidekiq/metrics_collector.rb

@@ -21,7 +21,10 @@ module Judoscale
         if track_busy_jobs?
           busy_counts = Hash.new { |h, k| h[k] = 0 }
           ::Sidekiq::Workers.new.each do |pid, tid, work|
-            busy_counts[work.dig("payload", "queue")] += 1
+            payload = work["payload"]
+            # payload is unparsed in Sidekiq 7
+            payload = JSON.parse(payload) if payload.is_a?(String)
+            busy_counts[payload["queue"]] += 1
           end
         end
 

data/lib/judoscale/sidekiq/version.rb

@@ -2,6 +2,6 @@
 
 module Judoscale
   module Sidekiq
-    VERSION = "1.0.0.rc2"
+    VERSION = "1.3.0"
   end
 end

data/lib/rails-autoscale-sidekiq.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "judoscale/sidekiq"

data/rails-autoscale-sidekiq.gemspec

@@ -0,0 +1,30 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "judoscale/sidekiq/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "rails-autoscale-sidekiq"
+  spec.version = Judoscale::Sidekiq::VERSION
+  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
+  spec.email = ["adam@adamlogic.com"]
+
+  spec.summary = "This gem provides Sidekiq integration with the Judoscale autoscaling add-on for Heroku."
+  spec.homepage = "https://judoscale.com"
+  spec.license = "MIT"
+
+  spec.metadata = {
+    "homepage_uri" => "https://judoscale.com",
+    "bug_tracker_uri" => "https://github.com/judoscale/judoscale-ruby/issues",
+    "documentation_uri" => "https://judoscale.com/docs",
+    "changelog_uri" => "https://github.com/judoscale/judoscale-ruby/blob/main/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/judoscale/judoscale-ruby"
+  }
+
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.add_dependency "rails-autoscale-core", Judoscale::Sidekiq::VERSION
+  spec.add_dependency "sidekiq", ">= 5.0"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.3.0
 platform: ruby
 authors:
 - Adam McCrea
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: judoscale-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +55,8 @@ files:
 - lib/judoscale/sidekiq.rb
 - lib/judoscale/sidekiq/metrics_collector.rb
 - lib/judoscale/sidekiq/version.rb
+- lib/rails-autoscale-sidekiq.rb
+- rails-autoscale-sidekiq.gemspec
 homepage: https://judoscale.com
 licenses:
 - MIT
@@ -64,9 +66,7 @@ metadata:
   documentation_uri: https://judoscale.com/docs
   changelog_uri: https://github.com/judoscale/judoscale-ruby/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/judoscale/judoscale-ruby
-post_install_message: |
-  `judoscale-sidekiq` is deprecated! Please migrate to `rails-autoscale-sidekiq`.
-  See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,13 +77,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems
-  to integrate Sidekiq with the Judoscale Heroku add-on.
+summary: This gem provides Sidekiq integration with the Judoscale autoscaling add-on
+  for Heroku.
 test_files: []