resque-scheduler 4.11.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ecd4f957b7c3df8c89bc85ffb8951b5df6cc18b004379b29ebcfc3be982621
-  data.tar.gz: 7aacc351234c1f367d8b73cda10d43b97ff26e89a3319e0afa76b51abea70430
+  metadata.gz: e23e91d3c9920396d8feaad257fe4a27f4ff269f6cd0d6f9756016599d7cdf27
+  data.tar.gz: 7c1c242fd5c2ed74f8c15924d476775f76ed4929fb65d31b965e708c5949a601
 SHA512:
-  metadata.gz: e668259967505827e06a40a83cb2e3b7c7c165df440c914c8e688c4d871594c46ac512ebb8a99856f4e3cf37f45625f5144bc6beeda1157c7b2d146eec9055cc
-  data.tar.gz: 32e7b921643fb62600d133db156c5f4c28d863a893a92d18ba1b1f7317b0371dd38cd11b0a1e2adcccfa211265f9d285b452d2e524d3637487e7c982c8563032
+  metadata.gz: c90721652b59bdc1f2572975d3ef93ed9aa420f36a6a8f3a0c5a35f17a3e5145ebdd30bfacf7d62e4903f9477319282c8a33d55080f5c870c84161f4933e79d4
+  data.tar.gz: 061fc1d3dfea48a20db7e8c11b31fe0b2e6594d9be0ed5c202c38f304941bceb8c1f15497d0c0ec886c0ddd37fc867b6dd1b5e143e9bb5961cd01b41f73d2e5e

data/.devcontainer/Dockerfile

@@ -0,0 +1,42 @@
+# Use Ruby 3.3 as specified in the test matrix
+FROM ruby:3.3
+
+# Install dependencies
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends \
+    git \
+    build-essential \
+    libssl-dev \
+    libreadline-dev \
+    zlib1g-dev \
+    redis-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create a non-root user
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    && apt-get update \
+    && apt-get install -y sudo \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+
+# Set the default user
+USER $USERNAME
+
+# Set working directory
+WORKDIR /workspaces/resque-scheduler
+
+# Install bundler
+RUN gem install bundler
+
+# Set environment variables for the test matrix configuration
+ENV REDIS_VERSION=latest
+ENV RESQUE=master
+ENV RUFUS_SCHEDULER=3.6
+ENV RACK_VERSION=3
+ENV COVERAGE=1

data/.devcontainer/README.md

@@ -0,0 +1,111 @@
+# Dev Container for Resque Scheduler
+
+This dev container is configured to match the GitHub Actions test matrix with the following configuration:
+
+- **Ruby version**: 3.3
+- **Resque version**: master (from git)
+- **Rufus-scheduler**: 3.6
+- **Redis version**: latest
+- **Rack version**: 3
+
+## Getting Started
+
+1. Open this repository in VS Code
+2. When prompted, click "Reopen in Container" (or run the command "Dev Containers: Reopen in Container")
+3. Wait for the container to build and start
+4. Once inside the container, dependencies will be automatically installed via `bundle install`
+
+## Running Tests
+
+To run the full test suite:
+
+```bash
+bundle exec rake
+```
+
+To run a specific test file:
+
+```bash
+bundle exec ruby test/scheduler_test.rb
+```
+
+To run tests with verbose output:
+
+```bash
+VERBOSE=1 bundle exec rake
+```
+
+To run tests matching a specific pattern:
+
+```bash
+PATTERN='test/scheduler_*_test.rb' bundle exec rake
+```
+
+## Testing with Different Configurations
+
+If you want to test with different versions, you can modify the environment variables and reinstall dependencies:
+
+```bash
+# Example: Test with rufus-scheduler 3.4
+export RUFUS_SCHEDULER=3.4
+bundle install
+
+# Run tests
+bundle exec rake
+
+# Reset to original configuration
+export RUFUS_SCHEDULER=3.6
+bundle install
+```
+
+## Available Environment Variables
+
+The following environment variables are set to match the test matrix:
+
+- `REDIS_VERSION`: latest
+- `RESQUE`: master
+- `RUFUS_SCHEDULER`: 3.6
+- `RACK_VERSION`: 3
+- `COVERAGE`: 1
+
+## Services
+
+### Redis
+Redis is available at `redis://redis:6379` or via `localhost:6379` from within the container.
+
+To connect to Redis CLI:
+
+```bash
+redis-cli -h redis
+```
+
+## Troubleshooting
+
+### Bundle Install Issues
+
+If you encounter issues with bundle install, try:
+
+```bash
+bundle config set --local build.redis --with-cflags="-Wno-error=implicit-function-declaration"
+bundle install
+```
+
+### Redis Connection Issues
+
+Make sure Redis is running:
+
+```bash
+redis-cli -h redis ping
+```
+
+Should return `PONG`.
+
+### Rebuilding the Container
+
+If you need to rebuild the container from scratch:
+
+1. Run "Dev Containers: Rebuild Container" from the command palette
+2. Or delete the container and volume manually:
+   ```bash
+   docker-compose -f .devcontainer/docker-compose.yml down -v
+   ```

