Release: Handle prevVersion when minor or patch are 0 (zero)

This commit is contained in:
Rafael Xavier de Souza 2013-06-05 10:39:07 -03:00
parent a52421b25f
commit ece91a5c3b

View File

@ -105,8 +105,7 @@ function getVersions() {
if ( preRelease ) { if ( preRelease ) {
newVersion = preRelease; newVersion = preRelease;
// Note: prevVersion is not currently used for pre-releases. The TODO // Note: prevVersion is not currently used for pre-releases.
// below about 1.10.0 applies here as well.
prevVersion = nextVersion = currentVersion; prevVersion = nextVersion = currentVersion;
} else { } else {
newVersion = currentVersion.substr( 0, currentVersion.length - 3 ); newVersion = currentVersion.substr( 0, currentVersion.length - 3 );
@ -115,15 +114,14 @@ function getVersions() {
minor = parseInt( parts[ 1 ], 10 ); minor = parseInt( parts[ 1 ], 10 );
patch = parseInt( parts[ 2 ], 10 ); patch = parseInt( parts[ 2 ], 10 );
// TODO: handle 1.10.0 if ( minor === 0 && patch === 0 ) {
// Also see comment above about pre-releases abort( "This script is not smart enough to handle major release (eg. 2.0.0)." );
if ( patch === 0 ) { } else if ( patch === 0 ) {
abort( "This script is not smart enough to handle the 1.10.0 release." ); prevVersion = git( "for-each-ref --count=1 --sort=-authordate --format='%(refname:short)' refs/tags/" + [ major, minor - 1 ].join( "." ) + "*" ).trim();
} else {
prevVersion = [ major, minor, patch - 1 ].join( "." );
} }
prevVersion = patch === 0 ?
[ major, minor - 1, 0 ].join( "." ) :
[ major, minor, patch - 1 ].join( "." );
nextVersion = [ major, minor, patch + 1 ].join( "." ) + "pre"; nextVersion = [ major, minor, patch + 1 ].join( "." ) + "pre";
} }