yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4154 commits 1 branch 31 tags 6.4 MiB
Commit graph

948 commits

Author SHA1 Message Date
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
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
Marshall Bockrath-Vandegrift
a38f3903cf Also expand the built-in default profiles. 2014-01-28 06:20:10 -05: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
19c49bd2ab Don't use /tmp when LEIN_FAST_TRAMPOLINE is enabled. 
Fixes #1396.
 2014-01-20 17:36:19 -08:00
Phil Hagelberg
93a2ffa85d Merge remote-tracking branch 'DavidEGrayson/lein_faster' 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-01-20 09:49:11 -08:00
Jean Niklas L'orange
3d50e8c9ba Properly initialize read profiles. 
Fixes #1407, fixes #1376.
 2014-01-07 14:02:55 +01:00
Jean Niklas L'orange
a0c65e9ec1 Properly setup profiles within project map. 2014-01-07 13:51:10 +01:00
Jean Niklas L'orange
9131b52b0b Drag out common map setup functionality. 2014-01-07 12:58:23 +01:00
Jean Niklas L'orange
a579ccd750 Remove dead :jvm-opts lookup 
Coming from the 57ea876ddd cleanup
 2014-01-07 02:08:21 +01:00
Jean Niklas L'orange
613a33b578 Pull out empty meta-merge defaults. 2014-01-07 02:00:53 +01:00
Phil Hagelberg
49d405cf5d Revert "Rely less on undocumented features" 
This reverts commit 9adc966aef.
 2014-01-06 11:58:58 -08:00
Ambrose Bonnaire-Sergeant
9adc966aef Rely less on undocumented features 
We simply guard against nil leaking into `merge` or `select-keys`. This does not change semantics.

I caught this with a linter I'm building.
 2014-01-02 23:58:22 +08:00
Jean Niklas L'orange
2ba5e31daa Test edit distance function. 2013-12-30 20:11:33 +01:00
Jean Niklas L'orange
c05e102036 Implement Damerau-Levenshtein, closes #1119. 
Fetching the keyboard layout seems to be impossible to do within the JVM
without shelling out. It's probably not worth it wrt. portability.
 2013-12-30 20:10:16 +01:00
David Grayson
6577d59c85 RyanTM and I reduced the run time of the 'lein help' command 
by making it just parse the task source code files instead of actually
requiring/compiling them (second try).

This results in a 70% speed improvement on my machine (14s to 4s).
 2013-12-20 11:41:53 -08:00
Larry Staton Jr
1a47f2683e Add LEIN_SILENT option to suppress *info* output 2013-12-05 17:09:00 -05:00
Phil Hagelberg
12b97749bd Bump version number back to a snapshot. 2013-11-19 10:05:36 -08:00
Phil Hagelberg
77d659e6ee Release 2.3.4 2013-11-18 21:59:05 -08:00
Phil Hagelberg
c575b7b82b Support :keyword args in leiningen.core.main/parse-options. 2013-11-17 09:15:11 -08:00
Phil Hagelberg
cd0066e19f Suggest exclusions for overrides. Closes #1198. 2013-11-17 08:56:53 -08:00
Phil Hagelberg
75a80f6951 Clean up dependency-str weirdness of version calculation. 2013-11-16 14:59:33 -08:00
Phil Hagelberg
e78ebb6504 Add exclusion suggestions for version ranges. 2013-11-16 14:43:59 -08:00
Phil Hagelberg
a45e8a5b0f Move parse-options test, fix typo. 2013-11-16 14:43:59 -08:00
Phil Hagelberg
1f7886c8bb Move parse-options into leiningen.core.main for general use. 
Also remove support for single-dashed args.
 2013-11-16 14:43:59 -08:00
Phil Hagelberg
23b3477298 Escape classpath separators. 
Fixes #1328.
 2013-11-14 11:02:06 -08:00
Phil Hagelberg
387db01ac5 Don't print with-profile output when only one profile is invoked. 2013-11-10 08:48:25 -08:00
Marshall Bockrath-Vandegrift
5d64d83fd6 More nuanced merging of project defaults. 2013-10-14 19:59:18 -04:00
Phil Hagelberg
85d3549c14 Bump version up to 2.3.4-SNAPSHOT. 2013-10-09 09:06:18 -07:00
Phil Hagelberg
6a6cecee0f Release 2.3.3 2013-10-05 15:40:59 -07:00
Marshall Bockrath-Vandegrift
39e3d57ec9 Implement :uberjar-merge-with requested in issue #973. 2013-10-05 13:56:57 -04:00
Phil Hagelberg
6853a511f9 Don't warn about user profiles when running outside a project. 2013-09-19 10:40:59 -07:00
Phil Hagelberg
b89ede9c23 Handle stdin for :eval-in :nrepl. 2013-08-27 19:20:58 -07:00
Phil Hagelberg
36a9350ba0 Allow default eval-in dispatch value to be changed with a defmethod. 2013-08-27 19:20:58 -07:00
Phil Hagelberg
762544a661 Fix a bug where *cwd* wasn't honored for project parsing. 2013-08-23 22:05:40 -07:00
Phil Hagelberg
0a5c616bbd Bump version up to 2.3.3-SNAPSHOT. 2013-08-20 17:42:27 -07:00
Chas Emerick
470f4c6ee1 Release 2.3.2 2013-08-20 16:59:19 -04:00
Chas Emerick
7d7426b143 prepare for 2.3.2 release 2013-08-20 16:55:17 -04:00
Phil Hagelberg
ad48331f26 Encourage production use of uberjars over lein run in tutorial. 2013-08-20 11:57:49 -07:00
Phil Hagelberg
45c7af9f69 Roll back profile-scoped target path for now. 
Discussion of rationale on mailing list.
 2013-08-17 21:48:21 -07:00
