Commit graph

3707 commits

Author SHA1 Message Date
Phil Hagelberg
0dd5967651 Improve error message to change when args aren't all readable strings. 2014-05-27 16:04:32 -07:00
Phil Hagelberg
547f4a7b9c Formatting fix.
[ci skip]
2014-05-27 15:53:23 -07:00
Phil Hagelberg
004bc6ecc5 Point to the right help text in deploy auth message. 2014-05-27 15:05:23 -07:00
Phil Hagelberg
b3f3537386 Avoid need for double-escaping in :release-tasks.
As per the recommendation of @crisptrutski.
2014-05-27 15:05:00 -07:00
Phil Hagelberg
fd615c1d44 Technically :alpha, :beta, and :rc aren't semantic levels.
[ci skip]
2014-05-27 14:33:23 -07:00
Phil Hagelberg
88ce99b421 Update NEWS.md. 2014-05-27 13:37:35 -07:00
Phil Hagelberg
ecdccda9eb Support :alpha, :beta, and :rc bump levels. 2014-05-27 13:37:22 -07:00
Phil Hagelberg
b1a07d03ec Pass arguments to f in change task through the reader.
This means that you can use non-strings as args in the change task,
but it requires double-quoting when you do want strings.
2014-05-27 11:46:15 -07:00
Phil Hagelberg
dd7447544b Encourage use of main/info and friends for plugin output. 2014-05-27 11:24:13 -07:00
Phil Hagelberg
5ddc3fd67d Clean up deploy repository aliasing to work with both :repositories entries. 2014-05-27 11:17:51 -07:00
Phil Hagelberg
7cdd68ea15 Propagate args to lein vcs push to underlying command. 2014-05-27 10:56:49 -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
88f2d3458e Reword a few things in deploy.md. 2014-05-27 10:46:37 -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
912566cfdf 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-27 10:13:30 -07:00
Phil Hagelberg
73d5e4c9f3 Ensure project.clj is written to project root.
Without this, tools such as grenchman will write project.clj to the
directory from which Leiningen was launched.

Also make require-resolve work like resolve for unqualified symbols.
2014-05-27 09:53:13 -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
Max Barnash
a031b9807d Use sjacket.parser/space-nodes instead of enumerating them ourselves 2014-05-27 14:30:53 +04:00
Wayne
07c1c7a7f8 Enable simple aliasing in :deploy-repositories. 2014-05-26 19:00:35 -07:00
Wayne
9b652d703a Document the release task.
Also adds sample alternate release workflow in sample.project.clj.
2014-05-26 15:38:04 -07:00
Phil Hagelberg
f7545a74ff Merge pull request #1531 from crisptrutski/load-function-via-cli
Ensure supporting namespace is loaded when passing custom function to `lein change`
2014-05-26 14:22:40 -07:00
Max Barnash
965158c964 Removed unused function 2014-05-26 10:23:00 +04:00
Max Barnash
0f779b06a0 Simplified change to use existing code 2014-05-26 10:20:59 +04: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
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