Commit graph

324 commits

Author SHA1 Message Date
Phil Hagelberg
df6e39b38a Fix JVM_OPTS with spaces, mostly. Closes #565.
Spaces in opts will still break when a space is followed by a dash.
Use :jvm-opts in profiles if you can.
2012-05-10 11:45:02 -07:00
Phil Hagelberg
2df87f3dda Reword a few things in READMEs, todo tweaks. 2012-05-09 19:22:04 -07:00
Phil Hagelberg
b5ed74c619 Merge pull request #564 from technomancy/issue512
Issue512
2012-05-09 14:51:18 -07:00
Nils Grunwald
2bf458b7a2 added -o as an alias 2012-05-09 23:31:12 +02:00
David Santiago
36120d8224 Make merge-profile private and convert found uses of it to merge-profiles. 2012-05-09 12:33:36 -07:00
David Santiago
a7707f0fff Fix formatting of lein-core/project test. 2012-05-09 12:29:32 -07:00
David Santiago
0f07df9f4c Add tests for unmerge-profiles and merging anonymous profiles through merge-profiles. 2012-05-09 11:23:30 -07:00
David Santiago
af618379a9 Fix merge-profile, which was incorrectly appending to the :included-profiles meta. 2012-05-09 11:23:12 -07:00
David Santiago
3fe6650a19 Fix bugs in unmerge-profiles. Add a test for unmerge-profiles. 2012-05-09 03:00:13 -07:00
David Santiago
482680ad24 Make add-profiles work even when there is no without-profiles metadata. Add a test for add-profiles. 2012-05-09 02:36:27 -07:00
David Santiago
53fb5cbf52 Update profiles-for to accept both keywords and direct maps. 2012-05-09 02:01:29 -07:00
David Santiago
155d32aef5 Add unmerge-profiles function. 2012-05-09 00:53:57 -07:00
David Santiago
6bbf4fc5d6 Return merge-profile to a public function, instead make it record the map it merges in the :included-profiles metadata. 2012-05-09 00:34:26 -07:00
David Santiago
1a8c9211dc Add add-profiles function. 2012-05-09 00:07:42 -07:00
Phil Hagelberg
de4c3b5d69 Friendlier error message when deps can't be found. Fixes #546. 2012-05-07 17:31:22 -07:00
David Santiago
262c669b26 Make merge-profile private. 2012-05-07 17:10:44 -07:00
Phil Hagelberg
6543bde5d9 Remove "checksum" verbiage from when-stale. 2012-05-07 17:04:41 -07:00
Phil Hagelberg
10a0da1991 Remove a layer of quoting in the when-stale files. 2012-05-07 17:03:12 -07:00
Phil Hagelberg
f6a4ba53ae Don't re-extract native deps unless deps have changed. Fixes #535.
Also introduces the when-stale helper function which should be useful
in other cases as well.
2012-05-07 16:29:31 -07:00
Phil Hagelberg
5cbe443560 Allow URL scheme to be omitted in $http_proxy.
Seems like most tools allow this to be omitted, so we should probably
follow suit.
2012-05-07 11:49:18 -07:00
Nelson Morris
3e1afa892e Bump pomegranate for http deploy fixes 2012-05-06 14:37:20 -05:00
Jacek Laskowski
c3a6ee0a9f Issue #559: Provide leiningen-version function 2012-05-04 20:56:22 +02:00
Phil Hagelberg
7a04b5b5c2 Ignore user profiles in classpath tests. Fixes #550.
May need a more global approach to this problem.
2012-04-29 17:30:35 -07:00
Phil Hagelberg
cdf0642dc8 Merge pull request #549 from hugoduncan/feature/add-fallback-for-lein-home
Add fallback for LEIN_HOME environment variable
2012-04-29 17:27:24 -07:00
Hugo Duncan
2c47d3aed6 Add fallback for LEIN_HOME environment variable
When using leiningen-core outside of lein, LEIN_HOME, which is set be the lein shell wrapper,
is not set. Fall back to using the system property for user.home to calculate the lein
home directory
2012-04-29 09:18:54 -04:00
Hugo Duncan
ccd3f58465 Decouple init-project from l.c.project/read
Reading a project should be side affect free. init-project modifies the current
classloader (and possible installs a new context classloader), so should not be
part of leiningen.core.project/read.
2012-04-29 09:07:51 -04:00
Phil Hagelberg
afc7df8e7e Don't set environment to empty map by default. 2012-04-25 11:29:43 -07:00
Phil Hagelberg
4b63f9a953 Make the environment for subprocesses check a dynamic map. 2012-04-24 16:10:17 -07:00
Phil Hagelberg
1faf0eedb4 Bump version of ordered to avoid locked version range. 2012-04-24 16:10:17 -07:00
Chas Emerick
18d58964d5 test for init-project 2012-04-24 13:27:07 -04:00
Chas Emerick
b1ae6b0758 load plugins, middleware, hooks, etc after merging profiles in with-profile 2012-04-24 13:27:07 -04:00
Phil Hagelberg
5f5c0cdbab Fix native-path and repl test failures. 2012-04-18 21:51:50 -07:00
Phil Hagelberg
b99b57a3d5 Clarify that :password and :passphrase are used by different repositories.
[ci skip]
2012-04-17 22:14:53 -07:00
Phil Hagelberg
fed8eb6241 Merge pull request #532 from kenrestivo/ce788c934159183eaaec2f3a9d841a862e791d52
Maven repos seem to want "password" not "passphrase"
2012-04-17 22:09:40 -07:00
Phil Hagelberg
9e83fc3f95 Bump to Clojure 1.4.0. 2012-04-17 22:07:04 -07:00
Phil Hagelberg
e04f1bee9b Move :native-path to under target/ dir. 2012-04-17 22:04:29 -07:00
Chas Emerick
3da949b538 avoid NPE when searching for "Suppressed exit" 2012-04-17 07:59:52 -04:00
ken restivo
ce788c9341 maven wants password not passphrase 2012-04-16 22:32:44 -07:00
Phil Hagelberg
55935d01e9 Remove "bundled mode" from bin/lein. 2012-04-12 11:50:11 -07:00
Phil Hagelberg
030632acf6 Bump back to snapshot. 2012-04-12 10:37:34 -07:00
Phil Hagelberg
a95f990227 Release 2.0.0-preview3. 2012-04-12 10:18:32 -07:00
Phil Hagelberg
344a4658b0 Fix :offline? project key to have question mark. 2012-04-12 10:04:54 -07:00
Phil Hagelberg
de2ded08a7 Don't shutdown agents when exit is suppressed. 2012-04-12 10:04:12 -07:00
Phil Hagelberg
d17654bacd Ensure deps are calculated in prep. Fixes #433 for real. 2012-04-10 17:25:50 -07:00
Nelson Morris
4ffde4c655 Bump pomegranate; fixes #491 2012-04-10 13:28:46 -05:00
Chas Emerick
a4821e0c79 don't call pomegranate/can-modify? 2012-04-09 18:53:39 -04:00
Phil Hagelberg
81652f9161 news/todos 2012-04-09 12:18:06 -07:00
Phil Hagelberg
13a6b10d90 Make help task look up argument in aliases map. 2012-04-09 11:54:29 -07:00
Phil Hagelberg
0a5d1edd8b Remove last vestiges of exit-code-as-return-value. Fixes #510. 2012-04-09 11:48:32 -07:00
Phil Hagelberg
49dcb03ecf Don't warn of profile merge conflicts when the classes match. 2012-04-07 12:40:14 -07:00
Phil Hagelberg
5206f9315b Automatically activate offline profile when needed. Fixes #478. 2012-04-07 12:40:14 -07:00
Nelson Morris
3076100706 Handle global exclusions in all dependency cases. Fixes #498
Also remove global exclusion handling in pom generation, otherwise
it would generate 2 exclusion tags.
2012-04-04 19:02:54 -05:00
Phil Hagelberg
2307991c1a Set http proxy system properties. Addresses half of #281. 2012-04-04 11:21:06 -07:00
Phil Hagelberg
eb3806dc64 Get authentication info out of $http_proxy. 2012-04-04 10:04:45 -07:00
Phil Hagelberg
6a9713da7f Fix get-proxy-settings when http_proxy isn't set. 2012-04-04 09:58:38 -07:00
Juergen Hoetzel
18362faf8a add proxy support
Parse http_proxy environment variable to setup aether/pomegranate proxy config.
2012-04-04 18:12:56 +02:00
Phil Hagelberg
9f5e3187a9 Re-add missing stacktrace. 2012-04-03 11:33:17 -07:00
Phil Hagelberg
bd75def95b Use main/info instead of println for loggish things. Fixes #473. 2012-04-02 21:13:23 -07:00
David Santiago
0223ad8339 Fix merge-profiles so that it does not clobber existing metadata in the project map, but instead merges. 2012-04-02 17:50:24 -07:00
Phil Hagelberg
0babb90b05 Translate nonzero exit codes into exceptions. Fixes #493. 2012-04-02 11:12:36 -07:00
Phil Hagelberg
56c8f1dd4d Move :prep-tasks to default project instead of profile. 2012-04-02 10:29:17 -07:00
Phil Hagelberg
4b57ef2c8a Fix absolutize to no longer assume unix paths. 2012-04-01 22:22:36 -07:00
Phil Hagelberg
3586e62e6b Store :trampoline-promise in metadata instead of in project map. Fixes #490. 2012-04-01 21:56:53 -07:00
Phil Hagelberg
de282bfbe5 Fix :without-profiles as per suggestion in #488. 2012-04-01 09:13:56 -07:00
David Santiago
f52b7da79a Fix merge-profiles so that :included-profiles metadata is added to if it is already present, instead of overwriting it. 2012-04-01 01:35:30 -07:00
Phil Hagelberg
a7c2878d36 Add debug and info functions for #473.
Still need to start using them.
2012-03-30 11:09:41 -07:00
Phil Hagelberg
eef8fe3d08 Block repl on prep-tasks. 2012-03-29 18:42:36 -07:00
Phil Hagelberg
6e225eb0a9 Test needs to set-ize things. 2012-03-29 17:10:58 -07:00
Phil Hagelberg
020071e576 Whitelist classpath to just zip/jar files. Fixes #481.
Helps with #457.
2012-03-29 17:01:20 -07:00
David Santiago
2c034aa0d3 Add :included-profiles metadata to project map in merge-profiles. See issue 392. 2012-03-29 02:48:31 -07:00
Phil Hagelberg
21d9917a3f Now :project-init is redundant with :injections. 2012-03-28 13:37:06 -07:00
Phil Hagelberg
a1d8abfb75 Add :offline profile. 2012-03-27 10:18:24 -07:00
Phil Hagelberg
6492101d36 Inline shutdown hook for killing subprocesses. 2012-03-27 10:18:17 -07:00
Phil Hagelberg
4e89806158 Shouldn't need to aot in leiningen-core anymore. 2012-03-25 19:19:36 -07:00
Colin Jones
82eeed1a4e Destroy subprocesses on shutdown
This prevents orphaned processes from shelling out via
eval-in :subprocess. The song-and-dance around sh/
sh-without-orphans is to keep the public fn `sh` the same.

