montagejs · hthetiot · Aug 7, 2013 · Aug 27, 2013 · Aug 27, 2013 · Aug 27, 2013
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,20 @@
 .DS_Store
 lcov.info
 lcov-report/
-/node_modules
+# It is necessary to explicate the ignorable node_modules because
+# node_modules/mr is a checked-in symlink, necessary for resolving the
+# Jasminum/PhantomJS cyclic dependency upon Mr.
+/node_modules/.bin
+/node_modules/colors
+/node_modules/istanbul
+/node_modules/jasminum
+/node_modules/joey
+/node_modules/jshint
+/node_modules/mop-integration
+/node_modules/optimist
+/node_modules/q-io
+/node_modules/q
+/node_modules/qs
+/node_modules/util
+/node_modules/wd
+/node_modules/websocket.io
diff --git a/.jshintignore b/.jshintignore
@@ -2,3 +2,5 @@
 **/node_modules/**
 **/packages/**
 **/spec/**
+boot/boilerplate.js
+boot.js
diff --git a/.jshintrc b/.jshintrc
@@ -7,26 +7,43 @@
     "noarg": true,
     "noempty": true,
     "nonew": true,
+    "newcap": false,
     "undef": true,
     "unused": "paramsignore",
     "trailing": true,
     "indent": 4,
     "boss": true,
     "eqnull": true,
+    "node": true,
     "browser": true,
     "globals": {
         "CustomEvent": true,
         "WebSocket": false,
+        "location": true,
+        "console": false,
+        "alert": true,
+        "hasOwnProperty": true,
+
+        "phantom": true,
 
         "require": false,
         "exports": false,
         "module": false,
         "global": false,
+        "__dirname": false,
+        "__filename": false,
 
         "WeakMap": true,
         "Map": true,
         "Set": true,
+        "URL": true,
 
-        "console": false
+        "describe": true,
+        "ddescribe": true,
+        "xdescribe": true,
+        "it": true,
+        "iit": true,
+        "xit": true,
+        "expect": true
     }
 }
diff --git a/adhoc.html b/adhoc.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <script src="bootstrap.js" data-module="adhoc"></script>
+        <script src="boot.js" data-module="adhoc"></script>
     </head>
     <body>
         <p>Open your browser&apos;s console.</p>

diff --git a/adhoc.js b/adhoc.js
@@ -1,5 +1,6 @@
+/* global -URL */
 
-var URL = require("mini-url");
+var URL = require("url");
 var QS = require("qs");
 
 var a = document.createElement("a");

diff --git a/bin/mr b/bin/mr
diff --git a/bin/mr-phantom.js b/bin/mr-phantom.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require("../phantom/boot")();
diff --git a/bin/mr.js b/bin/mr.js
@@ -0,0 +1,29 @@
+#!/usr/bin/env node --harmony
+
+var Require = require("../require");
+var Optimist = require("optimist");
+var URL = require("url");
+var Q = require("q");
+var FS = require("q-io/fs");
+
+var argv = Optimist.argv;
+var program = argv._.shift();
+
+Require.findPackageLocationAndModuleId(program)
+.then(function (info) {
+    return Require.loadPackage(info.location, {
+    })
+    .invoke("async", info.id);
+}, function (error) {
+    var location = Require.filePathToLocation(program);
+    var directory = URL.resolve(location, "./");
+    var file = FS.relativeFromDirectory(directory, location);
+    var descriptions = {};
+    descriptions[directory] = Q({});
+    return Require.loadPackage(directory, {
+        descriptions: descriptions
+    })
+    .invoke("async", file);
+})
+.done();
+
diff --git a/bin/mrs.js b/bin/mrs.js
@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+var optimist = require("optimist");
+var build = require("../build");
+
+var argv = optimist
+    .default("execute", "")
+    .alias("e", "execute")
+    .alias("h", "help")
+    .argv;
+
+function usage() {
+    console.log("Usage: mrs <entry> [-e <expression>]");
+    console.log("");
+    console.log("   Creates a <script> from CommonJS modules");
+    process.exit(-1);
+}
+
+if (argv.help) {
+    usage();
+}
+if (argv._.length !== 1) {
+    usage();
+}
+
+var path = argv._[0];
+build(path)
+.then(function (bundle) {
+    console.log(bundle + argv.execute);
+}).done();
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/usr/bin/env node
		require("../phantom/boot")();