Tweak some wording / formatting

Author: trptcolin

src/koan_engine/random.clj

@@ -5,7 +5,7 @@
             [clojure.string :as s]))
 
 (def success-quotes
-  ["Hack and be marry!"
+  ["Hack and be merry!"
    "You're bound to be unhappy if you optimize everything. -Donald Knuth"
    "Lisp isn't a language, it's a building material. -Alan Kay"
    "The key to performance is elegance. -Jon Bentley and Doug McIlroy"
@@ -14,27 +14,29 @@
 (def failure-quotes
   ["If at first you don't succeed; call it version 0.1"
    "I would love to change the world, but they won't give me the source code."
-   "Loosing is fun. -Dwarf Fortress"
+   "Losing is fun. -Dwarf Fortress"
    "Deleted code is debugged code. -Jeff Sickel"])
 
 (defn- solve-koan [koan]
-  (print "and the solution is (';' as delimiter): ")
+  (println)
+  (print "Your solution (using \";\" as a delimiter): ")
   (flush)
   (let [solutions (s/split (read-line) #";")
         filled-koan (reduce (fn [k s] (s/replace-first k #"\b___?\b" s)) koan solutions)]
     (println)
-    (println "Your solution:\n" filled-koan)
+    (println "The koan, filled in with your solution:\n" filled-koan)
     (if
-        (or (try
-              (load-string filled-koan)
-              (catch AssertionError e (prn e) false)
-              (catch Exception e (prn e) false))
-            (= (symbol "skip-koan") (first solutions))
-            (= "skip-koan" (first solutions))
-            (= :skip-koan (first solutions)))
-      (println "Success. " (-> success-quotes shuffle first) "\nNext koan is coming up.\n")
+      (or (try
+            (load-string filled-koan)
+            (catch AssertionError e (prn e) false)
+            (catch Exception e (prn e) false))
+          (= (symbol "skip-koan") (first solutions))
+          (= "skip-koan" (first solutions))
+          (= :skip-koan (first solutions)))
+      (println "Success! " (-> success-quotes shuffle first)
+               "\nNext koan coming right up.\n")
       (do
-        (println "Failed." (-> failure-quotes shuffle first) "\nTry again!")
+        (println "Oh no, failed!" (-> failure-quotes shuffle first) "\nTry again!")
         (solve-koan koan)))))
 
 (defmacro random-koan [prefix-forms & forms]
@@ -43,35 +45,38 @@
                   shuffle
                   first)]
     ((fn [[doc# code#]]
-       (println "Solve the following koan:")
-       (println "meditate: " doc#)
+       (println "-----\nSolve the following koan:")
+       (println doc#)
        (println code#)
        (solve-koan (str prefix-forms code#)))
      koan)))
 
 (defn- do-run [opts]
   (let [{:keys [dojo-resource koan-resource koan-root]} opts
         koan-file (-> koan-resource
-                 ordered-koans
-                 shuffle
-                 first)
+                      ordered-koans
+                      shuffle
+                      first)
         form (s/replace (slurp (file koan-root (str koan-file ".clj")))
-                             #"\(ns" "(comment")
+                        #"\(ns" "(comment")
         form-wo-meditations (-> form
                                 (s/replace #"\(meditations[\s\S]*" "")
                                 (s/replace "\"" "\\\""))]
-    (println "\nmeditating uppon: " koan-file)
-    (println "the contex of the koan:\n" form-wo-meditations)
+    (println "\nMeditating upon: " koan-file)
+    (println "The contex of the koan:\n"
+             (s/trim form-wo-meditations)
+             "\n")
     (u/with-dojo [dojo-resource]
-      (-> (s/replace form "(meditations" (format "(random-koan \"%s\"" form-wo-meditations))
+      (-> (s/replace form "(meditations" (format "(random-koan \"%s\""
+                                                 form-wo-meditations))
           load-string)))
   (do-run opts))
 
 (defn runner [opts]
   (println
-"Showing a random koan from the project.
-You might never reach enlightement but you can play endlessly until you get bored and start writing your own koans!")
+    "You might never reach enlightement, but you can play endlessly until you get bored and start writing your own koans!")
   (println)
   (println
-"Provide your answer or \"skip-koan\" if you want to skip the current one. You will automatically get the next random koan on success. Use ';' as delimiter if you need to provide multiple answers. If you need to provide multiple answers but only some of those have effect on the given koan you have to provide your solution in the right place; however, what you type for the rest is not important, you can keep them blank or use :skip.")
+    "Provide your answer or \"skip-koan\" if you want to skip the current one. You will automatically get the next random koan on success. Use \";\" as delimiter if you need to provide multiple answers. If you need to provide multiple answers but only some of those have effect on the given koan you have to provide your solution in the right place; however, what you type for the rest is not important, you can keep them blank or use :skip.")
+  (println "-----")
   (do-run opts))