gouda 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36a7c7b361cb8008f34b4a178c6bf1eb2a358e95502d0550fc14fef78ef5ed7
-  data.tar.gz: 6d2bc5778d6284f212189f4311e575393c5d9c1da13e4618f0b9a5d6ace9e954
+  metadata.gz: 69ee0eda4e10e8777d9cb1df596472103558ace52ba2fd018de2fcbc28a59ead
+  data.tar.gz: 7d2eb26cafd53af69e52f8a5de8adf8d08678d7618dbccc6d50c500e49780c92
 SHA512:
-  metadata.gz: 71a324a3bae3ee17c2ed547915b1cc841442059c30f0c85138f1b220a7c9dc2b307e6d0363fba12069be0b893ce74e1cefe81f5d3fc1ceec427b56a7331be256
-  data.tar.gz: 8e9d521dc92ccd14175611e21535ed9e5b71610e74c22fd4038e11a16c104b9fc73d93431e1e9aae38bb37e739d91447f3739ddd8099083e4d6e821db1426ea5
+  metadata.gz: 7bb748afdacae3fe76ee49a4b82e45c282d3feeee6fb69cb390b57e9b05db9108d692521454121724fbec81970c297117befd900dde9a687bfc51d8b08a4cd8e
+  data.tar.gz: f14f7bad25ba4d0b2c22ec0dad98747ef1a1e79fa3a5978b987f13fbe340220eddfe6958fa1751083402c7f65a6e3f4129fdbb53bfa0d6e87ecc45692b7d4548

data/.github/workflows/ci.yml

@@ -9,28 +9,37 @@ env:
 jobs:
   test:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    strategy:
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
     services:
       postgres:
-        image: postgres:15-alpine
+        image: postgres
         env:
           POSTGRES_PASSWORD: postgres
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
           - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 100ms
-          --health-timeout 1s
-          --health-retries 100
 
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: "Tests and Lint"
         run: bundle exec rake
+        env:
+          PGHOST: localhost
+          PGUSER: postgres
+          PGPASSWORD: postgres
+          TESTOPTS: "--fail-fast"

data/.gitignore

