Commit graph

3581 commits

Author SHA1 Message Date
Max Barnash
8741938311 Fixed change task to work with newlines 2014-05-26 07:29:20 +04:00
Phil Hagelberg
f37710473b Silence warn calls when LEIN_SILENT is set. 2014-05-25 19:17:34 -07:00
Phil Hagelberg
74b0dc5b66 Merge remote-tracking branch 'cddr/826-info-messages-to-stder'
Conflicts:
	leiningen-core/src/leiningen/core/classpath.clj
2014-05-25 19:16:16 -07: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
Phil Hagelberg
2ee940117c Merge remote-tracking branch 'waynr/lein-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-25 14:57:31 -07:00
Wayne
bbc75a6f3a Fix passing of stale project map bug.
Since release-tasks could include any number of lein-change calls, seems like a
good idea to re-read project.clj between tasks.

Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-25 13:22:26 -07:00
Wayne
2b7e7d8e56 Update :git commit method.
Necessary for default release-tasks.

Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-25 13:19:52 -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
4ccec1a4a3 Fixup regular expression to be less lenient 2014-05-25 16:05: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
f42c27aa53 Skip anaemic helper 2014-05-25 14:52:40 +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
Wayne
91938de99f Minor changes for lein-release.
* Adds 'commit' multimethod and :git impelementation.'
* Use binding on leiningen.release/*level* to pass release task arg to default
  :release-tasks.
2014-05-25 01:58:01 -07:00
Phil Hagelberg
3c0d8c2b24 Document change task; stop using prime marks in local names. 2014-05-24 16:25:45 -07:00
Phil Hagelberg
fd4c50aa6c Don't try to read non-forms in sjacket->clj. 2014-05-24 16:18:02 -07: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
Phil Hagelberg
19e64583b0 Merge remote-tracking branch 'crisptrutski/set-project-version'
# 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:23:33 -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
Phil Hagelberg
0b9bf383c2 Implement :release-tasks. 2014-05-23 22:27:06 -07:00
Phil Hagelberg
1a02131b1b Change increment-version to add snapshots where appropriate. 2014-05-23 21:23:08 -07:00
Phil Hagelberg
3f4b2df764 Catch qualifier in version-map->string. 2014-05-23 21:16:34 -07:00
Phil Hagelberg
f503282c5c Fix assert-uncommitted. 2014-05-23 21:05:07 -07:00
Phil Hagelberg
ec45757459 Automatically load methods for other leiningen.vcs systems. 2014-05-23 20:59:34 -07:00
Phil Hagelberg
47dc18aafa Add assert-committed method to leiningen.vcs. 2014-05-23 20:59:33 -07:00
Chris Truter
a10fbc569e Follow separator convention, reorganise, and add some comments 2014-05-24 05:05:23 +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
Phil Hagelberg
1651cb067b Merge pull request #1526 from ardumont/add-toc-to-tutorial
Add TOC to the tutorial
2014-05-23 11:16:03 -07:00
Antoine R. Dumont
7b151b262d Add TOC to the tutorial 2014-05-23 19:25:19 +02:00
Phil Hagelberg
805cb61a55 Merge pull request #1524 from petergarbers/handle-duplicate-keys-in-defproject
defproject throws an exception on duplicate keys
2014-05-22 17:25:04 -07:00
Peter Garbers
d214fe99a8 Lists duplicate keys in exception thrown 2014-05-23 00:52:41 +02:00
Peter Garbers
98d113374f defproject throws an exception on duplicate keys 2014-05-22 02:49:01 +02:00
Wayne
a8a1f5bd99 Clean up semver string parsing.
Signed-off-by: Wayne <wayne@puppetlabs.com>
2014-05-19 22:17:49 -07: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
88aa1ac009 Remove SCM protocol stub. 2014-05-16 13:59:20 -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
680629304e Remove some unnecessary code.
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