From 253fc8c506b47f901bbc018720b7e86329dffbcf Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 12 Jul 2013 12:22:06 +0200
Subject: [PATCH] Raise LoadError if the file doesn't exist but do not catch
 it. :)

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

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index a4894237..5b5dda4b 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -126,7 +126,7 @@ module Jekyll
         {}
       else
         Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
-        abort
+        raise LoadError
       end
     end
 
@@ -144,7 +144,7 @@ module Jekyll
           new_config = read_config_file(config_file)
           configuration = configuration.deep_merge(new_config)
         end
-      rescue => err
+      rescue ArgumentError => err
         Jekyll.logger.warn "WARNING:", "Error reading configuration. " +
                      "Using defaults (and options)."
         $stderr.puts "#{err}"
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 0f197643..0e6372b0 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -82,6 +82,7 @@ class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
     setup do
       @path = File.join(Dir.pwd, '_config.yml')
+      @user_config = File.join(Dir.pwd, "my_config_file.yml")
     end
 
     should "fire warning with no _config.yml" do
@@ -102,6 +103,14 @@ class TestConfiguration < Test::Unit::TestCase
       mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
       assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
+
+    should "fire warning when user-specified config file isn't there" do
+      mock(YAML).safe_load_file(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
+      mock($stderr).puts(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red)
+      assert_raises LoadError do
+        Jekyll.configuration({'config' => [@user_config]})
+      end
+    end
   end
   context "loading config from external file" do
     setup do