ruby-changes:54880
From: hsbt <ko1@a...>
Date: Mon, 18 Feb 2019 18:53:17 +0900 (JST)
Subject: [ruby-changes:54880] hsbt:r67085 (trunk): Fixup r66984. It breakes bundler's examples.
hsbt 2019-02-18 18:53:13 +0900 (Mon, 18 Feb 2019) New Revision: 67085 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67085 Log: Fixup r66984. It breakes bundler's examples. Modified files: trunk/lib/bundler/shared_helpers.rb trunk/spec/bundler/runtime/setup_spec.rb Index: lib/bundler/shared_helpers.rb =================================================================== --- lib/bundler/shared_helpers.rb (revision 67084) +++ lib/bundler/shared_helpers.rb (revision 67085) @@ -276,7 +276,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/shared_helpers.rb#L276 # 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 Index: spec/bundler/runtime/setup_spec.rb =================================================================== --- spec/bundler/runtime/setup_spec.rb (revision 67084) +++ spec/bundler/runtime/setup_spec.rb (revision 67085) @@ -876,7 +876,7 @@ end https://github.com/ruby/ruby/blob/trunk/spec/bundler/runtime/setup_spec.rb#L876 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/