From ef2a7f9b1b5503ce2a98a483f5da4e4f60cef490 Mon Sep 17 00:00:00 2001 From: Bundlerbot Date: Wed, 20 Feb 2019 12:02:36 +0000 Subject: [PATCH] Merge #6977 6977: Update the location of bundler gemspec. r=deivid-rodriguez a=hsbt ### What was the end-user problem that led to this PR? On the ruby core repository has the original patch for the test suite. The current bundler repository was inconsistency status with it. ### What was your diagnosis of the problem? This pull-request was the missing commit of https://github.com/bundler/bundler/pull/6973 ### What is your fix for the problem, implemented in this PR? The test suite of bundler break the inconsistency gemspec location, Co-authored-by: SHIBATA Hiroshi (cherry picked from commit 7199b124d4b6d217fc1dff2f1e93dda151ad9664) --- bundler.gemspec | 2 +- spec/support/path.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundler.gemspec b/bundler.gemspec index 26fc32278a2..be4a9d5f15c 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -5,7 +5,7 @@ begin require File.expand_path("../lib/bundler/version", __FILE__) rescue LoadError # for Ruby core repository - require File.expand_path("../bundler/version", __FILE__) + require File.expand_path("../version", __FILE__) end require "shellwords" diff --git a/spec/support/path.rb b/spec/support/path.rb index 76fa89d3cc2..084ade46bf8 100644 --- a/spec/support/path.rb +++ b/spec/support/path.rb @@ -9,7 +9,7 @@ def root end def gemspec - @gemspec ||= root.join(ruby_core? ? "lib/bundler.gemspec" : "bundler.gemspec") + @gemspec ||= root.join(ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec") end def bindir