Merge pull request #3 from dertseha/ci_build

Added continuous integration tasks

.gitignore

@@ -1 +1,2 @@
 /node_modules/
+/build/

.travis.yml

@@ -0,0 +1,9 @@
+language: node_js
+node_js:
+  - "0.10"
+before_script:
+  - npm install -g grunt-cli
+script:
+  - grunt
+  - grunt coverage
+  - node node_modules/coveralls/bin/coveralls.js < build/reports/coverage/lcov.info

Gruntfile.js

@@ -2,11 +2,14 @@ var path = require("path");
 
 module.exports = function(grunt) {
   "use strict";
-  var jsFiles = ["Gruntfile.js", "src/**/*.js"];
+  var jsFiles = ["Gruntfile.js", "src/**/*.js", "test/**/*.js"];
 
   grunt.initConfig({
     pkg: grunt.file.readJSON("package.json"),
 
+    // cleaning output directories
+    clean: ["build", "lib"],
+
     // Run JSHint on all sources
     jshint: {
       options: {
@@ -27,7 +30,7 @@ module.exports = function(grunt) {
 
     // browserify for packing all commonjs files
     browserify: {
-      client: {
+      lib: {
         src: ["src/QRCode.js"],
         dest: "lib/qrcode.js",
         options: {
@@ -43,16 +46,61 @@ module.exports = function(grunt) {
           "lib/qrcode.min.js": ["lib/qrcode.js"]
         }
       }
+    },
+
+    // Run tests using mocha
+    mochaTest: {
+      libRaw: {
+        options: {
+          require: ["./test/testStandard.js"],
+          reporter: "spec"
+        },
+        src: ["test/**/*Test.js"]
+      },
+      coverage: {
+        options: {
+          require: ["./test/testCoverage.js"],
+          reporter: "min"
+        },
+        src: ["test/**/*Test.js"]
+      }
+    },
+
+    // tasks for coverage analysis (istanbul)
+    instrument: {
+      files: ["src/**/*.js"],
+      options: {
+        basePath: "build/instrumented/"
+      }
+    },
+    storeCoverage: {
+      options: {
+        dir: "build/reports/coverage/"
+      }
+    },
+    makeReport: {
+      src: "build/reports/coverage/**/*.json",
+      options: {
+        type: "lcov",
+        dir: "build/reports/coverage/",
+        print: "text-summary"
+      }
     }
   });
 
   grunt.loadNpmTasks("grunt-browserify");
+  grunt.loadNpmTasks("grunt-contrib-clean");
   grunt.loadNpmTasks("grunt-contrib-jshint");
   grunt.loadNpmTasks("grunt-contrib-uglify");
+  grunt.loadNpmTasks("grunt-istanbul");
   grunt.loadNpmTasks("grunt-jsbeautifier");
+  grunt.loadNpmTasks("grunt-mocha-test");
 
   grunt.registerTask("lint", ["jshint", "jsbeautifier"]);
+  grunt.registerTask("test", ["mochaTest:libRaw"]);
   grunt.registerTask("compile", ["browserify", "uglify"]);
 
-  grunt.registerTask("default", ["lint", "compile"]);
+  grunt.registerTask("coverage", ["instrument", "mochaTest:coverage", "storeCoverage", "makeReport"]);
+
+  grunt.registerTask("default", ["clean", "lint", "test", "compile"]);
 };

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/janantala/qrcode.js.png?branch=master)](http://travis-ci.org/janantala/qrcode.js) [![Coverage Status](https://coveralls.io/repos/janantala/qrcode.js/badge.png?branch=master)](https://coveralls.io/r/janantala/qrcode.js?branch=master)
+
 # qrcode.js v1.0.0
 
 QR code generator, supports Numeric, Alphanumeric and Binary inputMode up to lvl 40.

package.json

@@ -18,11 +18,17 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "coveralls": "~2.2.0",
+    "expect.js": "~0.2.0",
     "grunt": "~0.4.1",
     "grunt-browserify": "~1.2.4",
+    "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-jshint": "~0.4.3",
     "grunt-contrib-uglify": "~0.2.2",
-    "grunt-jsbeautifier": "~0.2.0"
+    "grunt-contrib-yuidoc": "~0.4.0",
+    "grunt-istanbul": "~0.2.2",
+    "grunt-jsbeautifier": "~0.2.0",
+    "grunt-mocha-test": "~0.6.3"
   },
   "engines": {
     "node": ">=0.10.x"

test/QRMathTest.js

@@ -0,0 +1,23 @@
+/* global describe, it, global */
+var expect = require("expect.js");
+
+var QRMath = require(global.resolveSource("QRMath.js"));
+
+describe("QRMath", function() {
+  "use strict";
+
+  describe("glog", function() {
+    it("should return 1 for 2", function() {
+      var result = QRMath.glog(2);
+
+      expect(result).to.be(1);
+    });
+
+    it("should return 53 for 40", function() {
+      var result = QRMath.glog(40);
+
+      expect(result).to.be(53);
+    });
+
+  });
+});

test/testCoverage.js

@@ -0,0 +1,10 @@
+/* global global, __dirname */
+var path = require("path");
+
+var testSourceBase = path.resolve(path.join(__dirname, "..", "build", "instrumented", "src"));
+
+global.resolveSource = function(file) {
+  "use strict";
+
+  return path.join(testSourceBase, file);
+};

test/testStandard.js

@@ -0,0 +1,10 @@
+/* global global, __dirname */
+var path = require("path");
+
+var testSourceBase = path.resolve(path.join(__dirname, "..", "src"));
+
+global.resolveSource = function(file) {
+  "use strict";
+
+  return path.join(testSourceBase, file);
+};