Improve watcher, hide clojure invocation

Author: plexus

CHANGELOG.md

@@ -1,11 +1,11 @@
 # Unreleased
 
-## Added
-
-## Fixed
-
 ## Changed
 
+- Merge consecutive calls to `lambdaisland.launchpad.watcher/watch!`, so it's
+  easier to use from user code
+- Don't show full clojure invocation by default, can be seen with `--verbose`
+
 # 0.26.123-alpha (2024-01-29 / d471611)
 
 ## Fixed
@@ -209,4 +209,4 @@ Initial release
 - lambdaisland.classpath integration
 - Support for cider-nrepl, refactor-nrepl
 - Basic support for shadow-cljs cljs nREPL-base REPL
-- Auto-connect for Emacs
+- Auto-connect for Emacs

src/lambdaisland/launchpad.clj

@@ -494,9 +494,10 @@
 
 (defn run-process [{:keys [cmd prefix working-dir
                            background? timeout-ms check-exit-code? env
-                           color]
+                           color show-command?]
                     :or {working-dir "."
-                         check-exit-code? true}}]
+                         check-exit-code? true
+                         show-command? true}}]
   (fn [ctx]
     (let [working-dir  (io/file working-dir)
           proc-builder (doto (ProcessBuilder. (map str cmd))
@@ -506,7 +507,8 @@
           prefix (str "[" (ansi-fg (+ 30 color) (or prefix (first cmd))) "] ")
           process (pipe-process-output (.start proc-builder) prefix)
           ctx (update ctx :processes (fnil conj []) process)]
-      (apply println (str prefix "$") (map shellquote cmd))
+      (when show-command?
+        (apply println (str prefix "$") (map shellquote cmd)))
       (if background?
         ctx
         (let [exit (if timeout-ms
@@ -523,7 +525,8 @@
     (apply debug (map shellquote args))
     ((run-process {:cmd args
                    :ctx-process-key :clojure-process
-                   :background? true}) ctx)))
+                   :background? true
+                   :show-command? false}) ctx)))
 
 (def before-steps [read-deps-edn
                    handle-cli-args

src/lambdaisland/launchpad/watcher.clj

@@ -15,6 +15,7 @@
            java.io.File
            io.methvin.watcher.DirectoryWatcher))
 
+(defonce handlers (atom nil))
 (defonce watchers (atom nil))
 
 (defn canonical-path [p]
@@ -50,7 +51,8 @@
   "Watch a number of files, takes a map from filename (string) to
   handler (receives a map with `:type` and `:path`, as with Beholder)."
   [file->handler]
-  (let [file->handler (update-keys file->handler canonical-path)
+  (let [file->handler (swap! handlers merge file->handler)
+        file->handler (update-keys file->handler canonical-path)
         directories (distinct (map parent-path (keys file->handler)))
         ;; in case of nested directories, only watch the top-most one
         directories (remove (fn [d]