tests/os/system.js @@ -3,6 +3,15 @@ # this script is intended to work both in narwhal/bin and in # any project's bin dir; it's copied by tusk --init. +function enquote_all () { + ARGS="" + for ARG in "$@"; do + [ -n "$ARGS" ] && ARGS="$ARGS " + ARGS="$ARGS'""$(echo " $ARG" | cut -c 2- | sed 's/'"'"'/'"'"'"'"'"'"'"'"'/g')""'" + done + echo "$ARGS" +} + # get the absolute path of the executable SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0") @@ -27,7 +36,7 @@ if [ "$#" -lt 1 ]; then echo SEALVL="$SEALVL" >&2 "$SHELL" else - "$SHELL" -c "$*" + "$SHELL" -c "$(enquote_all "$@")" fi if [ "$OLDSEA" != "" ]; then echo SEA="$OLDSEA" >&2 bin/sea @@ -239,6 +239,7 @@ }, "browserjs": { "name": "browserjs", + "version": "0.1", "dependencies": [ "narwhal" ], @@ -597,6 +598,7 @@ "rake", "make" ], + "version": "0.1.1", "githubName": "jake", "type": "zip", "location": "http://github.com/280north/jake/zipball/master" @@ -702,7 +704,7 @@ "template", "json" ], - "author": "andychup (http://code.google.com/u/andychup/)", + "author": "Andy Chu (andy@chubot.org)", "contributors": [ "Irakli Gozalishvili (http://rfobic.wordpress.com/)" ], @@ -771,10 +773,9 @@ "type": "zip", "location": "http://github.com/mrclash/narwhal-mongodb/zipball/master" }, -<<<<<<< HEAD "underscore": { "name": "underscore", - "description": "Underscore is a utility-belt library for Javascript that provides a lot of the functional programming support.", + "description": "Functional programming aid for JavaScript. Works well with jQuery.", "url": "http://documentcloud.github.com/underscore/", "keywords": [ "util", @@ -783,10 +784,11 @@ "client", "browser" ], - "author": "Jeremy Ashkenas <jashkenas@gmail.com>", - "maintainer": "Kris Kowal (http://askawizard.blogspot.com/) <kris.kowal@cixar.com>", + "author": "Jeremy Ashkenas <jeremy@documentcloud.org>", + "maintainer": "Kris Kowal <kris.kowal@cixar.com>", "contributors": [], "dependencies": [], + "lib": ".", "githubName": "underscore", "type": "zip", "location": "http://github.com/kriskowal/underscore/zipball/master" @@ -806,6 +808,95 @@ "githubName": "silk", "type": "zip", "location": "http://github.com/kriskowal/silk/zipball/master" + }, + "objective-j": { + "name": "objective-j", + "dependencies": [ + "narwhal", + "browserjs", + "jake" + ], + "preload": [ + "objective-j/loader" + ], + "description": "Objective-J and Cappuccino module", + "keywords": [ + "objective-j", + "objj", + "objective j", + "cappuccino" + ], + "author": "280 North, Inc. (http://280north.com/)", + "version": "0.7.9", + "contributors": [ + "Francisco Tolmasky (http://tolmasky.com/)", + "Ross Boucher (http://rossboucher.com/)", + "Tom Robinson (http://tlrobinson.net/)", + "Numerous others (http://contributors.cappuccino.org/)" + ], + "githubName": "objective-j-package", + "type": "zip", + "location": "http://github.com/280north/objective-j-package/zipball/master" + }, + "cappuccino": { + "name": "cappuccino", + "dependencies": [ + "narwhal", + "browserjs", + "jake", + "objective-j" + ], + "description": "Cappuccino module", + "keywords": [ + "objective-j", + "objj", + "objective j", + "capp", + "cappuccino" + ], + "author": "280 North, Inc. (http://280north.com/)", + "version": "0.7.9", + "objj-frameworks": [ + "Frameworks" + ], + "objj-debug-frameworks": [ + "Frameworks/Debug" + ], + "contributors": [ + "Francisco Tolmasky (http://tolmasky.com/)", + "Ross Boucher (http://rossboucher.com/)", + "Tom Robinson (http://tlrobinson.net/)", + "Numerous others (http://contributors.cappuccino.org/)" + ], + "githubName": "cappuccino-package", + "type": "zip", + "location": "http://github.com/280north/cappuccino-package/zipball/master" + }, + "ojunit": { + "name": "ojunit", + "dependencies": [ + "narwhal", + "objective-j", + "cappuccino" + ], + "author": "Tom Robinson (http://280north.com/)", + "contributors": [ + "Ross Boucher", + "Martin Häcker" + ], + "description": "A simple Objective-J unit test framework.", + "keywords": [ + "objective-j", + "unit test", + "testing", + "test" + ], + "objj-frameworks": [ + "Framework" + ], + "githubName": "ojunit", + "type": "zip", + "location": "http://github.com/280north/ojunit/zipball/master" } } -} +} \ No newline at end of file catalog.json @@ -42,7 +42,7 @@ exports.system = function (command) { return require("os").enquote(arg); }).join(" "); } - return getCSystem().invokeInt([command]); + return getCSystem().invokeInt([command]) >> 8; }; exports.dup = function () { engines/rhino/lib/os-engine.js @@ -188,6 +188,20 @@ "silk": { "type": "github", "user": "kriskowal" + }, + "objective-j": { + "type": "github", + "user": "280north", + "name": "objective-j-package" + }, + "cappuccino": { + "type": "github", + "user": "280north", + "name": "cappuccino-package" + }, + "ojunit": { + "type": "github", + "user": "280north" } } } sources.json @@ -1,3 +1,4 @@ exports.testPopen = require("./popen"); +exports.testSystem = require("./system"); if (require.main === module.id) require("os").exit(require("test/runner").run(exports)); tests/os/all-tests.js 8ba564963b35f2c884b554a79aada56655fc93ef 3ff89e40417ac48f7000e57dd8ab33bd2bac0923 tlrobinson tom@280north.com http://github.com/tlrobinson/narwhal/commit/85ab2fcd69015b4a8b10c1495ecc22aa343fa9b8 85ab2fcd69015b4a8b10c1495ecc22aa343fa9b8 2009-11-12T18:37:34-08:00 2009-11-12T18:37:34-08:00 Merge branch 'master' into kriskowal Conflicts: catalog.json sources.json 587e1ea4d463b7a63a345b9f23a086f9bd154f25 tlrobinson tom@280north.com