Merge pull request #584 from cesine/preversion

added Rickshaw.version fixes #538 fixes #224

.gitignore

@@ -1,5 +1,7 @@
 *.log
 *swp
+yarn-error.log
+yarn.lock
 
 # Dependency directories
 node_modules

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "rickshaw",
-  "version": "1.6.0-rc.0",
+  "version": "1.6.0",
   "description": "Rickshaw is a JavaScript toolkit for creating interactive time series graphs.",
   "main": "./rickshaw",
   "license": "MIT",

package.json

@@ -43,6 +43,9 @@
     "test": "make && nodeunit tests",
     "watch": "nodemon --watch src --exec make rickshaw.js",
     "coverage": "istanbul cover nodeunit tests --reporter=lcov",
-    "coveralls": "cat ./coverage/lcov.info | coveralls"
+    "coveralls": "cat ./coverage/lcov.info | coveralls",
+    "preversion:src": "sed \"s/version: '[^,]*'/version: '$npm_package_version'/\" src/js/Rickshaw.js  > output &&  mv output src/js/Rickshaw.js",
+    "preversion:bower": "sed 's/\"version\": \"[^,]*\"/\"version\": \"'$npm_package_version'\"/' bower.json  > output &&  mv output bower.json",
+    "version": "npm run preversion:src && npm run preversion:bower && make clean && make && npm test && git add -A src bower.json rickshaw.js rickshaw.min.js"
   }
 }

src/js/Rickshaw.js

@@ -1,6 +1,7 @@
-/* jshint -W079 */ 
+/* jshint -W079 */
 
 var Rickshaw = {
+	version: '1.6.0',
 
 	namespace: function(namespace, obj) {
 

tests/Rickshaw.js

@@ -0,0 +1,8 @@
+var Rickshaw = require('../rickshaw');
+var package = require('../package.json');
+
+exports.load = function(test) {
+
+  test.equal(Rickshaw.version, package.version, 'Rickshaw.version is defined');
+  test.done();
+};