Add build step, see readme for instructions. Fixes #8

Author: peol

.gitignore

@@ -163,4 +163,7 @@ pip-log.txt
 .DS_Store
 
 # web server
-server/
+server/
+
+# node modules
+node_modules/

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "test/mocha/mocha-phantomjs"]
-	path = test/mocha/mocha-phantomjs
-	url = https://github.com/metaskills/mocha-phantomjs.git

MIT-LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright 2012 Christoffer Åström, Andrée Hansson
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright 2012 Christoffer Åström, Andrée Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

grunt.js

@@ -0,0 +1,66 @@
+/*global module:false*/
+module.exports = function(grunt) {
+
+	// Project configuration.
+	grunt.initConfig({
+		meta: {
+			version: '0.1.0pre',
+			banner: '/*! Touché - v<%= meta.version %> - ' +
+				'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+				'* https://github.com/stoffeastrom/touche/\n' +
+				'* Copyright (c) <%= grunt.template.today("yyyy") %> ' +
+				'Christoffer Åström, Andrée Hansson; Licensed MIT */'
+		},
+		lint: {
+			files: ['grunt.js', 'lib/**/*.js', 'test/*.js']
+		},
+		mocha: {
+			all: {
+				src: ['test/index.html'],
+				run: true
+			}
+		},
+		concat: {
+			dist: {
+				src: [
+					'<banner:meta.banner>',
+					'lib/touche.js',
+					'lib/*.js'
+				],
+				dest: 'dist/touche.js'
+			}
+		},
+		min: {
+			dist: {
+				src: ['<banner:meta.banner>', '<config:concat.dist.dest>'],
+				dest: 'dist/touche.min.js'
+			}
+		},
+		watch: {
+			files: '<config:lint.files>',
+			tasks: 'lint'
+		},
+		jshint: {
+			options: {
+				curly: true,
+				eqeqeq: true,
+				immed: true,
+				latedef: true,
+				newcap: true,
+				noarg: true,
+				sub: true,
+				undef: true,
+				boss: true,
+				eqnull: true,
+				browser: true
+				},
+			globals: {}
+		},
+		uglify: {}
+	});
+
+	grunt.loadNpmTasks('grunt-mocha');
+
+	// Default task.
+	grunt.registerTask('default', 'lint mocha concat min');
+};

lib/touche.js

@@ -21,7 +21,10 @@
 
 	T.utils = {
 		logger: function(event, touchList) {
-			if(!event.touches) return;
+			if(!event.touches) {
+				return;
+			}
+
 			touchList = touchList || 'touches';
 
 			var str = "",

readme.md

@@ -114,19 +114,24 @@ Touche.pinch(element, {
 });
 ```
 
-## How to run the test
+## Setting up the build environment
 
-You can run the test by either running them in the browser (by opening `test.index.html`) or by command line.
-To set up running them from command line, read below.
+Touché is using grunt.js to build (concatenate + minify) and running tests. Below is instructions on how to properly set up this project.
 
 ```
-$ git submodule foreach git pull
+$ cd touche
+$ npm install -g grunt
 $ npm install -g phantomjs
-$ cd test/mocha/mocha-phantomjs
-$ npm install
-$ cd ../../cli
-// *nix:
-$ sh run-tests.sh
-// windows:
-$ run-tests.bat
+$ npm install grunt-mocha
+```
+
+After installing, you can run a few different tasks using grunt:
+
+```
+// lint all test + lib files
+$ grunt lint
+// run the test suite
+$ grunt mocha
+// default: runs lint, mocha, concat, min
+$ grunt
 ```

test/cli/run-tests.bat

@@ -14,9 +14,6 @@
 		<script src="test.utils.js"></script>
 		<script src="test.point.js"></script>
 		<script src="test.rect.js"></script>
-		<script>
-			if (window.mochaPhantomJS) { mochaPhantomJS.run(); }
-			else { mocha.run(); }
-		</script>
+		<script>mocha.run();</script>
 	</body>
 </html>

test/cli/run-tests.sh

@@ -1,3 +1,4 @@
+/*global describe, Touche, expect, it*/
 describe('Point', function() {
 	var p1 = new Touche.Point(4, 10),
 		p2 = new Touche.Point(6, 20);

test/index.html

@@ -1,3 +1,4 @@
+/*global describe, Touche, expect, it*/
 describe('Rect', function() {
 	var r = new Touche.Rect(4, 8, 100, 50),
 		p1 = new Touche.Point(30, 40),

test/mocha/mocha-phantomjs

@@ -1,3 +1,4 @@
+/*global describe, Touche, expect, it*/
 describe('Utils', function() {
 	describe('#isFunction', function() {
 		var isFn = Touche.utils.isFunction;