Commit graph

602 commits

Author SHA1 Message Date
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
Phil Hagelberg
33bab94f7f Merge pull request #926 from redinger/normalize-profiles
Normalize profiles before merging them
2013-01-11 19:33:34 -08:00
Christopher Redinger
e053fe1930 Normalize profiles before merging them 2013-01-11 21:49:03 -05:00
Phil Hagelberg
c300908789 newnew's not newnew anymore; it's just new. 2013-01-11 10:55:55 -08:00
Phil Hagelberg
eb15a82e12 Back to 2.0.0-SNAPSHOT. 2013-01-10 16:59:36 -08:00
Phil Hagelberg
1e309c1a52 Release 2.0.0-RC1 2013-01-10 16:45:09 -08:00
Nelson Morris
b7c54adc4e Print checksum exceptions 2013-01-10 17:03:20 -06:00
Phil Hagelberg
5f6fd4f306 Move resolution failure messages to catch block in get-dependencies. 2013-01-10 13:31:46 -08:00
Phil Hagelberg
96adcdccc5 Fix tests re: central snapshots. 2013-01-10 11:40:15 -08:00
Phil Hagelberg
567a4f87bc Bump to latest lein-newnew. 2013-01-10 11:40:02 -08:00
Phil Hagelberg
15c5eb9287 Don't need to explicitly include clojars classic in project.clj. 2013-01-10 11:35:35 -08:00
Phil Hagelberg
adab79df77 Todos and news. 2013-01-10 11:35:18 -08:00
Phil Hagelberg
824c3dc511 Don't refer folks to the Releases repository docs yet. 2013-01-10 11:08:56 -08:00
Phil Hagelberg
c70fca859f Merge pull request #909 from hyPiRion/normalize-data-in-project-map
Normalize data in project map
2013-01-10 11:02:53 -08:00
Hugo Duncan
eb58efca7d Disable snapshots from maven central 2013-01-09 17:04:40 -05:00
Jean Niklas L'orange
ef3641c172 Add a repo test case which actually merges repositories. 2013-01-07 21:48:03 +01:00
Jean Niklas L'orange
88dfec8daf Add tests to ensure that repository merging works as intended. 2013-01-07 20:42:19 +01:00
Jean Niklas L'orange
4c1320255e Normalize repositories in project map before merging. Fixes #858. 2013-01-07 02:54:46 +01:00
Phil Hagelberg
3d3fb9cdb2 Clarify the exit docstring. 2013-01-02 22:32:30 -08:00
Phil Hagelberg
712ac9a017 Exclusion to pacify lein-pedantic. 2012-12-28 12:00:19 -08:00
Jean Niklas L'orange
27fe39d618 Fix ^:displace and ^:replace handling in meta-merge
An object with the metadata flag `:displace` set signals that, if a merge
conflict appears, this object is to be discarded. Likewise, `^:replace` signals
that this object should be kept in a merge conflict.

However, previous functionality only tested if the right element had the
`:replace` flag, or if the left element had the `:displace` flag. This commit
resolves this by checking whether the left element has a `:replace` flag and the
right element has a `:displace` flag, and handles accordingly to the semantics
explained in the previous paragraph.

Whenever two elements where both has the `:displace` flag is merged, the
leftmost is picked, and their metadata is merged. Likewise for the `:replace`
flag. The elements will not lose their `:displace` and `:replace` flags, as they
have not really been preferred over another element.

The `nil?` tests have been placed at the top to reflect that nil is the lack of
a value, not a value itself. As such, elements will not be "preferred" or
"discarded" over nil/nothing.
2012-12-28 04:28:34 +01:00
Phil Hagelberg
799bf696d3 Fix classpath test. 2012-12-26 10:07:57 -08:00
Nelson Morris
723671b607 Use aether data to figure out repository id for listener output
For "important" events, aether gives us enough info to figure
out which repo it is happening from.  Lets use it instead
of trying to match from project data.

