yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2214 from technomancy/2212-allow-keyword-dependency-versions

Browse source 
Allow keyword dependency versions, fixes #2212
This commit is contained in:
Chris Price 2016-10-04 14:37:41 -07:00 committed by GitHub
commit 90f7ffdb14
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
leiningen-core/src/leiningen/core/classpath.clj
View file

@ -538,17 +538,17 @@
due to the use of `:managed-dependencies`, and to inject a `nil` into the
vector in the place where the version string should be."
[dep]
(if dep
;; Some plugins may replace a keyword with a version string later on, so
;; assume that even lenght vectors are alright. If not, then they will blow up
;; at a later stage.
(if (even? (count dep))
dep
(let [id (first dep)
sec (second dep)
version (if-not (keyword? sec) sec)
opts (if (keyword? sec)
(nthrest dep 1)
(nthrest dep 2))]
opts (rest dep)]
;; it's important to preserve the metadata, because it is used for
;; profile merging, etc.
(with-meta
(into [id version] opts)
(into [id nil] opts)
(meta dep)))))
(defn normalize-dep-vectors

30
leiningen-core/test/leiningen/core/test/classpath.clj
View file

@ -106,3 +106,33 @@
["sonatype" {:url "https://oss.sonatype.org/"}]
["internal" {:url "https://sekrit.info/repo"
:username :gpg :password :gpg}]])))))
(deftest test-normalize-dep-vectors
(testing "dep vectors with string version"
(is (= ['foo/bar "1.0.0"]
(normalize-dep-vector ['foo/bar "1.0.0"])))
(is (= ['foo/bar "1.0.0" :classifier "test"]
(normalize-dep-vector ['foo/bar "1.0.0" :classifier "test"])))
(is (= ['foo/bar "1.0.0" :classifier "test" :exclusions ['foo/baz]]
(normalize-dep-vector ['foo/bar "1.0.0" :classifier "test" :exclusions ['foo/baz]]))))
(testing "dep vectors with keyword version (e.g., for use with lein-modules)"
(is (= ['foo/bar :version]
(normalize-dep-vector ['foo/bar :version])))
(is (= ['foo/bar :version :classifier "test"]
(normalize-dep-vector ['foo/bar :version :classifier "test"])))
(is (= ['foo/bar :version :classifier "test" :exclusions ['foo/baz]]
(normalize-dep-vector ['foo/bar :version :classifier "test" :exclusions ['foo/baz]]))))
(testing "dep vectors with explicit nils for versions (managed dependencies)"
(is (= ['foo/bar nil]
(normalize-dep-vector ['foo/bar nil])))
(is (= ['foo/bar nil :classifier "test"]
(normalize-dep-vector ['foo/bar nil :classifier "test"])))
(is (= ['foo/bar nil :classifier "test" :exclusions ['foo/baz]]
(normalize-dep-vector ['foo/bar nil :classifier "test" :exclusions ['foo/baz]]))))
(testing "dep vectors with implicit nils for versions (managed dependencies)"
(is (= ['foo/bar nil]
(normalize-dep-vector ['foo/bar])))
(is (= ['foo/bar nil :classifier "test"]
(normalize-dep-vector ['foo/bar :classifier "test"])))
(is (= ['foo/bar nil :classifier "test" :exclusions ['foo/baz]]
(normalize-dep-vector ['foo/bar :classifier "test" :exclusions ['foo/baz]])))))