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 #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 <[email protected]> (cherry picked from commit 7199b12)
rubygems · Feb 20, 2019 · ef2a7f9 · ef2a7f9
1 parent d3cf5b4
commit ef2a7f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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