Merge pull request #10 from AnyPresence/develop

Develop

Author: jfmarino

Gruntfile.js

@@ -2,17 +2,19 @@ module.exports = function(grunt) {
 
 	// Project configuration.
 	grunt.initConfig({
+		pkg: grunt.file.readJSON('package.json'),
+
 		browserify: {
 			dist: {
 				files: {
-					'dist/ap_gateway.js': ['index.js']
+					'dist/<%=pkg.name%>-v<%=pkg.version%>.js': ['index.js']
 				},
 				options: {
 					watch: true
 				}
 			}
 		},
-		
+
 		jshint: {
 			lib: ['lib/**/*.js'],
 			options: {
@@ -21,22 +23,62 @@ module.exports = function(grunt) {
 				browserify: true
 			}
 		},
-		
+
+		clean: {
+			dist: ['dist/*']
+		},
+
+		uglify: {
+			dist: {
+				options: {
+					sourceMap: true
+				},
+				files: {
+					'dist/<%=pkg.name%>-v<%=pkg.version%>.min.js': ['dist/<%=pkg.name%>-v<%=pkg.version%>.js']
+				}
+			}
+		},
+
 		watch: {
 			lint: {
 				files: ['lib/**/*.js'],
 				tasks: ['jshint']
 			}
+		},
+
+		mochify: {
+			tests: {
+				src: ['test/browser/*.js']
+			}
+		},
+
+		mochaTest: {
+			tests: {
+				src: ['test/node/*.js']
+			}
 		}
 	});
 
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-browserify');
+	grunt.loadNpmTasks('grunt-mochify');
+	grunt.loadNpmTasks('grunt-mocha-test');
+	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-clean');
+
+
+	// Testing tasks
+	grunt.registerTask('test-node', ['jshint', 'mochaTest']);
+	grunt.registerTask('test-browser', ['browserify', 'jshint', 'mochify']);
+	grunt.registerTask('test', ['test-node', 'test-browser']);
 
-	grunt.registerTask('compile', ['browserify', 'jshint', 'watch']);
+	// Build distributable
+	grunt.registerTask('build', ['clean:dist', 'browserify', 'jshint', 'uglify']);
+	// Build and watch
+	grunt.registerTask('development', ['build', 'watch']);
 
 	// Default task(s).
-	grunt.registerTask('default', ['compile']);
+	grunt.registerTask('default', ['build']);
 
-};
+};