Permalink
Browse files

Merge branch '1.x'

Conflicts:
	.gitignore
	README.md
	bin/lein
	project.clj
	src/leiningen/compile.clj
	src/leiningen/core.clj
	src/leiningen/help.clj
	src/leiningen/jar.clj
	src/leiningen/repl.clj
	test/leiningen/test/deps.clj
	test/leiningen/test/help.clj
	todo.org
  • Loading branch information...
2 parents 4f06404 + 76e7088 commit 532496a1ab0bc0bd34efd5f5bb22ddfa12f8d0c5 @technomancy committed Mar 5, 2012
Showing with 70 additions and 246 deletions.
  1. +40 −211 NEWS → NEWS.md
  2. +6 −7 README.md
  3. +1 −1 bin/lein.bat
  4. +1 −0 sample.project.clj
  5. +4 −5 src/leiningen/help.clj
  6. +1 −1 test/leiningen/test/help.clj
  7. +1 −1 test/leiningen/test/install.clj
  8. +16 −20 todo.org
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -248,13 +248,12 @@ explains how to write plugins.
of Leiningen it is enabled automatically.
**Q:** I don't have access to stdin inside my project.
-**A:** There's a problem in the library that Leiningen uses to spawn
- new processes that blocks access to console input. This means that
- functions like `read-line` will not work as expected in most
- contexts, though the `repl` task necessarily includes a
- workaround. You can also use the `trampoline` task to
- launch your project's JVM after Leiningen's has exited rather than
- launching it as a subprocess. TODO: document in-process classloader
+**A:** This is a limitation of the JVM's process-handling methods;
+ none of them expose stdin correctly. This means that functions like
+ `read-line` will not work as expected in most contexts, though the
+ `repl` task necessarily includes a workaround. You can also use the
+ `trampoline` task to launch your project's JVM after Leiningen's has
+ exited rather than launching it as a subprocess.
## Contributing
View
@@ -22,7 +22,7 @@ if "%DIR_CONTAINING%" neq "" cd "%DIR_CONTAINING%"
if "x%LEIN_HOME%" == "x" (
if exist "%CD%\.lein" (
- if /I NOT %CD%==%USERPROFILE% echo Running in bundled mode.
+ if /I NOT "%CD%"=="%USERPROFILE%" echo Running in bundled mode.
set LEIN_HOME=%CD%\.lein
) else (
set LEIN_HOME=%USERPROFILE%\.lein
View
@@ -32,6 +32,7 @@
:dependencies [[org.clojure/clojure "1.1.0"]
[org.clojure/clojure-contrib "1.1.0"]
[org.jclouds/jclouds "1.0-RC6" :classifier "jdk15"]
+ [net.sf.ehcache/ehcache "2.3.1" :type "pom"]
[log4j "1.2.15" :exclusions [javax.mail/mail
javax.jms/jms
com.sun.jdmk/jmxtools
View
@@ -30,11 +30,10 @@
(formatted-docstring command docstring padding))))
(defn- get-subtasks-and-docstrings-for [task]
- (into {}
- (map (fn [subtask]
- (let [m (meta subtask)]
- [(str (:name m)) (:doc m)]))
- (:subtasks (meta task)))))
+ (map (fn [subtask]
+ (let [m (meta subtask)]
+ [(str (:name m)) (first (.split (:doc m "") "\n"))]))
+ (:subtasks (meta task))))
(defn subtask-help-for
[task-ns task]
@@ -31,4 +31,4 @@
;; (is (= ["install" "uninstall"]
;; (sort (keys m))))))
-;; (doseq [[_ var] (ns-publics *ns*)] (alter-meta! var assoc :busted true))
+;; (doseq [[_ var] (ns-publics *ns*)] (alter-meta! var assoc :busted true))
@@ -25,7 +25,7 @@
(def jdom-dir (file local-repo "jdom" "jdom" "1.0"))
-(deftest test-standalone-install
+(deftest ^{:online true} test-standalone-install
(delete-file-recursively jdom-dir true)
;; (delete-shell-wrappers)
(install nil "nomnomnom" "0.5.0-SNAPSHOT")
View
@@ -1,8 +1,3 @@
-#-*- mode: org -*-
-#+startup: overview
-#+startup: hidestars
-#+TODO: TODO | INPROGRESS | DONE
-
Leiningen TODOs
See also https://github.com/technomancy/leiningen/issues
@@ -77,6 +72,13 @@ See also https://github.com/technomancy/leiningen/issues
- [X] install (minus shell wrappers)
- [X] uberjar
- [X] deploy
+* For 1.7.0
+ - [X] System/exit in repl (#324)
+ - [X] interactive task takes full CPU (#346)
+ - [X] whole-namespace test selectors (#242)
+ - [X] Auto-exclusions for dev-deps and plugins (#375)
+ - [X] Investigate NPE on lein test (#388)
+ - [X] Bring back rlwrap (#381)
* For 1.6.2
- [X] resources with eval-in-leiningen (#248)
- [X] fix :omit-default-repositories wrt central (#211)
@@ -110,12 +112,11 @@ See also https://github.com/technomancy/leiningen/issues
- [X] Merge native-deps
- [X] Add leiningen.util.injected namespace
* For 1.5.1
-** TODO
- - [X] Move ns docstrings to :help-summary to allow AOT given CLJ-130.
- - [X] Put :eval-in-lein deps in lib/dev for leiningen process access.
- - [X] Revert back to :warn on checksum failure.
- - [X] Fix LEIN_ROOT warning in bin/lein.
- - [X] Honor user-settings in more places.
+ - [X] Move ns docstrings to :help-summary to allow AOT given CLJ-130.
+ - [X] Put :eval-in-lein deps in lib/dev for leiningen process access.
+ - [X] Revert back to :warn on checksum failure.
+ - [X] Fix LEIN_ROOT warning in bin/lein.
+ - [X] Honor user-settings in more places.
* For 1.5.0
- unify auth options between :repositories and :deploy-to
- suppress socket closed stacktrace in interactive task
@@ -193,19 +194,14 @@ See also https://github.com/technomancy/leiningen/issues
- upgrade task (patch submitted)
- doc generation (autodoc plugin)
* For 1.0
- - Remove install task dependency on having Maven installed :Phil:
- - Use -Xbootclasspath where possible :Dan:
- - Don't write manifest, pom, etc. to disk when jarring :Dan:
- - Don't put uberjar in ~/.m2 :Phil:
+ - Remove install task dependency on having Maven installed
+ - Use -Xbootclasspath where possible
+ - Don't write manifest, pom, etc. to disk when jarring
+ - Don't put uberjar in ~/.m2
- Perform compilation in either a subprocess or with a separate classloader
- Allow test task to take namespaces as an argument
- Fix eval-in-project to let plugins pass in extra args
- Resources directory added to classpath (for properties, etc)
-* Plugin ideas
- - metrics
- - LOC
- - complexity
- - time logs
* Git-aware dependencies (experimental back-burner idea)
Talking with Rich after Emerging Langs day 1
Problem: you can pull in two versions of the same library

0 comments on commit 532496a

Please sign in to comment.