Rename "roles" to "units". Put units in their own folders.

lib/cli.js

@@ -72,7 +72,7 @@ program
       this.missingArgument('--storage-url')
     }
 
-    require('./roles/provider')({
+    require('./units/provider')({
       name: options.name
     , killTimeout: 10000
     , heartbeatInterval: options.heartbeatInterval
@@ -155,7 +155,7 @@ program
       this.missingArgument('--storage-url')
     }
 
-    require('./roles/device')({
+    require('./units/device')({
       serial: serial
     , provider: options.provider
     , ports: options.ports
@@ -188,7 +188,7 @@ program
       this.missingArgument('--connect-dev-dealer')
     }
 
-    require('./roles/processor')({
+    require('./units/processor')({
       name: name
     , endpoints: {
         appDealer: options.connectAppDealer
@@ -212,7 +212,7 @@ program
     , Number
     , 10000)
   .action(function(name, options) {
-    require('./roles/reaper')({
+    require('./units/reaper')({
       name: name
     , heartbeatTimeout: options.heartbeatTimeout
     , reapInterval: options.reapInterval
@@ -238,7 +238,7 @@ program
     , String
     , 'tcp://*:7113')
   .action(function(name, options) {
-    require('./roles/triproxy')({
+    require('./units/triproxy')({
       name: name
     , endpoints: {
         pub: options.bindPub
@@ -306,7 +306,7 @@ program
       this.missingArgument('--app-url')
     }
 
-    require('./roles/auth/ldap')({
+    require('./units/auth/ldap')({
       port: options.port
     , secret: options.secret
     , ssid: options.ssid
@@ -354,7 +354,7 @@ program
       this.missingArgument('--app-url')
     }
 
-    require('./roles/auth/mock')({
+    require('./units/auth/mock')({
       port: options.port
     , secret: options.secret
     , ssid: options.ssid
@@ -395,7 +395,7 @@ program
       this.missingArgument('--connect-sub')
     }
 
-    require('./roles/notify/hipchat')({
+    require('./units/notify/hipchat')({
       token: options.token
     , room: options.room
     , priority: options.priority
@@ -458,7 +458,7 @@ program
       this.missingArgument('--storage-plugin-apk-url')
     }
 
-    require('./roles/app')({
+    require('./units/app')({
       port: options.port
     , secret: options.secret
     , ssid: options.ssid
@@ -509,7 +509,7 @@ program
       this.missingArgument('--connect-push')
     }
 
-    require('./roles/websocket')({
+    require('./units/websocket')({
       port: options.port
     , secret: options.secret
     , ssid: options.ssid
@@ -533,7 +533,7 @@ program
     , String
     , os.tmpdir())
   .action(function(options) {
-    require('./roles/storage/temp')({
+    require('./units/storage/temp')({
       port: options.port
     , saveDir: options.saveDir
     })
@@ -561,7 +561,7 @@ program
       this.missingArgument('--storage-url')
     }
 
-    require('./roles/storage/plugins/image')({
+    require('./units/storage/plugins/image')({
       port: options.port
     , storageUrl: options.storageUrl
     , cacheDir: options.cacheDir
@@ -588,7 +588,7 @@ program
       this.missingArgument('--storage-url')
     }
 
-    require('./roles/storage/plugins/apk')({
+    require('./units/storage/plugins/apk')({
       port: options.port
     , storageUrl: options.storageUrl
     , cacheDir: options.cacheDir

lib/roles/device.js

@@ -1,54 +0,0 @@
-var syrup = require('syrup')
-
-var logger = require('../util/logger')
-var lifecycle = require('../util/lifecycle')
-
-module.exports = function(options) {
-  // Show serial number in logs
-  logger.setGlobalIdentifier(options.serial)
-
-  var log = logger.createLogger('device')
-
-  return syrup.serial()
-    // We want to send logs before anything else starts happening
-    .dependency(require('./device/plugins/logger'))
-    .define(function(options) {
-      var log = logger.createLogger('device')
-      log.info('Preparing device')
-      return syrup.serial()
-        .dependency(require('./device/plugins/solo'))
-        .dependency(require('./device/plugins/screenshot'))
-        .dependency(require('./device/plugins/http'))
-        .dependency(require('./device/plugins/service'))
-        .dependency(require('./device/plugins/display'))
-        .dependency(require('./device/plugins/browser'))
-        .dependency(require('./device/plugins/store'))
-        .dependency(require('./device/plugins/clipboard'))
-        .dependency(require('./device/plugins/logcat'))
-        .dependency(require('./device/plugins/shell'))
-        .dependency(require('./device/plugins/touch'))
-        .dependency(require('./device/plugins/install'))
-        .dependency(require('./device/plugins/forward'))
-        .dependency(require('./device/plugins/group'))
-        .dependency(require('./device/plugins/reboot'))
-        .dependency(require('./device/plugins/connect'))
-        .dependency(require('./device/plugins/account'))
-        .dependency(require('./device/plugins/ringer'))
-        .dependency(require('./device/plugins/wifi'))
-        .dependency(require('./device/plugins/sd'))
-        .define(function(options, solo) {
-          if (process.send) {
-            // Only if we have a parent process
-            process.send('ready')
-          }
-          log.info('Fully operational')
-          return solo.poke()
-        })
-        .consume(options)
-    })
-    .consume(options)
-    .catch(function(err) {
-      log.fatal('Setup had an error', err.stack)
-      lifecycle.fatal()
-    })
-}

lib/units/app/index.js

@@ -11,17 +11,17 @@ var Promise = require('bluebird')
 var httpProxy = require('http-proxy')
 var compression = require('compression')
 
-var logger = require('../util/logger')
+var logger = require('../../util/logger')
-var pathutil = require('../util/pathutil')
+var pathutil = require('../../util/pathutil')
-var dbapi = require('../db/api')
+var dbapi = require('../../db/api')
-var datautil = require('../util/datautil')
+var datautil = require('../../util/datautil')
 
-var auth = require('./app/middleware/auth')
+var auth = require('./middleware/auth')
-var deviceIconMiddleware = require('./app/middleware/device-icons')
+var deviceIconMiddleware = require('./middleware/device-icons')
-var browserIconMiddleware = require('./app/middleware/browser-icons')
+var browserIconMiddleware = require('./middleware/browser-icons')
-var appstoreIconMiddleware = require('./app/middleware/appstore-icons')
+var appstoreIconMiddleware = require('./middleware/appstore-icons')
 
-var webpackServerConfig = require('./../../webpack.config').webpackServer
+var webpackServerConfig = require('./../../../webpack.config').webpackServer
 
 module.exports = function(options) {
   var log = logger.createLogger('app')
@@ -48,7 +48,7 @@ module.exports = function(options) {
   }
   else {
     app.use('/static/app/build',
-      require('./app/middleware/webpack')(webpackServerConfig))
+      require('./middleware/webpack')(webpackServerConfig))
   }
 
   app.use('/static/bower_components',

lib/units/device/index.js

@@ -0,0 +1,54 @@
+var syrup = require('syrup')
+
+var logger = require('../../util/logger')
+var lifecycle = require('../../util/lifecycle')
+
+module.exports = function(options) {
+  // Show serial number in logs
+  logger.setGlobalIdentifier(options.serial)
+
+  var log = logger.createLogger('device')
+
+  return syrup.serial()
+    // We want to send logs before anything else starts happening
+    .dependency(require('./plugins/logger'))
+    .define(function(options) {
+      var log = logger.createLogger('device')
+      log.info('Preparing device')
+      return syrup.serial()
+        .dependency(require('./plugins/solo'))
+        .dependency(require('./plugins/screenshot'))
+        .dependency(require('./plugins/http'))
+        .dependency(require('./plugins/service'))
+        .dependency(require('./plugins/display'))
+        .dependency(require('./plugins/browser'))
+        .dependency(require('./plugins/store'))
+        .dependency(require('./plugins/clipboard'))
+        .dependency(require('./plugins/logcat'))
+        .dependency(require('./plugins/shell'))
+        .dependency(require('./plugins/touch'))
+        .dependency(require('./plugins/install'))
+        .dependency(require('./plugins/forward'))
+        .dependency(require('./plugins/group'))
+        .dependency(require('./plugins/reboot'))
+        .dependency(require('./plugins/connect'))
+        .dependency(require('./plugins/account'))
+        .dependency(require('./plugins/ringer'))
+        .dependency(require('./plugins/wifi'))
+        .dependency(require('./plugins/sd'))
+        .define(function(options, solo) {
+          if (process.send) {
+            // Only if we have a parent process
+            process.send('ready')
+          }
+          log.info('Fully operational')
+          return solo.poke()
+        })
+        .consume(options)
+    })
+    .consume(options)
+    .catch(function(err) {
+      log.fatal('Setup had an error', err.stack)
+      lifecycle.fatal()
+    })
+}

lib/units/processor/index.js

@@ -1,11 +1,11 @@
 var zmq = require('zmq')
 
-var logger = require('../util/logger')
+var logger = require('../../util/logger')
-var wire = require('../wire')
+var wire = require('../../wire')
-var wirerouter = require('../wire/router')
+var wirerouter = require('../../wire/router')
-var wireutil = require('../wire/util')
+var wireutil = require('../../wire/util')
-var dbapi = require('../db/api')
+var dbapi = require('../../db/api')
-var lifecycle = require('../util/lifecycle')
+var lifecycle = require('../../util/lifecycle')
 
 module.exports = function(options) {
   var log = logger.createLogger('processor')

lib/units/provider/index.js

@@ -5,12 +5,12 @@ var Promise = require('bluebird')
 var zmq = require('zmq')
 var _ = require('lodash')
 
-var logger = require('../util/logger')
+var logger = require('../../util/logger')
-var wire = require('../wire')
+var wire = require('../../wire')
-var wireutil = require('../wire/util')
+var wireutil = require('../../wire/util')
-var wirerouter = require('../wire/router')
+var wirerouter = require('../../wire/router')
-var procutil = require('../util/procutil')
+var procutil = require('../../util/procutil')
-var lifecycle = require('../util/lifecycle')
+var lifecycle = require('../../util/lifecycle')
 
 module.exports = function(options) {
   var log = logger.createLogger('provider')

lib/units/reaper/index.js

@@ -1,11 +1,11 @@
 var Promise = require('bluebird')
 var zmq = require('zmq')
 
-var logger = require('../util/logger')
+var logger = require('../../util/logger')
-var wire = require('../wire')
+var wire = require('../../wire')
-var wireutil = require('../wire/util')
+var wireutil = require('../../wire/util')
-var dbapi = require('../db/api')
+var dbapi = require('../../db/api')
-var lifecycle = require('../util/lifecycle')
+var lifecycle = require('../../util/lifecycle')
 
 module.exports = function(options) {
   var log = logger.createLogger('reaper')

lib/units/triproxy/index.js

@@ -1,7 +1,7 @@
 var zmq = require('zmq')
 
-var logger = require('../util/logger')
+var logger = require('../../util/logger')
-var lifecycle = require('../util/lifecycle')
+var lifecycle = require('../../util/lifecycle')
 
 module.exports = function(options) {
   var log = logger.createLogger('triproxy')

lib/units/websocket/index.js

@@ -8,15 +8,15 @@ var Promise = require('bluebird')
 var _ = require('lodash')
 var request = Promise.promisifyAll(require('request'))
 
-var logger = require('../util/logger')
+var logger = require('../../util/logger')
-var wire = require('../wire')
+var wire = require('../../wire')
-var wireutil = require('../wire/util')
+var wireutil = require('../../wire/util')
-var wirerouter = require('../wire/router')
+var wirerouter = require('../../wire/router')
-var dbapi = require('../db/api')
+var dbapi = require('../../db/api')
-var datautil = require('../util/datautil')
+var datautil = require('../../util/datautil')
-var cookieSession = require('./websocket/middleware/cookie-session')
+var cookieSession = require('./middleware/cookie-session')
-var ip = require('./websocket/middleware/remote-ip')
+var ip = require('./middleware/remote-ip')
-var auth = require('./websocket/middleware/auth')
+var auth = require('./middleware/auth')
 
 module.exports = function(options) {
   var log = logger.createLogger('websocket')