diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-02-19 22:36:28 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-02-19 22:36:28 +0900 |
| commit | 0f3375ea81406e0e6ecca20d775c7a4d8ab9ebfd (patch) | |
| tree | 8139b214631910693611dddfa05476bc846a9a6d | |
| parent | 0c95d6dcad318737c36b139337ed5913b88f23ff (diff) | |
| download | bundler-0f3375ea81406e0e6ecca20d775c7a4d8ab9ebfd.tar.gz | |
Fixup r66984. It breakes bundler's examples.
| -rw-r--r-- | lib/bundler/shared_helpers.rb | 2 | ||||
| -rw-r--r-- | spec/runtime/setup_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index 6a0da52e1e..02b3801c44 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -278,7 +278,7 @@ module Bundler # avoid stepping above the tmp directory when testing gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"] # for Ruby Core - "lib/bundler.gemspec" + "lib/bundler/bundler.gemspec" else "bundler.gemspec" end diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb index b57d61c3a6..fe84fc5379 100644 --- a/spec/runtime/setup_spec.rb +++ b/spec/runtime/setup_spec.rb @@ -871,7 +871,7 @@ end FileUtils.ln_s(bundler_dir, File.join(gems_dir, "bundler-#{Bundler::VERSION}")) - gemspec_file = ruby_core? ? "#{bundler_dir}/lib/bundler.gemspec" : "#{bundler_dir}/bundler.gemspec" + gemspec_file = ruby_core? ? "#{bundler_dir}/lib/bundler/bundler.gemspec" : "#{bundler_dir}/bundler.gemspec" gemspec = File.read(gemspec_file). sub("Bundler::VERSION", %("#{Bundler::VERSION}")) gemspec = gemspec.lines.reject {|line| line =~ %r{lib/bundler/version} }.join |