Merge pull request #1 from bitovi/master

d

Author: dolymood

.gitignore

@@ -1,3 +1,4 @@
+docs/*
 .tmp*
 cookbook*
 site/docs/*

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "can"]
 	path = can
 	url = git://github.com/bitovi/canjs.git
-[submodule "canui"]
-	path = canui
-	url = git://github.com/bitovi/canui.git
-[submodule "jquery"]
-	path = jquery
-	url = git://github.com/bitovi/jquerypp.git
 [submodule "steal"]
 	path = steal
 	url = git://github.com/bitovi/steal.git
@@ -16,3 +10,9 @@
 [submodule "documentjs"]
 	path = documentjs
 	url = git://github.com/bitovi/documentjs.git
+[submodule "jquerypp"]
+	path = jquerypp
+	url = https://github.com/bitovi/jquerypp.git
+[submodule "jmvc"]
+	path = jmvc
+	url = git://github.com/bitovi/jmvc-generators

Gruntfile.js

@@ -0,0 +1,18 @@
+module.exports = function (grunt) {
+
+  grunt.loadNpmTasks('grunt-contrib-connect');
+
+  grunt.initConfig({
+    connect: {
+      server: {
+        options: {
+          port: 8000,
+          base: '.',
+          keepalive: true
+        }
+      }
+    }
+  })
+
+  grunt.registerTask("server", "connect:server")
+};

build/changelog.ejs

@@ -0,0 +1,4 @@
+__<%= version %>__ ( <%= date.toDateString().substring(4) %> )
+<% for(var i = 0; i < issues.length; i++) { %>
+- change: [<%= issues[i].title %>](<%= issues[i].url %>)<% } %>
+

build/tasks/bannerize.js

@@ -1,23 +1,16 @@
 var path = require('path');
 
-// A grunt task that strips multiline comments
+// A grunt task that writes the banner to every file
 module.exports = function (grunt) {
 	grunt.registerMultiTask('bannerize', 'Adds the banner to a set of files', function () {
-		var _ = grunt.utils._;
 		var options = grunt.config.process(['bannerize', this.target]);
-		var banner = grunt.helper('banner');
-		var defaults = _.extend({ exclude : [] }, grunt.config('strip')._options);
-		grunt.file.expandFiles(this.file.src).forEach(function (file) {
-			for(var i = 0; i < defaults.exclude.length; i++) {
-				if(defaults.exclude[i].test(file)) {
-					return;
-				}
-			}
+		var banner = this.data.banner;
+
+		grunt.file.expand(this.data.files).forEach(function (file) {
 			var outFile = options.out ? path.join(options.out, path.basename(file)) : file;
-			grunt.log.writeln('Adding banner to ' + file);
 
-			var code = grunt.helper('file_strip_banner', file, { block : true });
-			grunt.file.write(outFile, banner + code);
+			grunt.log.writeln('Adding banner to ' + file);
+			grunt.file.write(outFile, banner + grunt.file.read(file));
 		});
 	});
 }

build/tasks/beautify.js

@@ -5,6 +5,7 @@
  * Copyright (c) 2012 Camille Moncelier
  * Licensed under the MIT license.
  */
