[ultra] Add support for Whidbey/Puget options

This commit resolves #40

It allows a user to add whidbey/puget options in Ultra's `:repl` key,
which will be merged into the whidbey.printer/printer options map.

src/ultra/colorscheme.clj

@@ -62,5 +62,5 @@
     (alter-var-root
       #'whidbey.repl/printer
       merge
-      (assoc opts :color-scheme color-scheme))
+      {:color-scheme color-scheme})
     (set-pretty-colors color-scheme)))

src/ultra/repl.clj

@@ -4,8 +4,7 @@
             [clojure.tools.nrepl.server]
             [glow.core :as glow]
             [io.aviso.repl :as pretty-repl]
-            [ultra.printer :refer [cprint]]
-            [ultra.printer.escape-hatch]))
+            [ultra.printer :refer [cprint]]))
 
 (defmacro source
   "Prints the source code for the given symbol, if it can find it.
@@ -57,7 +56,9 @@
   [repl stacktraces]
   (when (not (false? repl))
     (require 'ultra.repl.whidbey)
+    (require 'whidbey.repl)
     (eval '(ultra.repl.whidbey/add-whidbey-middleware))
+    (eval `(whidbey.repl/update-options! ~repl))
     (replace-source))
   (when (not (false? stacktraces))
     (add-pretty-middleware)))

src/ultra/test.clj

@@ -3,7 +3,6 @@
   (:require [clojure.data :as data]
             [clojure.pprint :as pp]
             [puget.color.ansi :as ansi]
-            [puget.printer :as printer]
             [ultra.test.diff :as diff]))