Merge pull request technomancy#1338 from jcrossley3/port-required

Abort with a nicer message when neither port nor .nrepl-port is provided
ascii1011 · Oct 2, 2013 · a4a027c · a4a027c
2 parents 9e04655 + 360fab0
commit a4a027c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/leiningen/repl.clj b/src/leiningen/repl.clj
@@ -42,7 +42,9 @@
 (defn client-repl-port [project]
   (let [port (repl-port project)]
     (if (= port 0)
-      (slurp (io/file (:root project) ".nrepl-port"))
+      (try
+        (slurp (io/file (:root project) ".nrepl-port"))
+        (catch Exception _ (main/abort "Port is required")))
       port)))
 
 (defn connect-string [project opts]

diff --git a/test/leiningen/test/repl.clj b/test/leiningen/test/repl.clj
@@ -74,7 +74,10 @@
        "7"                   "repl-host:7"
        "myhost:9"            "myhost:9"
        "http://localhost:20" "http://localhost:20")
-  (is (= "127.0.0.1:4242" (connect-string lthelper/sample-project []))))
+  (is (= "127.0.0.1:4242" (connect-string lthelper/sample-project [])))
+  (is (re-find
+       #"Port is required"
+       (lthelper/abort-msg connect-string lthelper/with-resources-project []))))
 
 (deftest test-options-for-reply
   (is (= (lthelper/fix-path-delimiters "/home/user/.lein-repl-history")