Updating supported Rubies to add new versions and remove EOL ones

square · Mar 7, 2024 · d43e808 · d43e808
1 parent b63c716
commit d43e808
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 114 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,32 +10,14 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.6.5
-          - 2.7.0
           - 3.0.0
           - 3.1.0
+          - 3.2.0
+          - 3.3.0
         gemfile:
-          - gemfiles/activesupport_2.3_LTS.gemfile
-          - gemfiles/activesupport_3.gemfile
-          - gemfiles/activesupport_4.gemfile
-          - gemfiles/activesupport_5.gemfile
-          - gemfiles/activesupport_6.gemfile
-          - gemfiles/activesupport_7.gemfile
-        exclude:
-          - ruby: 2.6.5
-            gemfile: gemfiles/activesupport_7.gemfile
-          - ruby: 2.7.0
-            gemfile: gemfiles/activesupport_3.gemfile
-          - ruby: 2.7.0
-            gemfile: gemfiles/activesupport_4.gemfile
-          - ruby: 3.0.0
-            gemfile: gemfiles/activesupport_3.gemfile
-          - ruby: 3.0.0
-            gemfile: gemfiles/activesupport_4.gemfile
-          - ruby: 3.1.0
-            gemfile: gemfiles/activesupport_3.gemfile
-          - ruby: 3.1.0
-            gemfile: gemfiles/activesupport_4.gemfile
+          - gemfiles/activesupport_6_1.gemfile
+          - gemfiles/activesupport_7_0.gemfile
+          - gemfiles/activesupport_7_1.gemfile
 
     name: Ruby ${{ matrix.ruby }} using Gemfile ${{ matrix.gemfile }}
     env:

diff --git a/gemfiles/activesupport_2.3_LTS.gemfile b/gemfiles/activesupport_2.3_LTS.gemfile
diff --git a/gemfiles/activesupport_3.gemfile b/gemfiles/activesupport_3.gemfile
diff --git a/gemfiles/activesupport_4.gemfile b/gemfiles/activesupport_4.gemfile
diff --git a/gemfiles/activesupport_5.gemfile → gemfiles/activesupport_6_1.gemfile b/gemfiles/activesupport_5.gemfile → gemfiles/activesupport_6_1.gemfile
@@ -6,7 +6,7 @@ gem "pry", "~> 0.12.2"
 gem "rake"
 gem "rspec", "~> 3.8"
 gem "rubocop", "0.63.1"
-gem "activesupport", "~> 5"
+gem "activesupport", "~> 6.1"
 
 platforms :mri do
   gem "pry-byebug"

diff --git a/gemfiles/activesupport_6.gemfile → gemfiles/activesupport_7_0.gemfile b/gemfiles/activesupport_6.gemfile → gemfiles/activesupport_7_0.gemfile
@@ -6,7 +6,7 @@ gem "pry", "~> 0.12.2"
 gem "rake"
 gem "rspec", "~> 3.8"
 gem "rubocop", "0.63.1"
-gem "activesupport", "~> 6"
+gem "activesupport", "~> 7.0"
 
 platforms :mri do
   gem "pry-byebug"

diff --git a/gemfiles/activesupport_7.gemfile → gemfiles/activesupport_7_1.gemfile b/gemfiles/activesupport_7.gemfile → gemfiles/activesupport_7_1.gemfile
@@ -6,7 +6,7 @@ gem "pry", "~> 0.12.2"
 gem "rake"
 gem "rspec", "~> 3.8"
 gem "rubocop", "0.63.1"
-gem "activesupport", "~> 7"
+gem "activesupport", "~> 7.1"
 
 platforms :mri do
   gem "pry-byebug"

diff --git a/lib/rrule/humanizer.rb b/lib/rrule/humanizer.rb
@@ -31,9 +31,8 @@ def to_s
 
       send freq_option.downcase
 
-      if until_option
-        raise 'Implement Until'
-      elsif count_option
+      raise 'Implement Until' if until_option
+      if count_option
         add 'for'
         add count_option
         add plural?(count_option) ? 'times' : 'time'