@@ -5,5 +5,6 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+/tmp/*
+!/tmp/.keep
 Gemfile.lock

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.1

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-05-27
+## [0.1.0] - 2023-06-10
 
 - Initial release
 
+## [0.1.1] - 2023-06-10
+
+- Fix support for older ruby versions until 2.7

data/gouda.gemspec

@@ -4,12 +4,12 @@ Gem::Specification.new do |spec|
   spec.name = "gouda"
   spec.version = Gouda::VERSION
   spec.summary = "Job Scheduler"
-  spec.description = "Job Scheduler for Rails"
+  spec.description = "Job Scheduler for Rails and PostgreSQL"
   spec.authors = ["Sebastian van Hesteren", "Julik Tarkhanov"]
   spec.email = ["sebastian@cheddar.me", "me@julik.nl"]
   spec.homepage = "https://rubygems.org/gems/gouda"
   spec.license = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
   spec.require_paths = ["lib"]
 
   spec.metadata["homepage_uri"] = spec.homepage

data/lib/gouda/active_job_extensions/concurrency.rb

@@ -21,7 +21,7 @@ module Gouda
             enqueue_limit = total_limit
           end
 
-          self.gouda_concurrency_config = {perform_limit:, enqueue_limit:, key:}
+          self.gouda_concurrency_config = {perform_limit: perform_limit, enqueue_limit: enqueue_limit, key: key}
         end
       end
 

data/lib/gouda/scheduler.rb

@@ -72,7 +72,7 @@ module Gouda::Scheduler
       # `class` is a reserved keyword and a method that exists on every Ruby object so...
       cron_entry_params[:job_class] ||= cron_entry_params.delete(:class)
       params_with_defaults = defaults.merge(cron_entry_params)
-      Entry.new(name:, **params_with_defaults)
+      Entry.new(name: name, **params_with_defaults)
     end
   end
 

data/lib/gouda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gouda
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/gouda/worker.rb

@@ -135,7 +135,7 @@ module Gouda
           break if check_shutdown.call
 
           did_process = Gouda.config.app_executor.wrap do
-            Gouda::Workload.checkout_and_perform_one(executing_on: worker_id_and_thread_id, queue_constraint:, in_progress: executing_workload_ids)
+            Gouda::Workload.checkout_and_perform_one(executing_on: worker_id_and_thread_id, queue_constraint: queue_constraint, in_progress: executing_workload_ids)
           end
 
           # If no job was retrieved the queue is likely empty. Relax the polling then and ease off.

data/lib/gouda/workload.rb

@@ -66,7 +66,7 @@ class Gouda::Workload < ActiveRecord::Base
             # Appsignal.increment_counter("gouda_workloads_revived", 1, job_class: workload.active_job_class_name)
 
             interrupted_at = workload.last_execution_heartbeat_at
-            workload.update!(state: "finished", interrupted_at:, last_execution_heartbeat_at: Time.now.utc, execution_finished_at: Time.now.utc)
+            workload.update!(state: "finished", interrupted_at: interrupted_at, last_execution_heartbeat_at: Time.now.utc, execution_finished_at: Time.now.utc)
             revived_job = ActiveJob::Base.deserialize(workload.active_job_data)
             # Save the interrupted_at timestamp so that upon execution the new job will raise a Gouda::Interrpupted exception.
             # The exception can then be handled like any other ActiveJob exception (using rescue_from or similar).
@@ -116,7 +116,7 @@ class Gouda::Workload < ActiveRecord::Base
       uncached do # Necessary because we SELECT with a clock_timestamp() which otherwise gets cached by ActiveRecord query cache
         transaction do
           jobs.first.tap do |job|
-            job&.update!(state: "executing", executing_on:, last_execution_heartbeat_at: Time.now.utc, execution_started_at: Time.now.utc)
+            job&.update!(state: "executing", executing_on: executing_on, last_execution_heartbeat_at: Time.now.utc, execution_started_at: Time.now.utc)
           end
         rescue ActiveRecord::RecordNotUnique
           # It can happen that due to a race the `execution_concurrency_key NOT IN` does not capture
@@ -133,7 +133,7 @@ class Gouda::Workload < ActiveRecord::Base
   # @param in_progress[#add,#delete] Used for tracking work in progress for heartbeats
   def self.checkout_and_perform_one(executing_on:, queue_constraint: Gouda::AnyQueue, in_progress: Set.new)
     # Select a job and mark it as "executing" which will make it unavailable to any other
-    workload = checkout_and_lock_one(executing_on:, queue_constraint:)
+    workload = checkout_and_lock_one(executing_on: executing_on, queue_constraint: queue_constraint)
     if workload
       in_progress.add(workload.id)
       workload.perform_and_update_state!

data/lib/gouda.rb

@@ -57,7 +57,7 @@ module Gouda
     Gouda.logger.info("Gouda version: #{Gouda::VERSION}")
     Gouda.logger.info("Worker threads: #{Gouda.config.worker_thread_count}")
 
-    Gouda.worker_loop(n_threads: Gouda.config.worker_thread_count, queue_constraint:)
+    Gouda.worker_loop(n_threads: Gouda.config.worker_thread_count, queue_constraint: queue_constraint)
   end
 
   def self.config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gouda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sebastian van Hesteren
@@ -123,7 +123,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Job Scheduler for Rails
+description: Job Scheduler for Rails and PostgreSQL
 email:
 - sebastian@cheddar.me
 - me@julik.nl
@@ -157,6 +157,7 @@ files:
 - lib/gouda/version.rb
 - lib/gouda/worker.rb
 - lib/gouda/workload.rb
+- tmp/.keep
 homepage: https://rubygems.org/gems/gouda
 licenses:
 - MIT
@@ -172,14 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Job Scheduler