From d387fd0baab65675dbd973189db14359d36e4d54 Mon Sep 17 00:00:00 2001
From: Henry Goodman <github@henrygoodman.com>
Date: Wed, 17 Feb 2016 00:29:57 -0800
Subject: [PATCH] Add show_dir_listing option for serve command

---
 lib/jekyll/commands/serve.rb | 4 ++++
 lib/jekyll/configuration.rb  | 1 +
 test/test_commands_serve.rb  | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 29408fe2..69ea8ba7 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -10,6 +10,8 @@ module Jekyll
           "ssl_key"  => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"     => ["-P", "--port [PORT]", "Port to listen on"],
           "baseurl"  => ["-b", "--baseurl [URL]", "Base URL"],
+          "show_dir_listing" => ["--show-dir-listing",
+            "Show a directory listing instead of loading your index file."],
           "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
             "Skips the initial site build which occurs before the server is started."]
         }
@@ -91,6 +93,8 @@ module Jekyll
             )
           }
 
+          opts[:DirectoryIndex] = [] if opts[:JekyllOptions]['show_dir_listing']
+
           enable_ssl(opts)
           enable_logging(opts)
           opts
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 0f8618a1..cf499aa2 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -44,6 +44,7 @@ module Jekyll
       'port'          => '4000',
       'host'          => '127.0.0.1',
       'baseurl'       => '',
+      'show_dir_listing' => false,
 
       # Output Configuration
       'permalink'     => 'date',
diff --git a/test/test_commands_serve.rb b/test/test_commands_serve.rb
index 87472c3d..9fd3c1db 100644
--- a/test/test_commands_serve.rb
+++ b/test/test_commands_serve.rb
@@ -68,6 +68,11 @@ class TestCommandsServe < JekyllUnitTest
         ]
       end
 
+      should "use empty directory index list when show_dir_listing is true" do
+        opts = { "show_dir_listing" => true }
+        assert custom_opts(opts)[:DirectoryIndex].empty?
+      end
+
       context "verbose" do
         should "debug when verbose" do
           assert_equal custom_opts({ "verbose" => true })[:Logger].level, 5