Merge branch 'files'

Conflicts:
	tasks/couchapp.js
This commit is contained in:
Max Thayer 2013-09-08 22:05:44 -04:00
commit dc1763de2a
1 changed files with 19 additions and 7 deletions

24
tasks/couchapp.js Normal file → Executable file
View File

@ -5,11 +5,12 @@
* Licensed under the MIT license. * Licensed under the MIT license.
*/ */
var path, couchapp, nanolib, urls, auth; var path, couchapp, nanolib, urls, async;
path = require('path'); path = require('path');
couchapp = require('couchapp'); couchapp = require('couchapp');
urls = require('url'); urls = require('url');
async = require('async');
var genDB = function(db) { var genDB = function(db) {
var parts, dbname, auth; var parts, dbname, auth;
@ -29,12 +30,23 @@ module.exports = function(grunt) {
// ========================================================================== // ==========================================================================
grunt.registerMultiTask("couchapp", "Install Couchapp", function() { grunt.registerMultiTask("couchapp", "Install Couchapp", function() {
var appobj, done; var task = this;
done = this.async(); var done = this.async();
appobj = require(path.join(process.cwd(), path.normalize(this.data.app)));
return couchapp.createApp(appobj, this.data.db, function(app) { async.each(this.files, function(file, cb) {
return app.push(done); var appobj, apppath
apppath = path.join(process.cwd(), path.normalize(file.src[0]))
try {
appobj = require(apppath)
couchapp.createApp(appobj, task.data.db, function(app) {
app.push(cb);
}); });
} catch(ex) {
grunt.log.error(ex);
grunt.log.warn('Could not load couchapp from ' + apppath + '.');
cb();
}
}, done);
}); });
grunt.registerMultiTask("rmcouchdb", "Delete a Couch Database", function() { grunt.registerMultiTask("rmcouchdb", "Delete a Couch Database", function() {