Home Explore Help
Register Sign In
shepheb
/
amber
forked from amber/amber
1
0
Fork 0
Files
Browse Source

Merge pull request #733 from mkroehnert/cli

Amber CLI: JavaScript cleanup + enhanced error reporting for 'amber serve'
Nicolas Petton 11 years ago
parent
2510ded92b d69ba7c719
commit
0d0b221dfc
5 changed files with 333 additions and 370 deletions
Unified View Show Diff Stats
  1. 145 171
      cli/js/AmberCli.js
  2. 11 4
      cli/st/AmberCli.st
  3. 158 178
      cli/support/amber-cli.js
  4. 7 5
      cli/support/amberc-cli.js
  5. 12 12
      cli/support/amberc.js

File diff suppressed because it is too large
+ 145 - 171
cli/js/AmberCli.js


+ 11 - 4
cli/st/AmberCli.st
View File 

@@ -169,7 +169,9 @@ username: aUsername
 
 
 
 checkDirectoryLayout
 
 checkDirectoryLayout
 
 	(fs existsSync: self basePath, 'index.html') ifFalse: [
 
 	(fs existsSync: self basePath, 'index.html') ifFalse: [
 
-		console warn: 'Warning: project directory does not contain index.html'].
 
+		console warn: 'Warning: project directory does not contain index.html.'.
 
+		console warn: '    You can specify the directory containing index.html with --base-path.'.].
 
+		console warn: '    You can also specify a custom error page with --fallback-page.'.
 
 	(fs existsSync: self basePath, 'st') ifFalse: [
 
 	(fs existsSync: self basePath, 'st') ifFalse: [
 
 		console warn: 'Warning: project directory is missing an "st" directory'].
 
 		console warn: 'Warning: project directory is missing an "st" directory'].
 
 	(fs existsSync: self basePath, 'js') ifFalse: [
 
 	(fs existsSync: self basePath, 'js') ifFalse: [
 
@@ -309,7 +311,7 @@ respondFileNamed: aFilename to: aResponse
 
 		ex notNil 
 		ex notNil 
 			ifTrue: [
 
 			ifTrue: [
 
 				console log: filename, ' does not exist'.
 
 				console log: filename, ' does not exist'.
 
-				self respondInternalErrorTo: aResponse]
 
+				self respondNotFoundTo: aResponse]
 
 			ifFalse: [
 
 			ifFalse: [
 
 				type := self class mimeTypeFor: filename.
 
 				type := self class mimeTypeFor: filename.
 
 				type = 'application/javascript'
 
 				type = 'application/javascript'
 
@@ -337,8 +339,13 @@ respondNotCreatedTo: aResponse
 
 respondNotFoundTo: aResponse
 
 respondNotFoundTo: aResponse
 
 	self fallbackPage isNil ifFalse: [^self respondFileNamed: self fallbackPage to: aResponse].
 
 	self fallbackPage isNil ifFalse: [^self respondFileNamed: self fallbackPage to: aResponse].
 
 	aResponse 
 	aResponse 
-		writeHead: 404 options: #{'Content-Type' -> 'text/plain'};
 
-		write: '404 Not found';
 
+		writeHead: 404 options: #{'Content-Type' -> 'text/html'};
 
+		write: '<html><body><p>404 Not found</p>';
 
+		write: '<p>Did you forget to put an index.html file into the directory which is served by "bin/amber serve"? To solve this you can:<ul>';
 
+		write: '<li>create an index.html in the served directory.</li>';
 
+		write: '<li>can also specify the location of a page to display instead of this error page with the "--fallback-page" option.</li>';
 
+		write: '<li>change the directory to be served with the "--base-path" option.</li>';
 
+		write: '</ul></p></body></html>';
 
 		end
 
 		end
 
 !
 
 !

File diff suppressed because it is too large
+ 158 - 178
cli/support/amber-cli.js


+ 7 - 5
cli/support/amberc-cli.js
View File 

@@ -86,8 +86,8 @@ function handle_options(optionsArray) {
 
 						// Will end up being the last non js/st argument
 
 						// Will end up being the last non js/st argument
 
 						programName.push(currentItem);
 
 						programName.push(currentItem);
 
 						break;
 
 						break;
 
-				};
 
-		};
 
+				}
 
+		}
 
 		currentItem = optionsArray.shift();
 
 		currentItem = optionsArray.shift();
 
 	}
 
 	}
 
 
 
