diff --git a/bin/josi b/bin/josi index d02f21b..cdab141 100755 --- a/bin/josi +++ b/bin/josi @@ -28,12 +28,12 @@ var matchingTasks = task ? tasks.getAllMatching(task) : []; if (matchingTasks.length == 1) { var matchedTask = matchingTasks[0]; if (!utilities.cwdContainsApp() && matchedTask.appOnly) { - sys.puts('ERROR: can only execute the task "' + matchedTask.name + '" in a directory containing a Josi app.'); + sys.puts('ERROR: can only execute the task "' + matchedTask.name + '" in a directory containing a josi app.'); } else { matchedTask.execute(opts, tasks.tasks); } } else if (matchingTasks.length > 1) { - sys.puts('"' + task + '" is not a Josi command, did you mean one of these?'); + sys.puts('"' + task + '" is not a josi command, did you mean one of these?'); matchingTasks.forEach(function(t) { sys.puts('\t' + t.name); }); diff --git a/examples/hello/controllers/home.js b/examples/hello/controllers/home.js index 8265322..2946fca 100644 --- a/examples/hello/controllers/home.js +++ b/examples/hello/controllers/home.js @@ -2,5 +2,7 @@ var actionresults = require('josi/actionresults'); var redirect = actionresults.redirect; var view = actionresults.view; +a.fail(); + this.index = function() { return view({ title: 'A Title', name: 'Kate' }); }; this.redir = function() { return redirect('/product/details/1'); } diff --git a/lib/josi/package.js b/lib/josi/package.js index 2eb4ed3..706c29a 100644 --- a/lib/josi/package.js +++ b/lib/josi/package.js @@ -1,3 +1,3 @@ -this.name = 'Josi'; +this.name = 'josi'; this.version = '0.1'; this.author = 'Matt Lee - @thatismatt'; diff --git a/lib/josi/tasks/create.js b/lib/josi/tasks/create.js index a0512cf..535187d 100644 --- a/lib/josi/tasks/create.js +++ b/lib/josi/tasks/create.js @@ -9,13 +9,13 @@ this.task = { execute: function(opts) { var appName = opts.name; if (utilities.fileOrDirectoryExists(appName)) { - sys.puts('Can\'t create a new Josi app with the name "' + appName + '",' + + sys.puts('Can\'t create a new josi app with the name "' + appName + '",' + ' as a file or directory with that name already exists.'); return; } - sys.puts('Creating Josi app...'); + sys.puts('Creating app...'); createApp(appName); - sys.puts('Josi app created. Type "cd ' + appName + '; josi run" to start the web server.'); + sys.puts('App created. Type "cd ' + appName + '; josi run" to start the web server.'); }, } @@ -59,7 +59,7 @@ var createController = function(appName, controllerName) { '', 'this.index = function() {', ' return view({', - ' title: \'' + appName + ' - A Josi App\',', + ' title: \'' + appName + ' - a josi app\',', ' name: \'' + appName + '\'', ' });', '};', '' diff --git a/lib/josi/tasks/run.js b/lib/josi/tasks/run.js index 9580632..86cd5bb 100644 --- a/lib/josi/tasks/run.js +++ b/lib/josi/tasks/run.js @@ -10,7 +10,7 @@ this.task = { var port = parseInt(opts.port) || 8080; var server = new Server(process.cwd()); server.listen(port); - sys.puts('Josi server started on http://localhost:' + port + '/.'); + sys.puts('josi server started on http://localhost:' + port + '/.'); sys.puts('ctrl-c to stop.'); } };