improved logger, support for more js shells, and quit() env module

.gitignore

@@ -22,3 +22,4 @@ build/tests/override/node_modules
 build/tests/override/one-built.js
 tests/node/node_modules
 tests/node/embedded/node_modules
+*.sw*

build/jslib/browser/args.js

@@ -0,0 +1 @@
+define(function(){return function(){};});

build/jslib/browser/file.js

@@ -0,0 +1 @@
+define(function(){return function(){};});

build/jslib/browser/load.js

@@ -0,0 +1,2 @@
+//nothing to do here
+define(function(){return function(){};});

build/jslib/browser/optimize.js

@@ -0,0 +1 @@
+define(function(){return function(){};});

build/jslib/browser/print.js

@@ -0,0 +1,6 @@
+define(function(){
+	return function(){
+		console.log.apply(console,Array.prototype.slice.apply(arguments));
+	};
+});
+

build/jslib/browser/quit.js

@@ -0,0 +1 @@
+define(function(){return function(){};});

build/jslib/env.js

@@ -22,6 +22,8 @@
         env = 'node';
     } else if (typeof window !== "undefined" && navigator && document) {
         env = 'browser';
+    } else if (typeof load === 'function' && typeof print === 'function'){
+        env = 'spartan';
     }
 
     define({
@@ -44,4 +46,4 @@
             });
         }
     });
-}());
+}());

build/jslib/logger.js

