summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-12-15 22:43:45 +0900
committergit <svn-admin@ruby-lang.org>2021-12-19 12:14:10 +0900
commita81e0600a7fa97bc1782de91110c6704a47af419 (patch)
treee72b6d29c47a42c5ee43e5393118d0b4fa93a78f
parent7159af3491763aeeaf7accec426ff228d7dbfa3b (diff)
[ruby/reline] Load correct version.rb from gemspec
When merged to ruby/ruby, reline.gemspec file is located under lib/reline, as the same as reline/version.rb. That is the latter path relative from the former differs from the ruby/reline case, and the reline/version.rb in the default load path will be loaded. Try `require_relative` not to load unexpected files. https://github.com/ruby/reline/commit/54905d0e1b
-rw-r--r--lib/reline/reline.gemspec8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/reline/reline.gemspec b/lib/reline/reline.gemspec
index 400301fc70..26809db873 100644
--- a/lib/reline/reline.gemspec
+++ b/lib/reline/reline.gemspec
@@ -1,7 +1,9 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'reline/version'
+begin
+ require_relative 'lib/reline/version'
+rescue LoadError
+ require_relative 'version'
+end
Gem::Specification.new do |spec|
spec.name = 'reline'