rmcouchdb doesn't drop everything if dbname is absent; mkcouchdb reports helpful error message if dbname is absent

This commit is contained in:
Max Thayer 2013-09-06 10:02:16 -04:00
parent af73a33070
commit a41ae8efac
2 changed files with 37 additions and 27 deletions

View File

@ -68,8 +68,7 @@ possible to write in your configuration file:
}); });
Note, however, that if you call 'rmcouchdb' without a sub-argument, in Note that if you call `rmcouchdb` without a sub-argument, it will not delete any databases.
keeping with grunt's standards, it will drop *all* of your databases!
## Demo ## Demo

View File

@ -46,6 +46,7 @@ module.exports = function(grunt) {
dbname = parts.pathname.replace(/^\//, ''); dbname = parts.pathname.replace(/^\//, '');
try { try {
nano = require('nano')(parts.protocol + '//' + parts.host); nano = require('nano')(parts.protocol + '//' + parts.host);
if (dbname) {
nano.db.destroy(dbname, function(err) { nano.db.destroy(dbname, function(err) {
if (err) { if (err) {
if (err.status_code && err.status_code === 404) { if (err.status_code && err.status_code === 404) {
@ -61,6 +62,10 @@ module.exports = function(grunt) {
} }
return done(err, null); return done(err, null);
}); });
} else {
grunt.log.writeln("No database specified... skipping.");
return done(null, null);
}
} catch (e) { } catch (e) {
grunt.warn(e); grunt.warn(e);
done(e, null); done(e, null);
@ -74,6 +79,7 @@ module.exports = function(grunt) {
parts = urls.parse(this.data.db); parts = urls.parse(this.data.db);
dbname = parts.pathname.replace(/^\//, ''); dbname = parts.pathname.replace(/^\//, '');
try { try {
if (dbname) {
nano = require('nano')(parts.protocol + '//' + parts.host); nano = require('nano')(parts.protocol + '//' + parts.host);
nano.db.create(dbname, function(err) { nano.db.create(dbname, function(err) {
if (_this.data.options && _this.data.options.okay_if_exists) { if (_this.data.options && _this.data.options.okay_if_exists) {
@ -88,6 +94,11 @@ module.exports = function(grunt) {
return done(err, null); return done(err, null);
} }
}); });
} else {
var err_msg = "No database specified... skipping.";
grunt.warn(err_msg);
return done(new Error(err_msg), null);
}
} catch (e) { } catch (e) {
grunt.warn(e); grunt.warn(e);
done(e, null); done(e, null);