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

Refactored Configuration#config_files

This commit is contained in:
Parker Moore 2013-04-12 23:59:37 +02:00
parent bd8d271ce3
commit 6881d3bfbf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/jekyll/configuration.rb
View File

@ -73,22 +73,25 @@ module Jekyll
reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) } reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) }
end end
# Public: Directory of the Jekyll source folder
#
# override - the command-line options hash
#
# Returns the path to the Jekyll source directory
def source(override)
override['source'] || self['source'] || DEFAULTS['source']
end
# Public: Generate list of configuration files from the override # Public: Generate list of configuration files from the override
# #
# override - the command-line options hash # override - the command-line options hash
# #
# Returns an Array of config files # Returns an Array of config files
def config_files(override) def config_files(override)
# _config.yml may override default source location, but until
# then, we need to know where to look for _config.yml
source = override['source'] || self['source'] || DEFAULTS['source']
# Get configuration from <source>/_config.yml or <source>/<config_file> # Get configuration from <source>/_config.yml or <source>/<config_file>
config_files = override.delete('config') config_files = override.delete('config')
config_files = File.join(source, "_config.yml") if config_files.to_s.empty? config_files = File.join(source(override), "_config.yml") if config_files.to_s.empty?
unless config_files.is_a? Array config_files = [config_files] unless config_files.is_a? Array
config_files = [config_files]
end
config_files config_files
end end