Merge branch 'master' of github.com:samhiatt/grunt-couchapp
This commit is contained in:
commit
a0c459aaa0
|
@ -32,8 +32,11 @@ module.exports = function(grunt) {
|
||||||
grunt.registerMultiTask("couchapp", "Install Couchapp", function() {
|
grunt.registerMultiTask("couchapp", "Install Couchapp", function() {
|
||||||
var appobj, done;
|
var appobj, done;
|
||||||
done = this.async();
|
done = this.async();
|
||||||
|
if (require("fs").lstatSync(this.data.app).isDirectory()) { // if new-style (directory-based) couchapp app
|
||||||
appobj = require(path.join(process.cwd(), path.normalize(this.data.app)));
|
appobj = couchapp.loadFiles(this.data.app);
|
||||||
|
} else { // otherwise, fall back to old style.
|
||||||
|
appobj = require(path.join(process.cwd(), path.normalize(this.data.app)))
|
||||||
|
}
|
||||||
|
|
||||||
return couchapp.createApp(appobj, this.data.db, function(app) {
|
return couchapp.createApp(appobj, this.data.db, function(app) {
|
||||||
return app.push(done);
|
return app.push(done);
|
||||||
|
@ -55,13 +58,14 @@ module.exports = function(grunt) {
|
||||||
grunt.log.writeln("Database " + db.name + " not present... skipping.");
|
grunt.log.writeln("Database " + db.name + " not present... skipping.");
|
||||||
return done(null, null) ;
|
return done(null, null) ;
|
||||||
} else {
|
} else {
|
||||||
grunt.warn("Database " + db.name + " does not exist.");
|
throw ("Database " + db.name + " does not exist.");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
grunt.warn(err);
|
throw err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return done(err, null);
|
// remove db was a success
|
||||||
|
return done();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
grunt.log.writeln("No database specified... skipping.");
|
grunt.log.writeln("No database specified... skipping.");
|
||||||
|
@ -69,7 +73,7 @@ module.exports = function(grunt) {
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
grunt.warn(e);
|
grunt.warn(e);
|
||||||
done(e, null);
|
return done(e, null);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
|
@ -86,26 +90,35 @@ module.exports = function(grunt) {
|
||||||
nano = require('nano')(db.url);
|
nano = require('nano')(db.url);
|
||||||
nano.db.create(db.name, function(err, res) {
|
nano.db.create(db.name, function(err, res) {
|
||||||
if (err) {
|
if (err) {
|
||||||
if (_this.data.options && _this.data.options.okay_if_exists) {
|
if (err.error && err.error=="unauthorized") {
|
||||||
|
grunt.warn(err.reason);
|
||||||
|
throw err;
|
||||||
|
} else if (err.code && err.description) { // probably connection error
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
else if (_this.data.options && _this.data.options.okay_if_exists) {
|
||||||
grunt.log.writeln("Database " + db.name + " exists, skipping");
|
grunt.log.writeln("Database " + db.name + " exists, skipping");
|
||||||
return done(null, null);
|
return done(null, null);
|
||||||
} else {
|
} else {
|
||||||
grunt.warn("Database " + db.name + " exists, aborting.");
|
grunt.warn("Database " + db.name + " exists and okay_if_exists set to false. Aborting.");
|
||||||
return done(err, null);
|
throw err;
|
||||||
}
|
}
|
||||||
} else {
|
} else if (res && res.ok==true) {
|
||||||
grunt.log.writeln("Database " + db.name + " created.");
|
grunt.log.ok("Database " + db.name + " created.");
|
||||||
return done(null, null);
|
return done(null, null);
|
||||||
|
} else {
|
||||||
|
console.log("Unexpected response received.");
|
||||||
|
console.dir(res);
|
||||||
|
throw "Unexpected response";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
var err_msg = "No database specified to create!";
|
var err_msg = "No database specified to create!";
|
||||||
grunt.warn(err_msg);
|
throw err_msg;
|
||||||
return done(new Error(err_msg), null);
|
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
grunt.warn(e);
|
grunt.warn(e);
|
||||||
done(e, null);
|
return done(e, null);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue