diff --git a/README.md b/README.md index 3fa315a..a417254 100644 --- a/README.md +++ b/README.md @@ -231,12 +231,12 @@ These patterns are closely based on https://calver.org/ | `00J` | 001, 002..366 | `%j` | | `BUILD` | 0011, 1001, 1002, .. | build number (lexid) | | `BLD` | 11, 1001, 1002, .. | zero truncated `BUILD` | +| `MAJOR` | 0..9, 10..99, 100.. | `--major` | +| `MINOR` | 0..9, 10..99, 100.. | `-m/--minor` | +| `PATCH` | 0..9, 10..99, 100.. | `-p/--patch` | +| `NUM` | 0, 1, 2... | `-r/--release-num` | | `RELEASE` | alpha, beta, rc | `--release=` | | `PYTAG` | a, b, rc | `--release=` | -| `NUM` | 0, 1, 2... | release tag number | -| `MAJOR` | 0..9, 10..99, 100.. | `--major` | -| `MINOR` | 0..9, 10..99, 100.. | `--minor` | -| `PATCH` | 0..9, 10..99, 100.. | `--patch` | ### Week Numbering diff --git a/test/test_cli.py b/test/test_cli.py index c1105f8..1c01513 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -104,13 +104,17 @@ def test_version(runner): def test_incr_default(runner): - old_version = "v201701.0999-alpha" - initial_version = config._initial_version() + old_version = "v201701.0004-alpha" - result = runner.invoke(cli, ['test', "-vv", old_version]) + cmd = ['test', "-vv", "--pin-date", "--release", "beta", old_version] + result = runner.invoke(cli, cmd) assert result.exit_code == 0 - new_version = initial_version.replace(".1001-alpha", ".11000-alpha") - assert f"Version: {new_version}\n" in result.output + assert f"Version: v201701.0005-beta\n" in result.output + + cmd = ['test', "-vv", "--pin-date", "--release", "beta", old_version, "vYYYY0M.BUILD[-RELEASE]"] + result = runner.invoke(cli, cmd) + assert result.exit_code == 0 + assert f"Version: v201701.1005-beta\n" in result.output def test_incr_pin_date(runner): @@ -179,6 +183,17 @@ def test_incr_to_final(runner): assert f"Version: {new_version}\n" in result.output +def test_incr_release_num(runner): + semver = "MAJOR.MINOR.PATCH[PYTAGNUM]" + + old_version = "0.1.0b0" + new_version = "0.1.0b1" + + result = runner.invoke(cli, ['test', "-vv", "--release-num", old_version, semver]) + assert result.exit_code == 0 + assert f"Version: {new_version}\n" in result.output + + def test_incr_invalid(runner): old_version = "v201701.0999-alpha"