Commit graph

387 commits

Author SHA1 Message Date
Phil Hagelberg
5ddc3fd67d Clean up deploy repository aliasing to work with both :repositories entries. 2014-05-27 11:17:51 -07:00
Phil Hagelberg
ad522387f3 Move level parsing to release task function. Default to :patch. 2014-05-27 10:56:36 -07:00
Phil Hagelberg
3e6b8a1818 Merge remote-tracking branch 'waynr/deploy-repositories-aliasing'
# 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-05-27 10:38:02 -07:00
Phil Hagelberg
573ebd8481 Merge remote-tracking branch 'arr-ee/fix-1534'
# 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-05-27 09:36:34 -07:00
Wayne
07c1c7a7f8 Enable simple aliasing in :deploy-repositories. 2014-05-26 19:00:35 -07:00
Chris Truter
6f620ad317 Use existing helper instead
1. Reorganise tests a bit so loading property still checked.
2. Add explicit exception if unexpected type to `collapse-function`
3. Unrelated addition of test to show leading `:` ignored in nested paths
2014-05-26 08:05:45 +02:00
Chris Truter
fc9884b5c4 Disable problematic but non-essential test
Failure must have something to do with namespace state that
changes between running tests in REPL and running the full suite.

Test is not an important property, so just commenting out.
2014-05-26 07:55:18 +02:00
Chris Truter
93e82887bf Aggressive resolve policy for lein.change functions 2014-05-26 07:55:18 +02:00
Max Barnash
8741938311 Fixed change task to work with newlines 2014-05-26 07:29:20 +04:00
Phil Hagelberg
e0640c21a6 Merge remote-tracking branch 'crisptrutski/set-group-or-artifact-id'
Conflicts:
	src/leiningen/change.clj
2014-05-25 17:45:36 -07:00
Phil Hagelberg
d8765c978c Merge remote-tracking branch 'crisptrutski/lein-release-and-change-interop'
Conflicts:
	src/leiningen/release.clj
	test/leiningen/test/release.clj
2014-05-25 17:12:12 -07:00
Phil Hagelberg
28eb8f02c5 Make bump-version work with strings and default to bound *level*. 2014-05-25 15:05:56 -07:00
Chris Truter
b99c207340 Fix things broken by late rename
Note to self:

Always unload namespaces and test again after renaming.
2014-05-25 16:28:02 +02:00
Chris Truter
08c3ad2587 Update leiningen.change tests to use real bump-version
Not sure what you think of creating this kind of coupling in the tests.

This were useful tests for driving the previous commits, but happy to
delete them now.
2014-05-25 16:11:29 +02:00
Chris Truter
c5bd294aa5 Reappropriate bump-version function for lein.change usability
One wart to notice is that argument order is switched between
`bump-version-map` and `bump-version`. This is because the `lein.change`
semantics enforce that version-string is the first argument.

Have not added tests for this function, do you think we should?
2014-05-25 16:09:48 +02:00
Chris Truter
16e283e14f Implement artifact/group-id editability 2014-05-25 14:54:33 +02:00
Chris Truter
a1e6fa6db9 Whitespace and test group merge 2014-05-25 14:54:06 +02:00
Chris Truter
64b8243d3a Update collapse-fn tests to illustrate argument order
Didn't like having a property that was so crucial ingored in the tests
2014-05-25 14:51:40 +02:00
Phil Hagelberg
405fa31483 Fix release tests. 2014-05-24 14:31:37 -07:00
Phil Hagelberg
045ba88342 Add special case for "set" arg in change task; fix change tests. 2014-05-24 14:22:33 -07:00
Phil Hagelberg
c83b2facfe WIP: merge change task and release. 2014-05-24 09:59:29 -07:00
Phil Hagelberg
80d4f130fc Merge branch 'release'
# 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-05-24 09:24:24 -07:00
Chris Truter
055ee45918 Implement more features, simplify interface
Too much magic in those helper functions maybe?
2014-05-24 14:51:22 +02:00
Chris Truter
e41a4bc2a0 Add pending test for setting generic (nested) attributes 2014-05-24 14:51:21 +02:00
Chris Truter
947cc00e6c Attempt to make types transparent across sjacket boundary
Not sure how robust this is, but looks like a step towards less annoyance / surprise
2014-05-24 14:51:21 +02:00
Chris Truter
c071b8bd37 Improve interface for changing project settings 2014-05-24 04:57:26 +02:00
Chris Truter
cca167c19c Experiment with generic conventions
1. Look up functions based on "run-*" pattern
2. Support consistent argument passing scheme
3. Crude bump-version task
4. Some refactoring

