From ef9d8ddb7d6fb4eefc2f655fe6c6264af89a59f9 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 13 Apr 2013 20:24:45 +0200
Subject: [PATCH] Matching tests to new colorized output

---
 lib/jekyll/configuration.rb | 6 +++---
 test/test_configuration.rb  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 19deaf32..e67300a7 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -103,7 +103,7 @@ module Jekyll
     def read_config_file(file)
       configuration = dup
       next_config = YAML.safe_load_file(file)
-      raise "Configuration file: (INVALID) #{file}" if !next_config.is_a?(Hash)
+      raise "Configuration file: (INVALID) #{file}".yellow if !next_config.is_a?(Hash)
       Jekyll.info "Configuration file:", file
       configuration.deep_merge(next_config)
     end
@@ -125,9 +125,9 @@ module Jekyll
         # Errno:ENOENT = file not found
         Jekyll.warn "Configuration file:", "none"
       rescue => err
-        Jekyll.warn "WARNING", "Error reading configuration. " +
+        Jekyll.warn "WARNING:", "Error reading configuration. " +
                      "Using defaults (and options)."
-        Jekyll.warn "", "#{err}"
+        $stderr.puts "#{err}"
       end
 
       configuration.backwards_compatibilize
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 6eb35fc4..6e4675c6 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -64,7 +64,7 @@ class TestConfiguration < Test::Unit::TestCase
 
     should "fire warning with no _config.yml" do
       mock(YAML).safe_load_file(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
-      mock($stderr).puts("Configuration file: none")
+      mock($stderr).puts("Configuration file: none".yellow)
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
@@ -76,8 +76,8 @@ class TestConfiguration < Test::Unit::TestCase
 
     should "fire warning with bad config" do
       mock(YAML).safe_load_file(@path) { Array.new }
-      mock($stderr).puts("           WARNING: Error reading configuration. Using defaults (and options).")
-      mock($stderr).puts("Configuration file: (INVALID) #{@path}")
+      mock($stderr).puts(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow)
+      mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
   end