Skip to content

Commit

Permalink
Merge commit 'kurokikaze/model-validations' into model-validations-no…
Browse files Browse the repository at this point in the history
…de-version
  • Loading branch information
mde committed Apr 23, 2010
2 parents 66d45f7 + 3ca50c5 commit 09e776e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.markdown
Expand Up @@ -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:

Expand Down
7 changes: 4 additions & 3 deletions geddy-core/lib/init.js
Expand Up @@ -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');
Expand Down Expand Up @@ -97,7 +98,7 @@ var Init = function (config, callback) {
{
func: session.createStore,
args: [config.sessions.store],
callback: null,
callback: null
},
{
func: fs.readdir,
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion geddy-core/lib/requests.js
Expand Up @@ -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();
}
};
}();
2 changes: 1 addition & 1 deletion geddy-core/lib/response.js
Expand Up @@ -243,7 +243,7 @@ Response.prototype = new function () {
};

this.finish = function () {
this.resp.close();
this.resp.end();
};

}();
Expand Down
7 changes: 4 additions & 3 deletions geddy-core/scripts/Jakefile.js
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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));
}
Expand Down

0 comments on commit 09e776e

Please sign in to comment.