From d59fc41fbaf6ae3458a5260fb53916468f7e56f7 Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 7 Aug 2018 12:32:29 +0000 Subject: [PATCH] Fallback to load version constant for ruby core repository. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/logger.gemspec | 6 +++++- lib/prime.gemspec | 6 +++++- lib/rexml/rexml.gemspec | 6 +++++- lib/rss/rss.gemspec | 6 +++++- lib/webrick/webrick.gemspec | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/lib/logger.gemspec b/lib/logger.gemspec index 690817a2e2..b14e8be7ac 100644 --- a/lib/logger.gemspec +++ b/lib/logger.gemspec @@ -1,4 +1,8 @@ -require_relative "logger" +begin + require_relative "lib/logger" +rescue LoadError + require_relative "logger" +end Gem::Specification.new do |spec| spec.name = "logger" diff --git a/lib/prime.gemspec b/lib/prime.gemspec index de6d4f93b9..35c3fab674 100644 --- a/lib/prime.gemspec +++ b/lib/prime.gemspec @@ -1,4 +1,8 @@ -require_relative "prime" +begin + require_relative "lib/prime" +rescue LoadError + require_relative "prime" +end Gem::Specification.new do |spec| spec.name = "prime" diff --git a/lib/rexml/rexml.gemspec b/lib/rexml/rexml.gemspec index 777584453a..5e64e617c8 100644 --- a/lib/rexml/rexml.gemspec +++ b/lib/rexml/rexml.gemspec @@ -1,4 +1,8 @@ -require_relative "rexml" +begin + require_relative "lib/rexml/rexml" +rescue LoadError + require_relative "rexml" +end Gem::Specification.new do |spec| spec.name = "rexml" diff --git a/lib/rss/rss.gemspec b/lib/rss/rss.gemspec index 984286195a..99641801f2 100644 --- a/lib/rss/rss.gemspec +++ b/lib/rss/rss.gemspec @@ -1,4 +1,8 @@ -require_relative "rss" +begin + require_relative "lib/rss" +rescue LoadError + require_relative "rss" +end Gem::Specification.new do |spec| spec.name = "rss" diff --git a/lib/webrick/webrick.gemspec b/lib/webrick/webrick.gemspec index 07ca233078..a457a14750 100644 --- a/lib/webrick/webrick.gemspec +++ b/lib/webrick/webrick.gemspec @@ -1,5 +1,9 @@ # frozen_string_literal: true -require_relative 'version' +begin + require_relative 'lib/webrick/version' +rescue LoadError + require_relative 'version' +end Gem::Specification.new do |s| s.name = "webrick"