Phil Hagelberg
95bdc72f80 Add :exclusions to :base deps to avoid version conflict warnings. 2013-08-17 21:10:58 -07:00
Phil Hagelberg
be0db75e5e Memoize pedantic-print-(ranges|overrides) by stringifying up front. 
Fixes #1290.
 2013-08-17 21:10:58 -07:00
Phil Hagelberg
e624a768d3 Release 2.3.1 2013-08-13 04:28:39 +00:00
Phil Hagelberg
81389cf20c Leave :provided out of target-isolation calculation paths altogether. 2013-08-12 16:43:39 -07:00
Phil Hagelberg
1b4d1b345c Refer to checkout-deps-paths as a var instead of a raw fn. 
Might fix #1286.
 2013-08-10 18:17:39 -07:00
Phil Hagelberg
d25c22af3a Special-case the :provided profile. Again. 
Fixes #1283.
 2013-08-09 12:57:06 -07:00
Phil Hagelberg
ac33004a92 Bump back to snapshot. 2013-08-08 20:16:54 -07:00
Phil Hagelberg
aeaca0cbd7 Release 2.3.0 2013-08-08 20:10:42 -07:00
Phil Hagelberg
328b2182b0 Normalize profiles before excluding; fixes #1267. 
Note that :dev, :test, and :base still belong in the pom, but with
dependencies/paths scoped as <test>.
 2013-08-08 14:00:01 -07:00
Phil Hagelberg
13fe3db660 Allow -main to operate on project.clj files not in original cwd. 2013-08-08 12:01:08 -07:00
Phil Hagelberg
c46b6c93ff Add :eval-in :pprint for debugging Leiningen and plugins. 2013-08-08 12:01:08 -07:00
Phil Hagelberg
2f684415df Save off project into an atom when trampolining for later use. 
This will break when you do crazy stuff like:

    $ lein trampoline do with-profile production compile, repl

but it's better than the old behaviour.

Fixes #1277.
 2013-08-08 12:01:08 -07:00
Gary Fredericks
5a089b8e18 Issue #1276: cleanup wrong-arg-num err msg on 0-arg tasks 
0 arg task arglist was printing as `""` since passing `[project]` to
`next` resulted in `nil` which prints as `""`. Used `(comp vec next)`
instead to force it into `[]` which prints as `"[]"`.
 2013-08-05 15:07:41 -05:00
Yoshinori Kohyama
c3a60886f3 Issue #1272: Add :clean-targets option 
Add :clean-targets option to let `lein clean` remove files under
directories other than one specified by :target-path
 2013-08-04 18:46:16 +09:00
Phil Hagelberg
9f9ab003cd Oops; typo. 2013-07-30 21:00:52 -07:00
Phil Hagelberg
0f8d67d2e3 Remove dependency on "useful" library for packaging purposes. 
This dependency pulls in a number of other dependencies which we don't
use but which are difficult for downstream packagers to deal with.

Include our own version of map-vals (because seriously, why is this
not already part of Clojure) and update-first (because re-forming
those problems without it crazy convoluted). But our implementation is
a fair bit shorter because it doesn't have to handle all the edge
cases.
 2013-07-30 20:57:56 -07:00
Jean Niklas L'orange
2324cd21fc com.hypirion.io 0.3.1 (1.6-compiled) 2013-07-30 16:01:35 +02:00
Jean Niklas L'orange
3c2cd2f5a1 Bump com.hypirion.io to 0.3.0. 2013-07-30 11:19:44 +02:00
Phil Hagelberg
53fdf1c685 Scope :compile-path and :native-path under :target-path. 2013-07-24 20:55:28 -07:00
Phil Hagelberg
962ce20ae9 Scope :compile-path and :native-path under :target-path. 2013-07-24 20:55:23 -07:00
Phil Hagelberg
5b26b89d9c Support :pedantic? :abort/:warn. 
Move range/overlap detection into l.c.classpath.

Fixes #1197.
 2013-07-22 18:45:16 -07:00
Jean Niklas L'orange
b540e8ae95 Merge branch 'expand-composite-profiles' 2013-07-20 18:50:34 +02:00
Jean Niklas L'orange
7a935545c4 Don't attach subprofiles to metadata map. 
Whenever composite profiles were added to project maps, their children
were also attached as active profiles. This confuses `with-profile` and
profile merging task where excluded profiles only remove the name of the
composite profile, not the subprofiles. This allows uberjar to exclude
the default profile without excluding subprofiles, without excluding
active subprofiles themselves.

So these task actions now produce sensible results:
`lein with-profile +dev uberjar` -> uberjar with dev-dependencies, but
without the other default profiles
`lein -U uberjar` -> uberjar with snapshot updates, but not with any
default dependencies added.

Fixes #1233.
 2013-07-20 18:45:07 +02:00
Jean Niklas L'orange
cd8ed45638 Expand composite profiles before removing them. 
This seem to handle #1233 correctly, but breaks a pom test. I assume
there's some part of the merge logic I've forgotten, so feel free to
peek around and comment on what I've currently done.
 2013-07-18 01:45:25 +02:00
Phil Hagelberg
39fa6afb52 Default to recursive checkout deps. 
Fixes #1190.
 2013-07-16 20:22:09 -07:00
Phil Hagelberg
214fd7c6a2 Empty :*-paths when running outside a project dir. 
Fixes #1253.
 2013-07-15 13:33:43 -07:00
