Merge branch 'release/0.0.2'

thisissoon · Feb 9, 2015 · 6ae68c1 · 6ae68c1
2 parents 6729245 + 9fcd326
commit 6ae68c1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,7 @@
+## Changes in 0.0.2
+
+ * @eopa: Add grunt bump for versioning (#3)
+
+## Changes in 0.0.1
+
+ * First Release
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -267,8 +267,19 @@ module.exports = function (grunt) {
                     outdir: "docs/"
                 }
             }
-        }
+        },
 
+        bump: {
+            options: {
+                files: ["package.json", "bower.json"],
+                updateConfigs: ["pkg"],
+                commit: true,
+                commitFiles: ["-a"],
+                createTag: true,
+                push: true,
+                pushTo: "origin master"
+            }
+        }
 
     });
 
@@ -285,6 +296,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-protractor-runner");
     grunt.loadNpmTasks("grunt-protractor-webdriver");
     grunt.loadNpmTasks("grunt-processhtml");
+    grunt.loadNpmTasks("grunt-bump");
 
     grunt.registerTask("build", [
         "clean:beforeBuild",
@@ -295,6 +307,11 @@ module.exports = function (grunt) {
         "yuidoc"
     ]);
 
+    grunt.registerTask("release", [
+        "build",
+        "bump"
+    ]);
+
     grunt.registerTask("server", [
         "less:development",
         "connect:server",
@@ -330,6 +347,5 @@ module.exports = function (grunt) {
     ]);
 
     grunt.registerTask("default", ["build"]);
-    grunt.registerTask("release", ["build"]);
 
 };
diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "connect-livereload": "~0.5.0",
     "connect-modrewrite": "~0.7.9",
     "coveralls": "~2.11.2",
+    "grunt-bump": "~0.1.0",
     "grunt-contrib-clean": "~0.6.0",
     "grunt-contrib-concat": "~0.5.0",
     "grunt-contrib-connect": "~0.9.0",