diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 29b0c102..51e0db8c 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -1,6 +1,13 @@ All notable changes to this project will be documented in this file. This change log follows the conventions of http://keepachangelog.com/[keepachangelog.com]. == Unreleased (dev) +// {{{ +=== Changed +* Bumped kaocha to 1.69.1069. + +=== Fixed +* https://github.com/liquidz/antq/issues/176[#176]: Fixed not to overwrite progress bar. +// }}} == 1.9.867 (2022-07-22) // {{{ diff --git a/deps.edn b/deps.edn index 2bf9d8de..1898b524 100644 --- a/deps.edn +++ b/deps.edn @@ -26,7 +26,7 @@ :dev {:extra-paths ["test" "test/resources"] - :extra-deps {lambdaisland/kaocha {:mvn/version "1.68.1059"} + :extra-deps {lambdaisland/kaocha {:mvn/version "1.69.1069"} lambdaisland/deep-diff2 {:mvn/version "2.3.127"}} :jvm-opts ["-Dclojure.core.async.go-checking=true"]} diff --git a/src/antq/core.clj b/src/antq/core.clj index 0f424917..0bf4377a 100644 --- a/src/antq/core.clj +++ b/src/antq/core.clj @@ -177,7 +177,8 @@ deps) uniq-deps (distinct-deps org-deps) _ (report/init-progress uniq-deps options) - uniq-deps-with-vers (pmap #(assoc-versions % options) uniq-deps) + uniq-deps-with-vers (doall (pmap #(assoc-versions % options) uniq-deps)) + _ (report/deinit-progress uniq-deps options) assoc-latest-version* #(assoc-latest-version % options)] (->> org-deps (pmap #(complete-versions-by % uniq-deps-with-vers)) diff --git a/src/antq/report.clj b/src/antq/report.clj index f081a25f..ad693e7b 100644 --- a/src/antq/report.clj +++ b/src/antq/report.clj @@ -21,3 +21,9 @@ (:reporter options))) (defmethod run-progress :default [_ _] nil) + +(defmulti deinit-progress + (fn [_dep options] + (:reporter options))) + +(defmethod deinit-progress :default [_ _] nil) diff --git a/src/antq/report/table.clj b/src/antq/report/table.clj index a0077687..4914e97c 100644 --- a/src/antq/report/table.clj +++ b/src/antq/report/table.clj @@ -53,7 +53,7 @@ [{:keys [width total-count current-count]}] (let [width (or width 50) ratio (int (* width (/ current-count total-count)))] - (format "[ %s%s ] %d/%d\r" + (format "[%s%s] %d/%d\r" (apply str (repeat ratio "#")) (apply str (repeat (- width ratio) "-")) current-count @@ -71,3 +71,7 @@ (swap! count-atom inc) (log/async-print (progress-text {:total-count total-count :current-count @count-atom}))))) + +(defmethod report/deinit-progress "table" + [_ _] + (println ""))