Phil Hagelberg
57c0b1e0e2 Remove :target-path from :base profile. 
Fixes #1222; might introduce even more problems.
 2013-07-12 07:45:07 -07:00
Phil Hagelberg
1225f0bf4f Error message when aws creds are missing. 2013-07-12 07:44:51 -07:00
Phil Hagelberg
c701c57440 Move download-calculating script. 2013-07-12 07:40:06 -07:00
Gabriel Horner
f0bf04007e fix typo in docstring 2013-07-01 07:29:18 -04:00
Juergen Hoetzel
28fad91bfb Keep init-file when using LEIN_FAST_TRAMPOLINE 2013-06-20 22:20:42 +02:00
Stuart Sierra
fb133fdb67 Set default :jvm-opts in :base profile to :displace 
When the default behavior for `:jvm-opts` is additive, it can lead to
unexpected results if a project tries to add its own options which
conflict with the defaults. For example, the following setting:

    :jvm-opts ["-XX:-TieredCompilation"]

Results in a JVM command line like this, in which the project's JVM
options are overridden by the defaults:

    -XX:-TieredCompilation -XX:+TieredCompilation -XX:TieredStopAtLevel=1

By setting :displace metadata on the default :jvm-opts, any project
configuration of :jvm-opts will replace the defaults.
 2013-06-18 14:55:08 -04:00
Juergen Hoetzel
43fe245b4f Delete the initfile when the subprocess exits, not when the Leiningen process exits 
Fixes issues when a task is applied via trampoline:

Exception in thread "main" java.io.FileNotFoundException: /tmp/form-init2098686718977910298.clj (No such file or directory)
 2013-06-16 16:05:22 +02:00
Juergen Hoetzel
0bac7b7ea0 Use (pr-str form) to write form to init-file 
Ensures that the form can be read by read-string. Fixes issues when
the form is lazy, which result in invalid init files like:

clojure.lang.LazySeq@451d3cd3
 2013-06-16 15:51:13 +02:00
Jean Niklas L'orange
1c43a36125 Add in todos for 3.0.0. 2013-06-15 22:14:22 +02:00
Juergen Hoetzel
90a74131c9 use init-file (-i) instead of form (-e) when evaluating forms in subprocess. 
The form is still not passed correctly on Windows, when it has nested quotes is passed via "-e".
See: http://bugs.sun.com/view_bug.do?bug_id=6468220

Refs #1203
Refs #863
Refs #1224
 2013-06-15 14:01:01 +02:00
Juergen Hoetzel
89c4bf7520 Use nested strings in test-eval-in-project, refs #1203 
Test double quote issues on Windows platform: http://bugs.sun.com/view_bug.do?bug_id=6468220
 2013-06-15 13:43:51 +02:00
Phil Hagelberg
8307aa58fc Fix long line. 
[ci skip]
 2013-06-06 09:37:33 -07:00
Roberto Mannai
f4a0fcfa34 Suggestion on when you have to set the 'http_proxy' variable 
For example, on Windows:
set http_proxy=http://user:pwd@proxyserver:port
 2013-06-05 16:14:08 +03:00
Phil Hagelberg
e4b66b2b9e Bump back to snapshot. 
[ci skip]
 2013-05-28 21:43:13 -07:00
Phil Hagelberg
5eaad5c48d Release 2.2.0 2013-05-28 17:04:23 -07:00
Phil Hagelberg
c5767cdaca Support :bootclasspath in :java-agents. 2013-05-16 13:45:40 -07:00
Phil Hagelberg
3d9d5b54b6 Don't use two-clause cond. 2013-05-16 10:34:07 -07:00
AtKaaZ
533f4725db fix repo name should not contain path delims under windows so test won't 
fail
all tests pass under windows
 2013-05-16 05:32:38 +03:00
AtKaaZ
0277ec3e41 Merge remote-tracking branch 'upstream/master' into testsUnderWindows1 2013-05-16 05:04:16 +03:00
Phil Hagelberg
a99d923cb2 Preliminary support for :java-agents. 2013-05-15 17:32:43 -07:00
Phil Hagelberg
d432377964 Hold back on :aot :all in the uberjar profile till 3.0. 2013-05-15 15:36:38 -07:00
Phil Hagelberg
94beeeffc4 Some todos. 2013-05-15 13:53:07 -07:00
Phil Hagelberg
cbff7f06fb Fix -o and -U aliases to be additive. 2013-05-15 13:53:01 -07:00
Phil Hagelberg
bba38c436a Don't block :user profile from ~/.lein/profiles.d. 2013-05-15 13:31:29 -07:00
Phil Hagelberg
c5e5ed61af Fix classpath test to match new checkout-deps behaviour. 2013-05-14 20:44:18 -07:00
AtKaaZ
9f984cbf46 Merge remote-tracking branch 'upstream/master' into testsUnderWindows1 
Conflicts:
	leiningen-core/test/leiningen/core/test/classpath.clj
 2013-05-15 06:16:13 +03:00
AtKaaZ
3521a21a9d moving 2 functions from utils to helper 
merged all commits to date which required adding "dev-resources" so a
test wouldn't fail
`bin\lein test` tested under windows (currently 2 failures and 1 error)
 2013-05-15 02:39:23 +03:00
AtKaaZ
6c34ce7e6f Merge branch 'master' into testsUnderWindows1 2013-05-15 01:53:44 +03:00
Phil Hagelberg
7b32caf8f6 Merge default profiles in checkout-deps project reading. 
Fixes #1180, but in a way that's probably too clever.

Makes it possible to recursively descend into checkout dependencies
with the following addition to the `:user` profile:

`:checkout-deps-shares [#=(resolve leiningen.core.classpath/checkout-deps-paths)]`
 2013-05-14 15:15:40 -07:00
