merged various branches; demo passes
This commit is contained in:
parent
d636e472b0
commit
eb0e451e38
|
@ -5,12 +5,11 @@
|
|||
* Licensed under the MIT license.
|
||||
*/
|
||||
|
||||
var path, couchapp, nanolib, urls, async;
|
||||
var path, couchapp, nanolib, urls;
|
||||
|
||||
path = require('path');
|
||||
couchapp = require('couchapp');
|
||||
urls = require('url');
|
||||
async = require('async');
|
||||
|
||||
var genDB = function(db) {
|
||||
var parts, dbname, auth;
|
||||
|
@ -41,23 +40,14 @@ module.exports = function(grunt) {
|
|||
// ==========================================================================
|
||||
|
||||
grunt.registerMultiTask("couchapp", "Install Couchapp", function() {
|
||||
var task = this;
|
||||
var done = this.async();
|
||||
var appobj, done;
|
||||
done = this.async();
|
||||
|
||||
async.each(this.files, function(file, cb) {
|
||||
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);
|
||||
appobj = require(path.join(process.cwd(), path.normalize(this.data.app)));
|
||||
|
||||
return couchapp.createApp(appobj, this.data.db, function(app) {
|
||||
return app.push(done);
|
||||
});
|
||||
} 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() {
|
||||
|
@ -103,18 +93,19 @@ module.exports = function(grunt) {
|
|||
try {
|
||||
if (db.name) {
|
||||
nano = require('nano')(db.url);
|
||||
nano.db.create(db.name, function(err) {
|
||||
if (_this.data.options && _this.data.options.okay_if_exists) {
|
||||
nano.db.create(db.name, function(err, res) {
|
||||
if (err) {
|
||||
if (_this.data.options && _this.data.options.okay_if_exists) {
|
||||
grunt.log.writeln("Database " + db.name + " exists, skipping");
|
||||
}
|
||||
return done(null, null);
|
||||
} else {
|
||||
if (err){
|
||||
grunt.warn(err);
|
||||
}
|
||||
grunt.warn("Database " + db.name + " exists, aborting.");
|
||||
return done(err, null);
|
||||
}
|
||||
} else {
|
||||
grunt.log.writeln("Database " + db.name + " created.");
|
||||
return done(null, null);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
var err_msg = "No database specified to create!";
|
||||
|
|
Loading…
Reference in New Issue