Commit graph

3388 commits

Author SHA1 Message Date
Phil Hagelberg
1b39bc5b27 Make repl tests resilient to having .nrepl-port file in pwd. 2014-03-06 13:34:20 -08:00
Phil Hagelberg
0896686a5c Merge remote-tracking branch 'laurentpetit/master'
Conflicts:
	leiningen-core/src/leiningen/core/main.clj
2014-03-06 13:33:19 -08:00
Phil Hagelberg
606ceffe44 Fix tests for task arity mismatch abort messages. 2014-03-06 13:13:23 -08:00
Phil Hagelberg
1803f4d5fd Fix test failures due to missing artifacts.
Somehow a dependency of nodisassemble disappeared from Maven Central.
2014-03-06 12:57:48 -08:00
Phil Hagelberg
54156c95a2 Merge pull request #1440 from benwbooth/master
Show uncaught exceptions when using grenchman, don't display "Suppressed exit" when calling exit
2014-03-04 17:30:55 -08:00
Phil Hagelberg
e3e82875cd Merge pull request #1461 from cpmcdaniel/master
Fix for #1458: clean-targets sanity checks.
2014-03-03 19:31:14 -08:00
Craig McDaniel
a5cf442cf3 Support for overriding :clean-targets sanity checking (issue #1458).
Also made unit tests safer and faster using with-redefs to mock out
calls to delete-file-recursively.
Better error messages when a path is being protected.
2014-03-03 21:35:03 -05:00
Craig McDaniel
d4bedc9dd1 Making new methods private for issue #1458 2014-03-02 22:01:02 -05:00
Craig McDaniel
8cc891747f Merge remote-tracking branch 'upstream/master' 2014-03-01 14:01:36 -05:00
Craig McDaniel
9c84a5e2e0 Removed (run-tests) call that was being used for interactive REPL testing 2014-03-01 12:37:16 -05:00
Craig McDaniel
b19b80390c Fix for #1458: clean-targets sanity checks. 2014-03-01 12:35:32 -05:00
Craig McDaniel
ba6e88200b Partial implementation of fix for :clean-targets sanity checking (issue #1458) 2014-02-28 08:26:36 -05:00
Jean Niklas L'orange
de287f08fe Merge pull request #1454 from mpblair/profiles-help
Document :uberjar/:repl merging. Fixes #1422.
2014-02-28 13:21:18 +01:00
Matthew Blair
c7861c6c7e Update docstrings for repl and uberjar tasks based on feedback from hyPiRion 2014-02-27 21:33:46 -05:00
Craig McDaniel
c87cb003a2 Initial happy-path unit tests for the clean task. Relates to #1458 2014-02-25 22:13:13 -05:00
Jean Niklas L'orange
a28eeca1df Warn once when project.clj in checkout is missing. 2014-02-25 21:47:25 +01:00
Jean Niklas L'orange
491c2c9595 Merge branch 'retain-profile-metadata' 2014-02-24 18:32:08 +01:00
Jean Niklas L'orange
17e91e60fe Retain metadata after profile setup. Fixes #1414. 2014-02-24 18:31:43 +01:00
Jean Niklas L'orange
a0d3504b1e Test that :java-opts are converted to :jvm-opts.
Inside profiles. Ensures #1445 is fixed, thus closes #1445.
2014-02-23 15:06:51 +01:00
Jean Niklas L'orange
1d7e41bfbf Test that profile metadata is retained.
Breaks tests, as meta isn't retained yet.
2014-02-23 14:55:28 +01:00
Jean Niklas L'orange
a5d2ea5161 Allow non-string args to compile task. Fixes #1442 2014-02-22 15:24:40 +01:00
Jean Niklas L'orange
eac6cdf04f Merge pull request #1456, fixes #1455. 2014-02-22 13:58:20 +01:00
Jean Niklas L'orange
2cf555e99e Backquote uberjar-merge-with vector. 2014-02-22 13:56:52 +01:00
Peter Monks
d8302eff0b Fix for issue 1455 2014-02-20 11:21:17 -08:00
Matthew Blair
f9eddd5bed Fix Issue 1422 - add help text to repl and uberjar tasks documenting implicit profile application 2014-02-17 09:48:52 -05:00
Jean Niklas L'orange
b0c644dd7d Merge pull request #1453 from mpblair/blank-profiles
Merge in mplbair/blank-profiles

Prints better error messages for erroneous profile files, and fixes #1444.
2014-02-17 15:36:02 +01:00
Matthew Blair
1df22bcc95 Fix issue 1444 - Leiningen errors if profiles.clj is blank. Push try-catch from user/load-profiles to utils/read-file, print helpful error message from utils/read-file, and bubble exception up. 2014-02-16 17:35:57 -05:00
Jean Niklas L'orange
f0e558d994 2.3.3 -> 2.4.0-SNAPSHOT.
[ci skip]
2014-02-16 01:52:44 +01:00
Jean Niklas L'orange
19b8d3bf50 Merge pull request #1443 from jcrossley3/add-profiles
Fix add-profiles so they can be merged by name
2014-02-14 17:31:31 +01:00
Phil Hagelberg
cc41da388b Revert license back to official EPL; addresses #1446. 2014-02-12 13:42:53 -08:00
Jim Crossley
77650ce3fd Fix add-profiles so they can be merged by name
I believe the :profiles metadata was introduced after this function was
written, so this update makes its comment -- "available to merge by
name" -- true again.
2014-02-09 16:07:12 -05:00
Ben Booth
4f24b89e3b Don't show the "Suppressed exit" message when exit is called 2014-02-07 16:58:59 -08:00
Ben Booth
6395e6eb4d send stack trace through to the nREPL client 2014-02-07 16:58:28 -08:00
Laurent Petit
c28f03a092 Optional msg argument to leiningen.core.main/exit. Use it for abort.
- New signature: leiningen.core.main/exit [exit-code & msg]
- msg used when *exit-process?* is false as the Exception message
2014-02-07 08:42:35 +01:00
Phil Hagelberg
b15c5666d1 Propagate eval-in-project exit code in run task to lein's process. 2014-02-06 11:37:00 -08:00
Phil Hagelberg
ae15ef0034 Merge pull request #1434 from jcrossley3/patch-1
Only exit if there are errors
2014-02-02 11:31:19 -08:00
Jim Crossley
638b710acb Only exit if there are errors
Otherwise, parent processes can't continue.
2014-02-02 10:56:33 -05:00
Phil Hagelberg
c50c7ee8bc Merge pull request #1432 from jcrossley3/filespec-dirs
Filter out directories matching readme/license prefix
2014-01-31 08:24:55 -08:00
Jim Crossley
9e598e1674 Filter out directories matching readme/license prefix 2014-01-30 19:12:07 -05:00
Jean Niklas L'orange
f2008d38ca Merge pull request #1431 from hura/patch-1
Update TUTORIAL.md
2014-01-28 18:57:23 +01:00
hura
83a120d70e Update TUTORIAL.md
AOT abbreviations is now explained
2014-01-28 12:35:40 -05:00
Marshall Bockrath-Vandegrift
a38f3903cf Also expand the built-in default profiles. 2014-01-28 06:20:10 -05:00
Phil Hagelberg
195b723df8 Merge pull request #1430 from mblair/add-new-app-files
mention all files created by the project generator
2014-01-27 15:53:12 -08:00
Matt Blair
b35aa83874 mention all files created by the project generator 2014-01-27 13:17:38 -08:00
Jean Niklas L'orange
c845d45377 Merge branch 'decompose-profiles' 2014-01-27 16:33:04 +01:00
Jean Niklas L'orange
ecb7ed0e77 Decompose with-profile args not containing +/-. 2014-01-27 16:31:34 +01:00
Marshall Bockrath-Vandegrift
8bd6b8fb53 Fix #1421 by decomposing profiles into collections of atomic profiles. 2014-01-27 15:54:05 +01:00
Phil Hagelberg
22d3880e08 Fix a bug where show-profiles was stripping profile namespaces. 2014-01-24 14:54:52 -08:00
Phil Hagelberg
5458cefa51 Merge pull request #1425 from technomancy/lower-http-timeout-1096
Lower read time out for wagon-http
2014-01-24 14:45:41 -08:00
Marshall Bockrath-Vandegrift
466902da96 Handle bultitude returning full ns form instead of just symbol. 2014-01-24 13:36:21 -05:00