data/.devcontainer/devcontainer.json

@@ -0,0 +1,41 @@
+{
+  "name": "Resque Scheduler Dev Container",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspaces/resque-scheduler",
+  
+  // Features to add to the dev container
+  "features": {
+    "ghcr.io/devcontainers/features/git:1": {}
+  },
+  
+  // Configure tool-specific properties
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rebornix.ruby"
+      ],
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+      }
+    }
+  },
+  
+  // Use 'forwardPorts' to make a list of ports inside the container available locally
+  "forwardPorts": [6379],
+  
+  // Use 'postCreateCommand' to run commands after the container is created
+  "postCreateCommand": "bundle install",
+  
+  // Set environment variables for the test matrix
+  "containerEnv": {
+    "REDIS_VERSION": "latest",
+    "RESQUE": "master",
+    "RUFUS_SCHEDULER": "3.6",
+    "RACK_VERSION": "3",
+    "COVERAGE": "1"
+  },
+  
+  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root
+  "remoteUser": "vscode"
+}

data/.devcontainer/docker-compose.yml

@@ -0,0 +1,31 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ../..:/workspaces:cached
+    working_dir: /workspaces/resque-scheduler
+    command: sleep infinity
+    environment:
+      REDIS_VERSION: "latest"
+      RESQUE: "master"
+      RUFUS_SCHEDULER: "3.6"
+      RACK_VERSION: "3"
+      COVERAGE: "1"
+      REDIS_URL: "redis://redis:6379"
+    depends_on:
+      - redis
+    # Runs app on the same network as the redis container, allows "forwardPorts" in devcontainer.json function
+    network_mode: service:redis
+
+  redis:
+    image: redis:latest
+    restart: unless-stopped
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis-data:/data
+
+volumes:
+  redis-data:

data/.github/workflows/rubocop.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby: [
-            2.7
+            3.4
         ]
 
     steps:

data/.github/workflows/ruby.yml

@@ -19,57 +19,29 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - 2.3
-          - 2.4
-          - 2.5
-          - 2.6
-          - 2.7
           - "3.0"
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
+          - head
         resque-version:
           - "master"
-          - "~> 2.4.0"
-          - "~> 1.27"
         rufus-scheduler:
-          - "3.2"
           - "3.4"
           - "3.5"
           - "3.6"
         redis-version:
-          - "~> 4.x"
-          - "~> 5.x"
-        exclude:
-          - ruby-version: head
-            rufus-scheduler: 3.2
-          - ruby-version: 3.2
-            rufus-scheduler: 3.2
-
-          - ruby-version: 2.3
-            resque-version: "~> 1.27"
-            rufus-scheduler: 3.4
-          - ruby-version: 2.3
-            resque-version: "~> 1.27"
-            rufus-scheduler: 3.5
-          - ruby-version: 2.5
-            resque-version: "~> 2.4.0"
-            rufus-scheduler: 3.5
-          - ruby-version: 2.5
-            resque-version: master
-            rufus-scheduler: 3.2
-
-          - ruby-version: 2.3
-            redis-version: "~> 5.x"
-          - ruby-version: 2.4
-            redis-version: "~> 5.x"
-
-          - resque-version: "~> 1.27"
-            redis-version: "~> 5.x"
+          - "4.8"
+          - "latest"
+        rack-version:
+          - 2
+          - 3
     env:
       REDIS_VERSION: "${{ matrix.redis-version }}"
       RESQUE: "${{ matrix.resque-version }}"
       RUFUS_SCHEDULER: "${{ matrix.rufus-scheduler }}"
