From 738d171f6bd95b7a733297dc966de16be7fd9c7e Mon Sep 17 00:00:00 2001
From: Asher Van Brunt <asher.vanbrunt@gmail.com>
Date: Thu, 14 Oct 2010 19:09:22 -0700
Subject: [PATCH] Resolve Issue 15: Allow passing configuration option

---
 bin/gollum | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bin/gollum b/bin/gollum
index 86ac7622..6f4703bb 100755
--- a/bin/gollum
+++ b/bin/gollum
@@ -35,6 +35,10 @@ opts = OptionParser.new do |opts|
     exit 0
   end
 
+  opts.on("--config [CONFIG]", "Path to additional configuration file") do |config|
+    options['config'] = config
+  end
+
   opts.on("--irb", "Start an irb process with gollum loaded for the current wiki.") do
     options['irb'] = true
   end
@@ -99,5 +103,11 @@ if options['irb']
 else
   require 'gollum/frontend/app'
   Precious::App.set(:gollum_path, gollum_path)
+  if cfg = options['config']
+    # If the path begins with a '/' it will be considered an absolute path,
+    # otherwise it will be relative to the CWD
+    cfg = File.join(Dir.getwd, cfg) unless cfg.slice(0) == File::SEPARATOR 
+    require cfg
+  end
   Precious::App.run!(options)
 end