Drop deprecated arities of eval-in-project.
This commit is contained in:
parent
98d8aa8f97
commit
cadde5a2a0
3 changed files with 13 additions and 12 deletions
|
@ -159,11 +159,13 @@
|
|||
"Executes form in an isolated classloader with the classpath and compile path
|
||||
set correctly for the project. If the form depends on any requires, put them
|
||||
in the init arg to avoid the Gilardi Scenario: http://technomancy.us/143"
|
||||
[project form & [handler skip-auto-compile init]]
|
||||
(when skip-auto-compile
|
||||
(println "WARNING: eval-in-project's skip-auto-compile arg is deprecated."))
|
||||
(prep project skip-auto-compile)
|
||||
(let [form-string (get-readable-form nil project form init)]
|
||||
(if (:eval-in-leiningen project)
|
||||
(eval-in-leiningen project form-string)
|
||||
(eval-in-subprocess project form-string))))
|
||||
([project form init]
|
||||
(prep project skip-auto-compile)
|
||||
;; might only make sense to stringify the form in :subprocess eval
|
||||
(let [form-string (get-form-string project form init)]
|
||||
;; TODO: support :eval-in :leiningen, :subprocess, or :classloader (default)
|
||||
;; TODO: normalize old :eval-in-leiningen to new format in project/read
|
||||
(if (:eval-in-leiningen project)
|
||||
(eval-in-leiningen project form-string)
|
||||
(eval-in-subprocess project form-string))))
|
||||
([project form] (eval-in-project project form nil)))
|
||||
|
|
|
@ -22,9 +22,8 @@
|
|||
ns/f, passing it the args."
|
||||
[project given & args]
|
||||
(eval-in-project project (run-form given args)
|
||||
nil nil `(try (require '~(symbol (namespace
|
||||
(normalize-main given))))
|
||||
(catch FileNotFoundException _#))))
|
||||
`(try (require '~(symbol (namespace (normalize-main given))))
|
||||
(catch FileNotFoundException _#))))
|
||||
|
||||
(defn ^{:help-arglists '([])} run
|
||||
"Run the project's -main function.
|
||||
|
|
|
@ -74,7 +74,7 @@ selectors. With no arguments, runs all tests."
|
|||
result (doto (File/createTempFile "lein" "result") .deleteOnExit)]
|
||||
(eval-in-project project (form-for-testing-namespaces
|
||||
nses (.getAbsolutePath result) (vec selectors))
|
||||
nil nil '(require 'clojure.test))
|
||||
'(require 'clojure.test))
|
||||
(if (and (.exists result) (pos? (.length result)))
|
||||
(let [summary (read-string (slurp (.getAbsolutePath result)))
|
||||
success? (zero? (+ (:error summary) (:fail summary)))]
|
||||
|
|
Loading…
Reference in a new issue