From 2643808e1a2fb0c8b09e82f1d1d10d9ed24e1dc4 Mon Sep 17 00:00:00 2001
From: "Martin@MBP" <github@wwwendt.de>
Date: Thu, 26 Jun 2014 07:52:06 +0200
Subject: [PATCH] Use grunt-yabs for release

---
 Gruntfile.coffee | 69 +++++++++++++++++++++++++++++-------------------
 package.json     | 15 ++++++-----
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index b9ebe7f9..d77bfd76 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -24,25 +24,25 @@ module.exports = (grunt) ->
                 "  * Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
                 " Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */\n"
 
-    bumpup:
-        options:
-            dateformat: "YYYY-MM-DD HH:mm"
-            normalize: true
-            updateProps: 
-                pkg: "package.json"
-        files: ["package.json", "bower.json", "fancytree.jquery.json"]
-
-    checkrepo:
-      beforeBump:
-          tag:
-              eq: "<%= pkg.version %>" # Check if highest repo tag == pkg.version
-#          tagged: false # Require last commit (HEAD) to be tagged
-          clean: true # // Require repo to be clean (no unstaged changes)
-      beforeRelease:
-          tag:
-              lt: "<%= pkg.version %>" # Check if highest repo tag is lower than pkg.version
-#          tagged: false # Require last commit (HEAD) to be tagged
-          clean: true # // Require repo to be clean (no unstaged changes)
+    # bumpup:
+    #     options:
+    #         dateformat: "YYYY-MM-DD HH:mm"
+    #         normalize: true
+    #         updateProps: 
+    #             pkg: "package.json"
+    #     files: ["package.json", "bower.json", "fancytree.jquery.json"]
+
+#     checkrepo:
+#       beforeBump:
+#           tag:
+#               eq: "<%= pkg.version %>" # Check if highest repo tag == pkg.version
+# #          tagged: false # Require last commit (HEAD) to be tagged
+#           clean: true # // Require repo to be clean (no unstaged changes)
+#       beforeRelease:
+#           tag:
+#               lt: "<%= pkg.version %>" # Check if highest repo tag is lower than pkg.version
+# #          tagged: false # Require last commit (HEAD) to be tagged
+#           clean: true # // Require repo to be clean (no unstaged changes)
 
     clean:
         build:
@@ -286,12 +286,12 @@ module.exports = (grunt) ->
                 ]
                 testname: "fancytree qunit tests"
 
-    tagrelease:
-        file: "package.json"
-        commit:  true
-        message: "Tagging the %version% release."
-        prefix:  "v"
-        annotate: true
+    # tagrelease:
+    #     file: "package.json"
+    #     commit:  true
+    #     message: "Tagging the %version% release."
+    #     prefix:  "v"
+    #     annotate: true
 
     uglify:
         # build:
@@ -337,6 +337,21 @@ module.exports = (grunt) ->
             files: ["src/*.js", "test/unit/*.js"]
             tasks: ["jshint:beforeConcat"]
 
+    yabs:
+        release:
+            common: # defaults for all tools
+                manifests: ['package.json', 'bower.json', 'fancytree.jquery.json']
+            # The following tools are run in order:
+            check: { clean: true, branch: ['master'] }
+            run_test: { tasks: ['test'] }
+            bump: {} # 'bump' also uses the increment mode `yabs:release:MODE`
+            run_build: { tasks: ['build'] }
+            commit: { add: '.' }
+            tag: {}
+            push: { tags: true }
+            bump_develop: { inc: 'prepatch' }
+            commit_develop: { add: '.', message: 'Bump prerelease ({%= version %}) [ci skip]' }
+            # push_develop: {}
 
   # ----------------------------------------------------------------------------
 
@@ -395,8 +410,8 @@ module.exports = (grunt) ->
       "clean:build"
       "replace:release"
       "compress:dist"
-      "tagrelease"
-      "bumpup:prerelease"
+      # "tagrelease"
+      # "bumpup:prerelease"
       ]
 
   grunt.registerTask "upload", [
diff --git a/package.json b/package.json
index 7a8b139f..0038cceb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "jquery.fancytree",
   "title": "jQuery Fancytree Plugin",
   "description": "Fancytree is a JavaScript dynamic tree view plugin for jQuery with support for persistence, keyboard, checkboxes, drag'n'drop, and lazy loading.",
-  "version": "2.1.0-0",
+  "version": "2.1.0",
   "homepage": "https://github.com/mar10/fancytree",
   "author": {
     "name": "Martin Wendt",
@@ -33,23 +33,24 @@
     "grunt-contrib-concat": "~0.4.0",
     "grunt-contrib-connect": "^0.7.1",
     "grunt-contrib-copy": "~0.4.1",
+    "grunt-contrib-cssmin": "~0.7.0",
     "grunt-contrib-jshint": "~0.3.0",
     "grunt-contrib-less": "~0.8.1",
     "grunt-contrib-qunit": "~0.2.0",
     "grunt-contrib-uglify": "^0.4.0",
     "grunt-contrib-watch": "~0.5.3",
+    "grunt-docco": "~0.3.2",
     "grunt-exec": "~0.4.0",
     "grunt-html": "~0.3.3",
+    "grunt-jsdoc": "~0.5.1",
+    "grunt-saucelabs": "~4.1.2",
     "grunt-tagrelease": "^0.3.3",
     "grunt-text-replace": "~0.3.7",
-    "qunitjs": "1.x",
-    "grunt-saucelabs": "~4.1.2",
-    "grunt-jsdoc": "~0.5.1",
+    "grunt-yabs": "0.0.5",
     "ink-docstrap": "git://github.com/terryweiss/docstrap",
-    "grunt-docco": "~0.3.2",
-    "grunt-contrib-cssmin": "~0.7.0"
+    "qunitjs": "1.x"
   },
   "scripts": {
     "test": "grunt ci --verbose"
   }
-}
\ No newline at end of file
+}