judoscale-good_job 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1df50c38532a91549a2939e7b1e5f79fbcb6ec2be58ba804a7fbb45996a2d8fd
-  data.tar.gz: 1650b18d7167261fa17579ea94ceed78c9223d41bb279c4468db786fa5ea10b8
+  metadata.gz: dac87de18dfef986786bf05140ce577ad215ee07096dbed0a236165925c62098
+  data.tar.gz: 6e8a9c2131e19295869fc354c71160ee4bf6a913d674c0cf7bf827875b389685
 SHA512:
-  metadata.gz: 4c6ff8f697a5a3ab169560b97a2916fcfa13c7ab9d663cdada7deb0c36226ce770386cb9bb3dff92529b04a1e5a2ffc2b6c908c02be17b22a6564cd42a36ac6e
-  data.tar.gz: eb0ccceeb377d0c39e03627671150a09db5ff7f94b52bd139f267d82166f98df7c1ce2845ceb702a812c83114079bbcd97b62509d2229b1ce16c7209a1f56571
+  metadata.gz: 225bd45625c073cdff0c306aa741281ca4e9aadfe7287b73f781531e29fe6997936135838f8b44d0b5a3391f84d9fe968746682ccb76f3b4fe0ed3a8f74433c7
+  data.tar.gz: 9a64e9bc3fb6b4a7649cc23889021b4e7bc5b850f1c3967ce028d410134f1f4f15c5dc1db6f274b457939f722575e38a09150315213bedb2f24ec2c0d4c49e7d

data/lib/judoscale/good_job/metrics_collector.rb

@@ -9,19 +9,29 @@ module Judoscale
     class MetricsCollector < Judoscale::JobMetricsCollector
       include ActiveRecordHelper
 
+      def self.good_job_v4?
+        Gem::Version.new(::GoodJob::VERSION) >= Gem::Version.new("4")
+      end
+
+      def self.good_job_base_class
+        good_job_v4? ? ::GoodJob::Job : ::GoodJob::Execution
+      end
+
       def self.adapter_config
         Judoscale::Config.instance.good_job
       end
 
       def self.collect?(config)
-        super && ActiveRecordHelper.table_exists_for_model?(::GoodJob::Execution)
+        super && ActiveRecordHelper.table_exists_for_model?(good_job_base_class)
       end
 
       def initialize
         super
 
+        @good_job_base_class = self.class.good_job_base_class
+
         queue_names = run_silently do
-          ::GoodJob::Execution.select("distinct queue_name").map(&:queue_name)
+          @good_job_base_class.select("distinct queue_name").map(&:queue_name)
         end
         self.queues |= queue_names
       end
@@ -32,7 +42,7 @@ module Judoscale
 
         # logically we don't need the finished_at condition, but it lets postgres use the indexes
         oldest_execution_time_by_queue = run_silently do
-          ::GoodJob::Execution
+          @good_job_base_class
             .where(performed_at: nil, finished_at: nil)
             .group(:queue_name)
             .pluck(:queue_name, Arel.sql("min(coalesce(scheduled_at, created_at))"))
@@ -42,7 +52,7 @@ module Judoscale
 
         if track_busy_jobs?
           busy_count_by_queue = run_silently do
-            ::GoodJob::Execution.running.group(:queue_name).count
+            @good_job_base_class.running.group(:queue_name).count
           end
           self.queues |= busy_count_by_queue.keys
         end

data/lib/judoscale/good_job.rb

@@ -7,12 +7,12 @@ require "active_job/railtie"
 require "good_job"
 require "judoscale-ruby"
 require "judoscale/config"
-require "judoscale/good_job/version"
+require "judoscale/version"
 require "judoscale/good_job/metrics_collector"
 
 Judoscale.add_adapter :"judoscale-good_job",
   {
-    adapter_version: Judoscale::GoodJob::VERSION,
+    adapter_version: Judoscale::VERSION,
     framework_version: ::GoodJob::VERSION
   },
   metrics_collector: Judoscale::GoodJob::MetricsCollector,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-good_job
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: judoscale-ruby
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: good_job
   requirement: !ruby/object:Gem::Requirement
@@ -33,6 +33,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -40,6 +43,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: 
 email:
 - hello@judoscale.com
@@ -47,17 +53,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile-activerecord-6-1
-- Gemfile-activerecord-7-0
-- Rakefile
-- judoscale-good_job.gemspec
 - lib/judoscale-good_job.rb
 - lib/judoscale/good_job.rb
 - lib/judoscale/good_job/metrics_collector.rb
-- lib/judoscale/good_job/version.rb
-- lib/rails-autoscale-good_job.rb
-- rails-autoscale-good_job.gemspec
 homepage: https://judoscale.com
 licenses:
 - MIT
@@ -82,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Autoscaling for Good Job workers.

data/Gemfile

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-good_job"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "activerecord"
-gem "pg"
-gem "minitest"
-gem "rake"

data/Gemfile-activerecord-6-1

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-good_job"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "activerecord", "~> 6.1"
-gem "pg"
-gem "minitest"
-gem "rake"

data/Gemfile-activerecord-7-0

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-good_job"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "activerecord", "~> 7.0"
-gem "pg"
-gem "minitest"
-gem "rake"

data/Rakefile

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "lib"
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task default: :test

data/judoscale-good_job.gemspec

@@ -1,30 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "judoscale/good_job/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "judoscale-good_job"
-  spec.version = Judoscale::GoodJob::VERSION
-  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"]
-  spec.email = ["hello@judoscale.com"]
-
-  spec.summary = "Autoscaling for Good Job workers."
-  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 "judoscale-ruby", Judoscale::GoodJob::VERSION
-  spec.add_dependency "good_job", ">= 3.0"
-end

data/lib/judoscale/good_job/version.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Judoscale
-  module GoodJob
-    VERSION = "1.7.0"
-  end
-end

data/lib/rails-autoscale-good_job.rb

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

data/rails-autoscale-good_job.gemspec

@@ -1,30 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "judoscale/good_job/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "rails-autoscale-good_job"
-  spec.version = Judoscale::GoodJob::VERSION
-  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"]
-  spec.email = ["hello@judoscale.com"]
-
-  spec.summary = "Autoscaling for Good Job workers."
-  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::GoodJob::VERSION
-  spec.add_dependency "good_job", ">= 3.0"
-end