deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add middleman.rb option

Browse source
This commit is contained in:
Thomas Reynolds 2014-08-14 20:34:31 -07:00
parent 0f785a448a
commit e886eeaa3e
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
middleman-core/lib/middleman-core/application.rb
View file

@ -256,10 +256,17 @@ module Middleman
def evaluate_configuration
# Check for and evaluate local configuration in `config.rb`
local_config = File.join(root, 'config.rb')
if File.exist? local_config
logger.debug '== Reading: Local config'
config_context.instance_eval File.read(local_config), local_config, 1
config_rb = File.join(root, 'config.rb')
if File.exist? config_rb
logger.debug '== Reading: Local config: config.rb'
config_context.instance_eval File.read(config_rb), config_rb, 1
else
# Check for and evaluate local configuration in `middleman.rb`
middleman_rb = File.join(root, 'middleman.rb')
if File.exist? middleman_rb
logger.debug '== Reading: Local middleman: middleman.rb'
config_context.instance_eval File.read(middleman_rb), middleman_rb, 1
end
end
env_config = File.join(root, 'environments', "#{config[:environment]}.rb")