Phil Hagelberg
f21a2c4a64 Merge :uberjar profile when uberjarring. 
Fixes #1170.
 2013-05-14 14:31:01 -07:00
Phil Hagelberg
f40da67ece Make profile-scope-target-path work with anonymous profiles. 
Also make it work in scenarios where the project map lacks :target-path.
 2013-05-14 13:42:41 -07:00
Phil Hagelberg
a1d7b6f3ea Scope :target-path by profile unless it's the default (:base). 
Anyone using a %s pattern in their custom :target-path will get this
behaviour, but strings that don't have it will continue to behave as
normal.

Fixes #468.
 2013-05-14 11:40:56 -07:00
AtKaaZ
9588d307d5 Merge branch 'master' into testsUnderWindows1 2013-05-13 21:00:58 +03:00
Phil Hagelberg
cf679d4f1c Normalize :mirrors like :repositories. Fixes #1171. 2013-05-13 09:40:34 -07:00
AtKaaZ
a8e20e96ce fix some path errors in windows tests 
lein test still has 2 failures and 1 error after this.
normalize-path should now handle absolute *nix paths correctly under
windows
addresses #1176
 2013-05-13 08:15:55 +03:00
Colin Jones
b4660d52db Bump nrepl & clojure-complete dependencies 2013-05-12 15:19:07 -05:00
Phil Hagelberg
92615f15ce Don't create target/classes unless we're in an actual project. 
Fixes #589.
 2013-05-09 16:35:20 -07:00
Phil Hagelberg
1f65fa4468 Remove stray println. 2013-05-09 16:34:58 -07:00
Ryan Fowler
1ab531fcc8 Better at knowing what get-dependencies calls have been memoized 
It turns out that #1162 wasn't that helpful because the project
argument keeps changing. This new version makes the real worker get a
filtered version of project, so that memoization hits are much more
likely.
 2013-05-02 19:04:42 -05:00
Phil Hagelberg
01dd252b8a Fix a bunch of tests from reorg-repl. 2013-05-02 14:12:58 -07:00
Phil Hagelberg
5adef11d33 Some more don't-warn-when-missing profiles. 2013-05-02 13:59:10 -07:00
Phil Hagelberg
086ab45ad3 Merge remote-tracking branch 'ryfow/memoize-get-dependencies' 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2013-05-02 13:51:33 -07:00
Phil Hagelberg
c508badfd9 Add :repl to list of don't-warn-when-missing profiles. 2013-05-02 13:48:55 -07:00
Phil Hagelberg
02f1d5dc82 Merge branch 'reorg-repl' 
Conflicts:
	leiningen-core/src/leiningen/core/main.clj
	leiningen-core/src/leiningen/core/project.clj
	src/leiningen/repl.clj
 2013-05-02 13:13:55 -07:00
Ryan Fowler
f613c40668 memoize get-dependencies 
get-dependencies is expensive and sometimes gets called multiple times
with the same arguments. This pretty consistently knocks a couple
tenths of a second off of the extremely common
 `lein repl < /dev/null`.
 2013-05-01 17:26:35 -05:00
Christoffer Sawicki
f20230c490 Make error messages in project/read refer to correct file 2013-04-27 23:53:19 +02:00
Colin Jones
f0582e2314 Escape quotes for Java versions below 7 
See http://gluck-md.blogspot.com/2012/12/jdk7-surprise.html

fixes #1121
 2013-04-14 21:03:57 -05:00
Phil Hagelberg
7ef8170aea Back to 2.2.0-SNAPSHOT. 2013-04-12 10:16:37 -07:00
Phil Hagelberg
eccd23d062 Release 2.1.3 2013-04-12 10:02:18 -07:00
Marko Topolnik
26cb21935b Revert "project.clj setting overrides profile setting" 2013-04-10 14:25:59 +02:00
Marko Topolnik
f19eeeb746 Populate project-map meta when outside project 
// cherry-picked from master
 2013-04-10 13:48:02 +02:00
Marko Topolnik
7a7e7fb623 project.clj setting overrides profile setting 
// fixes #1128
 2013-04-10 12:19:52 +02:00
Marko Topolnik
ea29210d23 Populate project-map meta when outside project 
// fixes #1129
 2013-04-10 12:08:26 +02:00
bdollard
3debae78c0 fixes #1123: mirrors can get credentials using gpg 2013-04-03 14:06:19 -04:00
Marko Topolnik
0908397422 Add resolve-and-apply to main and use it 
Fixes #1120
 2013-04-03 16:20:32 +02:00
Jean Niklas L'orange
95185a9b0a Improve error messages when reading user profiles. 
Also associates :origin to the file the user profile were defined in,
and tags it within its metadata.
 2013-03-30 16:36:21 +01:00
Phil Hagelberg
da76893c23 Back to 2.2.0-SNAPSHOT. 2013-03-28 15:38:43 -07:00
Phil Hagelberg
10d7d1faa3 Release 2.1.2 2013-03-28 14:46:32 -07:00
Phil Hagelberg
078ff98f3d Merge pull request #1114 from joelittlejohn/system-no-proxy 
Add support for no_proxy environment variable
 2013-03-28 12:15:57 -07:00
Phil Hagelberg
f5c2d04b57 Move default :test-selectors to :leiningen/test profile. 
Fixes #1099.
 2013-03-28 11:38:04 -07:00
Phil Hagelberg
a42c5521f4 Move Tiered Compilation to LEIN_JVM_OPTS and document. 
Fixes #1111.
 2013-03-28 11:04:13 -07:00
