Skip to content

Commit

Permalink
Merge branch 'release/0.4.1'
Browse files Browse the repository at this point in the history
* release/0.4.1:
  bumped version to 0.4.1
  updated documentation with usage
  • Loading branch information
fsaintjacques committed Mar 24, 2013
2 parents 1348113 + 5f01db1 commit 04ab58f
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.4.1
45 changes: 43 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ correct versioning for official releases (git flow release).
[semver]: https://github.com/mojombo/semver
[gitflow]: https://github.com/nvie/gitflow

usage
-----
examples
--------

Basic operations

Expand Down Expand Up @@ -66,3 +66,44 @@ Advanced operations
1.2.3-rc2+meta
$ semver
1.0.1-rc2


usage
-----

Usage:
semver
semver init [<version>]
semver bump [(major|minor|patch|prerel <prerel>|meta <meta>) | --force <version>] [--pretend]
semver compare <version> [<oldversion>]
semver --help
semver --version

Arguments:
<version> A version must match the following regex pattern:
"^[0-9]*\.[0-9]*\.[0-9]*(-[0-9A-Za-z-]*)?(+[0-9A-Za-z-]*)?$".
In english, the version must match X.Y.Z(-PRERELEASE)(+METADATA)
where X, Y and Z are positive integers, PRERELEASE is an optionnal
string composed of alphanumeric characters and hyphens and
METADATA is also an optional string composed of alphanumeric
characters and hyphens.

<oldversion> See <version> definition.

<prerel> String that must be composed of alphanumeric characters and hyphens.

<meta> String that must be composed of alphanumeric characters and hyphens.

Options:
-f, --force=<version> Forces a bump of any version without checking if it
respects semver bumping rules.
-p, --pretend Do not overwrite the project's version file, only
output what the new version string would be.
-v, --version Print the version of this tool.
-h, --help Print this help message.

Commands:
init initialize this project's version.
bump this project's version by one of major, minor, patch, prerel, meta
or a forced potentialy conflicting version.
compare <version> to this project's version or to provided <oldversion>.
6 changes: 3 additions & 3 deletions src/semver
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SEMVER_REGEX="^[0-9]*\.[0-9]*\.[0-9]*(-[0-9A-Za-z-]*)?(+[0-9A-Za-z-]*)?$"
SEMVER_REGEX_BASH="^([0-9]*)\.([0-9]*)\.([0-9]*)(\-[0-9A-Za-z-]+)?(\+[0-9A-Za-z-]+)?$"

PROG="semver"
PROG_VERSION=0.4.0
PROG_VERSION=0.4.1

VERSION_FILE=.version
DEFAULT_VERSION=0.1.0
Expand Down Expand Up @@ -48,8 +48,8 @@ Options:
Commands:
init initialize this project's version.
bump this project's version by one of major, minor or patch or a forced
potentialy conflicting version.
bump this project's version by one of major, minor, patch, prerel, meta
or a forced potentialy conflicting version.
compare <version> to this project's version or to provided <oldversion>."


Expand Down

0 comments on commit 04ab58f

Please sign in to comment.