refs #455
2012-03-24 11:06:08 -05:00
Nelson Morris
d633fad0b6 Let deps :tree print a dependency tree 2012-03-22 22:27:16 -05:00
Phil Hagelberg
d04bc76a1b Set :jvm-opts during eval-in :leiningen. 2012-03-20 13:53:25 -07:00
Michael S. Klishin
0761d16880 Use a more helpful message when task is not found
Instead of "that's not a task" print "... is not a task"
2012-03-13 23:12:05 +04:00
Phil Hagelberg
6141fdca51 Deprecate conj-dependencies.
This scenario should be handled by task-specific profiles instead of a
function like this.
2012-03-12 12:06:01 -07:00
Michael S. Klishin
712f1b9b84 Respect :java-cmd in project if it is given 2012-03-12 21:51:35 +04:00
Phil Hagelberg
245b036a4a Back to 2.0.0-SNAPSHOT. 2012-03-11 21:06:48 -07:00
Phil Hagelberg
82bbd3b601 Release 2.0.0-preview2. 2012-03-08 20:33:47 -08:00
Phil Hagelberg
377904f6b8 Add :default profile in when loading plugins outside a project. 2012-03-08 10:26:02 -08:00
Roman Gonzalez
ec4f674e95 Fix documentation on add-repo-auth function
The documentation was after parameter list (checked out this issue via marginalia documentation).
2012-03-07 21:06:08 -08:00
Phil Hagelberg
bb381f9fd2 Handle nil :plugins key when running outside project dir. 2012-03-07 15:52:41 -08:00
Phil Hagelberg
cc711200a4 Move version back to 2.0.0-SNAPSHOT. 2012-03-07 14:24:03 -08:00
Phil Hagelberg
efe16d5dee Release 2.0.0-preview1. 2012-03-07 12:06:48 -08:00
Phil Hagelberg
14ec91355b Load plugins when operating outside a project dir. 2012-03-07 11:58:12 -08:00
Phil Hagelberg
f6f46c267e Don't recursively prep project. 2012-03-07 11:30:26 -08:00
Tobias Crawley
158355303e leiningen.core.main/task-not-found needs to be marked as not needing a project to work properly. 2012-03-07 13:59:20 -05:00
Phil Hagelberg
d6fdc21648 Allow suppressing of leiningen.core.main/exit for IDEs/tools. 2012-03-06 11:07:52 -08:00
Phil Hagelberg
1370be9725 Drop user/settings in favour of checking :user profile directly. 2012-03-06 11:07:51 -08:00
Phil Hagelberg
bf1ab79052 Port :checkout-deps-shares to master branch. 2012-03-05 17:39:48 -08:00
Phil Hagelberg
94a12b3cde Pass through :local-repo and :offline? options to pomegranate. 2012-03-02 16:17:46 -08:00
Phil Hagelberg
c4dad5be02 Bump lein-newnew plugin to 0.2.4. Fixes #427. 2012-03-02 14:15:14 -08:00
Phil Hagelberg
02e39e507a Add conj-dependency function. 2012-03-01 15:50:56 -08:00
Phil Hagelberg
28397ad6eb Test :exclusions. 2012-03-01 15:31:12 -08:00
Phil Hagelberg
5e7808796f Move :dependencies back to vector-of-vectors. 2012-03-01 15:31:08 -08:00
Phil Hagelberg
861e4f08ea Make leiningen-core dirs visible when testing leiningen proper. 2012-03-01 15:30:50 -08:00
Phil Hagelberg
71874208f3 Move normalization out of defproject into top-level comp. 2012-03-01 11:17:40 -08:00
Phil Hagelberg
85f2fa1935 Cosmetics. 2012-03-01 11:17:40 -08:00
Hugo Duncan
28fd085c5a Add warning if a checkouts directory does not contain a project.clj
This provides a diagnostic message, will leaving open the possibility for other
type of projects in checkouts
2012-02-29 16:16:47 -05:00
Phil Hagelberg
29c262da3b Don't put $LEIN_DIR/lib on the classpath; that's deprecated. 2012-02-25 22:01:53 -08:00
Anthony Grimes
9b0185747a Switch to bultitude for ns finding stuff. 2012-02-24 22:15:19 -06:00
Phil Hagelberg
d0768feb11 Move prep-tasks out of atom into :default profile. 2012-02-24 15:55:55 -08:00
Phil Hagelberg
03aa94c661 Implement :middleware. 2012-02-24 15:38:10 -08:00
Chas Emerick
03b8635c67 keys in :auth :repository-auth can now be regexes matching repository URLs, fixes gh-424 2012-02-24 07:44:07 -05:00
Chas Emerick
f0a17e3aad missed a test 2012-02-23 18:42:39 -05:00
Chas Emerick
a22da503be load plugins through classpath/resolve-dependencies so as to benefit from authentication config, etc, fixes gh-423 2012-02-23 14:35:57 -05:00
Chas Emerick
d4169089cc allow hook load/activation exceptions to bubble up, fixes gh-419 2012-02-23 13:25:34 -05:00
Chas Emerick
5c66dc0d22 Upgrade pomegranate to 0.0.8, fixes gh-422 2012-02-23 13:25:34 -05:00
Phil Hagelberg
fa0d11c48d Add a todo for including denormalize. 2012-02-22 17:31:16 -08:00
Phil Hagelberg
b449cd6a13 Ensure we launch eval-in-subprocess in the project root.
Needed for lein-sub-type behaviour.
2012-02-22 16:57:35 -08:00
Phil Hagelberg
ae37356845 Update tasks to use plural paths. Use :resource-paths instead of resources. 2012-02-22 16:43:17 -08:00
Phil Hagelberg
74c264fa59 Switch to "input" paths as plural keys. 2012-02-22 12:08:22 -08:00
Phil Hagelberg
7dcc660847 Simplify profile merging now that deps/repos are maps. 2012-02-22 12:03:49 -08:00
Phil Hagelberg
b03e2240ee Move :test-path into default-project. Fixes #416. 2012-02-22 11:03:59 -08:00
Phil Hagelberg
b518e9c962 Allow :injections to be a collection. 2012-02-22 11:03:30 -08:00
Chas Emerick
b2b8621618 emit sane progress messages when resolving dependencies and deploying artifacts 2012-02-22 08:47:18 -05:00
Chas Emerick
0a2e84754e upgrade to pomegranate 0.0.7 2012-02-22 08:47:18 -05:00
Chas Emerick
e03b74e00f upgrade to pomegranate 0.0.6; changes default checksum policy to only warn on failure 2012-02-22 08:47:18 -05:00
Chas Emerick
19a40fae95 don't swap out thread context classloader if it's already modifiable 2012-02-20 18:19:54 -05:00
Chas Emerick
b85b48a48b upgrade to pomegranate 0.0.5; use its get-classpath in leiningen.core.ns to fix gh-412 2012-02-20 18:19:29 -05:00
Chas Emerick
600fb09a31 add project classpath to leiningen's classpath if :eval-in :leiningen, fixes gh-411 2012-02-20 05:31:03 -05:00
Phil Hagelberg
7d8dca635d Use ordered maps for :dependencies and :repositories. Fixes #400. 2012-02-19 22:10:09 -08:00
Phil Hagelberg
6cadab9bd4 Going to go ahead and call that a typo. 2012-02-19 21:34:36 -08:00
Phil Hagelberg
1c41bf0d17 Expose :repository-auth from user profiles to pomegranate. 2012-02-19 21:18:12 -08:00
Phil Hagelberg
77d0abb474 Move special nrepl deps from :default profile to repl task. 2012-02-19 16:26:53 -08:00
Phil Hagelberg
69b03bf327 Fix a few leiningen-core tests. 2012-02-19 15:36:05 -08:00
Phil Hagelberg
7cc7afc61b Clarify mismatch warning when merging profiles. 2012-02-17 14:20:32 -08:00
Phil Hagelberg
ba8904a90d Don't rely on binding of *ns* in project/read. 2012-02-16 20:31:06 -08:00
Phil Hagelberg
4c5c173f1e Fix locking call. 2012-02-16 20:02:36 -08:00
Phil Hagelberg
8425e06ed1 Move :test-path to :default profile and lock inside project/read. 2012-02-16 15:51:05 -08:00
Phil Hagelberg
af2a5ddb53 Allow :aliases in project.clj. 2012-02-13 21:02:52 -08:00
Phil Hagelberg
0234593c4c Call System/setProperty for eval-in-leiningen calls. 2012-02-13 21:02:43 -08:00
Colin Jones
b757cb0cd3 Revert "Upgrade to the latest nrepl"
This reverts commit 01084cdb6a.
2012-02-11 18:05:25 -06:00
Colin Jones
d8be20b2ec Revert "Add sonatype snapshots for the time being"
This reverts commit 6a145804f7.
2012-02-11 18:05:12 -06:00
Colin Jones
6a145804f7 Add sonatype snapshots for the time being
This is only for nrepl 0.2.0-SNAPSHOT - we can get rid of it
as soon as there's a non-snapshot release.
2012-02-11 17:57:12 -06:00
Colin Jones
01084cdb6a Upgrade to the latest nrepl 2012-02-11 16:50:46 -06:00
Phil Hagelberg
432c4eae41 Link to the EPL in project.clj. 2012-02-08 22:55:48 -08:00
Phil Hagelberg
61522df1af Be more forgiving of sparse project maps in eval-in-project. 2012-02-08 22:55:19 -08:00
Phil Hagelberg
c11a3a83c0 Absolutize paths in :without-profiles project map as well. 2012-02-08 00:18:31 -08:00
Phil Hagelberg
bc22a95f66 Implement a few partially-applied help aliases. 2012-02-07 23:26:47 -08:00
Phil Hagelberg
dc1fa56950 Allow aliases to specify partially-applied tasks.
Love it... except for the bits dealing with varargs; yuck!
2012-02-07 23:26:47 -08:00
Phil Hagelberg
98ad4f9897 Profiles mean :jvm-opts in user/settings isn't necessary. 2012-02-07 20:58:48 -08:00
Phil Hagelberg
07c699cb6f Warn when profile is specified that doesn't exist. 2012-02-07 20:32:04 -08:00
Phil Hagelberg
c48f6ee9df Move absolutize-path call into merge-profiles.
Otherwise merge-profiles isn't any good for keys that involve paths
outside leiningen.core.project/read.
2012-02-07 18:15:03 -08:00
Phil Hagelberg
1c0f2099f9 Move :dev profile to :default in default-profiles.
Otherwise project-level :dev profiles will stomp on the inclusion of
nrepl and friends.

Conflicts:

	bin/lein
2012-02-07 17:09:34 -08:00
Phil Hagelberg
032a023eb5 Fix trampoline task. 2012-02-07 17:09:09 -08:00
Anthony Grimes
7a7945880f Move reply and lein-newnew to lein's own project.clj.
The only reason this wasn't possible before was because the classpath
was being cached in .lein-classpath, giving the appearance of those
dependencies not being seen.
2012-02-07 16:12:14 -06:00