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

Switch PluginManager to use require_with_graceful_fail 

* Add debug statement specifying current plugin to External#require_with_graceful_fail
This commit is contained in:
James Wen 2015-12-07 09:56:17 -05:00
parent 915d8adb1b
commit 0e89e80426
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/jekyll/external.rb
View File

@ -39,6 +39,7 @@ module Jekyll
def require_with_graceful_fail(names) def require_with_graceful_fail(names)
Array(names).each do |name| Array(names).each do |name|
begin begin
Jekyll.logger.debug("Requiring #{name}")
require name require name
rescue LoadError => e rescue LoadError => e
Jekyll.logger.error "Dependency Error:", <<-MSG Jekyll.logger.error "Dependency Error:", <<-MSG

14
lib/jekyll/plugin_manager.rb
View File

@ -24,12 +24,7 @@ module Jekyll
# #
# Returns nothing. # Returns nothing.
def require_gems def require_gems
site.gems.each do |gem| Jekyll::External.require_with_graceful_fail(site.gems.select { |gem| plugin_allowed?(gem) })
if plugin_allowed?(gem)
Jekyll.logger.debug("PluginManager:", "Requiring #{gem}")
require gem
end
end
end end
def self.require_from_bundler def self.require_from_bundler
@ -70,10 +65,9 @@ module Jekyll
# Returns nothing. # Returns nothing.
def require_plugin_files def require_plugin_files
unless site.safe unless site.safe
plugins_path.each do |plugins| plugins_path.each do |plugin_search_path|
Dir[File.join(plugins, "**", "*.rb")].sort.each do |f| plugin_files = Utils.safe_glob(plugin_search_path, File.join("**", "*.rb"))
require f Jekyll::External.require_with_graceful_fail(plugin_files)
end
end end
end end
end end