dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Pass require path to sub-process when running `bundle install`" (#8117) 

* Revert "Pass require path to sub-process when running `bundle install` (#7618)"

This reverts commit 43b9f13b1a.

* Revert "Update history to reflect merge of #7618 [ci skip]"

This reverts commit 2c605bfeb3.
This commit is contained in:
Ashwin Maroli 2020-04-13 16:11:38 +05:30 committed by GitHub
parent 657d924119
commit 4e25c36d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.markdown
View File

@ -29,7 +29,6 @@
* Add PageDrop to provide Liquid templates with data (#7992) * Add PageDrop to provide Liquid templates with data (#7992)
* Optimize `Kramdown::JekyllDocument#to_html` calls (#8041) * Optimize `Kramdown::JekyllDocument#to_html` calls (#8041)
* Reduce Jekyll::Renderer instances during a build (#7570) * Reduce Jekyll::Renderer instances during a build (#7570)
* Pass require path to sub-process when running `bundle install` (#7618)
### Documentation ### Documentation

12
lib/jekyll/commands/new.rb
View File

@ -139,11 +139,9 @@ module Jekyll
def after_install(path, options = {}) def after_install(path, options = {})
unless options["blank"] || options["skip-bundle"] unless options["blank"] || options["skip-bundle"]
begin begin
# Activate 'bundler' gem and puts it into the `loaded_specs`. require "bundler"
# For details: https://rubydocs.org/d/ruby-2-4-0/classes/Kernel.html#method-i-gem
gem "bundler"
bundle_install path bundle_install path
rescue Gem::MissingSpecError rescue LoadError
Jekyll.logger.info "Could not load Bundler. Bundle install skipped." Jekyll.logger.info "Could not load Bundler. Bundle install skipped."
end end
end end
@ -155,10 +153,8 @@ module Jekyll
def bundle_install(path) def bundle_install(path)
Jekyll.logger.info "Running bundle install in #{path.cyan}..." Jekyll.logger.info "Running bundle install in #{path.cyan}..."
Dir.chdir(path) do Dir.chdir(path) do
bundler_gemspec = Gem.loaded_specs["bundler"] exe = Gem.bin_path("bundler", "bundle")
exe = bundler_gemspec.bin_file "bundle" process, output = Jekyll::Utils::Exec.run("ruby", exe, "install")
require_paths = bundler_gemspec.full_require_paths
process, output = Jekyll::Utils::Exec.run("ruby", "-I", *require_paths, exe, "install")
output.to_s.each_line do |line| output.to_s.each_line do |line|
Jekyll.logger.info("Bundler:".green, line.strip) unless line.to_s.empty? Jekyll.logger.info("Bundler:".green, line.strip) unless line.to_s.empty?