New command line loader and baseDir. Fixed module loading problems with invisible superior level node_modules directory

johanfirebase · johanfirebase · commit 6b7bcf044a68 · 2011-11-02T08:02:30.000-05:00
diff --git a/bin/cli.js b/bin/cli.js
@@ -0,0 +1,94 @@
+// Copyright (c) 2011 Firebase.co and Contributors - http://www.firebase.co
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+/*
+ * This file bootstraps the Runtime for the Command Line. It's compiled in place of the initial script of the app. Check the file bin/priest
+ */
+
+var priest = require('priest')
+var path = require('path')
+var sys = require('sys')
+var fs = require('fs')
+
+module.exports = function() {
+	var pureArgs = process.argv.slice(2)
+	var noArgs = pureArgs.length == 0
+	var mainScriptPath = module.filename
+	var mainScriptDirName = path.dirname(mainScriptPath)
+
+	var expressionName = priest.inferExpressionNameByFileName(path.basename(mainScriptPath))
+	if(!expressionName) {
+		throw "The file '" + scriptName+ "' was not recognized as a priest script due file name extension incompatibility"
+		return
+	}
+
+	require.paths.unshift(path.join(mainScriptDirName,'node_modules'))
+
+	var runtime = new priest.Runtime()
+	runtime.moduleRequire = function(moduleName) {
+		return require(moduleName)
+	}
+	var manifestPath = path.join(mainScriptDirName, priest.DEFAULT_MANIFEST_FILE_NAME)
+	path.exists(manifestPath, function(manifestFound) {
+		var self = this
+		var initializationFinished = function(err) {
+			if(err) {
+				console.error(err.toString())
+				process.exit(1)
+			}
+			if(pureArgs.indexOf('--print-expressions') != -1) {
+				var expressions = []
+				var expNames = Object.keys(runtime.loadedExpressionsMeta)
+				for(var i = 0; i < expNames.length; i++) {
+					var meta = runtime.loadedExpressionsMeta[expNames[i]]
+					expressions.push({
+						name: meta.name,
+						flags: meta.flags
+					})
+				}
+				sys.print(JSON.stringify(expressions))
+				process.exit(0)
+				} else 
+				{
+					var contextBase = {};
+					contextBase._resultCallback = function(res) {
+						if(!(res instanceof priest.IgnoreOutput)) {
+							sys.print(JSON.stringify(res))
+						}
+						process.exit(0)
+					}
+					contextBase._loopCallback = function() {};
+					contextBase._inputExpression  = function() {};
+					contextBase._variables = {};   
+					contextBase._errorCallback =  function() {};
+					runtime.runExpressionByName(expressionName, contextBase ,null)
+				}
+			}
+
+			if(manifestFound) {
+				runtime.loadFromManifestFile(manifestPath, initializationFinished)
+			} else {
+				runtime.setBaseDir(mainScriptDirName)
+				// Manually load the scripts
+				runtime.load(initializationFinished)
+			}
+		})
+
+	}
diff --git a/bin/priest b/bin/priest
@@ -1,6 +1,46 @@
 #!/usr/bin/env node
+// Copyright (c) 2011 Firebase.co and Contributors - http://www.firebase.co
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
-var CommandLine = require('../src/CommandLine.js')
-
-var cmd = new CommandLine()
-cmd.run()
+var fs = require('fs')
+var path = require('path')
+var priest = require('priest')
+require.extensions['.json'] = function (module, filename) {
+            return module._compile(fs.readFileSync(path.join(__dirname,"cli.js"), 'utf8'), filename);
+        };
+var pureArgs = process.argv.slice(2)
+var noArgs = pureArgs.length == 0
+if(noArgs) {
+	printHelp()
+	process.exit(0);
+} else {
+	var initialFileName = pureArgs[pureArgs.length -1]
+	var initialFileName = path.resolve(initialFileName)
+	require(initialFileName)() // run the cli... check cli.js for more info.
+}
+	
+function printHelp() {
+	console.log("Priest Runtime version " + priest.PackageInfo.version)
+	console.log("usage: priest TheProject.Main.priest.json")
+	console.log("options:")
+	console.log("	--print-expressions: print all the expression names and flags loaded by the runtime as a JSON document to stdout")
+	console.log("")
+	console.log("Copyright (C) 2011 Firebase and Contributors. http://priest.firebase.co")
+}
diff --git a/index.js b/index.js
@@ -1,2 +1 @@
-module.exports = require('./src/core.js')
-module.exports.CommandLine = require('./src/CommandLine.js')
+module.exports = require('./src/core.js')
diff --git a/src/CommandLine.js b/src/CommandLine.js
diff --git a/src/core.js b/src/core.js
@@ -1,3 +1,23 @@
+// Copyright (c) 2011 Firebase.co and Contributors - http://www.firebase.co
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 var vm = require('vm')
 var util = require('util')
 var StringBuffer = require('./StringBuffer')
@@ -391,17 +411,17 @@ function Runtime() {
 	this.registerWellKnownExpressionDir(dirName)
 	this._paths = new PathCache()
 	this.environmentName = process.env.NODE_ENV === undefined ? DEFAULT_ENVIRONMENT : process.env.NODE_ENV 
+	this.scriptDirectories = []
 	this.moduleRequire = function(moduleName) {
 		return require(moduleName)
 	}
 	this.events = new EventEmitter()
-	this.scriptDirectories = [{
-		path: path.resolve('.')
-	}]
+	
 	
 	this.mergedManifest = {
 		modules: []
 	}
+	this.baseDir = '.'
 }
 
 /*
@@ -593,7 +613,17 @@ Runtime.prototype._mergeWithManifestFile = function(manifestFile) {
 		}
 	}
 }
+
+Runtime.prototype.setBaseDir = function(dir) {
+	this.baseDir = dir
+}
+
+Runtime.prototype.pathFromBaseDir = function(dir) {
+	return path.join(this.baseDir, dir)
+}
+
 Runtime.prototype.loadFromManifestFile = function(manifestFile, initializationCallback) {
+	this.setBaseDir(path.dirname(manifestFile))
 	this._mergeWithManifestFile(manifestFile)
 	this.load(initializationCallback)
 	return true
@@ -619,7 +649,10 @@ Runtime.prototype.loadManifestModules = function() {
 Prepares the Runtime to Run. Since the introduction of initializer expressions, you can provide a callback to know when the initialization finishes. If no callback is provided no initialization will be executed.
 */
 Runtime.prototype.load = function(initializationCallback) {
-	this.registerInitializersDir(path.resolve(constants.INITIALIZERS_DIR_NAME))
+	this.scriptDirectories.push({
+		path: this.pathFromBaseDir('.')
+	})
+	this.registerInitializersDir(this.pathFromBaseDir(constants.INITIALIZERS_DIR_NAME))
 	var self = this
 	this.loadManifestModules()
 	
@@ -878,4 +911,7 @@ module.exports.exportTestOnlyFunctions = function() {
 	module.exports._testOnly_getHint = getHint
 	
 }
-
+module.exports.IgnoreOutput = function() {
+	
+}
+module.exports.PackageInfo = JSON.parse(fs.readFileSync(path.join(__dirname,"../package.json"), 'utf8'))

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-module.exports = require('./src/core.js')`
`2`		`-module.exports.CommandLine = require('./src/CommandLine.js')`
	`1`	`+module.exports = require('./src/core.js')`