getting bin/launch to work

Author: BryanDonovan

bin/launch

@@ -1,15 +1,13 @@
 #!/usr/bin/env node
 /**
  * Spawns one or more apps on multiple ports listed in apps' settings files.
- * TODO: Allow overriding settings.
- * TODO: This file probably needs review and refactoring.
- * TODO: Accept a 'copies' arg to specify how many instance of each app to launch.
- *       (see sonos-js/app.js for example).
  */
 var clc = require('cli-color');
 var path = require('path');
 var fs = require('fs');
 var spawn = require('child_process').spawn;
+var Settings = require('settings');
+var config = new Settings(require('../config'));
 
 var help = 'Usage: launch [app_name1 [app_name2]](required))';
 var argv = require('optimist')
@@ -27,13 +25,11 @@ if (argv._.length === 0) {
 process.env.NODE_ENV = process.env.NODE_ENV || argv.e || 'dev';
 var ENV = process.env.NODE_ENV;
 
-require('../src/index.js');
+require('../lib');
 
-// TODO: what path and file name for this combined log?
-// Or should it not be combined?
 function start_detached(module_name, app_port) {
-    var out = fs.openSync(__dirname + '/../logs/multi.log', 'a');
-    var err = fs.openSync(__dirname + '/../logs/multi.log', 'a');
+    var out = fs.openSync(__dirname + '/../log/multi.log', 'a');
+    var err = fs.openSync(__dirname + '/../log/multi.log', 'a');
     var start_opts = [module_name, '--port', app_port, '-e', ENV];
     var spawn_opts = {
         detached: true,
@@ -49,9 +45,9 @@ function start_detached(module_name, app_port) {
 function get_app_ports(app_settings) {
     var ports = [];
 
-    if (app_settings && app_settings[ENV] && app_settings[ENV].server && app_settings[ENV].server.port) {
-        var starting_port = app_settings[ENV].server.port;
-        var nbr_of_proxies = app_settings[ENV].server.proxies;
+    if (app_settings && app_settings.port) {
+        var starting_port = app_settings.port;
+        var nbr_of_proxies = app_settings.proxies;
         for (var i = 0; i < nbr_of_proxies; i++) {
             ports.push(starting_port + i);
         }
@@ -60,15 +56,15 @@ function get_app_ports(app_settings) {
     return ports;
 }
 
-argv._.forEach(function(module) {
-    var app_settings = require('../settings/' + module).settings;
+argv._.forEach(function(app_name) {
+    var app_settings = config.apps[app_name];
     var ports = get_app_ports(app_settings);
 
     if (ports.length === 0) {
-        throw new Error("Failed to get port from settings for module: " + module);
+        throw new Error("Failed to get port from settings for app: " + app_name);
     }
 
     ports.forEach(function(app_port) {
-        start_detached(module, app_port);
+        start_detached(app_name, app_port);
     });
 });

bin/start

@@ -14,7 +14,7 @@ var log_red = function(msg) {
 var help = 'Usage: $0 [app_name1, [app_name2]] -e dev';
 var optimist = require('optimist');
 argv = optimist
-    .boolean(['port'])
+    .string(['port'])
     .alias('port', 'p')
     .describe('port', 'port to run server(s) on')
     .string('env')
@@ -34,7 +34,7 @@ var app = require('../lib/app')();
 
 if (port) {
     if (isNaN(parseInt(port, 10))) {
-        throw "Invalid port number";
+        throw new Error("Invalid port number: " + port);
     }
 } else {
     port = 8080;

config.js

@@ -2,6 +2,13 @@ module.exports = {
     common: {
         server: {
             port: 8080
+        },
+
+        apps: {
+            users: {
+                port: 12100,
+                proxies: 2
+            }
         }
     },
 

lib/models/user.js

@@ -1,5 +1,6 @@
 function User(args) {
-    this.id = args.id;
+    this.id = args.id || 123;
+    this.username = args.username;
 }
 
 User.create = function (args, cb) {

lib/server/app_server.js

@@ -9,7 +9,7 @@ var logger = new Logger({
     name: 'app',
     streams: [
         {
-            path: '/tmp/app.log',
+            path: log_path,
             level: 'debug'
         }
     ]
@@ -20,6 +20,7 @@ function AppServer(config, options) {
     self.config = config;
     self.started = false;
 
+    // TODO:
     //var uncaught_exception_handler = require('./uncaught_exception_handler')({app_name: app_name});
     if (!config) { throw new Error("AppServer requires a config object"); }
 

test/acceptance/users/create.acceptance.js

@@ -11,11 +11,12 @@ describe("Feature: User creation", function () {
     context("Scenario: using a username and password", function () {
         context("Given a username does not already exist", function () {
             context("When an API client POSTs to /users with a valid username and password", function () {
+                var params;
                 var response;
                 var raw_res;
 
                 before(function (done) {
-                    var params = {
+                    params = {
                         username: support.random.string(),
                         password: support.random.string()
                     };
@@ -32,8 +33,9 @@ describe("Feature: User creation", function () {
                     assert.strictEqual(raw_res.statusCode, 200);
                 });
 
-                it("And the response data should include the user's ID", function () {
+                it("And the response data should include the user's ID and username", function () {
                     assert.ok(response.data.id);
+                    assert.equal(response.data.username, params.username);
                 });
             });
         });