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

Merge pull request #1190 from bhollis/middleman-core

Browse source 
Be quiet about missing extras when middleman-core is used alone
This commit is contained in:
Thomas Reynolds 2014-03-03 10:50:10 -10:00
parent 4e545eef27 0533bc4209
commit f5b3720ef8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/lib/middleman-core/core_extensions.rb
View file

@ -35,7 +35,6 @@ require 'middleman-more/core_extensions/i18n'
begin begin
require 'middleman-more/core_extensions/compass' require 'middleman-more/core_extensions/compass'
rescue LoadError rescue LoadError
$stderr.puts "Compass not installed: #{$!}"
end end
### ###

4
middleman-core/lib/middleman-core/renderers/markdown.rb
View file

@ -49,10 +49,14 @@ module Middleman
::Tilt.prefer(markdown_engine_klass, *markdown_exts) ::Tilt.prefer(markdown_engine_klass, *markdown_exts)
end end
rescue LoadError rescue LoadError
# If they just left it at the default engine and don't happen to have it,
# then they're using middleman-core bare and we shouldn't bother them.
if config.setting(:markdown_engine).value_set?
logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?" logger.warn "Requested Markdown engine (#{config[:markdown_engine]}) not found. Maybe the gem needs to be installed and required?"
end end
end end
end end
end
alias :included :registered alias :included :registered
end end