Skip to content

Commit

Permalink
Fix unverified deps not to handled from showing diff and upgrading #63
Browse files Browse the repository at this point in the history
  • Loading branch information
liquidz committed Mar 11, 2021
1 parent 326dbc4 commit 1320236
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 24 deletions.
12 changes: 7 additions & 5 deletions src/antq/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

(def ^:private disallowed-unverified-deps-map
{"antq/antq" "com.github.liquidz/antq"
"seancorfield/next.jdbc" "com.github.seancorfield/next.jdbc"})
"seancorfield/next.jdbc" "com.github.seancorfield/next.jdbc"})

(def cli-options
[[nil "--exclude=EXCLUDE" :default [] :assoc-fn concat-assoc-fn]
Expand Down Expand Up @@ -152,15 +152,17 @@
(pmap #(complete-versions-by % uniq-deps-with-vers))
(map (comp dissoc-no-longer-used-keys
assoc-latest-version))
(remove ver/latest?))))
(remove ver/latest?)
(map #(assoc % :outdated-target :version)))))

(defn unverified-deps
[deps]
(keep #(when-let [verified-name (and (= :java (:type %))
(get disallowed-unverified-deps-map (:name %)))]
(assoc %
:version (:name %)
:latest-version verified-name))
:latest-version verified-name
:outdated-target :name))
deps))

(defn exit
Expand Down Expand Up @@ -201,8 +203,8 @@
deps (fetch-deps options)
deps (unify-org-clojure-deps deps)]
(if (seq deps)
(let [outdated (outdated-deps deps options)
outdated (concat outdated (unverified-deps deps))]
(let [outdated (concat (outdated-deps deps options)
(unverified-deps deps))]
(report/reporter outdated options)

(cond-> outdated
Expand Down
7 changes: 7 additions & 0 deletions src/antq/record.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,10 @@
;; Project type keyword
;; e.g. :clojure, :leiningen, :shadow-cljs and so on.
project
;; Key to indicate which parameter is outdated
;; e.g. :version or :name
outdated-target])

(defn version-outdated?
[dep]
(= :version (:outdated-target dep)))
2 changes: 2 additions & 0 deletions src/antq/report/table.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(ns antq.report.table
(:require
[antq.diff :as diff]
[antq.record :as r]
[antq.report :as report]
[antq.util.dep :as u.dep]
[antq.util.ver :as u.ver]
Expand Down Expand Up @@ -33,6 +34,7 @@

;; Show diff URLs
(let [urls (->> deps
(filter r/version-outdated?)
(sort u.dep/compare-deps)
(keep diff/get-diff-url)
(distinct))]
Expand Down
40 changes: 21 additions & 19 deletions src/antq/upgrade.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(ns antq.upgrade
(:require
[antq.log :as log]
[antq.record :as r]
[antq.util.zip :as u.zip]))

(defmulti upgrader
Expand Down Expand Up @@ -42,23 +43,24 @@

(defn upgrade!
"Return only non-upgraded deps"
[version-checked-deps force?]
(when (and (seq version-checked-deps)
(not force?))
(log/info ""))
[deps force?]
(let [version-checked-deps (filter r/version-outdated? deps)]
(when (and (seq version-checked-deps)
(not force?))
(log/info ""))

(doall
(remove
(fn [dep]
(if (confirm dep force?)
(if-let [upgraded-content (upgrader dep)]
(do (log/info (format "Upgraded %s '%s' to '%s' in %s."
(:name dep)
(:version dep)
(:latest-version dep)
(:file dep)))
(spit (:file dep) upgraded-content)
true)
false)
false))
version-checked-deps)))
(doall
(remove
(fn [dep]
(if (confirm dep force?)
(if-let [upgraded-content (upgrader dep)]
(do (log/info (format "Upgraded %s '%s' to '%s' in %s."
(:name dep)
(:version dep)
(:latest-version dep)
(:file dep)))
(spit (:file dep) upgraded-content)
true)
false)
false))
version-checked-deps))))

0 comments on commit 1320236

Please sign in to comment.