CLI modularized, express injection allowed (#576)

* CLI modularized, express injection allowed

* rename cli() to startCli()

Author: tomasklapka

bin/lib/cli.js

@@ -0,0 +1,14 @@
+const program = require('commander')
+const packageJson = require('../../package.json')
+const loadInit = require('./init')
+const loadStart = require('./start')
+
+module.exports = function startCli (server) {
+  program.version(packageJson.version)
+
+  loadInit(program)
+  loadStart(program, server)
+
+  program.parse(process.argv)
+  if (program.args.length === 0) program.help()
+}

bin/lib/start.js

@@ -6,7 +6,7 @@ const extend = require('extend')
 const packageJson = require('../../package.json')
 const colors = require('colors/safe')
 
-module.exports = function (program) {
+module.exports = function (program, server) {
   const start = program
     .command('start')
     .description('run the Solid server')
@@ -38,12 +38,12 @@ module.exports = function (program) {
         })
       }
 
-      bin(argv)
+      bin(argv, server)
     })
   })
 }
 
-function bin (argv) {
+function bin (argv, server) {
   if (!argv.email) {
     argv.email = {
       host: argv['emailHost'],
@@ -117,7 +117,7 @@ function bin (argv) {
   const solid = require('../../')
   let app
   try {
-    app = solid.createServer(argv)
+    app = solid.createServer(argv, server)
   } catch (e) {
     if (e.code === 'EACCES') {
       console.log(colors.red.bold('ERROR'), 'You need root privileges to start on this port')

bin/solid

@@ -1,15 +1,3 @@
 #!/usr/bin/env node
-
-var program = require('commander')
-var packageJson = require('../package.json')
-var loadInit = require('./lib/init')
-var loadStart = require('./lib/start')
-
-program
-  .version(packageJson.version)
-
-loadInit(program)
-loadStart(program)
-
-program.parse(process.argv)
-if (program.args.length === 0) program.help()
+const startCli = require('./lib/cli')
+startCli()

index.js

@@ -1,2 +1,3 @@
 module.exports = require('./lib/create-app')
 module.exports.createServer = require('./lib/create-server')
+module.exports.startCli = require('./bin/lib/cli')