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

703 commits

Author SHA1 Message Date
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