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

2299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phil Hagelberg
ff0e95baf0 Debug output in apply-task. 2012-10-04 09:36:21 -07:00
Phil Hagelberg
b5dc41a682 Fix repl tests. 2012-10-04 09:26:14 -07:00
Phil Hagelberg
d23d9293fb Improve trampoline help. 2012-10-04 09:23:25 -07:00
Jeff Dik
c174a51163 project.clj: add exclusion for sisu-inject-plexus 
Fixes:

Recalculating Leiningen's classpath.
Failing dependency resolution because
[org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]]] -> [org.sonatype.sisu/sisu-inject-plexus "1.4.3"]
is overrulling
[leiningen-core "2.0.0-SNAPSHOT"] -> [com.cemerick/pomegranate "0.0.13" :exclusions [[org.slf4j/slf4j-api]]] -> [org.sonatype.aether/aether-connector-wagon "1.13.1"] -> [org.sonatype.sisu/sisu-inject-plexus "2.2.3"]
Please use [org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]] :exclusions [org.sonatype.sisu/sisu-inject-plexus]] to get [org.sonatype.sisu/sisu-inject-plexus "2.2.3"] or use [leiningen-core "2.0.0-SNAPSHOT" :exclusions [org.sonatype.sisu/sisu-inject-plexus]] to get [org.sonatype.sisu/sisu-inject-plexus "1.4.3"].Failing dependency resolution because
[org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]]] -> [org.sonatype.sisu/sisu-inject-plexus "1.4.3"] -> [org.codehaus.plexus/plexus-utils "2.0.5"]
is overrulling
[leiningen-core "2.0.0-SNAPSHOT"] -> [com.cemerick/pomegranate "0.0.13" :exclusions [[org.slf4j/slf4j-api]]] -> [org.sonatype.aether/aether-connector-wagon "1.13.1"] -> [org.codehaus.plexus/plexus-utils "2.0.7"]
Please use [org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]] :exclusions [org.codehaus.plexus/plexus-utils]] to get [org.codehaus.plexus/plexus-utils "2.0.7"] or use [leiningen-core "2.0.0-SNAPSHOT" :exclusions [org.codehaus.plexus/plexus-utils]] to get [org.codehaus.plexus/plexus-utils "2.0.5"].Failing dependency resolution because
[org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]]] -> [org.sonatype.sisu/sisu-inject-plexus "1.4.3"] -> [org.codehaus.plexus/plexus-classworlds "2.2.3"]
is overrulling
[leiningen-core "2.0.0-SNAPSHOT"] -> [com.cemerick/pomegranate "0.0.13" :exclusions [[org.slf4j/slf4j-api]]] -> [org.sonatype.aether/aether-connector-wagon "1.13.1"] -> [org.codehaus.plexus/plexus-classworlds "2.4"]
Please use [org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]] :exclusions [org.codehaus.plexus/plexus-classworlds]] to get [org.codehaus.plexus/plexus-classworlds "2.4"] or use [leiningen-core "2.0.0-SNAPSHOT" :exclusions [org.codehaus.plexus/plexus-classworlds]] to get [org.codehaus.plexus/plexus-classworlds "2.2.3"].
 2012-10-03 10:01:33 -07:00
Phil Hagelberg
a2285f1194 Merge pull request #801 from jcrossley3/242 
Include namespace metadata in test-selector predicates, fixes #242
 2012-10-03 08:19:39 -07:00
Jim Crossley
e770d5e649 Include namespace metadata in test-selector predicates, fixes #242 
More specific metadata wins, e.g. deftest trumps its namespace.

Also tweaked the tests a bit so that actual/expected results are now
shown in the output.
 2012-10-02 19:38:35 -04:00
Phil Hagelberg
4f507a207e Reverting "project.clj: add exclusion for sisu-inject-plexus" 
This reverts commit ca4cbbfa85.
 2012-09-29 20:21:18 -07:00
Phil Hagelberg
7daaad27e2 Merge pull request #797 from jeffdik/master 
Fix for dependency resolution conflict: sisu-inject-plexus 1.4.3 vs. 2.2.3
 2012-09-29 14:30:34 -07:00
Jeff Dik
ca4cbbfa85 project.clj: add exclusion for sisu-inject-plexus 
Fixes:

