Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

initial pass at adding spec validation to leiningen #2223

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

initial pass at adding spec validation to leiningen #2223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b7a085b
Merge remote-tracking branch 'technomancy/master'
Nov 29, 2016
64e7933
initial try at integrating scheme validation into leiningen core
Nov 29, 2016
8df69ee
get tests working
Nov 29, 2016
f2679cb
handle file reference correctly
Nov 29, 2016
0217087
Merge branch 'master' of github.com:technomancy/leiningen into specke…
Rovanion Mar 6, 2017
f8826b7
Added ::creds.
Rovanion Mar 6, 2017
4ae426a
Added more expressive options for how repository credentials are stored.
Rovanion Mar 6, 2017
82a80d5
A dependency "name" can be both a symbol and a string.
Rovanion Mar 6, 2017
57acad7
Allow :jvm-opts to be empty.
Rovanion Mar 6, 2017
8a499a5
Allow :source-paths to be empty.
Rovanion Mar 6, 2017
76066be
Add plain :creds field to project-map.
Rovanion Mar 6, 2017
23587c9
Accept :warn in :pedantic.
Rovanion Mar 6, 2017
486aaab
Simplified definition of aliases to be more lenient.
Rovanion Mar 6, 2017
f0e5aff
Changing the order of the long and short versions makes it so that th…
Rovanion Mar 6, 2017
8b36c3f
An alias can also be from one string to another.
Rovanion Mar 6, 2017
53be818
Added ::mailing-lists spec.
Rovanion Mar 6, 2017
39f5faf
Merge pull request #1 from Rovanion/specked-out
Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions leiningen-core/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
[org.apache.maven.wagon/wagon-http "2.12"]
[com.hypirion/io "0.3.1"]
[pedantic "0.2.0"]
[strictly-specking-standalone "0.1.1"]]
[org.slf4j/slf4j-nop "1.7.22"] ;; wagon-http started to use slf4j
;; we pull this in transitively but want a newer version
[org.clojure/tools.macro "0.1.5"]]
Expand Down
17 changes: 16 additions & 1 deletion leiningen-core/src/leiningen/core/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
[leiningen.core.utils :as utils]
[leiningen.core.user :as user]
[leiningen.core.classpath :as classpath]
[leiningen.core.project-schema :as schema]
[clojure.string :as str])
(:import (clojure.lang DynamicClassLoader)
(java.io PushbackReader Reader)))
Expand All @@ -32,6 +33,11 @@
(require 'leiningen.core.main)
((resolve 'leiningen.core.main/warn) args))

(defn- exit [& args]
;; TODO: remove with 3.0.0
(require 'leiningen.core.main)
(apply (resolve 'leiningen.core.main/exit) args))

(defn- update-each-contained [m keys f & args]
(reduce (fn [m k]
(if (contains? m k)
Expand Down Expand Up @@ -420,12 +426,21 @@
(format "Duplicate keys: %s"
(clojure.string/join ", " duplicates))))))))

;; color?
(defn handle-validation [initial-project-args f]
(if-let [{:keys [message]} (schema/validate-project initial-project-args f)]
(do
(println message)
(exit 1))
initial-project-args))

(defmacro defproject
"The project.clj file must either def a project map or call this macro.
See `lein help sample` to see what arguments it accepts."
[project-name version & args]
(let [f (io/file *file*)]
`(let [args# ~(unquote-project (argument-list->argument-map args))
`(let [args# (handle-validation ~(unquote-project (argument-list->argument-map args))
~(str f))
root# ~(if f (.getParent f))]
(def ~'project
(make args# '~project-name ~version root#)))))
Expand Down
Loading