Previously matching from the project data would be incorrect
and output failures or not output anything for transative repos.
2012-12-15 13:16:07 -06:00
Nelson Morris
c07259f875 Print checksum mismatch message
Previously the output for downloading files would just say "failed to find".
Instead output the fact checksums were invalid, and from which repository.
2012-12-15 11:13:00 -06:00
Phil Hagelberg
b15a1188db Upgrade to lein-newnew 0.3.6. Fixes #865. 2012-12-14 14:42:24 -08:00
Jean Niklas L'orange
d6ba16b9da Removes run task aliases within metadata. fix #882
Removes the task to be run residing within a project's metadata (inside
:without-profiles) in addition to the original map, in order to prevent
"with-profile" from reviving already used aliases.
2012-12-11 02:27:45 +01:00
Jean Niklas L'orange
493adefe34 Add :java-opts as an alias for :jvm-opts 2012-12-09 19:50:34 +01:00
Anthony Grimes
ba9e56f259 Add capability for selectors to be two functions (one checks the ns, one the vars)
This makes it so that a selector such as :only can prevent unnecessary loading
of namespaces that they aren't going to work on. It is a way for a selector
that knows which namespaces it will touch by the selector's arguments and the
namespace names themselves to not have to load all namespaces.

This commit also fixes a bug introduced by a recent pull request where
'namespaces' could not be resolved. Per discussion with technomancy, provided a
default test selector *always*.
2012-12-07 17:44:31 -06:00
Balint Erdi
d0dd2dcdcf Fix a leiningen-core project test case 2012-12-04 16:44:19 +01:00
David Greenberg
80cf398b50 Allow project's git repository to be different than project root
This allows for other directories to be used for the automatic
repository tagging. This is useful for repositories that contain
multiple projects, such as leiningen-core and leiningen, so that both
will have the correct repository tag information in their pom.xml.
2012-11-28 14:48:28 -05:00
Justin Balthrop
77327993ee don't propagate DRIP_INIT or DRIP_INIT_CLASS to subprocess 2012-11-19 13:07:53 -08:00
Bruce Adams
7495e10103 Bug fix for leading spaces in JVM_OPTS #856 2012-11-19 11:45:54 -05:00
Phil Hagelberg
24fd117104 Back to classic Clojars for a while.
Took longer than expected to get Releases working.
2012-11-18 05:43:27 -08:00
Phil Hagelberg
6d4ffe9a98 Add classic repo to Leiningen's own project.clj. 2012-11-15 07:07:52 -08:00
Phil Hagelberg
1fa23122ce Fix error message when there's an arity mismatch in apply-task. 2012-11-14 15:06:38 -08:00
Phil Hagelberg
8470f34c3f Fix global exclusions test broken by meta-merge changes. 2012-11-14 12:54:25 -08:00
Phil Hagelberg
d4a3708f44 Fix usages of when for return values. 2012-11-14 12:48:36 -08:00
Phil Hagelberg
2973d99652 Check Clojars releases repository instead of classic. Fixes #241. 2012-11-14 12:45:34 -08:00
Phil Hagelberg
4d9b8537cd Better docstrings in leiningen-core. 2012-11-12 15:15:12 -08:00
Phil Hagelberg
168d5e29b1 Accept optional not-found arg in lookup-alias. 2012-11-12 14:40:30 -08:00
Phil Hagelberg
359eed9627 Accept ^:replace metadata on *env*; don't always want to merge. 2012-11-12 14:40:30 -08:00
Phil Hagelberg
43110b873d Remove deprecated conj-dependencies function. 2012-11-12 14:40:30 -08:00
Justin Balthrop
c7cedb7db8 don't need a meta-merge to combine exclusion 2012-11-08 18:07:07 -08:00
Jacek Laskowski
bac476ce6d a typo 2012-11-09 01:31:15 +01:00
Justin Balthrop
8407b5906a fix bug when adding exclusions to dependencies with :displace metadata 2012-11-08 15:09:23 -08:00
Phil Hagelberg
e804b26716 Remove compatibility shims and warnings in preparation for 2.0.0. 2012-11-01 16:39:34 -07:00
Phil Hagelberg
3a0ab9b672 Tidy up user.clj and help.clj. 2012-10-31 11:51:23 -07:00