Skip to content
Browse files

Merge commit 'kurokikaze/model-validations' into model-validations-no…

…de-version
  • Loading branch information...
2 parents 66d45f7 + 3ca50c5 commit 09e776e2a38640d8ba30a37ea776fa0d74dbdeb7 @mde mde committed
Showing with 11 additions and 9 deletions.
  1. +1 −1 README.markdown
  2. +4 −3 geddy-core/lib/init.js
  3. +1 −1 geddy-core/lib/requests.js
  4. +1 −1 geddy-core/lib/response.js
  5. +4 −3 geddy-core/scripts/Jakefile.js
View
2 README.markdown
@@ -29,7 +29,7 @@ Apache License, Version 2
** Prerequisites**
-Geddy requires version 0.1.33 of Node.js.
+Geddy requires version 0.1.91 of Node.js.
To get Geddy from GitHub and install it:
View
7 geddy-core/lib/init.js
@@ -18,7 +18,8 @@
var fs = require('fs');
var sys = require('sys');
-//var child_process = require('child_process');
+var child_process = require('child_process');
+//var chexec =
var fleegix = require('geddy-core/lib/fleegix');
var session = require('geddy-core/lib/session');
@@ -97,7 +98,7 @@ var Init = function (config, callback) {
{
func: session.createStore,
args: [config.sessions.store],
- callback: null,
+ callback: null
},
{
func: fs.readdir,
@@ -110,7 +111,7 @@ var Init = function (config, callback) {
callback: this.registerControllers
},
{
- func: sys.exec,
+ func: child_process.exec,
args: ['find ' + config.dirname + '/app/views'],
callback: this.registerTemplates
}
View
2 geddy-core/lib/requests.js
@@ -72,7 +72,7 @@ var requests = new function () {
this.close = function () {
if (this.finished()) {
this.resp.write(this.content);
- this.resp.close();
+ this.resp.end();
}
};
}();
View
2 geddy-core/lib/response.js
@@ -243,7 +243,7 @@ Response.prototype = new function () {
};
this.finish = function () {
- this.resp.close();
+ this.resp.end();
};
}();
View
7 geddy-core/scripts/Jakefile.js
@@ -16,7 +16,7 @@
*/
var sys = require('sys');
-//var child_process = require('child_process');
+var child_process = require('child_process');
var fs = require('fs');
exports.tasks = {
@@ -108,11 +108,12 @@ exports.tasks = {
};
// Runs an array of shell commands asynchronously, calling the
-// next command off the queue inside the callback from sys.exec.
+// next command off the queue inside the callback from child_process.exec.
// When the queue is done, call the final callback function.
+
var runCmds = function (arr, callback) {
var run = function (cmd) {
- sys.exec(cmd, function (err, stdout, stderr) {
+ child_process.exec(cmd, function (err, stdout, stderr) {
if (err) {
sys.puts('Error: ' + JSON.stringify(err));
}

0 comments on commit 09e776e

Please sign in to comment.
Something went wrong with that request. Please try again.