+      RACK_VERSION: "${{ matrix.rack-version }}"
       COVERAGE: 1
 
     steps:

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 **ATTN**: This project uses [semantic versioning](http://semver.org/).
 
+## [5.0.0] - 2026-01-15
+### Breaking Changes
+* Ruby requirement: `>= 2.3.0` → `>= 3.0.0`
+* Resque dependency: `>= 1.27` → `>= 3.0`
+* Redis dependency: `>= 3.3` → `>= 4.0`
+* Removed `rack < 3` constraint
+
+### Added
+* Add Ruby 3.4 to the CI matrix by @and9000 in #804
+* Added `base64 ~> 0.1` runtime dependency (Ruby 3.4+ compatibility) by @PatrickTulskie in #809
+* Added `irb` dev dependency (Ruby 4+ compatibility) by @PatrickTulskie in #809
+* Added Rack 2/3 matrix testing by @PatrickTulskie in #809
+
+### Changed
+* Prepare for resque 3.0 compatibility by @PatrickTulskie in #809
+  * CI now tests Ruby 3.0-3.4 + head only (removed Ruby 2.x)
+  * Simplified to test against resque master only
+  * Modernized `.rubocop.yml` to `DisabledByDefault: true` approach
+  * Set `TargetRubyVersion: 3.0`
+  * Updated rubocop: `~> 0.40.0` → `~> 0.80`
+* Use `JSON.parse` instead of `JSON.load` (security improvement) by @PatrickTulskie in #809
+* Use `URI.decode_www_form_component` instead of `CGI.unescape` by @PatrickTulskie in #809
+* Consistent time formatting in views by @PatrickTulskie in #809
+
+### Fixed
+* Fix `Resque::Scheduler.print_schedule` by @codealchemy in #794
+* Remove circular require for resque from resque-scheduler by @zzak in #795
+* Fixed test compatibility with Rack 3 by @PatrickTulskie in #809
+* Fixed race condition in scheduler task tests by @PatrickTulskie in #809
+
 ## [4.10.3] - 2024-12-30
 ### Added
 * Expose timeout for lock via environment variable configuration by @pmm4654 in #786

data/Gemfile

@@ -24,6 +24,13 @@ else
   gem 'redis', redis_version
 end
 
+rack_version = ENV.fetch('RACK_VERSION', '3')
+gem 'rack', "~> #{rack_version}.0"
+
+if rack_version.to_i >= 3
+  gem 'rackup'
+end
+
 gem 'sinatra', '> 2.0'
 
 gemspec

data/lib/resque/scheduler/delaying_extensions.rb

@@ -1,5 +1,4 @@
 # vim:fileencoding=utf-8
-require 'resque'
 require_relative 'plugin'
 require_relative '../scheduler'
 

data/lib/resque/scheduler/server/views/delayed_schedules.erb

@@ -8,7 +8,7 @@
 <% @timestamps.each do |t| %>
 <tr>
   <td>
-    <%= Time.at(t) %>
+    <%= format_time(Time.at(t)) %>
   </td>
 </tr>
 <% end %>

data/lib/resque/scheduler/server.rb

@@ -87,9 +87,11 @@ module Resque
         def delayed_jobs_klass
           begin
             klass = Resque::Scheduler::Util.constantize(params[:klass])
-            @args = JSON.load(CGI.unescape(params[:args]))
+            args_param = params[:args] || params['args']
+            @args = args_param ? JSON.parse(URI.decode_www_form_component(args_param)) : []
             @timestamps = Resque.scheduled_at(klass, *@args)
           rescue
+            @args = []
             @timestamps = []
           end
 

data/lib/resque/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Scheduler
-    VERSION = '4.11.0'.freeze
+    VERSION = '5.0.0'.freeze
   end
 end

data/lib/resque/scheduler.rb

@@ -86,8 +86,8 @@ module Resque
         if rufus_scheduler
           log! "Scheduling Info\tLast Run"
           scheduler_jobs = rufus_scheduler.jobs
-          scheduler_jobs.each do |_k, v|
-            log! "#{v.t}\t#{v.last}\t"
+          scheduler_jobs.each do |job|
+            log! "#{job.opts}\t#{job.last_time}\t"
           end
         end
       end

data/resque-scheduler.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.files = `git ls-files -z`.split("\0").reject do |f|
     f.match(%r{^(test|spec|features|examples|bin|tasks)/}) ||
@@ -45,8 +45,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'json'
+  spec.add_development_dependency 'irb'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'ostruct'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
@@ -57,11 +59,13 @@ Gem::Specification.new do |spec|
 
   # We pin rubocop because new cops have a tendency to result in false-y
   # positives for new contributors, which is not a nice experience.
-  spec.add_development_dependency 'rubocop', '~> 0.40.0'
+  spec.add_development_dependency 'rubocop', '~> 0.80'
 
+  spec.add_runtime_dependency 'base64', '~> 0.1'
+  spec.add_runtime_dependency 'logger'
   spec.add_runtime_dependency 'mono_logger', '~> 1.0'
-  spec.add_runtime_dependency 'redis', '>= 3.3'
-  spec.add_runtime_dependency 'resque', '>= 1.27'
+  spec.add_runtime_dependency 'redis', '>= 4.0'
+  spec.add_runtime_dependency 'resque', '>= 3.0'
   # rufus-scheduler v3.7 causes a failure in test/multi_process_test.rb
   # rufus-scheduler v3.3 is missing a to_local method which fails tests
   spec.add_runtime_dependency 'rufus-scheduler', '~> 3.2', '!= 3.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Ben VandenBos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2026-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +85,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -175,14 +203,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: '0.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: '0.80'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement
@@ -203,28 +259,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +317,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/README.md"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/docker-compose.yml"
 - ".github/dependabot.yml"
 - ".github/funding.yml"
 - ".github/workflows/codeql-analysis.yml"
@@ -317,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="