@@ -21,36 +21,36 @@ define(['env!env/print'], function (print) {
             this.level = level;
         },
 
-        trace: function (message) {
+        trace: function () {
             if (this.level <= this.TRACE) {
-                this._print(message);
+                this._print(arguments);
             }
         },
 
-        info: function (message) {
+        info: function () {
             if (this.level <= this.INFO) {
-                this._print(message);
+                this._print(arguments);
             }
         },
 
-        warn: function (message) {
+        warn: function () {
             if (this.level <= this.WARN) {
-                this._print(message);
+                this._print(arguments);
             }
         },
 
-        error: function (message) {
+        error: function () {
             if (this.level <= this.ERROR) {
-                this._print(message);
+                this._print(arguments);
             }
         },
 
-        _print: function (message) {
-            this._sysPrint((this.logPrefix ? (this.logPrefix + " ") : "") + message);
+        _print: function (args) {
+            this._sysPrint(this.logPrefix ? (this.logPrefix + " ") : "", Array.prototype.slice.apply(args));
         },
 
-        _sysPrint: function (message) {
-            print(message);
+        _sysPrint: function (logPrefix,args) {
+            print.apply(this,[logPrefix].concat(args));
         }
     };
 

build/jslib/node/print.js

@@ -8,9 +8,5 @@
 /*global define: false, console: false */
 
 define(function () {
-    function print(msg) {
-        console.log(msg);
-    }
-
-    return print;
+    return console.log;
 });

build/jslib/node/quit.js

@@ -0,0 +1,4 @@
+define(function(){
+	return process.exit;
+});
+

build/jslib/rhino/quit.js

@@ -0,0 +1,3 @@
+define(function(){
+	return quit;
+});

build/jslib/spartan.js

@@ -0,0 +1 @@
+rhino.js

build/jslib/spartan/args.js

@@ -0,0 +1 @@
+../rhino/args.js

build/jslib/spartan/file.js

@@ -0,0 +1,48 @@
+//file API's may not be supported in spartan shell environments
+define({
+        getLineSeparator: function () {
+        },
+
+        exists: function (fileName) {
+        },
+
+        parent: function (fileName) {
+        },
+
+        normalize: function (fileName) {
+        },
+
+        isFile: function (path) {
+        },
+
+        isDirectory: function (path) {
+        },
+
+        absPath: function (fileObj) {
+        },
+
+        getFilteredFileList: function (/*String*/startDir, /*RegExp*/regExpFilters, /*boolean?*/makeUnixPaths, /*boolean?*/startDirIsJavaObject) {
+        },
+
+        copyDir: function (/*String*/srcDir, /*String*/destDir, /*RegExp?*/regExpFilter, /*boolean?*/onlyCopyNew) {
+        },
+
+        copyFile: function (/*String*/srcFileName, /*String*/destFileName, /*boolean?*/onlyCopyNew) {
+        },
+
+        renameFile: function (from, to) {
+        },
+
+        readFile: function (/*String*/path, /*String?*/encoding) {
+        },
+
+        saveUtf8File: function (/*String*/fileName, /*String*/fileContents) {
+        },
+
+        saveFile: function (/*String*/fileName, /*String*/fileContents, /*String?*/encoding) {
+        },
+
+        deleteFile: function (/*String*/fileName) {
+        }
+});
+

build/jslib/spartan/load.js

@@ -0,0 +1 @@
+../rhino/load.js

build/jslib/spartan/optimize.js

@@ -0,0 +1 @@
+../node/optimize.js

build/jslib/spartan/print.js

@@ -0,0 +1 @@
+../rhino/print.js

build/jslib/spartan/quit.js

@@ -0,0 +1 @@
+../rhino/quit.js

build/jslib/x.js

@@ -98,7 +98,30 @@ var requirejs, require, define;
             commandOption = fileName.substring(1);
             fileName = process.argv[3];
         }
-    }
+    } else if (typeof window !== "undefined" && navigator && document) {
+        env = 'browser';
+    } else if (typeof load === 'function' && typeof print === 'function'){
+        env = 'spartan';
+
+        fileName = args[0];
+
+        if (fileName && fileName.indexOf('-') === 0) {
+            commandOption = fileName.substring(1);
+            fileName = args[1];
+        }
+
+        exec = eval;
+
+        //Define a console.log for easier logging. Don't
+        //get fancy though.
+        if (typeof console === 'undefined') {
+            console = {
+                log: function () {
+                    print.apply(undefined, arguments);
+                }
+            };
+        }
+    } 
 
     //INSERT require.js
 
@@ -115,6 +138,9 @@ var requirejs, require, define;
 
         //INSERT build/jslib/node.js
 
+    } else if (env === 'spartan'){
+
+        //INSERT build/jslib/spartan.js
     }
 
     //Support a default file name to execute. Useful for hosted envs
@@ -225,19 +251,24 @@ var requirejs, require, define;
         //Just run an app
 
         //Load the bundled libraries for use in the app.
-        if (commandOption === 'lib') {
+        //browser loads libs by default
+        if (commandOption === 'lib' || env === 'browser') {
             loadLib();
         }
 
         setBaseUrl(fileName);
 
-        if (exists(fileName)) {
-            exec(readFile(fileName), fileName);
-        } else {
-            showHelp();
+        if(env === 'spartan'){
+            load(fileName);
+        } else if (env !== 'browser'){
+            if (exists(fileName)) {
+                exec(readFile(fileName), fileName);
+            } else {
+                showHelp();
+            }
         }
     }
 
-}((typeof console !== 'undefined' ? console : undefined),
-  (typeof Packages !== 'undefined' ? Array.prototype.slice.call(arguments, 0) : []),
-  (typeof readFile !== 'undefined' ? readFile : undefined)));
+})((typeof console !== 'undefined' ? console : undefined),
+  ((typeof Packages !== 'undefined' || (typeof load === 'function' && typeof print === 'function'))? Array.prototype.slice.call(arguments, 0) : []),
+  (typeof readFile !== 'undefined' ? readFile : undefined));

dist.js

@@ -22,7 +22,7 @@ var fs = require('fs'),
     loadRegExp = /\/\/INSERT ([\w\/\.]+)/g,
     moduleNameRegExp = /build\/jslib\/([\w\/\-]+)\.js$/,
     defRegExp = /define\s*\(/,
-    envs = ['node', 'rhino'],
+    envs = ['node', 'rhino', 'spartan', 'browser'],
     //Update this list of files by running the optimizer against
     //build/jslib/opto.build.js,
     //but then remove any jslib/node entries and make sure there is
@@ -36,6 +36,7 @@ var fs = require('fs'),
         'env!env/file',
         'build/jslib/lang.js',
         'env!env/print',
+        'env!env/quit',
         'build/jslib/logger.js',
         'build/jslib/blank.js',
         'build/jslib/blank.js',