From 3fba3365bbeade0a324397e8ff752165d99b9a37 Mon Sep 17 00:00:00 2001 From: Bill Tihen Date: Tue, 12 Aug 2025 21:06:34 +0200 Subject: [PATCH 1/6] upgrade ActiveJob to minimally 7.0 which allows thor 1.4 --- gush.gemspec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gush.gemspec b/gush.gemspec index 5b75c89..d7e5282 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -19,7 +19,9 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.required_ruby_version = '>= 3.0.0' - spec.add_dependency "activejob", ">= 6.1.0", "< 8.1.0" + # ActiveJob 7.0 is required to maintain compatibility concurrent-ruby and ActiveSupport logger gem usage + # however, this allows us to upgrade thor to v1.4.0 which fixes security issues + spec.add_dependency "activejob", ">= 7.0.0", "< 8.1.0" spec.add_dependency "concurrent-ruby", "~> 1.0" spec.add_dependency "multi_json", "~> 1.11" spec.add_dependency "redis", ">= 3.2", "< 6" @@ -28,7 +30,7 @@ Gem::Specification.new do |spec| spec.add_dependency "graphviz", "~> 1.2" spec.add_dependency "terminal-table", ">= 1.4", "< 3.1" spec.add_dependency "paint", "~> 2.2" - spec.add_dependency "thor", ">= 0.19", "< 1.3" + spec.add_dependency "thor", ">= 0.19", "< 1.5" spec.add_dependency "launchy", "~> 2.4" spec.add_development_dependency "bundler" spec.add_development_dependency "rake", "~> 12" From 09f1309d9fd420ef67b45da8d1b7997de24c2092 Mon Sep 17 00:00:00 2001 From: Bill Tihen Date: Tue, 12 Aug 2025 21:10:06 +0200 Subject: [PATCH 2/6] remove comment and move to Merge / Pull Request --- gush.gemspec | 2 -- 1 file changed, 2 deletions(-) diff --git a/gush.gemspec b/gush.gemspec index d7e5282..27fe4dc 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -19,8 +19,6 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.required_ruby_version = '>= 3.0.0' - # ActiveJob 7.0 is required to maintain compatibility concurrent-ruby and ActiveSupport logger gem usage - # however, this allows us to upgrade thor to v1.4.0 which fixes security issues spec.add_dependency "activejob", ">= 7.0.0", "< 8.1.0" spec.add_dependency "concurrent-ruby", "~> 1.0" spec.add_dependency "multi_json", "~> 1.11" From be8ec788dba69415c80d4b17b0187ce63f4e1ad6 Mon Sep 17 00:00:00 2001 From: Bill Tihen Date: Wed, 13 Aug 2025 08:03:03 +0200 Subject: [PATCH 3/6] update versions --- Gemfile | 2 +- lib/gush/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 2655f34..6268ea4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gemspec -rails_version = ENV['RAILS_VERSION'] || '< 7.0' +rails_version = ENV['RAILS_VERSION'] || '>= 7.0.0' rails_version = "~> #{rails_version}" if rails_version =~ /^\d/ gem 'activejob', rails_version diff --git a/lib/gush/version.rb b/lib/gush/version.rb index df6b7f2..8024a0a 100644 --- a/lib/gush/version.rb +++ b/lib/gush/version.rb @@ -1,3 +1,3 @@ module Gush - VERSION = '4.2.0'.freeze + VERSION = '4.2.1'.freeze end From 8a56e1af185e5e8144c0f7dc290c282a80303838 Mon Sep 17 00:00:00 2001 From: Bill Tihen Date: Tue, 28 Oct 2025 12:26:33 +0100 Subject: [PATCH 4/6] Update gush.gemspec Co-authored-by: Tobias <88370686+eglitobias@users.noreply.github.com> --- gush.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gush.gemspec b/gush.gemspec index 27fe4dc..80ad727 100644 --- a/gush.gemspec +++ b/gush.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.required_ruby_version = '>= 3.0.0' - spec.add_dependency "activejob", ">= 7.0.0", "< 8.1.0" + spec.add_dependency "activejob", ">= 7.0.0", "< 9" spec.add_dependency "concurrent-ruby", "~> 1.0" spec.add_dependency "multi_json", "~> 1.11" spec.add_dependency "redis", ">= 3.2", "< 6" From fbb366f58718c456dee4e79ab30e1f9789c65699 Mon Sep 17 00:00:00 2001 From: Bill Tihen Date: Tue, 28 Oct 2025 12:34:39 +0100 Subject: [PATCH 5/6] chore: update tests and rails versions --- .github/workflows/ruby.yml | 54 +++++++++++++++++++------------------- lib/gush/version.rb | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 627d8da..c6e86f3 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -10,10 +10,10 @@ name: Ruby on: pull_request: paths-ignore: - - 'README.md' + - "README.md" push: paths-ignore: - - 'README.md' + - "README.md" jobs: test: @@ -26,30 +26,30 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rails_version: ['6.1.0', '7.0', '7.1.0', '7.2.2', "8.0.1"] - ruby_version: ['3.1', '3.2', '3.3', '3.4'] + rails_version: ["7.0", "7.1.0", "7.2.2", "8.0.1", "8.1.0"] + ruby_version: ["3.1", "3.2", "3.3", "3.4"] exclude: - - ruby_version: '3.4' - rails_version: '6.1.0' - - ruby_version: '3.1' - rails_version: '8.0.1' + - ruby_version: "3.1" + rails_version: "8.1.0" + - ruby_version: "3.1" + rails_version: "8.0.1" steps: - - uses: actions/checkout@v4 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby_version }} - bundler-cache: true # runs 'bundle install' and caches installed gems automatically - env: - RAILS_VERSION: "${{ matrix.rails_version }}" - - name: Install Graphviz - run: sudo apt-get install graphviz - - name: Run code lint - run: bundle exec rubocop - env: - RAILS_VERSION: "${{ matrix.rails_version }}" - - name: Run tests - run: bundle exec rspec - env: - REDIS_URL: redis://localhost:6379/1 - RAILS_VERSION: "${{ matrix.rails_version }}" + - uses: actions/checkout@v4 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby_version }} + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + env: + RAILS_VERSION: "${{ matrix.rails_version }}" + - name: Install Graphviz + run: sudo apt-get install graphviz + - name: Run code lint + run: bundle exec rubocop + env: + RAILS_VERSION: "${{ matrix.rails_version }}" + - name: Run tests + run: bundle exec rspec + env: + REDIS_URL: redis://localhost:6379/1 + RAILS_VERSION: "${{ matrix.rails_version }}" diff --git a/lib/gush/version.rb b/lib/gush/version.rb index 8024a0a..ca99bff 100644 --- a/lib/gush/version.rb +++ b/lib/gush/version.rb @@ -1,3 +1,3 @@ module Gush - VERSION = '4.2.1'.freeze + VERSION = '4.3.0'.freeze end From fa7ff19c2667fa00affd33b6ddea43cb87f5a11f Mon Sep 17 00:00:00 2001 From: Bill Tihen Date: Wed, 19 Nov 2025 09:09:00 +0100 Subject: [PATCH 6/6] new major version number: dropping Rails 5.x allows us to upgrade thor beyond '1.3' to address a security issue in older versions. --- README.md | 2 +- lib/gush/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 505aa56..69a93c4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This README is about the latest `master` code, which might differ from what is r ### 1. Add `gush` to Gemfile ```ruby -gem 'gush', '~> 4.2' +gem 'gush', '~> 5.0' ``` ### 2. Create `Gushfile` diff --git a/lib/gush/version.rb b/lib/gush/version.rb index ca99bff..392e270 100644 --- a/lib/gush/version.rb +++ b/lib/gush/version.rb @@ -1,3 +1,3 @@ module Gush - VERSION = '4.3.0'.freeze + VERSION = '5.0.0'.freeze end