@@ -97,7 +97,7 @@ function handle_options(optionsArray) {
 
 		defaults.program = programName[0];
 
 		defaults.program = programName[0];
 
 	}
 
 	}
 
 	return defaults;
 
 	return defaults;
 
-};
 
+}
 
 
 
 
 
 // print available flags
 
 // print available flags
 
@@ -184,5 +184,7 @@ function print_usage() {
 
 		'',
 
 		'',
 
 		'        amberc -M main.js myboot.js myKernel.js Cat1.st Cat2.st Program',
 
 		'        amberc -M main.js myboot.js myKernel.js Cat1.st Cat2.st Program',
 
 	];
 
 	];
 
-	usage.forEach(function (line) { console.log(line); });
 
-};
 
+	usage.forEach(function (line) {
 
+        console.log(line);
 
+	});
 
+}

+ 12 - 12
cli/support/amberc.js
View File 

@@ -2,8 +2,10 @@
 
  * This is a "compiler" for Amber code.
 
  * This is a "compiler" for Amber code.
 
  * Put the following code into compiler.js:
 
  * Put the following code into compiler.js:
 
  *     var amberc = require('amberc');
 
  *     var amberc = require('amberc');
 
- *     var compiler = new amberc.Compiler('path/to/amber', ['/optional/path/to/compiler.jar]);
 
- *     compiler.main();
 
+ *     var compiler = new amberc.Compiler('path/to/amber');
 
+ *     var options = amberc.createDefaults();
 
+ *     // edit options entries
 
+ *     compiler.main(options);
 
  *
 
  *
 
  * Execute 'node compiler.js' without arguments or with -h / --help for help.
 
  * Execute 'node compiler.js' without arguments or with -h / --help for help.
 
  */
 
  */
 
@@ -109,10 +111,10 @@ Combo.prototype = {
 
 			self.check(id, arguments);
 
 			self.check(id, arguments);
 
 		};
 
 		};
 
 	},
 
 	},
 
-	check: function (id, arguments) {
 
-		this.results[id] = Array.prototype.slice.call(arguments);
 
+	check: function (id, theArguments) {
 
+		this.results[id] = Array.prototype.slice.call(theArguments);
 
 		this.items--;
 
 		this.items--;
 
-		if (this.items == 0) {
 
+		if (this.items === 0) {
 
 			this.callback.apply(this, this.results);
 
 			this.callback.apply(this, this.results);
 
 		}
 
 		}
 
 	}
 
 	}
 
@@ -180,7 +182,7 @@ AmberC.prototype.main = function(configuration, finished_callback) {
 
 		configuration.finished_callback = finished_callback;
 
 		configuration.finished_callback = finished_callback;
 
 	}
 
 	}
 
 
 
-	if (configuration.amd_namespace.length == 0) {
 
+	if (configuration.amd_namespace.length === 0) {
 
 		configuration.amd_namespace = 'amber_core';
 
 		configuration.amd_namespace = 'amber_core';
 
 	}
 
 	}
 
 
 
@@ -210,7 +212,7 @@ AmberC.prototype.check_configuration_ok = function(configuration) {
 
 		throw new Error('AmberC.check_configuration_ok(): missing configuration object');
 
 		throw new Error('AmberC.check_configuration_ok(): missing configuration object');
 
 	}
 
 	}
 
 
 