Joe Littlejohn
802e666f14 Add support for no_proxy environment variable 
Closes #816.
 2013-03-28 17:47:46 +00:00
Jean Niklas L'orange
51a2e1e625 Add tests for IObj vs. non IObjs merging. 2013-03-27 20:20:53 +01:00
Jean Niklas L'orange
664da4a3df Allow IObjs to be cmp. to non IObjs when merging. 
Fixes #1110.
 2013-03-27 20:20:15 +01:00
Jean Niklas L'orange
c42bb2a2c0 Only try to open file when needed in lein-version. 
(This should fix the breaking tests.)
 2013-03-27 19:38:15 +01:00
Pierre-Yves Ritschard
dc3cade47c Fetch version from pom.properties 
After clarifying things with @technomancy, it makes more sense
to pull the version from the already provisionned pom.properties
file.
 2013-03-27 00:37:24 +01:00
Pierre-Yves Ritschard
ea0b00a199 Provide a default version for leiningen 
For odd cases where leiningen is called without the wrapper shell script, any occurence of `:min-lein-version` will throw an exception since `leiningen-version` will return nil.

This fixes jenkinsci/leiningen-plugin#1 for instance.
I see two other ways to fix this:

- have the version be propagated from project.clj directly, through substitution
- let leiningen-version return a string that always passes or always fails (not sure which is best) the `:min-lein-version` requirement
 2013-03-26 23:54:21 +01:00
Gary Verhaegen
57f2228fbb Add way to set global vars (*assert*, *warn-on-reflection*, etc.) through config key :global-vars. 2013-03-26 21:54:27 +01:00
Jean Niklas L'orange
4e77b0d3d5 Change line endings for lein new on Windows. 
Fixes #1061.

This also incorporates the new environment variable
LEIN_NEW_UNIX_NEWLINES, for people who prefer to have '\n' as their
newline on non-unix operating systems.
 2013-03-26 02:45:44 +01:00
Phil Hagelberg
76dcd9c01d Move repl dependencies to dev profile. Fixes #1076. 2013-03-24 15:36:33 -07:00
Phil Hagelberg
160666ca3d Merge pull request #1094 from mtopolnik/remove-warn-chaining 
Consider removing warn-chaining
 2013-03-23 20:18:51 -07:00
Marko Topolnik
64dec29c14 Remove warn-chaining 2013-03-23 22:46:37 +01:00
Marko Topolnik
41f5641dfc Delete duplicate code 2013-03-23 17:15:02 +01:00
David Powell
b097e3fc2c Fix for incorrect escaping of parameters on Windows 
fixes #863 - exception when running lein check
 2013-03-23 13:33:20 +00:00
Phil Hagelberg
3edc5c3d44 Bump version back to 2.2.0-SNAPSHOT 2013-03-21 15:41:14 -07:00
Phil Hagelberg
bc84d8d166 Release 2.1.1 2013-03-21 15:32:09 -07:00
Phil Hagelberg
56a0bb1187 Add :test-paths to :checkout-deps-shares. 
Fixes #950.
 2013-03-21 12:40:24 -07:00
Phil Hagelberg
5c294e66e7 Allow run task to operate outside project directory. 
Fixes #1086.
 2013-03-21 12:39:29 -07:00
Phil Hagelberg
50a15b9d2a Merge remote-tracking branch 'origin/with-profile-symmetry' 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2013-03-20 15:15:04 -07:00
Phil Hagelberg
305bfc1410 Bump version numbers to 2.2.0-SNAPSHOT. 
[ci skip]
 2013-03-20 12:49:31 -07:00
