From 7d2167d28898171fae89bbba45f4ff2825619c02 Mon Sep 17 00:00:00 2001 From: smudge Date: Thu, 20 Jul 2023 11:23:32 -0400 Subject: [PATCH 1/6] Add rails 7.1 appraisal --- .github/workflows/tests.yml | 11 ++++++++++- Appraisals | 4 ++++ gemfiles/rails_7_1.gemfile | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gemfiles/rails_7_1.gemfile diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f23a759..c04605f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,15 +12,24 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.6, 2.7, 3.0] + ruby: [2.6, 2.7, 3.0, 3.1, 3.2] gemfile: - gemfiles/rails_5_2.gemfile - gemfiles/rails_6_0.gemfile - gemfiles/rails_6_1.gemfile - gemfiles/rails_7_0.gemfile + - gemfiles/rails_7_1.gemfile exclude: + - ruby: 3.2 + gemfile: gemfiles/rails_5_2.gemfile + - ruby: 3.1 + gemfile: gemfiles/rails_5_2.gemfile - ruby: 3.0 gemfile: gemfiles/rails_5_2.gemfile + - ruby: 2.7 + gemfile: gemfiles/rails_7_1.gemfile + - ruby: 2.7 + gemfile: gemfiles/rails_7_0.gemfile - ruby: 2.6 gemfile: gemfiles/rails_7_0.gemfile diff --git a/Appraisals b/Appraisals index 87af99c..f0ce2b4 100644 --- a/Appraisals +++ b/Appraisals @@ -13,3 +13,7 @@ end appraise 'rails-7-0' do gem 'railties', '~> 7.0.0' end + +appraise 'rails-7-1' do + gem 'railties', '~> 7.1.0' +end diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile new file mode 100644 index 0000000..036d983 --- /dev/null +++ b/gemfiles/rails_7_1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "~> 7.1.0" + +gemspec path: "../" From 6ea13479d1b389c2fcb405c0c864a25605974653 Mon Sep 17 00:00:00 2001 From: smudge Date: Fri, 6 Oct 2023 18:04:44 -0400 Subject: [PATCH 2/6] Address DevelopmentDependencies linter --- .rubocop.yml | 3 --- Gemfile | 6 ++++++ gemfiles/rails_5_2.gemfile | 5 +++++ gemfiles/rails_6_0.gemfile | 5 +++++ gemfiles/rails_6_1.gemfile | 5 +++++ gemfiles/rails_7_0.gemfile | 5 +++++ gemfiles/rails_7_1.gemfile | 5 +++++ uncruft.gemspec | 6 ------ 8 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 1762fd7..4b51c7c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,9 +2,6 @@ inherit_gem: betterlint: - config/default.yml -Gemspec/DevelopmentDependencies: - Enabled: false - AllCops: NewCops: enable TargetRubyVersion: 2.6 diff --git a/Gemfile b/Gemfile index fa75df1..e53daf2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,9 @@ source 'https://rubygems.org' gemspec + +gem 'appraisal', '~> 2.2.0' +gem 'betterlint' +gem 'rails' +gem 'rspec', '~> 3.7.0' +gem 'timecop', '~> 0.9.1' diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 8b2627f..77fe5e0 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "appraisal", "~> 2.2.0" +gem "betterlint" +gem "rails" gem "railties", "~> 5.2.0" +gem "rspec", "~> 3.7.0" +gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index 4cd55a8..41d7cf0 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "appraisal", "~> 2.2.0" +gem "betterlint" +gem "rails" gem "railties", "~> 6.0.0" +gem "rspec", "~> 3.7.0" +gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 4c467fe..4408ebb 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "appraisal", "~> 2.2.0" +gem "betterlint" +gem "rails" gem "railties", "~> 6.1.0" +gem "rspec", "~> 3.7.0" +gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index 495c72d..f7e0dbd 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "appraisal", "~> 2.2.0" +gem "betterlint" +gem "rails" gem "railties", "~> 7.0.0" +gem "rspec", "~> 3.7.0" +gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index 036d983..9ac7a97 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -2,6 +2,11 @@ source "https://rubygems.org" +gem "appraisal", "~> 2.2.0" +gem "betterlint" +gem "rails" gem "railties", "~> 7.1.0" +gem "rspec", "~> 3.7.0" +gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/uncruft.gemspec b/uncruft.gemspec index 6b8e395..9501730 100644 --- a/uncruft.gemspec +++ b/uncruft.gemspec @@ -20,10 +20,4 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6.0' s.add_dependency 'railties', '>= 5.2.0' - - s.add_development_dependency 'appraisal', '~> 2.2.0' - s.add_development_dependency 'betterlint' - s.add_development_dependency 'rails' - s.add_development_dependency 'rspec', '~> 3.7.0' - s.add_development_dependency 'timecop', '~> 0.9.1' end From d4a9c8320e823b1822b7bae2031b8a8afc53d9aa Mon Sep 17 00:00:00 2001 From: smudge Date: Fri, 6 Oct 2023 18:07:41 -0400 Subject: [PATCH 3/6] Unpin rspec --- Gemfile | 2 +- gemfiles/rails_5_2.gemfile | 2 +- gemfiles/rails_6_0.gemfile | 2 +- gemfiles/rails_6_1.gemfile | 2 +- gemfiles/rails_7_0.gemfile | 2 +- gemfiles/rails_7_1.gemfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index e53daf2..d90e5d5 100644 --- a/Gemfile +++ b/Gemfile @@ -5,5 +5,5 @@ gemspec gem 'appraisal', '~> 2.2.0' gem 'betterlint' gem 'rails' -gem 'rspec', '~> 3.7.0' +gem 'rspec' gem 'timecop', '~> 0.9.1' diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 77fe5e0..61cf07d 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -6,7 +6,7 @@ gem "appraisal", "~> 2.2.0" gem "betterlint" gem "rails" gem "railties", "~> 5.2.0" -gem "rspec", "~> 3.7.0" +gem "rspec" gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index 41d7cf0..d3aec0d 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -6,7 +6,7 @@ gem "appraisal", "~> 2.2.0" gem "betterlint" gem "rails" gem "railties", "~> 6.0.0" -gem "rspec", "~> 3.7.0" +gem "rspec" gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 4408ebb..8cc80c5 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -6,7 +6,7 @@ gem "appraisal", "~> 2.2.0" gem "betterlint" gem "rails" gem "railties", "~> 6.1.0" -gem "rspec", "~> 3.7.0" +gem "rspec" gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index f7e0dbd..99ed58a 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -6,7 +6,7 @@ gem "appraisal", "~> 2.2.0" gem "betterlint" gem "rails" gem "railties", "~> 7.0.0" -gem "rspec", "~> 3.7.0" +gem "rspec" gem "timecop", "~> 0.9.1" gemspec path: "../" diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index 9ac7a97..a70ebad 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -6,7 +6,7 @@ gem "appraisal", "~> 2.2.0" gem "betterlint" gem "rails" gem "railties", "~> 7.1.0" -gem "rspec", "~> 3.7.0" +gem "rspec" gem "timecop", "~> 0.9.1" gemspec path: "../" From 567ce4ecaf60576ca697c8291dfb25c223afb52d Mon Sep 17 00:00:00 2001 From: smudge Date: Fri, 6 Oct 2023 18:15:58 -0400 Subject: [PATCH 4/6] Exclude 2.6 + 7.1 --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c04605f..34c754d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,6 +30,8 @@ jobs: gemfile: gemfiles/rails_7_1.gemfile - ruby: 2.7 gemfile: gemfiles/rails_7_0.gemfile + - ruby: 2.6 + gemfile: gemfiles/rails_7_1.gemfile - ruby: 2.6 gemfile: gemfiles/rails_7_0.gemfile From 4f51171a273d9f725378ec1ad5cf071785ea6afd Mon Sep 17 00:00:00 2001 From: smudge Date: Fri, 6 Oct 2023 18:19:20 -0400 Subject: [PATCH 5/6] Use stringy versions to avoid 3.0 becomeing 3-latest --- .github/workflows/tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 34c754d..bddc983 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.6, 2.7, 3.0, 3.1, 3.2] + ruby: ['2.6', '2.7', '3.0', '3.1', '3.2'] gemfile: - gemfiles/rails_5_2.gemfile - gemfiles/rails_6_0.gemfile @@ -20,19 +20,19 @@ jobs: - gemfiles/rails_7_0.gemfile - gemfiles/rails_7_1.gemfile exclude: - - ruby: 3.2 + - ruby: '3.2' gemfile: gemfiles/rails_5_2.gemfile - - ruby: 3.1 + - ruby: '3.1' gemfile: gemfiles/rails_5_2.gemfile - - ruby: 3.0 + - ruby: '3.0' gemfile: gemfiles/rails_5_2.gemfile - - ruby: 2.7 + - ruby: '2.7' gemfile: gemfiles/rails_7_1.gemfile - - ruby: 2.7 + - ruby: '2.7' gemfile: gemfiles/rails_7_0.gemfile - - ruby: 2.6 + - ruby: '2.6' gemfile: gemfiles/rails_7_1.gemfile - - ruby: 2.6 + - ruby: '2.6' gemfile: gemfiles/rails_7_0.gemfile steps: From ce487d26b4855973d476663dab4e3ab70456f13d Mon Sep 17 00:00:00 2001 From: smudge Date: Fri, 6 Oct 2023 18:09:37 -0400 Subject: [PATCH 6/6] Bump version --- lib/uncruft/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/uncruft/version.rb b/lib/uncruft/version.rb index e16b8aa..c605261 100644 --- a/lib/uncruft/version.rb +++ b/lib/uncruft/version.rb @@ -1,3 +1,3 @@ module Uncruft - VERSION = '0.3.3'.freeze + VERSION = '0.3.4'.freeze end