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

Fix help task to work with plugins added to the classpath dynamically.

Browse source
This commit is contained in:
Phil Hagelberg 2012-01-12 09:19:51 -08:00
parent 0da32574a7
commit f4836379c9
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
leiningen-core/src/leiningen/core/ns.clj
View file

@ -4,7 +4,8 @@
(:require [clojure.java.io :as io]
[clojure.string :as string])
(:import (java.util.jar JarFile)
(java.io File BufferedReader PushbackReader InputStreamReader)))
(java.io File BufferedReader PushbackReader InputStreamReader)
(clojure.lang DynamicClassLoader)))
;; The contrib version has a couple issues: it searches the whole
;; classpath rather than allowing you to specify a prefix, which means
@ -13,7 +14,8 @@
;; declaration.
(defn- clj? [f]
(and (.isFile f) (.endsWith (.getName f) ".clj")))
;; Needs to work on JarEntries and Files, the former of which has no .isFile
(and (not (.isDirectory f)) (.endsWith (.getName f) ".clj")))
(defn- jar? [f]
(and (.isFile f) (.endsWith (.getName f) ".jar")))
@ -54,9 +56,12 @@
(def ^:private classpath-files
"A seq of all files on Leiningen's classpath."
(for [f (.split (System/getProperty "java.class.path")
(System/getProperty "path.separator"))]
(io/file f)))
(let [cl (.getContextClassLoader (Thread/currentThread))]
;; can't trust java.class.path alone if we use add-classpath
(map io/file (concat (if (instance? DynamicClassLoader cl)
(.getURLs cl))
(.split (System/getProperty "java.class.path")
(System/getProperty "path.separator"))))))
(defn namespaces-matching
"Return all namespaces matching the given prefix both on disk and

4
src/leiningen/help.clj
View file

@ -1,12 +1,10 @@
(ns leiningen.help
"Display a list of tasks or help for a given task."
(:use [leiningen.util.ns :only [namespaces-matching]])
(:require [clojure.string :as string]
[clojure.java.io :as io]
[leiningen.core.ns :as ns]))
;; TODO: switch to ns/namespaces-matching
(def tasks (->> (namespaces-matching "leiningen")
(def tasks (->> (ns/namespaces-matching "leiningen")
(filter #(re-find #"^leiningen\.(?!core|main)[^\.]+$" (name %)))
(distinct)
(sort)))