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

Try to fix reading of sample projects in leiningen.test.helper.

Browse source 
Still broken unfortunately; getting inexplicable NPE out of resolve.
This commit is contained in:
Phil Hagelberg 2011-12-02 15:54:18 -08:00
parent 708a586242
commit 7ff6478f5a
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
leiningen-core/src/leiningen/core/project.clj
View file

@ -59,7 +59,7 @@
(let [project (resolve 'leiningen.core.project/project)]
(when-not project
(throw (Exception. "project.clj must define project map.")))
(ns-unmap *ns* 'project) ; return it to original state
;; (ns-unmap *ns* 'project) ; return it to original state
@project)
(catch java.io.FileNotFoundException _)))
([] (read "project.clj")))

24
test/leiningen/test/helper.clj
View file

@ -1,18 +1,17 @@
(ns leiningen.test.helper
(:require [lancet.core :as lancet])
(:use [clojure.java.io :only [file]]
[leiningen.compile :only [platform-nullsink]]
[leiningen.core :only [read-project]]
[leiningen.util.maven :only [make-local-repo]]))
(:require [leiningen.core.project :as project]
[clojure.java.io :as io]))
(def local-repo (.getBasedir (make-local-repo)))
;; TODO: fix
(def local-repo (io/file (System/getProperty "user.home") ".m2" "repository"))
(defn m2-dir [n v]
(file local-repo (if (string? n) n (or (namespace n) (name n))) (name n) v))
(io/file local-repo
(if (string? n) n (or (namespace n) (name n))) (name n) v))
(defn- read-test-project [name]
(binding [*ns* (find-ns 'leiningen.core)]
(read-project (format "test_projects/%s/project.clj" name))))
(project/read (format "test_projects/%s/project.clj" name))))
(def sample-project (read-test-project "sample"))
@ -25,12 +24,3 @@
(def tricky-name-project (read-test-project "tricky-name"))
(def native-project (read-test-project "native"))
(def logger (first (.getBuildListeners lancet/ant-project)))
(defmacro with-no-log [& body]
`(do (.setOutputPrintStream logger (platform-nullsink))
(.setErrorPrintStream logger (platform-nullsink))
(try ~@body
(finally (.setOutputPrintStream logger System/out)
(.setErrorPrintStream logger System/err)))))