Skip to content
This repository was archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Update to work with node 0.6.
Browse files Browse the repository at this point in the history
See
https://github.com/joyent/node/wiki/API-changes-between-v0.4-and-v0.6.

* Don't use require.paths, as it's no longer mutable.
* Don't use process.binding('stdio'), as it was private and has been removed.

Note that no effort has been made to address #24, this is just to get up
and running with node 0.6.
  • Loading branch information
michaeltwofish authored and Evan Haas committed Dec 20, 2011
1 parent 00e0f54 commit e7baea0
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 29 deletions.
6 changes: 3 additions & 3 deletions cookies.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var fs = require('fs'),
_ = require('underscore')._,
wsrc = require('wsrc');
_ = require('./underscore')._,
wsrc = require('./wsrc');

var rc = wsrc.get();
var cookieJar = rc.cookies || {};
Expand Down Expand Up @@ -182,4 +182,4 @@ function readCookie(name) {
function eraseCookie(name) {
createCookie(name,"",-1);
}
*/
*/
4 changes: 2 additions & 2 deletions env.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

var http = require('http'),
url = require('url'),
_ = require('underscore')._;
_ = require('./underscore')._;
var libxml;
try {
libxml = require('libxmljs');
} catch (e) {
var stylize = require('colors').stylize;
var stylize = require('./colors').stylize;
console.log(stylize("Unable to load libxmljs. jQuery won't work!\n", 'yellow'));
exports.DOMDocument = function(x) { };
exports.window = {};
Expand Down
20 changes: 9 additions & 11 deletions shell.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
#!/usr/bin/env node
require.paths.unshift(__dirname + '/deps');
var webshellVersion = '0.3-dev';

require.paths.unshift(__dirname);
var WebShell = {
Util: {}
};

var util = require('util'),
repl = require('repl'),
wsrepl = require('wsrepl'),
wsrepl = require('./wsrepl'),
fs = require('fs'),
stylize = require('colors').stylize,
wsrc = require('wsrc'),
wsreadline = require('wsreadline'),
_ = require('underscore')._,
jquery = require('jquery'),
WsHttp = require('wshttp').WsHttp;
stylize = require('./colors').stylize,
wsrc = require('./wsrc'),
wsreadline = require('./wsreadline'),
_ = require('./underscore')._,
jquery = require('./jquery'),
WsHttp = require('./wshttp').WsHttp;

_.extend(WebShell.Util, require('wsutil'));
_.extend(WebShell.Util, require('./wsutil'));

_.mixin({
isJSON: function(headers) {
Expand All @@ -43,7 +41,7 @@ var $_ = {
printResponse: true,
postToRequestData: function (post) { return WebShell.Util.postToRequestData(this, post); },
fileToRequestData: function (filename, encoding) { return WebShell.Util.fileToRequestData(this, filename, encoding); },
cookies: require('cookies'),
cookies: require('./cookies'),
toolbox: {},
evalFile: WebShell.Util.evalFile
};
Expand Down
8 changes: 4 additions & 4 deletions wshttp.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// https://github.com/codehero/node-http-digest
// "node-http-digest is in the public domain."

var _ = require('underscore')._,
var _ = require('./underscore')._,
http = require('http'),
https = require('https'),
url = require('url'),
cookies = require('cookies'),
stylize = require('colors').stylize,
cookies = require('./cookies'),
stylize = require('./colors').stylize,
querystring = require('qs'),
hashlib = require('hashlib'),
wsutil = require('wsutil');
wsutil = require('./wsutil');

var failCount = 0;
var digestPersistent = {
Expand Down
6 changes: 3 additions & 3 deletions wsrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var fs = require('fs'),
stylize = require('colors').stylize,
wsutil = require('wsutil'),
_ = require('underscore')._;
stylize = require('./colors').stylize,
wsutil = require('./wsutil'),
_ = require('./underscore')._;

var functionPrefix = '___WSFUNC___';

Expand Down
5 changes: 2 additions & 3 deletions wsreadline.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ var readline = require('readline'),

module.exports = readline;

var stdio = process.binding('stdio');
var getCols = function() {
return tty.getWindowSize(stdio)[1];
return tty.getWindowSize(process.stdin);
};

readline.Interface.prototype.cursorToEnd = function() {
Expand Down Expand Up @@ -182,7 +181,7 @@ readline.Interface.prototype._prevLineParams = null;
readline.Interface.prototype._refreshLine = function () {
if (this._closed) return;

stdio.setRawMode(true);
tty.setRawMode(true);

var lineLen = this.line.length + this._promptLength;
var rows = Math.floor(lineLen / getCols());
Expand Down
6 changes: 3 additions & 3 deletions wsutil.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// vim: sw=2 ts=2 et
var url = require('url'),
util = require('util'),
stylize = require('colors').stylize,
stylize = require('./colors').stylize,
querystring = require('querystring'),
fs = require('fs'),
wsrc = require('wsrc'),
_ = require('underscore')._;
wsrc = require('./wsrc'),
_ = require('./underscore')._;

exports.parseURL = function(urlStr, protocolHelp, previousUrl) {
var u = url.parse(urlStr);
Expand Down

0 comments on commit e7baea0

Please sign in to comment.