[#83] Read managed dependencies from project map

Author: Yannick Scherer

lein-ancient/src/leiningen/ancient/artifact/check.clj

@@ -83,15 +83,12 @@
 
    We don't want to add a version to `:dependencies` but we want to
    check/update the one in `:managed-dependencies` - thus, we have to
-   remove all entries in `:dependencies` that have a managed counterpart."
-  [artifacts]
-  (let [managed-artifacts
-        (->> artifacts
-             (filter
-               (fn [{:keys [keys artifact]}]
-                 (contains? (set keys) :managed-dependencies)))
-             (map (comp :symbol :artifact))
-             (set))]
+   remove all entries in `:dependencies` that have a managed counterpart.
+
+   We expect the list of dependencies to treat as managed as an option
+   value to handle inheritance better."
+  [{:keys [managed-dependencies]} artifacts]
+  (let [managed-artifacts (set (map first managed-dependencies))]
     (remove
       (fn [{{:keys [symbol version-string]} :artifact, ks :keys}]
         (and (not (contains? (set ks) :managed-dependencies))
@@ -152,7 +149,7 @@
    "
   [options artifacts]
   (->> (collect-artifacts-from-map options [] artifacts)
-       (remove-managed-dependencies)
+       (remove-managed-dependencies options)
        (keep #(mark-artifact options %))))
 
 ;; ## Check

lein-ancient/src/leiningen/ancient/artifact/options.clj

@@ -100,11 +100,16 @@
       (seq exclude) (update-in [:exclude] concat exclude)
       true          (merge options))))
 
+(defn- managed-dependencies-options
+  [options {:keys [managed-dependencies]}]
+  (assoc options :managed-dependencies managed-dependencies))
+
 (defn options
   "Prepare the option map."
   ([] (options {}))
   ([opts]
    (-> {:cache (ref {})}
+       (managed-dependencies-options opts)
        (repository-options opts)
        (version-options opts)
        (selector-options opts))))

lein-ancient/src/leiningen/ancient/utils.clj

@@ -90,21 +90,23 @@
 (defn parse
   "Create a map of `:artifact-opts`, `:opts` and `:args` from the given
    project and arguments."
-  [{:keys [repositories mirrors] :as project} args
+  [{:keys [repositories mirrors managed-dependencies] :as project} args
    & {:keys [change-defaults exclude fixed]}]
   (try
     (let [[opts' rst] (cli/parse args
                                  :change-defaults change-defaults
                                  :exclude exclude)
           opts (merge opts' fixed)
-          artifact-opts (-> (assoc opts
-                                   :repositories repositories
-                                   :mirrors mirrors)
+          artifact-opts (-> opts
+                            (merge
+                              {:managed-dependencies managed-dependencies
+                               :repositories         repositories
+                               :mirrors              mirrors})
                             (o/options))]
       {:artifact-opts artifact-opts
-       :opts opts
-       :project project
-       :args rst})
+       :opts          opts
+       :project       project
+       :args          rst})
     (catch Throwable t
       (errorf "%s" (.getMessage t)))))
 

lein-ancient/test/leiningen/ancient/artifact/check_test.clj

@@ -106,7 +106,8 @@
                               [org.clojure/clojure "1.5.1"]
                               [managed]]
                :managed-dependencies [[managed "0.2.0"]]}
-        opts (o/options {})
+        opts (o/options
+               {:managed-dependencies '[[managed "0.2.0"]]})
         artifacts (->> (collect-artifacts opts data)
                        (filter :include?)
                        (map (juxt (comp :symbol :artifact)

lein-ancient/test/leiningen/ancient/artifact/files_test.clj

@@ -7,11 +7,30 @@
   (:import [java.io StringWriter]))
 
 (defn- const-opts
-  [v]
+  [v & [extra-opts]]
   (o/options
-    {:plugins? true
-     :repositories
-     {"const" (constantly [v])}}))
+    (merge
+      extra-opts
+      {:plugins? true
+       :repositories
+       {"const" (constantly [v])}})))
+
+(defn- test-upgrade!
+  [?file opts contents expected outdated-count]
+  (with-temp-file [tmp contents]
+    (let [f (?file tmp)
+          r (read! f)]
+      (is (satisfies? Dependencies f))
+      (is (satisfies? Dependencies r))
+      (let [outdated (check! r opts)]
+        (is (= outdated-count (count outdated)))
+        (is (every? :latest outdated))
+        (is (every? #{"0.1.1"} (map (comp :version-string :latest) outdated)))
+        (let [u (upgrade! r outdated)]
+          (is (satisfies? Dependencies u))
+          (is (= expected (write-string! u)))
+          (write-out! u)
+          (is (= expected (slurp tmp))))))))
 
 (deftest t-project-file-upgrading
   (are [?fmt ?file]
@@ -21,36 +40,14 @@
                   opts (const-opts "0.1.1")
                   contents (format ?fmt (pr-str ?artifact))
                   expected (format ?fmt (pr-str upgraded))]
-              (with-temp-file [tmp contents]
-                (let [f (?file tmp)
-                      r (read! f)]
-                  (is (satisfies? Dependencies f))
-                  (is (satisfies? Dependencies r))
-                  (let [outdated (check! r opts)]
-                    (is (= 1 (count outdated)))
-                    (is (every? :latest outdated))
-                    (is (every? #{"0.1.1"} (map (comp :version-string :latest) outdated)))
-                    (let [u (upgrade! r outdated)]
-                      (is (satisfies? Dependencies u))
-                      (is (= expected (write-string! u)))
-                      (write-out! u)
-                      (is (= expected (slurp tmp))))))))
+              (test-upgrade! ?file opts contents expected 1))
             '[artifact]
             '[artifact "0.1.0"]
             '[artifact "0.1.0" :exclusions [other]])
        (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
             "  :dependencies [%s])")
        project-file
 
-       (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
-            "  :managed-dependencies [%s])")
-       project-file
-
-       (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
-            "  :dependencies         [[artifact]]"
-            "  :managed-dependencies [%s])")
-       project-file
-
        (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
             "  :dependencies [#_[ignore] %s])")
        project-file
@@ -63,6 +60,34 @@
             "           %s]}")
        #(profiles-file % [:profiles :prof])))
 
+(deftest t-project-file-upgrading-with-managed-dependencies
+  (are [?fmt ?outdated-count]
+       (are [?artifact]
+            (let [[a _ & rst] ?artifact
+                  upgraded (reduce conj [a "0.1.1"] rst)
+                  opts (const-opts
+                         "0.1.1"
+                         {:managed-dependencies '[[artifact "0.2.0"]]})
+                  contents (format ?fmt (pr-str ?artifact))
+                  expected (format ?fmt (pr-str upgraded))]
+              (test-upgrade! project-file opts contents expected ?outdated-count))
+            '[artifact "0.1.0"]
+            '[artifact "0.1.0" :exclusions [other]])
+       (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
+            "  :managed-dependencies [%s])")
+       1
+
+       (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
+            "  :dependencies   [[artifact]]"
+            "  :parent-project {:path \"parent.clj\""
+            "                   :inherit [:managed-dependencies]})")
+       0
+
+       (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"
+            "  :dependencies         [[artifact]]"
+            "  :managed-dependencies [%s])")
+       1))
+
 (deftest t-project-file-upgrading-failure-because-of-modifications
   (let [opts (const-opts "0.1.1")
         contents (str "(defproject project-x \"0.1.1-SNAPSHOT\"\n"