Merge branch 'release/3.15.9'

Author: xavijam

NEWS

@@ -1,9 +1,6 @@
 CartoDB.js (v3.15)
 ===========
 
-[![Build Status](http://clinker.cartodb.net/desktop/plugin/public/status/CartoDB-js-develop-testing)]
-(http://clinker.cartodb.net/jenkins/job/CartoDB-js-develop-testing)
-
 This library allows to embed visualizations created with CartoDB in your map or website in a simple way.
 
 

NEWS.md

@@ -13,7 +13,7 @@
 - Create a new branch to prepare the release:
 
 ```
-git flow release start 3.15.4
+git flow release start 3.15.9
 ```
 
 - Build CartoDB.js files, choosing the new version:
@@ -25,7 +25,7 @@ grunt release
 - Update the NEWS file and commit the changes. Take into account that new CartoDB.js version will be replaced in ```API.md```, ```RELEASING.md```, ```README.md```, ```package.json```, ```cartodb.js``` and ```examples``` files.
 
 ```
-git commit -am "Files changed for version 3.15.4"
+git commit -am "Files changed for version 3.15.9"
 ```
 
 - Release it.
@@ -36,17 +36,17 @@ grunt publish
 
 - Check if those files have been updated in the CDN:
 ```
-http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.4/cartodb.js
-http://libs.cartocdn.com/cartodb.js/v3/3.15.4/cartodb.js
-http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.13/cartodb.js
-http://libs.cartocdn.com/cartodb.js/v3/3.13/cartodb.js
+http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15.9/cartodb.js
+http://libs.cartocdn.com/cartodb.js/v3/3.15.9/cartodb.js
+http://libs.cartocdn.com.s3.amazonaws.com/cartodb.js/v3/3.15/cartodb.js
+http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.js
 ```
 - Sometimes It takes more than 10 minutes, if it is not updated, execute ```grunt invalidate```.
 
 - And to finish: close the release and push it.
 
 ```
-git flow release finish 3.15.4
+git flow release finish 3.15.9
 git push --all
 git push --tags
 ```
@@ -75,7 +75,7 @@ grunt
 grunt publish
 ```
 
-For example, if we are in 3.15.4 and we want to go back to 3.13.4
+For example, if we are in 3.15.9 and we want to go back to 3.13.4
 
 ```
 git checkout 3.13.4

README.md

@@ -4,7 +4,7 @@
     "cartodb.js",
     "themes/css/cartodb.css"
   ],
-  "version": "3.15.1",
+  "version": "3.15.9",
   "homepage": "https://github.com/CartoDB/cartodb.js",
   "authors": [
     "CartoDB <support@cartodb.com>"

RELEASING.md

@@ -10,9 +10,8 @@ ORG=CartoDB
 REPO=cartodb.js-bower
 
 # prepare repo folder
-if [ -d $REPO ]
-  then
-    rm -rf $REPO
+if [ -d $REPO ]; then
+  rm -rf $REPO
 fi
 
 # clone repo
@@ -32,17 +31,21 @@ cp -R bower.json $REPO/bower.json
 
 cp -R LICENSE $REPO/LICENSE.md
 
-# commit and tag repo
-echo "-- Committing and tagging $REPO"
 cd $REPO
 git add -A
-CARTODBJS_VER=$(git diff bower.json | grep version | cut -d':' -f2 | cut -d'"' -f2 | sort -g -r | head -1) && if [ $(echo $CARTODBJS_VER | wc -m | tr -d ' ') = '1' ]; then echo 'VERSION DID NOT CHANGE'; else git tag -a $CARTODBJS_VER -m "Version $CARTODBJS_VER"; fi
-git tag -a $CARTODBJS_VER -m "Version $CARTODBJS_VER"
-git commit -m "v$CARTODBJS_VER"
 
-echo "-- Pushing $REPO"
-git push -fq origin master
-git push -fq origin --tags
+NEW_VERSION=$(git diff origin/master bower.json | grep version | cut -d':' -f2 | cut -d'"' -f2 | sort -g -r | head -1)
+if [ -z "$NEW_VERSION" ]; then
+  echo 'VERSION DID NOT CHANGE'
+else
+  echo "-- Tagging $NEW_VERSION"
+  git tag -a $NEW_VERSION -m "Version $NEW_VERSION";
+  git commit -m "v$NEW_VERSION"
+
+  echo "-- Pushing $REPO"
+  git push -fq origin master
+  git push -fq origin --tags
+fi
 
 cd ..