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

Use Jekyll.logger, never puts

This commit is contained in:
Parker Moore 2014-05-06 13:02:35 -04:00
parent fda3461c5a
commit 63e959e4e1
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/commands/new.rb
View File

@ -36,7 +36,7 @@ module Jekyll
end end
end end
puts "New jekyll site installed in #{new_blog_path}." Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
end end
def self.create_blank_site(path) def self.create_blank_site(path)

4
lib/jekyll/convertible.rb
View File

@ -50,9 +50,9 @@ module Jekyll
self.data = SafeYAML.load($1) self.data = SafeYAML.load($1)
end end
rescue SyntaxError => e rescue SyntaxError => e
puts "YAML Exception reading #{File.join(base, name)}: #{e.message}" Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
rescue Exception => e rescue Exception => e
puts "Error reading file #{File.join(base, name)}: #{e.message}" Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}"
end end
self.data ||= {} self.data ||= {}

2
lib/jekyll/site.rb
View File

@ -396,13 +396,11 @@ module Jekyll
def relative_permalinks_deprecation_method def relative_permalinks_deprecation_method
if config['relative_permalinks'] && has_relative_page? if config['relative_permalinks'] && has_relative_page?
$stderr.puts # Places newline after "Generating..."
Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" + Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
" in subfolders must be relative to the" + " in subfolders must be relative to the" +
" site source directory, not the parent" + " site source directory, not the parent" +
" directory. Check http://jekyllrb.com/docs/upgrading/"+ " directory. Check http://jekyllrb.com/docs/upgrading/"+
" for more info." " for more info."
$stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done."
end end
end end