diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb index a352028b..b9d1b841 100644 --- a/lib/jekyll/command.rb +++ b/lib/jekyll/command.rb @@ -18,9 +18,9 @@ module Jekyll site.process rescue Jekyll::FatalException => e puts - Jekyll::Logger.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:" - Jekyll::Logger.error "", "------------------------------------" - Jekyll::Logger.error "", e.message + Jekyll::Stevenson.error "ERROR:", "YOUR SITE COULD NOT BE BUILT:" + Jekyll::Stevenson.error "", "------------------------------------" + Jekyll::Stevenson.error "", e.message exit(1) end end diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb index 148869df..3c1c5f62 100644 --- a/lib/jekyll/commands/build.rb +++ b/lib/jekyll/commands/build.rb @@ -17,9 +17,9 @@ module Jekyll def self.build(site, options) source = options['source'] destination = options['destination'] - Jekyll::Logger.info "Source:", source - Jekyll::Logger.info "Destination:", destination - print Jekyll::Logger.formatted_topic "Generating..." + Jekyll::Stevenson.info "Source:", source + Jekyll::Stevenson.info "Destination:", destination + print Jekyll::Stevenson.formatted_topic "Generating..." self.process_site(site) puts "done." end @@ -36,14 +36,14 @@ module Jekyll source = options['source'] destination = options['destination'] - Jekyll::Logger.info "Auto-regeneration:", "enabled" + Jekyll::Stevenson.info "Auto-regeneration:", "enabled" dw = DirectoryWatcher.new(source, :glob => self.globs(source, destination), :pre_load => true) dw.interval = 1 dw.add_observer do |*args| t = Time.now.strftime("%Y-%m-%d %H:%M:%S") - print Jekyll::Logger.formatted_topic("Regenerating:") + "#{args.size} files at #{t} " + print Jekyll::Stevenson.formatted_topic("Regenerating:") + "#{args.size} files at #{t} " self.process_site(site) puts "...done." end diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 1819e0c7..d6648a2b 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -7,7 +7,7 @@ module Jekyll site.read unless deprecated_relative_permalinks(site) - Jekyll::Logger.info "Your test results", "are in. Everything looks fine." + Jekyll::Stevenson.info "Your test results", "are in. Everything looks fine." end end @@ -15,7 +15,7 @@ module Jekyll contains_deprecated_pages = false site.pages.each do |page| if page.uses_relative_permalinks - Jekyll::Logger.warn "Deprecation:", "'#{page.path}' uses relative" + + Jekyll::Stevenson.warn "Deprecation:", "'#{page.path}' uses relative" + " permalinks which will be deprecated in" + " Jekyll v1.1 and beyond." contains_deprecated_pages = true diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index c5219e13..f6c38fc7 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -9,7 +9,7 @@ module Jekyll new_blog_path = File.expand_path(args.join(" "), Dir.pwd) FileUtils.mkdir_p new_blog_path unless Dir["#{new_blog_path}/**/*"].empty? - Jekyll::Logger.error "Conflict:", "#{new_blog_path} exists and is not empty." + Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty." exit(1) end diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 0db188d3..06b9c767 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -115,7 +115,7 @@ module Jekyll def read_config_file(file) next_config = YAML.safe_load_file(file) raise "Configuration file: (INVALID) #{file}".yellow if !next_config.is_a?(Hash) - Jekyll::Logger.info "Configuration file:", file + Jekyll::Stevenson.info "Configuration file:", file next_config end @@ -135,9 +135,9 @@ module Jekyll end rescue SystemCallError # Errno:ENOENT = file not found - Jekyll::Logger.warn "Configuration file:", "none" + Jekyll::Stevenson.warn "Configuration file:", "none" rescue => err - Jekyll::Logger.warn "WARNING:", "Error reading configuration. " + + Jekyll::Stevenson.warn "WARNING:", "Error reading configuration. " + "Using defaults (and options)." $stderr.puts "#{err}" end @@ -153,7 +153,7 @@ module Jekyll config = clone # Provide backwards-compatibility if config.has_key?('auto') || config.has_key?('watch') - Jekyll::Logger.warn "Deprecation:", "Auto-regeneration can no longer" + + Jekyll::Stevenson.warn "Deprecation:", "Auto-regeneration can no longer" + " be set from your configuration file(s). Use the"+ " --watch/-w command-line option instead." config.delete('auto') @@ -161,14 +161,14 @@ module Jekyll end if config.has_key? 'server' - Jekyll::Logger.warn "Deprecation:", "The 'server' configuration option" + + Jekyll::Stevenson.warn "Deprecation:", "The 'server' configuration option" + " is no longer accepted. Use the 'jekyll serve'" + " subcommand to serve your site with WEBrick." config.delete('server') end if config.has_key? 'server_port' - Jekyll::Logger.warn "Deprecation:", "The 'server_port' configuration option" + + Jekyll::Stevenson.warn "Deprecation:", "The 'server_port' configuration option" + " has been renamed to 'port'. Please update your config" + " file accordingly." # copy but don't overwrite: diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index acdb0be0..aa02068d 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -76,7 +76,7 @@ module Jekyll def render_liquid(content, payload, info) Liquid::Template.parse(content).render!(payload, info) rescue Exception => e - Jekyll::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}" + Jekyll::Stevenson.error "Liquid Exception:", "#{e.message} in #{payload[:file]}" e.backtrace.each do |backtrace| puts backtrace end diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index 5b88fbf0..bd189e0f 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -18,14 +18,14 @@ module Jekyll def self.no_subcommand(args) if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first) - Jekyll::Logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \ + Jekyll::Stevenson.error "Deprecation:", "Jekyll now uses subcommands instead of just \ switches. Run `jekyll help' to find out more." end end def self.deprecation_message(args, deprecated_argument, message) if args.include?(deprecated_argument) - Jekyll::Logger.error "Deprecation:", message + Jekyll::Stevenson.error "Deprecation:", message end end end diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb index 1886194b..ef720f78 100644 --- a/lib/jekyll/filters.rb +++ b/lib/jekyll/filters.rb @@ -146,7 +146,7 @@ module Jekyll when String Time.parse(input) else - Jekyll::Logger.error "Invalid Date:", "'#{input}' is not a valid datetime." + Jekyll::Stevenson.error "Invalid Date:", "'#{input}' is not a valid datetime." exit(1) end end diff --git a/lib/jekyll/logger.rb b/lib/jekyll/logger.rb index ffe1954f..7eb53474 100644 --- a/lib/jekyll/logger.rb +++ b/lib/jekyll/logger.rb @@ -1,7 +1,7 @@ require 'logger' module Jekyll - class Logger < Logger + class Stevenson < Logger # Public: Print a jekyll message to stdout # # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc. diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb index 16ccd7e9..0b77b5e6 100644 --- a/lib/jekyll/site.rb +++ b/lib/jekyll/site.rb @@ -423,12 +423,12 @@ module Jekyll def relative_permalinks_deprecation_method if config['relative_permalinks'] && !@deprecated_relative_permalinks $stderr.puts # Places newline after "Generating..." - Jekyll::Logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" + + Jekyll::Stevenson.warn "Deprecation:", "Starting in 1.1, permalinks for pages" + " in subfolders must be relative to the" + " site source directory, not the parent" + " directory. Check http://jekyllrb.com/docs/upgrading/"+ " for more info." - $stderr.print Jekyll::Logger.formatted_topic("") + "..." # for "done." + $stderr.print Jekyll::Stevenson.formatted_topic("") + "..." # for "done." @deprecated_relative_permalinks = true end end