Colin Jones
fe6a0d1db2 Unify & expand the profile list for show-profiles 2013-03-19 23:12:12 -05:00
Phil Hagelberg
904f2c91a4 Release 2.1.0 2013-03-19 19:45:21 -07:00
Phil Hagelberg
fa602e807b Look for bare maps in ~/.lein/profiles.d/*; disallow :user there. 
Fixes #1068.
 2013-03-19 19:39:36 -07:00
Phil Hagelberg
ededa95c2d Merge remote-tracking branch 'marcliberatore/natives-update-java-library-path' 2013-03-19 14:25:48 -07:00
Marc Liberatore
d9e943e519 fix error in test introduced in 43581e2 2013-03-19 16:07:06 -04:00
Marc Liberatore
43581e240f update java.library.path based on :native-prefix, addressing #898 2013-03-19 15:25:51 -04:00
Phil Hagelberg
3816f67861 Bump cheshire, slingshot, and pomegranate deps. 2013-03-19 10:24:56 -07:00
Michael Klishin
8a06fbdb22 Merge pull request #1077 from djpowell/windows-system-profile 
use an appropriate location for system profiles on windows
 2013-03-18 12:59:15 -07:00
Phil Hagelberg
568065d4d9 Formatting for leiningen-core files. 2013-03-18 09:34:40 -07:00
Phil Hagelberg
8f953e21cf Bootstrap leiningen-core with the base profile only. 2013-03-18 09:21:00 -07:00
Phil Hagelberg
2b6e29c272 Prefer ^:private to closing over an atom. 
For consistency more than anything else.
 2013-03-18 09:11:43 -07:00
Phil Hagelberg
d4ea69d93b Warn when system profiles contain :repositories. 2013-03-18 09:10:35 -07:00
Phil Hagelberg
a23f4be441 Add :system to list of profiles applied by default. 2013-03-18 09:03:37 -07:00
david.powell
05bf3de42c use an appropriate location for system profiles on windows 
move os detection into leiningen.core.utils
 2013-03-18 15:20:54 +00:00
Jean Niklas L'orange
d27ec33cd7 credentials-fn != credentials 2013-03-18 02:44:16 +01:00
Tim McCormack
90f8cad903 Bugfix: Restrict repo credential lookup to known keys. 
The last test in that set is a regression test discovered while working
on #949.
 2013-03-17 20:55:28 -04:00
Toby Crawley
e836a57e1b Add notice about 'help gpg' to error output. 
This covers artifact signing, credential decryption, and dependency
verification.
 2013-03-17 17:08:51 -07:00
Phil Hagelberg
0e132292b7 Merge remote-tracking branch 'hyPiRion/read-nonblocking' 
Conflicts:
	src/leiningen/deploy.clj
 2013-03-17 08:05:11 -07:00
Phil Hagelberg
43a9994171 Disable :prep-tasks in out-of-project runs. 2013-03-16 16:23:14 -07:00
Phil Hagelberg
b42d5eab73 Use :user profile when running outside project root. 
Make repl outside project dir go through eval-in-project anyway.

Fixes #966.
 2013-03-16 16:18:49 -07:00
Jean Niklas L'orange
8890cc0c64 Drag out piping logic to com.hypirion.io 2013-03-16 23:24:52 +01:00
Jean Niklas L'orange
d4993be57a Bump dependency on com.hypirion.io 2013-03-16 23:24:48 +01:00
Phil Hagelberg
81413b3143 The :base profile makes no sense outside a project. 2013-03-16 14:01:09 -07:00
Toby Crawley
da1856a5c4 Handle the case where gpg isn't installed; consolidate gpg usage. 2013-03-15 16:13:06 -04:00
Toby Crawley
b2b0251382 Update to bultitude 0.2.2 across the board. 
This eliminates the need to exclude dynapath, since pomegranate and
bultitude now use the same version. This also updates core's pom.xml
with other recent version updates.
 2013-03-15 12:05:29 -04:00
Phil Hagelberg
d990ec5d94 Fix typo in key-manager-factory; memoize entire make-sslcontext. 2013-03-14 21:47:38 -07:00
Phil Hagelberg
2579b2989d Load key-manager-properties from user profile as well. 2013-03-14 21:37:40 -07:00
Stephen Nelson
18eab507e9 added default-key-manager that emulates the default JSSE behaviour. 
Reads keyStore system properties and creates a KeyManagerFactory and
using it to create an SSLContext.
 2013-03-14 21:21:20 -07:00
Jean Niklas L'orange
85f236310c Manually memoize to be able to warn when needed. 
For instance would password reading not work as intended when this input
is rebound.
 2013-03-14 23:32:55 +01:00
Jean Niklas L'orange
04b3835463 Rebind only when needed. 2013-03-14 23:32:55 +01:00
Jean Niklas L'orange
5742386022 Use RevivableInputStream to avoid blocking reads. 2013-03-14 23:32:54 +01:00
Jean Niklas L'orange
108980adfc Send bytes as received for correctness. 2013-03-14 23:30:08 +01:00
Phil Hagelberg
e57b9f1810 Move checking of LEIN_OFFLINE into defaults map to lower priority. 
Fixes #961.
 2013-03-14 11:58:02 -07:00
Phil Hagelberg
ea604f61c4 Suppress stack traces when dependencies can't resolve. 2013-03-14 11:56:25 -07:00
Laurent Petit
4c1d14bf81 When l.c.classpath/get-dependencies fails, it now propagates the root exc 2013-03-14 10:45:49 -07:00
Colin Jones
7663a004ed Tidy up a few tests 
Mostly gets project maps in a format suitable for eval-in-project
(including the repositories), but also number-ifies port for aether (the
way the real URL.getPort method behaves).
 2013-03-14 12:23:19 -05:00
Colin Jones
984f189606 Fix docstring typo 2013-03-14 12:12:11 -05:00
Colin Jones
0599cd59ca Send https proxy property down to subprocesses 
fixes #1060
 2013-03-14 10:47:28 -05:00
Nelson Morris
e2f19e5b77 Warn on version ranges for deps :tree 
Use the new :repository-session-fn keyword for pomegranate
to add a DependencyChainFilter that checks for version ranges.

We store them in an atom because this might happen on another thread,
and we need to allow all of the ranges to be found.

Fixes #734
 2013-03-13 00:04:12 -05:00
Hugo Duncan
6ade0b7822 Add alias for bootstrap in leningen-core 2013-03-12 22:58:50 -04:00
Michael Klishin
c85fc14030 Bump Clojure to 1.5.1 2013-03-12 20:37:10 +04:00
Phil Hagelberg
81f51b6adf Bump http-wagon version. Fixes #1051. 2013-03-07 09:10:05 -08:00
Chas Emerick
749998bda9 fix :checkout-deps-shares to work with non-project-key fns, fixes gh-1049 2013-03-06 13:58:10 -05:00
AtKaaZ
fdaa492151 upgrade bultitude from 0.1.7 to 0.2.1 else compilation fail on windows 
(at least)
 2013-03-02 03:23:55 +01:00
Chas Emerick
9f16f233a6 Only register wagons from each file once 2013-03-01 00:42:17 -05:00
Marc Liberatore
d3a7047c72 add a per-dependency :native-prefix, addressing #898 2013-02-28 17:43:37 -08:00
Phil Hagelberg
f7f588b739 Implement system-level profiles. Fixes #981. 2013-02-28 12:04:12 -08:00
Phil Hagelberg
fd11857be3 Merge pull request #1032 from juggler/accept-credentials-in-url 
Deploy task should accept repo URL with credentials in it
 2013-02-27 07:24:01 -08:00
Max Prokopiev
a61d6a66a6 [#975] Deploy task should accept repo URL with credentials in it 2013-02-27 15:43:34 +04:00
Phil Hagelberg
ff0f5a6d04 Workaround for :test-selectors and #878. 
Gotta love how quote silently discards metadata wooooo.
 2013-02-26 11:57:50 -08:00
Phil Hagelberg
4315a64465 Move default test selectors to base profile. 
Fixes #1031.
 2013-02-26 10:29:58 -08:00
aroemers
5a1056859f Fix reporting resolving issues other than for missing artifacts. 2013-02-23 19:29:29 +01:00
Phil Hagelberg
57ea876ddd Moving Tiered Compilation to the dev profile. 
Ensures the fix to #1025 doesn't affect production usage of Leiningen.
 2013-02-21 21:01:01 -08:00
Phil Hagelberg
ecf6ca40c8 Stop tiered compilation at 1 in project JVM. 
Fixes #1025.

We're doing this for Leiningen itself already, but I was hesitant to
do it for the project JVM as well until the stack trace bug came up.
 2013-02-21 20:58:53 -08:00
Phil Hagelberg
52ae933cfa Fix tests to no longer look for shouty output prefix. 2013-02-21 13:35:21 -08:00
Phil Hagelberg
3b3573b47b Revert "Logging warnings to stderr and editing for consistency" 
This reverts commit 4f05a44a0e.

Conflicts:
	leiningen-core/src/leiningen/core/project.clj
	src/leiningen/deploy.clj
	src/leiningen/test.clj
	src/leiningen/with_profile.clj
 2013-02-21 13:29:48 -08:00
Hugo Duncan
8472e347fd Output task not found messages to *err* 
Throws an ex-info rather than calling abort to avoid the "Leiningen has
encountered a critical error and will now exit." message.

Adds a check for a :suppress-msg key before printing the exception message in
leiningen.core.main/main.
 2013-02-21 16:01:25 -05:00
Phil Hagelberg
1e49148267 Merge pull request #1022 from tobias/dynapath-update 
Force usage of newer dynapath until pomegranate updates.
 2013-02-21 12:07:04 -08:00
Toby Crawley
5fd5592711 Force usage of newer dynapath until pomegranate updates. 
This fixes the issue causing the build failures. The root of it is
that dynapath was allowing pomegranate to modify the boot classloader,
which caused multiple copies of the same class to be loaded.
 2013-02-21 15:04:26 -05:00
Phil Hagelberg
cc4045b932 Merge remote-tracking branch 'hugoduncan/feature/fix-recursive-alias-993' 
Conflicts:
	leiningen-core/test/leiningen/core/test/project.clj
 2013-02-21 12:04:19 -08:00
Hugo Duncan
1a7b9d11e7 Log classpath files at debug in get-classpath 
Logging the classpath facilitates diagnosis of classpath issues.
 2013-02-18 17:21:15 -05:00
Jean Niklas L'orange
2ab0f9df5f Add in old fns to avoid breakage in plugins. 
Also tag them as deprecated. (Since I was a bit too eager on this one,
feel free to revert to before the merge if the changes aren't worth it.)
 2013-02-18 00:44:40 +01:00
Jean Niklas L'orange
6aed6d377f Resolve failing test introduced by *warn*. 
Also move abort-msg up to leiningen core and call it from the leiningen
test helpers package instead.
 2013-02-18 00:07:53 +01:00
Jean Niklas L'orange
dff5865b2e Merge branch 'master' of https://github.com/benjaminsavoy/leiningen 
Conflicts:
	leiningen-core/src/leiningen/core/project.clj
 2013-02-17 23:17:57 +01:00
Benjamin Savoy
4f05a44a0e Logging warnings to stderr and editing for consistency 2013-02-17 11:10:41 +01:00
Hugo Duncan
fb1e73cd3b Add test cases for warn-user-repos and fix 
Refactored warn-user-repos to take an argument to enable testing.

The tests are different depending on whether
LEIN_SUPPRESS_USER_LEVEL_REPO_WARNINGS is set or not.  This is not ideal, but
there doesn't seem to be a good way of altering the environment variables in
clojure.
 2013-02-16 22:29:12 -05:00
Hugo Duncan
7807740f8b Add LEIN_SUPPRESS_USER_LEVEL_REPO_WARNINGS 
Can be used to suppress warnings about repositories in user level profiles.  Also
adds the list of profiles containing :repositories when not suppressed.
 2013-02-16 22:29:12 -05:00
Anthony Grimes
f11d7d2234 Make sure metadata is propagated. 2013-02-15 15:23:59 -08:00
Anthony Grimes
4080c1e62f Add a simple alias mechanism for :repositories and :deploy-repositories. 2013-02-15 14:29:32 -08:00
Phil Hagelberg
26fee30387 Add Sonatype OSS snapshots repo for pomegratate. 2013-02-11 14:39:22 -08:00
Phil Hagelberg
cb71b5a071 Merge pull request #991 from hugoduncan/feature/simplify-deploy 
Simplify deploy by moving coordinate merging into aether
 2013-02-10 22:13:54 -08:00
Hugo Duncan
551479fc5a Fix stack overflow on with-profile self-aliases 
An alias such as {"doc" ["with-profile" "+doc" "doc"]} was leading to a stack
overflow when executed.

This was due to the project being reload when with-profile calls set-profiles,
thus re-instating the aliases that have been removed by remove-alias.
 2013-02-08 22:56:42 -05:00
Jean Niklas L'orange
147dfbc3da Add tests for prioritized repos. 2013-02-08 21:04:58 +01:00
Jean Niklas L'orange
120c54ab3c Pick prioritized value in add-repo if there is one 2013-02-08 21:04:23 +01:00
Jean Niklas L'orange
cd52531897 Move prioritized picks out of meta-merge. 2013-02-08 21:03:29 +01:00
Hugo Duncan
cc335da313 Simplify deploy 
This takes advantage of the coordinate merging in pomegranate.aether/deploy.
 2013-02-08 11:10:01 -05:00
Phil Hagelberg
f822cedeac Add experimental support for :eval-in :nrepl. 2013-02-07 15:15:24 -08:00
Jean Niklas L'orange
0864e69455 Implement symlink?. 2013-02-07 20:49:00 +01:00
Tim McCormack
f7fbda14c8 Use -- to treat filenames as non-option args to gpg. 
Ordinarily I'd also check that the filename was not "-", or perhaps
get the absolute path, but in this case I know the filename. (Otherwise
this could result in a hung process as gpg waited for stdin.)
 2013-02-05 20:25:26 -05:00
Bruce Adams
9f20aa3bfd Remove superfluous exclusion of slf4j 
The dependencies for pomegranate were cleaned up as of pomegranate-0.0.8. We no longer need to exclude slf4j. (Hard to claim this is important; I just happened to notice that it was not needed.)
 2013-02-03 16:20:43 -05:00
Jean Niklas L'orange
c9c5cca4dc Make profile aliases available outside projects. 
Fixes #978.

By adding an atom (to pop off used aliases to avoid recursive calls)
which contains :user :aliases from profiles, we can use those aliases
outside of project maps. Whenever looking up aliases, will check the
atom if we're not in a project.
 2013-02-03 13:20:03 +01:00
Jean Niklas L'orange
3a0a1911f7 Fix typo in min-version-warning. 2013-02-03 11:48:16 +01:00
Jean Niklas L'orange
3045ed7111 Add support for ~/.lein/profiles.d. Closes #871. 
Add support for profiles.d within the user's Leiningen home directory. All .clj
files within LEIN_HOME/profiles.d will be treated as maps merged into the
original profiles.clj (if existing).

Erroneous .clj file inside profiles.d emits an error message and will be treated
as nil.

A profile defined multiple times will error and "crash" the loading of profiles,
such that profiles return nil.

The errors will only be emitted once for user-friendliness.
 2013-01-23 19:53:28 +01:00
Jean Niklas L'orange
730141f972 Memoize user/profiles. 2013-01-23 19:53:28 +01:00
Phil Hagelberg
be4ec8c81e Bump to 2.1.0-SNAPSHOT. 2013-01-19 20:39:17 -08:00
Phil Hagelberg
0cd13d8cdb Release 2.0.0. 2013-01-19 20:07:46 -08:00
Jean Niklas L'orange
4f2bc328d7 Gracefully stop reading input in sub-process. Fixes #934. 
This commit handles three major bugs with the current way of redirecting input
from Leiningen to a sub-process:

- The redirection is never stopped. This means that typing on the keyboard after
  a sub-process has finished will crash the thread redirecting data from *in* to
  the sub-process' input stream, as it is closed.

- The redirection is buffered. This means that data intended to a subsequent
  sub-process may be sent to this sub-process instead.

- The redirection blocks instead of busy waits. For the output streams, this is
  perfectly fine and the recommended approach to avoid wasting cycles. However,
  this has some issues when done to an input stream: If the sub-process finishes
  while the thread block waiting for a character, we will be unable to stop the
  thread before a character has been read. The consequence is that a character
  originally intended to the subsequent sub-process will be given to the
  previous process.

These issues are solved by reading one byte at a time, busy wait on data and
gracefully exit when the sub-process has ended (through a mutable
variable/atom).
 2013-01-18 01:02:15 +01:00
Phil Hagelberg
221d62a279 Merge pull request #932 from mgrubb/warn-on-user-in-project 
Emit warning when user profile is in project files
 2013-01-14 10:42:43 -08:00
Jean Niklas L'orange
1ea3c4c677 Treat :user in profile.clj as project map when outside of project. Fixes #931. 
By treating the `:user` profile in `profile.clj` as the project map when one's
outside of a project, the default repositories among with any mentioned
repositories within the `:user` profile will be fetched without any issues. Also
works fine when `profile.clj` doesn't contain any `:user` profile or no
`profile.clj` exists.
 2013-01-14 11:03:11 +01:00
Michael Grubb
ec435b48a6 Emit warning when user profile is in project files 
This implements issue #890.
It warns if a :user profile is found in either project.clj or
a profiles.clj in the project directory.
 2013-01-13 21:26:20 -06:00
Jean Niklas L'orange
fbc1804f86 Add tests to check ^:replace/^:displace behaviour. 2013-01-13 11:10:01 +01:00
Jean Niklas L'orange
2b40a3c8ec Prioritize metadata from :replace-vals and suppress from :displace. 2013-01-13 10:54:04 +01:00
Jean Niklas L'orange
e5511fe516 Back to 2.0.0-SNAPSHOT. 2013-01-13 10:38:54 +01:00
Phil Hagelberg
99f0ed7069 Release 2.0.0-RC2 2013-01-12 17:03:18 -08:00
Phil Hagelberg
b75658cff9 Be less specific in hooke-injection. 2013-01-12 14:44:50 -08:00
Phil Hagelberg
ccab537e56 Use default repos when non-nil project contains none. 2013-01-12 14:06:31 -08:00
Phil Hagelberg
e7b52a076d Oops, got the nesting wrong on that last one. 2013-01-12 13:20:54 -08:00
Phil Hagelberg
06fecc812a Use default repositories for plugins when outside project. 
Fixes #928.
 2013-01-12 12:56:39 -08:00