judoscale-sidekiq 1.0.0.rc2 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -1
  3. data/Gemfile-sidekiq-5 +2 -1
  4. data/Gemfile.lock +27 -11
  5. data/Rakefile +1 -1
  6. data/judoscale-sidekiq.gemspec +2 -7
  7. data/lib/judoscale/sidekiq/metrics_collector.rb +4 -1
  8. data/lib/judoscale/sidekiq/version.rb +1 -1
  9. data/lib/rails-autoscale-sidekiq.rb +3 -0
  10. data/rails-autoscale-sidekiq.gemspec +30 -0
  11. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8e9103d7d10e849e8d5eb34ddf7c1aa492960bf0f0b7c08158e41fb34649dd60
4
- data.tar.gz: 6fb4a36ca8f1a9af55b46c9600fae5e10dfa42960de90c37d651dc1a614c8ae3
3
+ metadata.gz: a87224b3c99510a95cb79b06ad4b9704a25050882aacc0c354eb6cbb9eb72e34
4
+ data.tar.gz: 4beaea504302215ece19d10bd1c823b983415df01ae915ea6a430a8fd3110207
5
5
  SHA512:
6
- metadata.gz: c7bbf28eb9bb70202f76d953faba2d6b7e1648303277083b69952f6b073e4afd9afeddbd5314d6dbac0b6be981904687c5882715fa32c3be88bbd46d94a7b1dc
7
- data.tar.gz: 3e147a90c721376f6d6f0cbae43b1cfcb780d1ae83ca33baa5b6ed0ccb2abbc0eb9cc8e766b697b88d2734b04c1f9ed3a532e1b1c660a1f54be560b400644782
6
+ metadata.gz: d744a847de3c9b3f61a78d2dbdfc04941685838f7032991ec6373f11cbb287a0a7fea3232c6f67912d32664b10ca230e68ad5fafd509515638b2605cb5ad881b
7
+ data.tar.gz: 897e7bc4e4d7881e35b42c2465c3eef5d3fcfb288710de72d8db68e290dcbd6530e0ccde0149805012bf3f7081b229a6692609624d7b8aab79e9a24948726900
data/Gemfile CHANGED
@@ -1,7 +1,10 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- gemspec
3
+ gemspec name: "judoscale-sidekiq"
4
4
 
5
5
  gem "judoscale-ruby", path: "../judoscale-ruby"
6
+ gem "sidekiq", "~> 7.0"
6
7
  gem "minitest"
7
8
  gem "rake"
9
+ gem "rake-release"
10
+ gem "debug"
data/Gemfile-sidekiq-5 CHANGED
@@ -1,8 +1,9 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- gemspec
3
+ gemspec name: "judoscale-sidekiq"
4
4
 
5
5
  gem "judoscale-ruby", path: "../judoscale-ruby"
6
6
  gem "sidekiq", "~> 5.0"
7
7
  gem "minitest"
8
8
  gem "rake"
9
+ gem "rake-release"
data/Gemfile.lock CHANGED
@@ -1,27 +1,40 @@
1
1
  PATH
2
2
  remote: ../judoscale-ruby
3
3
  specs:
4
- judoscale-ruby (1.0.0.rc2)
4
+ judoscale-ruby (1.3.0)
5
5
 
6
6
  PATH
7
7
  remote: .
8
8
  specs:
9
- judoscale-sidekiq (1.0.0.rc2)
10
- judoscale-ruby
9
+ judoscale-sidekiq (1.3.0)
10
+ judoscale-ruby (= 1.3.0)
11
11
  sidekiq (>= 5.0)
12
12
 
13
13
  GEM
14
14
  remote: https://rubygems.org/
15
15
  specs:
16
- connection_pool (2.2.5)
17
- minitest (5.15.0)
18
- rack (2.2.4)
16
+ concurrent-ruby (1.2.0)
17
+ connection_pool (2.3.0)
18
+ debug (1.7.1)
19
+ irb (>= 1.5.0)
20
+ reline (>= 0.3.1)
21
+ io-console (0.6.0)
22
+ irb (1.6.2)
23
+ reline (>= 0.3.0)
24
+ minitest (5.17.0)
25
+ rack (3.0.4.1)
19
26
  rake (13.0.6)
20
- redis (4.7.1)
21
- sidekiq (6.5.4)
22
- connection_pool (>= 2.2.2)
23
- rack (~> 2.0)
24
- redis (>= 4.5.0)
27
+ rake-release (1.3.0)
28
+ bundler (>= 1.11, < 3)
29
+ redis-client (0.12.1)
30
+ connection_pool
31
+ reline (0.3.2)
32
+ io-console (~> 0.5)
33
+ sidekiq (7.0.3)
34
+ concurrent-ruby (< 2)
35
+ connection_pool (>= 2.3.0)
36
+ rack (>= 2.2.4)
37
+ redis-client (>= 0.11.0)
25
38
 
26
39
  PLATFORMS
27
40
  arm64-darwin-20
@@ -30,10 +43,13 @@ PLATFORMS
30
43
  x86_64-linux
31
44
 
32
45
  DEPENDENCIES
46
+ debug
33
47
  judoscale-ruby!
34
48
  judoscale-sidekiq!
35
49
  minitest
36
50
  rake
51
+ rake-release
52
+ sidekiq (~> 7.0)
37
53
 
38
54
  BUNDLED WITH
39
55
  2.3.9
data/Rakefile CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "bundler/gem_tasks"
3
+ require "rake/release"
4
4
  require "rake/testtask"
5
5
 
6
6
  Rake::TestTask.new(:test) do |t|