-	if (0 === configuration.jsFiles.length && 0 === configuration.stFiles.lenght) {
 
+	if (0 === configuration.jsFiles.length && 0 === configuration.stFiles.length) {
 
 		throw new Error('AmberC.check_configuration_ok(): no files to compile/link specified in configuration object');
 
 		throw new Error('AmberC.check_configuration_ok(): no files to compile/link specified in configuration object');
 
 	}
 
 	}
 
 	return true;
 
 	return true;
 
@@ -387,7 +389,7 @@ AmberC.prototype.resolve_compiler = function(callback) {
 
 		});
 
 		});
 
 		callback(compilerFiles);
 
 		callback(compilerFiles);
 
 	});
 
 	});
 
-	var self = this
 
+	var self = this;
 
 	compiler_files.forEach(function(file) {
 
 	compiler_files.forEach(function(file) {
 
 		self.resolve_js(file, compiler_resolved.add());
 
 		self.resolve_js(file, compiler_resolved.add());
 
 	});
 
 	});
 
@@ -424,7 +426,7 @@ AmberC.prototype.create_compiler = function(compilerFilesArray) {
 
 		console.log('Compiler loaded');
 
 		console.log('Compiler loaded');
 
 		self.defaults.smalltalk.ErrorHandler._setCurrent_(self.defaults.smalltalk.RethrowErrorHandler._new());
 
 		self.defaults.smalltalk.ErrorHandler._setCurrent_(self.defaults.smalltalk.RethrowErrorHandler._new());
 
 
 
-		if(0 != self.defaults.jsGlobals.length) {
 
+		if(0 !== self.defaults.jsGlobals.length) {
 
 			var jsGlobalVariables = self.defaults.smalltalk.globalJsVariables;
 
 			var jsGlobalVariables = self.defaults.smalltalk.globalJsVariables;
 
 			jsGlobalVariables.push.apply(jsGlobalVariables, self.defaults.jsGlobals);
 
 			jsGlobalVariables.push.apply(jsGlobalVariables, self.defaults.jsGlobals);
 
 		}
 
 		}
 
@@ -444,7 +446,7 @@ AmberC.prototype.create_compiler = function(compilerFilesArray) {
 
  * Followed by category_export().
 
  * Followed by category_export().
 
  */
 
  */
 
 AmberC.prototype.compile = function() {
 
 AmberC.prototype.compile = function() {
 
-	console.log('Compiling collected .st files')
 
+	console.log('Compiling collected .st files');
 
 	// import .st files
 
 	// import .st files
 
 	var self = this;
 
 	var self = this;
 
 	var imports = new Combo(function() {
 
 	var imports = new Combo(function() {
 
@@ -491,7 +493,6 @@ AmberC.prototype.category_export = function() {
 
 		jsFile = path.join(jsFilePath, jsFile);
 
 		jsFile = path.join(jsFilePath, jsFile);
 
 		defaults.compiled.push(jsFile);
 
 		defaults.compiled.push(jsFile);
 
 		var smalltalk = defaults.smalltalk;
 
 		var smalltalk = defaults.smalltalk;
 
-		var pluggableExporter = smalltalk.PluggableExporter;
 
 		var packageObject = smalltalk.Package._named_(category);
 
 		var packageObject = smalltalk.Package._named_(category);
 
 		packageObject._transport()._namespace_(defaults.amd_namespace);
 
 		packageObject._transport()._namespace_(defaults.amd_namespace);
 
 		fs.writeFile(jsFile, smalltalk.String._streamContents_(function (stream) {
 
 		fs.writeFile(jsFile, smalltalk.String._streamContents_(function (stream) {
 
@@ -535,7 +536,6 @@ AmberC.prototype.verify = function() {
 
  */
 
  */
 
 AmberC.prototype.compose_js_files = function() {
 
 AmberC.prototype.compose_js_files = function() {
 
 	var defaults = this.defaults;
 
 	var defaults = this.defaults;
 
-	var self = this;
 
 	var programFile = defaults.program;
 
 	var programFile = defaults.program;
 
 	if (undefined === programFile) {
 
 	if (undefined === programFile) {
 
 		return;
 
 		return;

Some files were not shown because too many files changed in this diff