From d89a67b340e58532385925c6d3f9faecfc64a908 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Wed, 31 Dec 2025 13:33:52 -0700 Subject: [PATCH 01/13] Unlock Puma 7 --- Appraisals | 2 +- gemfiles/rails_7_0.gemfile | 2 +- puma-pool-usage.gemspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Appraisals b/Appraisals index f407fac..bbfdc48 100644 --- a/Appraisals +++ b/Appraisals @@ -17,7 +17,7 @@ end appraise "rails-7-0" do gem "rails", "~> 7.0.0" - gem "puma", "~> 6.0" + gem "puma", "~> 7.0" end appraise "latest" do diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index e612e9c..55b667a 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" -gem "puma", "~> 6.0" +gem "puma", "~> 7.0" gemspec path: "../" diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index 61d331f..c73cbc7 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "puma-pool-usage" - spec.version = "1.0.1" + spec.version = "1.0.2" spec.authors = ["Brandon Medenwald"] spec.email = ["brandon@simplymadeapps.com"] From 8aeb43c249aaaec2d57b10e7b121ed57ab814f4a Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Mon, 5 Jan 2026 16:00:14 -0700 Subject: [PATCH 02/13] Add test schedule and adjust appraisals, tests, and gemspec --- .github/workflows/tests-schedule.yml | 12 ++++++++++++ .github/workflows/tests.yml | 3 ++- Appraisals | 22 +++++++++++----------- puma-pool-usage.gemspec | 2 +- 4 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/tests-schedule.yml diff --git a/.github/workflows/tests-schedule.yml b/.github/workflows/tests-schedule.yml new file mode 100644 index 0000000..b0e4d2d --- /dev/null +++ b/.github/workflows/tests-schedule.yml @@ -0,0 +1,12 @@ +name: tests-schedule + +on: + schedule: + # Run at 06:20 UTC every Monday (weekly) + - cron: "20 6 * * 1" + workflow_dispatch: + +jobs: + tests: + uses: ./.github/workflows/tests.yml + secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1b51c22..42cce08 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ on: pull_request: push: branches: [ master ] + workflow_call: jobs: tests: @@ -11,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.7.6, 3.0.4, 3.1.2] + ruby: [3.2.9, 3.3.10, 3.4.8, 4.0.0] env: RAILS_ENV: test steps: diff --git a/Appraisals b/Appraisals index bbfdc48..1041dcc 100644 --- a/Appraisals +++ b/Appraisals @@ -1,22 +1,22 @@ # frozen_string_literal: true -appraise "rails-5" do - gem "rails", "~> 5.0" - gem "puma", "3.12.0" +appraise "rails-6-1" do + gem "rails", "~> 6.1.0" + gem "puma", "~> 5.0" end -appraise "rails-6" do - gem "rails", "~> 6.0.0" - gem "puma", "~> 4.0" +appraise "rails-7-2" do + gem "rails", "~> 7.2" + gem "puma", "~> 5.0" end -appraise "rails-6-1" do - gem "rails", "~> 6.1.0" - gem "puma", "~> 5.0" +appraise "rails-8-0" do + gem "rails", "~> 8.0.0" + gem "puma", "~> 6.0" end -appraise "rails-7-0" do - gem "rails", "~> 7.0.0" +appraise "rails-8-1" do + gem "rails", "~> 8.1.0" gem "puma", "~> 7.0" end diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index c73cbc7..6cc68e4 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| end spec.require_paths = ["lib"] - spec.add_dependency "puma", ">= 3.12", "< 7.0" + spec.add_dependency "puma", ">= 5.0", "< 8.0" spec.add_dependency "rails", ">= 5.0" spec.add_development_dependency "appraisal" From e8d2fb70d26825000a9e52ffb891b6594b1ddca9 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Mon, 5 Jan 2026 16:02:18 -0700 Subject: [PATCH 03/13] change bundler dependency bc ruby 4 needs it --- puma-pool-usage.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index 6cc68e4..c3863f1 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_dependency "rails", ">= 5.0" spec.add_development_dependency "appraisal" - spec.add_development_dependency "bundler", "~> 2.0" + spec.add_development_dependency "bundler", ">= 2.0" spec.add_development_dependency "rake", ">= 12.3.3" spec.add_development_dependency "rspec", "~> 3.0" spec.add_development_dependency "rubocop", "~> 1.28" From 03f7ffb5bc19e91961aa766a7a15e5cd72c7149d Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Mon, 5 Jan 2026 16:09:41 -0700 Subject: [PATCH 04/13] Add bigdecimal --- puma-pool-usage.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index c3863f1..be91d33 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -29,6 +29,7 @@ Gem::Specification.new do |spec| spec.add_dependency "rails", ">= 5.0" spec.add_development_dependency "appraisal" + spec.add_development_dependency "bigdecimal" spec.add_development_dependency "bundler", ">= 2.0" spec.add_development_dependency "rake", ">= 12.3.3" spec.add_development_dependency "rspec", "~> 3.0" From 29c2da635201dd02e8b3828f24ca20cc748af084 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Mon, 5 Jan 2026 16:14:10 -0700 Subject: [PATCH 05/13] Add mutex as no longer default in ruby 3.4 --- puma-pool-usage.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index be91d33..6f438a0 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -31,6 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "appraisal" spec.add_development_dependency "bigdecimal" spec.add_development_dependency "bundler", ">= 2.0" + spec.add_development_dependency "mutex_m" spec.add_development_dependency "rake", ">= 12.3.3" spec.add_development_dependency "rspec", "~> 3.0" spec.add_development_dependency "rubocop", "~> 1.28" From 7597317c030030acf4250574cb262d56773bf705 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 11:36:44 -0700 Subject: [PATCH 06/13] update worfklows and rubocop and gemspec --- .github/workflows/tests-schedule.yml | 3 ++- .github/workflows/tests.yml | 2 +- .rubocop.yml | 2 +- puma-pool-usage.gemspec | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests-schedule.yml b/.github/workflows/tests-schedule.yml index b0e4d2d..0cda4dd 100644 --- a/.github/workflows/tests-schedule.yml +++ b/.github/workflows/tests-schedule.yml @@ -7,6 +7,7 @@ on: workflow_dispatch: jobs: - tests: + run-tests: + if: ${{ github.repository == 'simplymadeapps/puma-pool-usage' }} uses: ./.github/workflows/tests.yml secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 42cce08..d080f49 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: env: RAILS_ENV: test steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} diff --git a/.rubocop.yml b/.rubocop.yml index 4e05fe3..1b599dc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ AllCops: NewCops: enable - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.2 Bundler/OrderedGems: Exclude: diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index 6f438a0..e207816 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "mutex_m" spec.add_development_dependency "rake", ">= 12.3.3" spec.add_development_dependency "rspec", "~> 3.0" - spec.add_development_dependency "rubocop", "~> 1.28" - spec.add_development_dependency "simplecov", "< 0.18" # https://github.com/codeclimate/test-reporter/issues/413 + spec.add_development_dependency "rubocop", ">= 3.2.0" + spec.add_development_dependency "simplecov" spec.add_development_dependency "simplecov-rcov" end From 037f19a74023e8b3449b6e060a8cdc15d15f7e38 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 11:41:45 -0700 Subject: [PATCH 07/13] revert rubocop dependency mistake --- puma-pool-usage.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index e207816..fb20c1e 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "mutex_m" spec.add_development_dependency "rake", ">= 12.3.3" spec.add_development_dependency "rspec", "~> 3.0" - spec.add_development_dependency "rubocop", ">= 3.2.0" + spec.add_development_dependency "rubocop", "~> 1.28" spec.add_development_dependency "simplecov" spec.add_development_dependency "simplecov-rcov" end From 4db6706be9e2c3209c8cd1b081d9db32625da6e8 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 11:45:33 -0700 Subject: [PATCH 08/13] adjust required_ruby_version --- puma-pool-usage.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index fb20c1e..569269e 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://www.github.com/simplymadeapps/puma-pool-usage" spec.license = "MIT" - spec.required_ruby_version = ">= 2.7.0" + spec.required_ruby_version = ">= 3.2.0" spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = spec.homepage From 96ff21eaf7d353cf2b1e6aa8ddc2417f809ac696 Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 11:55:05 -0700 Subject: [PATCH 09/13] improve name for scheduled tests to be more clear --- .github/workflows/{tests-schedule.yml => scheduled_tests.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{tests-schedule.yml => scheduled_tests.yml} (92%) diff --git a/.github/workflows/tests-schedule.yml b/.github/workflows/scheduled_tests.yml similarity index 92% rename from .github/workflows/tests-schedule.yml rename to .github/workflows/scheduled_tests.yml index 0cda4dd..c8a5c29 100644 --- a/.github/workflows/tests-schedule.yml +++ b/.github/workflows/scheduled_tests.yml @@ -1,4 +1,4 @@ -name: tests-schedule +name: scheduled-tests on: schedule: From 3fb3ec9aa2cb8a7c46e1d729bb031d76bffe305d Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 14:28:32 -0700 Subject: [PATCH 10/13] remove rails 6 from appraisal --- Appraisals | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Appraisals b/Appraisals index 1041dcc..770bd94 100644 --- a/Appraisals +++ b/Appraisals @@ -1,10 +1,5 @@ # frozen_string_literal: true -appraise "rails-6-1" do - gem "rails", "~> 6.1.0" - gem "puma", "~> 5.0" -end - appraise "rails-7-2" do gem "rails", "~> 7.2" gem "puma", "~> 5.0" From 88dda994f5cf123bdb70bc3889783fe2a484919d Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 14:30:26 -0700 Subject: [PATCH 11/13] change version to 2.0.0 --- puma-pool-usage.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index 569269e..b8cf3f1 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "puma-pool-usage" - spec.version = "1.0.2" + spec.version = "2.0.0" spec.authors = ["Brandon Medenwald"] spec.email = ["brandon@simplymadeapps.com"] From 6c269e9be9146d13cc5d6a50cb5d8e8f3e3ed69f Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 14:41:50 -0700 Subject: [PATCH 12/13] update rails gemfiles --- gemfiles/rails_6.gemfile | 8 -------- gemfiles/{rails_6_1.gemfile => rails_7_2.gemfile} | 2 +- gemfiles/{rails_5.gemfile => rails_8_0.gemfile} | 4 ++-- gemfiles/{rails_7_0.gemfile => rails_8_1.gemfile} | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 gemfiles/rails_6.gemfile rename gemfiles/{rails_6_1.gemfile => rails_7_2.gemfile} (82%) rename gemfiles/{rails_5.gemfile => rails_8_0.gemfile} (67%) rename gemfiles/{rails_7_0.gemfile => rails_8_1.gemfile} (82%) diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile deleted file mode 100644 index f38b4be..0000000 --- a/gemfiles/rails_6.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 6.0.0" -gem "puma", "~> 4.0" - -gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_7_2.gemfile similarity index 82% rename from gemfiles/rails_6_1.gemfile rename to gemfiles/rails_7_2.gemfile index be9024e..8523a75 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_7_2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 6.1.0" +gem "rails", "~> 7.2" gem "puma", "~> 5.0" gemspec path: "../" diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_8_0.gemfile similarity index 67% rename from gemfiles/rails_5.gemfile rename to gemfiles/rails_8_0.gemfile index 20f8e32..9ac48f5 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_8_0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 5.0" -gem "puma", "3.12.0" +gem "rails", "~> 8.0.0" +gem "puma", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_8_1.gemfile similarity index 82% rename from gemfiles/rails_7_0.gemfile rename to gemfiles/rails_8_1.gemfile index 55b667a..b2df916 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_8_1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 7.0.0" +gem "rails", "~> 8.1.0" gem "puma", "~> 7.0" gemspec path: "../" From f39b6161090a1223e796e220d6f0f34a8232c3bb Mon Sep 17 00:00:00 2001 From: coderSquirrel Date: Tue, 6 Jan 2026 14:44:48 -0700 Subject: [PATCH 13/13] restrict rails dependency to v 7.2 --- puma-pool-usage.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puma-pool-usage.gemspec b/puma-pool-usage.gemspec index b8cf3f1..88efa3a 100644 --- a/puma-pool-usage.gemspec +++ b/puma-pool-usage.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "puma", ">= 5.0", "< 8.0" - spec.add_dependency "rails", ">= 5.0" + spec.add_dependency "rails", ">= 7.2.0" spec.add_development_dependency "appraisal" spec.add_development_dependency "bigdecimal"