data/judoscale-sidekiq.gemspec CHANGED
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
8
8
  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
9
9
  spec.email = ["adam@adamlogic.com"]
10
10
 
11
- spec.summary = "This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems to integrate Sidekiq with the Judoscale Heroku add-on."
11
+ spec.summary = "This gem provides Sidekiq integration with the Judoscale autoscaling add-on for Heroku."
12
12
  spec.homepage = "https://judoscale.com"
13
13
  spec.license = "MIT"
14
14
 
@@ -25,11 +25,6 @@ Gem::Specification.new do |spec|
25
25
 
26
26
  spec.required_ruby_version = ">= 2.6.0"
27
27
 
28
- spec.add_dependency "judoscale-ruby"
28
+ spec.add_dependency "judoscale-ruby", Judoscale::Sidekiq::VERSION
29
29
  spec.add_dependency "sidekiq", ">= 5.0"
30
-
31
- spec.post_install_message = <<~EOS
32
- `judoscale-sidekiq` is deprecated! Please migrate to `rails-autoscale-sidekiq`.
33
- See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
34
- EOS
35
30
  end
data/lib/judoscale/sidekiq/metrics_collector.rb CHANGED
@@ -21,7 +21,10 @@ module Judoscale
21
21
  if track_busy_jobs?
22
22
  busy_counts = Hash.new { |h, k| h[k] = 0 }
23
23
  ::Sidekiq::Workers.new.each do |pid, tid, work|
24
- busy_counts[work.dig("payload", "queue")] += 1
24
+ payload = work["payload"]
25
+ # payload is unparsed in Sidekiq 7
26
+ payload = JSON.parse(payload) if payload.is_a?(String)
27
+ busy_counts[payload["queue"]] += 1
25
28
  end
26
29
  end
27
30
 
data/lib/judoscale/sidekiq/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Judoscale
4
4
  module Sidekiq
5
- VERSION = "1.0.0.rc2"
5
+ VERSION = "1.3.0"
6
6
  end
7
7
  end
data/lib/rails-autoscale-sidekiq.rb ADDED
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "judoscale/sidekiq"
data/rails-autoscale-sidekiq.gemspec ADDED
@@ -0,0 +1,30 @@
1
+ lib = File.expand_path("../lib", __FILE__)
2
+ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
+ require "judoscale/sidekiq/version"
4
+
5
+ Gem::Specification.new do |spec|
6
+ spec.name = "rails-autoscale-sidekiq"
7
+ spec.version = Judoscale::Sidekiq::VERSION
8
+ spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
9
+ spec.email = ["adam@adamlogic.com"]
10
+
11
+ spec.summary = "This gem provides Sidekiq integration with the Judoscale autoscaling add-on for Heroku."
12
+ spec.homepage = "https://judoscale.com"
13
+ spec.license = "MIT"
14
+
15
+ spec.metadata = {
16
+ "homepage_uri" => "https://judoscale.com",
17
+ "bug_tracker_uri" => "https://github.com/judoscale/judoscale-ruby/issues",
18
+ "documentation_uri" => "https://judoscale.com/docs",
19
+ "changelog_uri" => "https://github.com/judoscale/judoscale-ruby/blob/main/CHANGELOG.md",
20
+ "source_code_uri" => "https://github.com/judoscale/judoscale-ruby"
21
+ }
22
+
23
+ spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
24
+ spec.require_paths = ["lib"]
25
+
26
+ spec.required_ruby_version = ">= 2.6.0"
27
+
28
+ spec.add_dependency "rails-autoscale-core", Judoscale::Sidekiq::VERSION
29
+ spec.add_dependency "sidekiq", ">= 5.0"
30
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: judoscale-sidekiq
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc2
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam McCrea
@@ -9,22 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2022-09-07 00:00:00.000000000 Z
12
+ date: 2023-02-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: judoscale-ruby
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ">="
18
+ - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: '0'
20
+ version: 1.3.0
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ">="
25
+ - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: '0'
27
+ version: 1.3.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: sidekiq
30
30
  requirement: !ruby/object:Gem::Requirement
@@ -55,6 +55,8 @@ files:
55
55
  - lib/judoscale/sidekiq.rb
56
56
  - lib/judoscale/sidekiq/metrics_collector.rb
57
57
  - lib/judoscale/sidekiq/version.rb
58
+ - lib/rails-autoscale-sidekiq.rb
59
+ - rails-autoscale-sidekiq.gemspec
58
60
  homepage: https://judoscale.com
59
61
  licenses:
60
62
  - MIT
@@ -64,9 +66,7 @@ metadata:
64
66
  documentation_uri: https://judoscale.com/docs
65
67
  changelog_uri: https://github.com/judoscale/judoscale-ruby/blob/main/CHANGELOG.md
66
68
  source_code_uri: https://github.com/judoscale/judoscale-ruby
67
- post_install_message: |
68
- `judoscale-sidekiq` is deprecated! Please migrate to `rails-autoscale-sidekiq`.
69
- See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
69
+ post_install_message:
70
70
  rdoc_options: []
71
71
  require_paths:
72
72
  - lib
@@ -77,13 +77,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
77
77
  version: 2.6.0
78
78
  required_rubygems_version: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: 1.3.1
82
+ version: '0'
83
83
  requirements: []
84
84
  rubygems_version: 3.2.32
85
85
  signing_key:
86
86
  specification_version: 4
87
- summary: This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems
88
- to integrate Sidekiq with the Judoscale Heroku add-on.
87
+ summary: This gem provides Sidekiq integration with the Judoscale autoscaling add-on
88
+ for Heroku.
89
89
  test_files: []