diff options
| author | Bundlerbot <bot@bundler.io> | 2019-02-20 12:02:36 +0000 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-02-20 21:41:18 +0900 |
| commit | fa150290b851d2bbf47bfef6fb1637a96098fa31 (patch) | |
| tree | d9d25e8ed5e5e25e68a03ce89169d92f0e24f96f | |
| parent | 87c8dd3a08d5c873c53dedb2c7f43074d252f255 (diff) | |
| download | bundler-fa150290b851d2bbf47bfef6fb1637a96098fa31.tar.gz | |
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 <hsbt@ruby-lang.org>
(cherry picked from commit 7199b124d4b6d217fc1dff2f1e93dda151ad9664)
| -rw-r--r-- | bundler.gemspec | 2 | ||||
| -rw-r--r-- | spec/support/path.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundler.gemspec b/bundler.gemspec index fff5d0dfd5..0ce9fe7125 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 Gem::Specification.new do |s| diff --git a/spec/support/path.rb b/spec/support/path.rb index 38f7145dc7..69efcba051 100644 --- a/spec/support/path.rb +++ b/spec/support/path.rb @@ -9,7 +9,7 @@ module Spec 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 |