From 7e74b7ee1ea6322b84633543de50813ed17511ef Mon Sep 17 00:00:00 2001
From: Gert Goet <gert@thinkcreate.dk>
Date: Wed, 3 Jan 2024 15:57:22 +0100
Subject: [PATCH] Use require_relative where possible

Also solves https://github.com/mikel/mail/pull/1412
---
 mail.gemspec            | 2 +-
 rakelib/corpus.rake     | 2 +-
 rakelib/generate_tables | 2 +-
 spec/spec_helper.rb     | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mail.gemspec b/mail.gemspec
index faa5fed75..59561769d 100644
--- a/mail.gemspec
+++ b/mail.gemspec
@@ -1,4 +1,4 @@
-require './lib/mail/version'
+require_relative 'lib/mail/version'
 
 Gem::Specification.new do |s|
   s.name        = "mail"
diff --git a/rakelib/corpus.rake b/rakelib/corpus.rake
index 1be2ec55c..1f5ba216e 100644
--- a/rakelib/corpus.rake
+++ b/rakelib/corpus.rake
@@ -3,7 +3,7 @@ require 'benchmark'
 namespace :corpus do
 
   task :load_mail do
-    require File.expand_path('../spec/environment', __dir__)
+    require_relative '../spec/environment'
     require 'mail'
   end
 
diff --git a/rakelib/generate_tables b/rakelib/generate_tables
index 995cb8c98..743837433 100644
--- a/rakelib/generate_tables
+++ b/rakelib/generate_tables
@@ -4,7 +4,7 @@
 # Usage:
 #   ruby tasks/generate_tables
 # The Unicode version downloaded is determined by the UNICODE_VERSION lib/mail/multibye/unicode.rb
-require './lib/mail/multibyte/unicode'
+require_relative '../lib/mail/multibyte/unicode'
 
 require 'open-uri'
 require 'tmpdir'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7672e5add..4a43170b8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
-require File.expand_path('environment', __dir__)
+
+require_relative 'environment'
 
 unless defined?(MAIL_ROOT)
   $stderr.puts("Running Specs under Ruby Version #{RUBY_VERSION}")
@@ -17,7 +18,7 @@
 end
 
 require 'rspec'
-require File.join(__dir__, 'matchers', 'break_down_to')
+require_relative 'matchers/break_down_to'
 
 require 'mail'