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

Look for plugins under the source directory by default

This commit is contained in:
Matt Rogers 2013-01-10 21:24:28 -06:00
parent f3f181484d
commit 92eb926bf8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/jekyll/site.rb
View File

@ -18,7 +18,7 @@ module Jekyll
self.safe = config['safe'] self.safe = config['safe']
self.source = File.expand_path(config['source']) self.source = File.expand_path(config['source'])
self.dest = File.expand_path(config['destination']) self.dest = File.expand_path(config['destination'])
self.plugins = Array(config['plugins']).map { |d| File.expand_path(d) } self.plugins = setup_plugins
self.lsi = config['lsi'] self.lsi = config['lsi']
self.pygments = config['pygments'] self.pygments = config['pygments']
self.permalink_style = config['permalink'].to_sym self.permalink_style = config['permalink'].to_sym
@ -99,6 +99,14 @@ module Jekyll
end end
end end
def setup_plugins
if (config['plugins'] == Jekyll::DEFAULTS['plugins'])
[File.join(self.source, config['plugins'])]
else
Array(config['plugins']).map { |d| File.expand_path(d) }
end
end
# Read Site data from disk and load it into internal data structures. # Read Site data from disk and load it into internal data structures.
# #
# Returns nothing. # Returns nothing.

7
test/test_site.rb
View File

@ -7,9 +7,9 @@ class TestSite < Test::Unit::TestCase
assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins
end end
should "have an array for plugins if passed as a string" do should "look for plugins under the site directory by default" do
site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => '/tmp/plugins'})) site = Site.new(Jekyll::DEFAULTS.merge({'source' => source_dir}))
assert_equal ['/tmp/plugins'], site.plugins assert_equal [File.join(source_dir, '_plugins')], site.plugins
end end
should "have an array for plugins if passed as an array" do should "have an array for plugins if passed as an array" do
@ -26,6 +26,7 @@ class TestSite < Test::Unit::TestCase
site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => nil})) site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => nil}))
assert_equal [], site.plugins assert_equal [], site.plugins
end end
end end
context "creating sites" do context "creating sites" do
setup do setup do