From 9a7e093992a173699197e2aebdb990afb54cc8e9 Mon Sep 17 00:00:00 2001 From: Mikael Karon Date: Tue, 13 Aug 2013 18:36:29 +0800 Subject: [PATCH 1/3] Bumped version to PRERELEASE --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 374b417..2af850e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-semver", "description": "Semantic versioning for grunt", - "version": "0.0.3", + "version": "0.0.4-0", "homepage": "https://github.com/mikaelkaron/grunt-semver", "author": { "name": "Mikael Karon", From 58f5794c587e1213c67b381a446f1a8d696ad6cb Mon Sep 17 00:00:00 2001 From: Mikael Karon Date: Thu, 15 Aug 2013 16:49:02 +0800 Subject: [PATCH 2/3] Simplified code. Updated bump to strip build if not provided. --- tasks/semver.js | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/tasks/semver.js b/tasks/semver.js index 2b00b0e..0b25fa4 100644 --- a/tasks/semver.js +++ b/tasks/semver.js @@ -20,15 +20,12 @@ module.exports = function(grunt) { function format() { /*jshint validthis:true */ var me = this; - - var prerelease = me.prerelease; var build = me.build; - var result = [ me.major, me.minor, me.patch ].join("."); - if (prerelease && prerelease.length) { - result += '-' + prerelease.join("."); - } + // Call super + var result = me.format(); + // Add build if it exists if (build && build.length) { result += "+" + build.join("."); } @@ -46,7 +43,7 @@ module.exports = function(grunt) { case "validate" : if (part) { try { - grunt.log.ok(format.call(build ? semver(semver(part) + "+" + build) : semver(part))); + grunt.log.writeln(format.call(semver(build ? semver.clean(part) + "+" + build : part)).green); } catch (e) { grunt.fail.warn(e); @@ -54,11 +51,11 @@ module.exports = function(grunt) { } else { this.files.forEach(function (file) { - var src = file.src; - var json = grunt.file.readJSON(src); - try { - grunt.log.ok(src + " : " + format.call(build ? semver(semver(json[VERSION]) + "+" + build) : semver(json[VERSION]))); + var src = file.src; + var json = grunt.file.readJSON(src); + + grunt.log.writeln(src + " : " + format.call(semver(build ?semver.clean(json[VERSION]) + "+" + build : json[VERSION])).green); } catch (e) { grunt.fail.warn(e); @@ -69,15 +66,16 @@ module.exports = function(grunt) { case "set" : this.files.forEach(function (file) { - var src = file.src; - var dest = file.dest || src; - var json = grunt.file.readJSON(src); - var version; - try { - version = json[VERSION] = format.call(build ? semver(semver(part || json[VERSION]) + "+" + build) : semver(part || json[VERSION])); + var src = file.src; + var dest = file.dest || src; + + grunt.log.write(src + " : "); - grunt.log.ok(src + " : " + version); + var json = grunt.file.readJSON(src); + var version = json[VERSION] = format.call(semver(build ? semver.clean(part || json[VERSION]) + "+" + build : part || json[VERSION]).inc(part)); + + grunt.log.writeln(version.green); grunt.file.write(dest, JSON.stringify(json, null, options[SPACE])); } @@ -88,34 +86,34 @@ module.exports = function(grunt) { break; case "bump" : - this.files.forEach(function (file) { - var src = file.src; - var dest = file.dest || src; - var json = grunt.file.readJSON(src); - var version; - - switch (part) { - case "major" : - case "minor" : - case "patch" : - case "prerelease" : + switch (part) { + case "major" : + case "minor" : + case "patch" : + case "prerelease" : + this.files.forEach(function (file) { try { - version = json[VERSION] = format.call((build ? semver(semver(json[VERSION]) + "+" + build) : semver(json[VERSION])).inc(part)); + var src = file.src; + var dest = file.dest || src; + + grunt.log.write(src + " : "); + + var json = grunt.file.readJSON(src); + var version = json[VERSION] = format.call(semver(build ? semver.clean(json[VERSION]) + "+" + build : semver.clean(json[VERSION])).inc(part)); - grunt.log.ok(src + " : " + version); + grunt.log.writeln(version.green); grunt.file.write(dest, JSON.stringify(json, null, options[SPACE])); } catch (e) { - grunt.log.error(e); + grunt.fail.warn(e); } + }); + break; - break; - - default : - grunt.fail.warn("Unknown part '" + part + "'"); - } - }); + default : + grunt.fail.warn("Unknown part '" + part + "'"); + } break; default : From 5a1279efe2f2ae468ecaa85bbf16e6729ebc4648 Mon Sep 17 00:00:00 2001 From: Mikael Karon Date: Thu, 15 Aug 2013 16:49:53 +0800 Subject: [PATCH 3/3] Bumped version to RELEASE Updated README.md --- README.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 76c6449..8b4bea9 100644 --- a/README.md +++ b/README.md @@ -50,5 +50,7 @@ A string value that is used to format the output JSON In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/). ## Release History +0.1.0 - First somewhat stable release +0.0.3 - Nothing to important 0.0.2 - Added support for `build` 0.0.1 - First release diff --git a/package.json b/package.json index 2af850e..886f00f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "grunt-semver", "description": "Semantic versioning for grunt", - "version": "0.0.4-0", + "version": "0.1.0", "homepage": "https://github.com/mikaelkaron/grunt-semver", "author": { "name": "Mikael Karon",