[DEX-2728] fix: drop ruby 2.5/2.6 support

.env

@@ -1 +1 @@
-REDIS_URL=redis://:supersecret@127.0.0.1:6379/10
+REDIS_URL=redis://:supersecret@redis:6379/10

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Provide configs
+2. Run command
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Context (please complete the following information):**
+ - Gem version
+ - Ruby version
+ - Rails version
+ - Gruf version
+ - Faraday version
+
+**Additional context**
+Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+# Context
+
+<!--
+Short description about the feature and the motivation/issue behind it
+-->
+-
+
+## Related tickets
+
+-
+
+# What's inside
+
+<!--
+List of features and changes (or highlights) (from the code perspective)
+The purpose of this list is to track the progress if it's WIP (use checkboxes)
+and to emphasize the critical parts (which you'd like to pay reviewers attention to)
+-->
+- [x] A
+
+# Checklist:
+
+- [ ] I have added tests
+- [ ] I have made corresponding changes to the documentation

.github/workflows/ci.yml

@@ -4,38 +4,47 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches: [ '**' ]
 
 jobs:
-  build:
+  lint:
+    runs-on: ubuntu-latest
+    env:
+      RUBY_VERSION: "3.3"
+    name: Rubocop
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Ruby w/ same version as image
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+      - name: Install dependencies
+        run: |
+          gem install dip
+          dip bundle install
+      - name: Run linter
+        run: dip rubocop
+
+  test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0"]
-    services:
-      redis:
-        image: bitnami/redis:6.2
-        ports:
-          - 6379:6379
-        env:
-          REDIS_PASSWORD: supersecret
-        options: >-
-          --health-cmd "redis-cli -p 6379 -a 'supersecret' ping"
-          --health-interval 1s
-          --health-timeout 3s
-          --health-retries 10
+        ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3' ]
+    env:
+      RUBY_VERSION: ${{ matrix.ruby }}
+    name: Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Ruby
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Ruby w/ same version as image
         uses: ruby/setup-ruby@v1
         with:
-          bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
-      - name: Run all tests
-        run: bundle exec rspec
-        env:
-          REDIS_URL: redis://:supersecret@redis:${{ job.services.redis.ports[6379] }}/0
-          # FIXME!
-          SKIP_REDIS_SPECS: true
-      - name: Run rubocop
-        run: bundle exec rubocop
+      - name: Install dependencies
+        run: |
+          gem install dip
+          dip provision
+      - name: Run tests
+        run: dip appraisal rspec --format RspecJunitFormatter --out test-results/rspec_${{ matrix.ruby }}.xml --format documentation

.gitignore

@@ -3,8 +3,15 @@
 /_yardoc/
 /coverage/
 /doc/
+/log/
 /pkg/
 /spec/reports/
 /tmp/
 /.idea
 *.gem
+/test-results/
+.rspec_status
+/Gemfile.lock
+/gemfiles/*gemfile*
+/spec/internal/log/*.log
+test.log

.gitlab-ci.yml

@@ -0,0 +1,37 @@
+include:
+  - project: "nstmrt/rubygems/templates"
+    ref: master
+    file: "build-rubygems.yml"
+
+lint:
+  stage: test
+  image: ${BUILD_CONF_HARBOR_REGISTRY}/dhub/library/ruby:3.3
+  tags:
+    - paas-tests
+  script:
+    - bundle install
+    - bundle exec rubocop
+
+tests:
+  stage: test
+  image: ${BUILD_CONF_HARBOR_REGISTRY}/dhub/library/ruby:$RUBY_VERSION
+  tags:
+    - paas-tests
+  services:
+    - name: ${BUILD_CONF_HARBOR_REGISTRY}/dhub/bitnami/redis:6.2
+      alias: redis
+  variables:
+    REDIS_PASSWORD: supersecret
+  parallel:
+    matrix:
+      - RUBY_VERSION: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+  before_script:
+    - gem sources --remove https://rubygems.org/
+    - gem sources --add ${RUBYGEMS_PUBLIC_SOURCE}
+    - gem install bundler -v 2.3.26
+    - bin/setup
+  script:
+    - bundle exec appraisal rspec --format RspecJunitFormatter --out test-results/rspec_$RUBY_VERSION.xml --format documentation
+  artifacts:
+    reports:
+      junit: test-results/rspec*.xml

.rspec

@@ -1 +1,2 @@
 --require spec_helper
+--require rails_helper

.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 Style/Documentation:
   Enabled: false

Appraisals

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# See compatibility table at https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+
+versions_map = {
+  '6.0' => %w[2.7],
+  '6.1' => %w[2.7 3.0],
+  '7.0' => %w[3.1],
+  '7.1' => %w[3.2],
+  '7.2' => %w[3.3 3.4],
+  '8.0' => %w[3.4]
+}
+
+current_ruby_version = RUBY_VERSION.split('.').first(2).join('.')
+
+versions_map.each do |rails_version, ruby_versions|
+  ruby_versions.each do |ruby_version|
+    next if ruby_version != current_ruby_version
+
+    appraise "rails-#{rails_version}" do
+      gem 'rails', "~> #{rails_version}.0"
+    end
+  end
+end

CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG.md
 
+## 1.0.0 (2024-12-28)
+
+Features:
+
+- Drop ruby 2.5/2.6 support
+- Add appraisals
+
+Fix:
+
+- Fix ruby-kafka health-check bug for some ActiveSupport versions
+
 ## 0.5.0 (2023-08-16)
 
 Features:

Dockerfile

@@ -0,0 +1,14 @@
+ARG RUBY_VERSION
+
+FROM ruby:$RUBY_VERSION
+
+ARG BUNDLER_VERSION
+ARG RUBYGEMS_VERSION
+
+ENV BUNDLE_JOBS=4 \
+  BUNDLE_RETRY=3
+
+RUN gem update --system "${RUBYGEMS_VERSION}" \
+  && rm /usr/local/lib/ruby/gems/*/specifications/default/bundler*.gemspec \
+  && gem install --default bundler:${BUNDLER_VERSION} \
+  && gem install bundler -v ${BUNDLER_VERSION}

Gemfile

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source ENV.fetch('RUBYGEMS_PUBLIC_SOURCE', 'https://rubygems.org/')
 
 # Specify your gem's dependencies in http_health_check.gemspec
 gemspec
 
-gem 'rake', '~> 13.0'
-
 group :test do
-  gem 'rspec_junit_formatter'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura', require: false
 end

bin/setup

@@ -4,5 +4,6 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
+bundle exec appraisal install
 
 # Do any other automated setup that you need to do here

bin/test

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+bundle exec rubocop
+bundle exec appraisal rspec