Recalculating Leiningen's classpath.
Failing dependency resolution because
[org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]]] -> [org.sonatype.sisu/sisu-inject-plexus "1.4.3"]
is overrulling
[leiningen-core "2.0.0-SNAPSHOT"] -> [com.cemerick/pomegranate "0.0.13" :exclusions [[org.slf4j/slf4j-api]]] -> [org.sonatype.aether/aether-connector-wagon "1.13.1"] -> [org.sonatype.sisu/sisu-inject-plexus "2.2.3"]
Please use [org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]] :exclusions [org.sonatype.sisu/sisu-inject-plexus]] to get [org.sonatype.sisu/sisu-inject-plexus "2.2.3"] or use [leiningen-core "2.0.0-SNAPSHOT" :exclusions [org.sonatype.sisu/sisu-inject-plexus]] to get [org.sonatype.sisu/sisu-inject-plexus "1.4.3"].Failing dependency resolution because
[org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]]] -> [org.sonatype.sisu/sisu-inject-plexus "1.4.3"] -> [org.codehaus.plexus/plexus-utils "2.0.5"]
is overrulling
[leiningen-core "2.0.0-SNAPSHOT"] -> [com.cemerick/pomegranate "0.0.13" :exclusions [[org.slf4j/slf4j-api]]] -> [org.sonatype.aether/aether-connector-wagon "1.13.1"] -> [org.codehaus.plexus/plexus-utils "2.0.7"]
Please use [org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]] :exclusions [org.codehaus.plexus/plexus-utils]] to get [org.codehaus.plexus/plexus-utils "2.0.7"] or use [leiningen-core "2.0.0-SNAPSHOT" :exclusions [org.codehaus.plexus/plexus-utils]] to get [org.codehaus.plexus/plexus-utils "2.0.5"].Failing dependency resolution because
[org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]]] -> [org.sonatype.sisu/sisu-inject-plexus "1.4.3"] -> [org.codehaus.plexus/plexus-classworlds "2.2.3"]
is overrulling
[leiningen-core "2.0.0-SNAPSHOT"] -> [com.cemerick/pomegranate "0.0.13" :exclusions [[org.slf4j/slf4j-api]]] -> [org.sonatype.aether/aether-connector-wagon "1.13.1"] -> [org.codehaus.plexus/plexus-classworlds "2.4"]
Please use [org.apache.maven.indexer/indexer-core "4.1.3" :exclusions [[org.apache.maven/maven-model] [org.sonatype.aether/aether-api] [org.sonatype.aether/aether-util]] :exclusions [org.codehaus.plexus/plexus-classworlds]] to get [org.codehaus.plexus/plexus-classworlds "2.4"] or use [leiningen-core "2.0.0-SNAPSHOT" :exclusions [org.codehaus.plexus/plexus-classworlds]] to get [org.codehaus.plexus/plexus-classworlds "2.2.3"].
 2012-09-29 19:44:29 +00:00
Justin Balthrop
80ec48e9b6 Print message when installing jar locally. 2012-09-27 14:01:12 -07:00
Justin Balthrop
123b929ec7 Fix environment passing to project JVM. 
Runtime#exec takes an array of strings of the form "key=val", but we
were previously passing an array of interspersed keys and vals.
 2012-09-27 13:46:35 -07:00
Justin Balthrop
c369447c8b support :os and :arch options in project map 
Use :arch option to provide -d32 or -d64 option to project JVM.
 2012-09-27 13:44:11 -07:00
Justin Balthrop
b7b61e9655 always extract native deps from snapshot jars 
- fixes #796
- also add token param to when-stale, because otherwise multiple callers
  of with-stale can contaminate each other's results
 2012-09-27 13:23:34 -07:00
Justin Balthrop
48bea66ea0 use -classpath instead of -cp so that jdb can be used for :java-cmd 2012-09-27 11:22:03 -07:00
Justin Balthrop
52d33ef15e ignore things like .leinrc too 2012-09-27 11:18:36 -07:00
Michael Klishin
307ac9d628 Merge pull request #795 from juergenhoetzel/master 
Reworked classpath setup: bin/lein
 2012-09-26 12:24:14 -07:00
Juergen Hoetzel
8f9c246f14 code reuse: context specific CLASSPATH is used checkout and non-checkout 2012-09-26 20:34:27 +02:00
Juergen Hoetzel
26af2db2b7 use bash helper function add_path to setup classpath 
instead of conditionally (cywin/unix) constructing the classpath using
bash assignment.
 2012-09-26 20:14:41 +02:00
Juergen Hoetzel
e0398e0819 Add bash function add_path for (class)path setup 2012-09-26 19:48:17 +02:00
Michael S. Klishin
b86095c61b Handle the default field case 2012-09-22 04:42:59 +04:00
Michael S. Klishin
e732c9f3ff Fail if the field we are searching over is unsupported 
This is not a very user-friendly way of failing but OK for now
 2012-09-22 04:41:57 +04:00
Michael S. Klishin
3675690ade Print which field we are searching over 2012-09-22 04:37:47 +04:00
Michael S. Klishin
9c4c5c780c Allow searching over fields other than artifact id, fixes #243 
Examples:

# searches over artifact id (the default field)
$ lein search clojure
$ lein search "Riak client"

# search for artifacts in a specific group
$ lein search group:clojurewerkz
$ lein search g:clojurewerkz

# search over description
$ lein search d:clojurewerkz
$ lein search description:clojurewerkz
 2012-09-22 04:25:18 +04:00
Michael S. Klishin
e06bd2e66c Ignore all .lein\* files 2012-09-22 03:29:05 +04:00
Michael S. Klishin
14ccb65e3e Display a message before we update the search index 
Otherwise it looks as if `lein search` has locked up for minutes or is in
an infinite loop.
 2012-09-22 03:26:27 +04:00
Phil Hagelberg
80fa726879 Merge pull request #790 from technomancy/per_project_repl_history 
Add default REPL history file locations, per-project and globally
 2012-09-18 17:01:05 -07:00