Not great at structuring Clojure code, so open to tips to organise
this namespace better!
2014-05-24 04:12:46 +02:00
Chris Truter
fff11d4fcc Set project version via sjacket 2014-05-24 02:44:09 +02:00
Wayne
7cae821956 Fix up version parsing code.
Now with working tests!

Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-19 22:17:42 -07:00
Wayne
63a90d6dc3 Fix version-map->string and associated test.
Adds a member to each testcase vector that represents the original version
string minus the quantifier, or just the original version string itself in the
case of the version string being an invalid maven version.

Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-16 13:57:55 -07:00
Wayne
18cae29409 Add test for version-map->string
Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-16 11:01:08 -07:00
Wayne
d601b6140f Begin working on leiningen.release.
parse-maven-version is a modified copy of the same function found in
relaynetwork/lein-release. Also began working on unit tests.

Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-16 11:01:08 -07:00
Phil Hagelberg
07a1ecaa93 Normalize :aot :all to :aot [:all].
This fixes type mismatch issues when merging profiles.

Fixes #1488.
2014-04-22 16:41:50 -07:00
Phil Hagelberg
f4b0bf6ec9 Fix weird de-duping behaviour in pom.
It used to be we would merge a bunch of profiles into the project, and
then trim out dupes based on group/artifact/version, which was totally
wrong; it ignores classifiers and extensions.
2014-04-22 16:24:10 -07:00
Phil Hagelberg
88181a4bbf Use dep-key for distinct call in pom task.
group/artifact version tuple isn't enough to de-dupe correctly.

Fixes #1494.
2014-04-22 15:03:34 -07:00
Jim Crossley
9d8b214ccc Include group in dedupe key to fix #1480 2014-04-15 17:29:14 -04:00
Phil Hagelberg
ed67d8093b Make Leiningen (more) Eastwood-friendly.
Still get a couple warnings... We don't really care about the
unlimited-use warnings from clojure.test, and there are a couple
warnings we get stemming from bugs/limitations in Eastwood.
2014-04-03 20:18:28 -07:00
Matthew Blair
65c3dd5766 Create new tests for use of --force option 2014-04-01 23:25:00 -04:00
Matthew Blair
f7c70fa2f0 Fix executable test - add force option since test is being run in system temp directory 2014-04-01 23:24:42 -04:00
Jean Niklas L'orange
a296ff8918 Bump all Clojure 1.5.1 deps to 1.6.0. 2014-03-26 13:43:38 +01:00
Jean Niklas L'orange
84af9246cf Do not depend on map ordering in tests. 2014-03-26 13:43:38 +01:00
Phil Hagelberg
6cdc043e9a Adapt template template so that the #1409 fix doesn't break new templates. 2014-03-17 15:30:40 -07:00
Phil Hagelberg
ae91367b78 Tell Bultitude not to ignore unreadable namespaces in test/check.
Fixes #1409.
2014-03-17 15:21:19 -07:00
Phil Hagelberg
e8da286ea7 Failing test for #1409. 2014-03-17 14:25:44 -07:00
Phil Hagelberg
a6bebc9459 Merge pull request #1470 from fredericksgary/issue-1469
lein run: don't catch app errors as require errors
2014-03-13 20:06:17 -07:00
Gary Fredericks
b19b305d58 Slightly more homogeneous test project names 2014-03-13 20:24:42 -05:00
Gary Fredericks
cc886d56a3 lein run: don't catch app errors as require errors
closes #1469

`lein run` currently has some special error handling around
FileNotFoundException which helps it decide what exactly it should
do. Unfortunately if the actual running of the given main function
itself throws a FileNotFoundException this is currently caught by
Leiningen and assumed to be a require error.

The simple solution is to run the main method outside of that error
handling block.

Regression test provided.
2014-03-13 20:17:59 -05:00
Phil Hagelberg
1b39bc5b27 Make repl tests resilient to having .nrepl-port file in pwd. 2014-03-06 13:34:20 -08:00
Craig McDaniel
a5cf442cf3 Support for overriding :clean-targets sanity checking (issue #1458).
Also made unit tests safer and faster using with-redefs to mock out
calls to delete-file-recursively.
Better error messages when a path is being protected.
2014-03-03 21:35:03 -05:00
Craig McDaniel
9c84a5e2e0 Removed (run-tests) call that was being used for interactive REPL testing 2014-03-01 12:37:16 -05:00