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

Finish up the plugin manager 

And so it shall be.
This commit is contained in:
Parker Moore 2014-11-05 19:29:54 -08:00
parent b0a7f9c8c9
commit 8ee1b2a1fd
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/plugin_manager.rb
View File

@ -17,7 +17,7 @@ module Jekyll
def conscientious_require def conscientious_require
require_plugin_files require_plugin_files
require_gems require_gems
self.require_from_bundler self.class.require_from_bundler
end end
# Require each of the gem plugins specified. # Require each of the gem plugins specified.
@ -33,9 +33,9 @@ module Jekyll
def self.require_from_bundler def self.require_from_bundler
unless ENV["JEKYLL_NO_BUNDLER_REQUIRE"] unless ENV["JEKYLL_NO_BUNDLER_REQUIRE"]
require "bundler/setup" require "bundler"
Bundler.require(:jekyll_plugins) Bundler.require(:jekyll_plugins)
ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = true ENV["JEKYLL_NO_BUNDLER_REQUIRE"] = "true"
end end
rescue LoadError rescue LoadError
false false

8
test/test_plugin_manager.rb Normal file
View File

@ -0,0 +1,8 @@
require 'helper'
class TestPluginManager < Test::Unit::TestCase
def test_requiring_from_bundler
Jekyll::PluginManager.require_from_bundler
assert ENV["JEKYLL_NO_BUNDLER_REQUIRE"], 'Gemfile plugins were not required.'
end
end