Michael S. Klishin
51936c03d4 Add default REPL history file locations, per-project and globally 
When lein repl is launched in a directory with project.clj ("in project"), the
location is ./.lein-repl-history.

When lein repl is running in a directory without project.clj ("globally"), the
location is ~/.lein/repl-history.

Fixes #751
 2012-09-19 03:57:44 +04:00
Phil Hagelberg
2c2f13283b Merge pull request #786 from technomancy/global-offline-flag 
If LEIN_OFFLINE env var is set, assume offline mode by default
 2012-09-18 16:18:46 -07:00
Michael S. Klishin
dc9fd48376 Make LEIN_OFFLINE take precedence over what's in project.clj 
Per discussion with @technomancy
 2012-09-19 03:16:18 +04:00
Colin Jones
51b4bade31 Bump clojure-complete dependency 2012-09-18 08:33:34 -05:00
Michael S. Klishin
387e624838 If LEIN_OFFLINE env var is set, assume offline mode by default. References #678. 2012-09-18 13:00:29 +04:00
Phil Hagelberg
975e3eb494 Honor :standalone in :repl-options. 2012-09-17 21:38:19 -07:00
Michael Klishin
317122eb24 Merge pull request #784 from dchelimsky/fix-typo 
fix typo in lein script
 2012-09-14 10:49:16 -07:00
Michael Klishin
67726053e5 Merge pull request #783 from StevenBorrelli/patch-1 
Fix typos in lein script for download_failed_message
 2012-09-14 10:48:59 -07:00
StevenBorrelli
9690f8de65 Fix typos in lein script for download_failed_message 
Change downoad_failed_message to download_failed_message
Add endquote to error message for curl HTTP_CLIENT.
 2012-09-14 12:46:13 -05:00
David Chelimsky
88e9ddfe34 fix typo in lein script 2012-09-14 12:45:50 -05:00
Michael Klishin
d8fb3f2857 Merge pull request #782 from basicsensei/leakyenv 
move setlocal first to prevent leaking LEIN_VERSION to parent shell in win7/xp
 2012-09-13 01:00:31 -07:00
basicsensei
a1bc1f56cc move setlocal first to prevent leaking it to parent shell in win7/xp 
However on win7 though (but not on winxp) all set variables inside
script will be leaked if the script fails within another setlocal ie. 
set JAVA_CMD="ja"va"
lein
set
Will show LEIN_HOME, LEIN_JAR and ORIGINAL_PWD remained set.

The following .bat will prove the point:
@echo on
setLocal EnableExtensions EnableDelayedExpansion
set xxx="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

rem comment the following line to prevent xxx to leak into parent shell:
setlocal
rem the below will make script fail(just type "set" to see it leaked):
if x == '

echo not reached!
 2012-09-13 09:48:29 +02:00
Michael Klishin
89141459fb Merge pull request #781 from basicsensei/fix774 
use LEIN_JAVA_CMD in lein.bat just as in the bash script
 2012-09-12 22:32:39 -07:00
basicsensei
3b5feb5393 use LEIN_JAVA_CMD in lein.bat just as in the bash script 
just as @technomancy said in #774
if LEIN_JAVA_CMD is not set it will fall back to JAVA_CMD which in turn
if it's not set it will fall back to just "java" (without dbl.quotes)
 2012-09-13 02:48:26 +02:00
Phil Hagelberg
1d022be8a0 Merge pull request #779 from davie/master 
pass local-repo to install
 2012-09-12 09:13:23 -07:00
davie moston
9233e13121 pass local-repo to install 2012-09-11 22:52:56 +01:00
Phil Hagelberg
72e6908778 Add a warning under project-specific tasks. 2012-09-11 10:43:28 -07:00
Phil Hagelberg
a1d4a0fb79 Don't use fast trampolines outside a project. Fixes #777. 2012-09-11 10:30:16 -07:00
Phil Hagelberg
742b89f691 Improve error message when javac is missing. Fixes #774. 2012-09-11 10:19:04 -07:00
Phil Hagelberg
67e8019382 Mention the Gitorious mirroring and Travis tests. 
Also warn about using the master branch without a checkout.

[ci skip]
 2012-09-11 09:50:16 -07:00
Michael Klishin
1dacc0dd57 Merge pull request #778 from basicsensei/fix774 
fix for when JAVA_CMD is set to path containing double quotes
 2012-09-11 07:14:46 -07:00
basicsensei
1ac8eac0cc fix for when JAVA_CMD is set to path containing double quotes 
addresses #774
script will still fail if it contains characters like >, <, |, & or even
parentheses or an even number of double quotes
ie. this will work:
set JAVA_CMD="c:\program"" f""iles\java\jdk1."7.0_0"5\bin\java.exe"
lein javac
 2012-09-11 15:47:22 +02:00
Justin Balthrop
d702a234f5 fix truncated doc string for set-profiles 2012-09-10 12:15:47 -07:00
Phil Hagelberg
fead243aac Print message from with-profile exceptions. Fixes #764. 2012-09-10 08:21:41 -07:00