cleanup

Author: escherize

bb.edn

@@ -69,7 +69,7 @@
 
          watch-ci
          {:requires [[bb.dl-and-run :as dl]
-                     [clojure.pprint :as pp]]
+                     [bb.watch-ci :as watch-ci]]
           :doc "Watch the CI status for a branch until it passes."
           :examples [["bb watch-ci --branch current" "Check currently checked out branch in MB_DIR repo"]]
           :task
@@ -79,15 +79,15 @@
                                                  :msg "What branch should we check?"
                                                  :short "-b"
                                                  :long "--branch BRANCH"
-                                                 :choices (delay (t/list-branches (t/mb-env)))
+                                                 :choices (delay (t/list-branches (t/mb-dir)))
                                                  :choices-doc "list of branches"
                                                  :prompt :select})
                     branch (if (= "current" branch)
                              (let [current (t/current-branch)]
                                (do (println (c/green (c/bold "Using current branch: " (t/current-branch))))
                                    current))
                              branch)]
-                (bb.watch-ci/branch branch)))}
+                (watch-ci/branch branch)))}
 
          install-autotab {:doc "Prints shell code to autocomplete tasks using bb.
                         Note: for fish shell please make sure ~/.config/fish/completions exists."

bb/dl_and_run.clj

@@ -6,15 +6,14 @@
    [bb.tasks :as t]
    [cheshire.core :as json]
    [clojure.edn :as edn]
-   [clojure.string :as str]
    [selmer.parser :refer [<<]]))
 
 (defn- keep-first
   "like (fn [f coll] (first (keep f coll))) but does not do chunking."
   [f coll]
   (reduce (fn [_ element] (when-let [resp (f element)] (reduced resp))) nil coll))
 
-(defn- gh-get [url]
+(defn gh-get [url]
   (try (-> url
            (curl/get {:headers {"Accept" "application/vnd.github+json"
                                 "Authorization" (str "Bearer " (t/env "GH_TOKEN"))}})
@@ -141,20 +140,3 @@
 (defn download-and-run-latest-jar! [{:keys [branch port socket-repl] :as args}]
   (let [info (download-latest-jar! args)]
     (run-jar! info port socket-repl)))
-
-(def pretty {:success "✅"
-             :skipped "⏭️ "
-             :cancelled "⏹️"
-             :in-progress "🔄"
-             :failure "❌"})
-
-(defn checks-for-branch [branch]
-  ;; note: this is a ref, so it can e.g. also be a sha.
-  (->> (str "https://api.github.com/repos/metabase/metabase/commits/" branch "/check-runs")
-       gh-get
-       :check_runs
-       (mapv :conclusion)
-       (mapv (fn [x] (if (nil? x) :in-progress (keyword x))))
-       frequencies
-       (sort-by first)
-       reverse))

bb/quick_test.clj

@@ -6,12 +6,12 @@
    [bb.tasks :as t]
    [clojure.string :as str]))
 
-(defn- test-path [] (str (t/mb-env) "/test"))
+(defn- test-path [] (str (t/mb-dir) "/test"))
 
 (defn- file->ns [path]
   (-> path
       str
-      (str/replace (str (t/mb-env) "/test/") "")
+      (str/replace (str (t/mb-dir) "/test/") "")
       (str/replace #"\.clj$" "")
       (str/replace "_" "-")
       (str/replace "/" ".")))

bb/watch_ci.clj

@@ -1,11 +1,6 @@
 (ns bb.watch-ci
-  (:require [babashka.process :refer [shell]]
-            [bask.colors :as c]
-            [bb.cli :as cli]
-            [bb.tasks :as t]
-            [clojure.string :as str]
+  (:require [clojure.string :as str]
             [bb.dl-and-run :as dl]
-            [clojure.pprint :as pp]
             [table.core :as table]))
 
 (defn checks-for-branch [branch]