+var beautifier = require('js-beautify');
 
 module.exports = function (grunt) {
 
@@ -18,8 +19,6 @@ module.exports = function (grunt) {
 	};
 
 	grunt.registerMultiTask('beautify', 'Javascript beautifier', function () {
-		var beautifier = require('node-beautify');
-
 		var options = null;
 		var tmp = grunt.config(['beautifier', this.target, 'options']);
 		if (typeof tmp === 'object') {
@@ -38,7 +37,13 @@ module.exports = function (grunt) {
 
 		// Beautify specified files.
 		var excludes = grunt.config(['beautifier', this.target, 'exclude']);
-		grunt.file.expandFiles(this.file.src).filter(function (file) {
+
+		grunt.file.expand(this.filesSrc).filter(function (file) {
+			if(/\.min\./.test(file)) {
+				grunt.log.writeln('Not beautifying ' + file);
+				return false;
+			}
+
 			for (var i = 0; i < excludes.length; i++) {
 				if (excludes[i].test(file)) {
 					grunt.log.writeln('Not beautifying ' + file);
@@ -48,7 +53,7 @@ module.exports = function (grunt) {
 			return true;
 		}).forEach(function (filepath) {
 				grunt.log.writeln('Beautifying ' + filepath);
-				var result = beautifier.beautifyJs(grunt.file.read(filepath), options);
+				var result = beautifier(grunt.file.read(filepath), options);
 				grunt.file.write(filepath, result);
 			});
 

build/tasks/build.js

@@ -5,35 +5,27 @@ module.exports = function( grunt ) {
 	grunt.registerMultiTask('build', 'Runs build files.', function() {
 		var done = this.async();
 		var target = this.target;
-		var files = Array.isArray(this.file.src) ? this.file.src : [this.file.src];
-		// TODO grunt.file.expandFiles(this.file.src);
-		var series = files.map(function (file) {
-			return function(callback) {
-				var options = grunt.config.process(['build', target]);
-				var args = [file, options.out || 'dist/', options.version || 'edge'];
-				var libraries = Array.isArray(options.libraries) ? options.libraries : [];
 
-				args.push.apply(args, libraries);
+		var options = grunt.config.process(['build', target]);
+		var args = [this.data.src, this.data.out || 'dist/', this.data.version || 'edge'];
+		var libraries = Array.isArray(this.data.libraries) ? this.data.libraries : [];
 
-				grunt.verbose.writeflags(options, 'Options');
-				grunt.log.writeln('Running  ./js ' + args.join(' '));
+		args.push.apply(args, libraries);
 
-				grunt.utils.exec({
-					cmd : "./js",
-					args : args,
-					opts : {
-						cwd: jsDir
-					}
-				}, function(error, result, code) {
-					callback(error, result, code);
-				});
+		grunt.verbose.writeflags(this.data, 'Options');
+		grunt.log.writeln('Running  ./js ' + args.join(' '));
 
-				grunt.log.write("Building " + file + " with Steal...\n");
+		grunt.util.spawn({
+			cmd : "./js",
+			args : args,
+			opts : {
+				cwd: jsDir
 			}
-		});
-		grunt.utils.async.parallel(series, function(error, results) {
+		}, function(error, result, code) {
 			grunt.log.writeln('Done building');
 			done();
-		})
+		});
+
+		grunt.log.write("Building " + this.data.src + " with Steal...\n");
 	});
 };

build/tasks/changelog.js

@@ -0,0 +1,65 @@
+var https = require('https'),
+querystring = require('querystring'),
+ejs = require('ejs');
+
+module.exports = function(grunt) {
+
+	grunt.registerMultiTask('changelog', 'Updates changelog.md based on GitHub milestones', function() {
+		var done = this.async(),
+
+		params = querystring.stringify({
+			milestone: this.data.milestone,
+			state: 'closed',
+			per_page: 100
+		}),
+
+		path = '/repos/' + this.data.user + '/' + this.data.repo + '/issues?' + params,
+
+		buffer = '',
+		self = this;
+
+		var write = function() {
+			var issues = JSON.parse(buffer),
+			log = '';
+
+			if(grunt.file.exists('changelog.md')) {
+				log = grunt.file.read('changelog.md');
+			};
+
+			ejs.renderFile(__dirname + '/../changelog.ejs', {
+				version: self.data.version,
+				date: new Date(Date.now()),
+				issues: issues
+			}, function(e, template) {
+
+				if(e) {
+					done(e);
+				}
+
+				grunt.file.write('changelog.md', template + log);
+				done();
+
+			});
+		},
+
+		req = https.request({
+			hostname: 'api.github.com',
+			path: path
+		}, function(res) {
+
+			res.on('data', function(data) {
+				buffer += data;
+			});
+
+			res.on('end', write);
+		});
+
+		req.end();
+
+		req.on('error', function(e) {
+			done(e);
+		});
+
+	});
+
+}

build/tasks/docco.js

@@ -5,24 +5,18 @@ var docco = require('docco');
 
 module.exports = function(grunt) {
 	grunt.registerMultiTask('docco', 'Docco processor.', function() {
-		var _ = grunt.utils._;
-		var options = grunt.config.process(['docco', this.target]);
-		var defaults = _.extend({
-			exclude : [/\.min\./]
-		}, grunt.config.process('docco')._options);
-		grunt.verbose.writeflags(options, 'Options');
+		var _ = grunt.util._;
 		var done = this.async();
-		var src = grunt.file.expandFiles(this.file.src).filter(function(file) {
-			for(var i = 0; i < defaults.exclude.length; i++) {
-				if(defaults.exclude[i].test(file)) {
-					return false;
-				}
-			}
-			return true;
+		var options = this.options();
+		var src = grunt.file.expand(this.data.files).filter(function(file) {
+			return !_.some(options.exclude, function(exclude) {
+				return exclude.test(file);
+			});
 		});
 
-		docco.document(src, _.extend({}, defaults.docco, options.docco) || {}, function(err, result, code){
-			grunt.log.writeln("Doccoed [" + src.join(", ") + "]; " + err ? err : "(No errors)" + "\n" + result + " " + code);
+		docco.document( _.extend({ args: src }, this.data.docco, options.docco), function(err, result, code){
+			grunt.log.writeln("Doccoed [" + src.join(", ") + "]; " +
+				err ? err : "(No errors)" + "\n" + result + " " + code);
 			done();
 		});
 	});