merge in next

.coveralls.yml

@@ -1 +1 @@
-repo_token: w9HmlMl9558e1LpP9p62YgYutkVE9PqtN
+repo_token: K4pavPyoEIHgj3bxfghHu2YmA8aqrnAnA

.travis.yml

@@ -1,6 +1,4 @@
 language: node_js
 node_js:
-  - 4
-  - 5
-  - 6
   - 7
+  - 8

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-16 Lloyd Brookes <[email protected]>
+Copyright (c) 2013-17 Lloyd Brookes <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bin/cli.js

@@ -1,158 +1,2 @@
 #!/usr/bin/env node
-'use strict'
-const localWebServer = require('../')
-const cliOptions = require('../lib/cli-options')
-const commandLineArgs = require('command-line-args')
-const commandLineUsage = require('command-line-usage')
-const ansi = require('ansi-escape-sequences')
-const loadConfig = require('config-master')
-const path = require('path')
-const os = require('os')
-const arrayify = require('array-back')
-const t = require('typical')
-const flatten = require('reduce-flatten')
-
-const usage = commandLineUsage(cliOptions.usageData)
-const stored = loadConfig('local-web-server')
-let options
-let isHttps = false
-
-try {
-  options = collectOptions()
-} catch (err) {
-  stop([ `[red]{Error}: ${err.message}`, usage ], 1)
-  return
-}
-
-if (options.misc.help) {
-  stop(usage, 0)
-} else if (options.misc.config) {
-  stop(JSON.stringify(options.server, null, '  '), 0)
-} else {
-  const valid = validateOptions(options)
-  if (!valid) {
-    /* gracefully end the process */
-    return
-  }
-
-  const app = localWebServer({
-    static: {
-      root: options.server.directory,
-      options: {
-        hidden: true
-      }
-    },
-    serveIndex: {
-      path: options.server.directory,
-      options: {
-        icons: true,
-        hidden: true
-      }
-    },
-    log: {
-      format: options.server['log-format']
-    },
-    compress: options.server.compress,
-    mime: options.server.mime,
-    forbid: options.server.forbid,
-    spa: options.server.spa,
-    'no-cache': options.server['no-cache'],
-    rewrite: options.server.rewrite,
-    verbose: options.server.verbose,
-    mocks: options.server.mocks
-  })
-
-  app.on('error', err => {
-    if (options.server['log-format']) {
-      console.error(ansi.format(err.message, 'red'))
-    }
-  })
-
-  if (options.server.https) {
-    options.server.key = path.resolve(__dirname, '..', 'ssl', '127.0.0.1.key')
-    options.server.cert = path.resolve(__dirname, '..', 'ssl', '127.0.0.1.crt')
-  }
-
-  if (options.server.key && options.server.cert) {
-    const https = require('https')
-    const fs = require('fs')
-    isHttps = true
-
-    const serverOptions = {
-      key: fs.readFileSync(options.server.key),
-      cert: fs.readFileSync(options.server.cert)
-    }
-
-    const server = https.createServer(serverOptions, app.callback())
-    server.listen(options.server.port, onServerUp)
-  } else {
-    app.listen(options.server.port, onServerUp)
-  }
-}
-
-function stop (msgs, exitCode) {
-  arrayify(msgs).forEach(msg => console.error(ansi.format(msg)))
-  process.exitCode = exitCode
-}
-
-function onServerUp () {
-  let ipList = Object.keys(os.networkInterfaces())
-    .map(key => os.networkInterfaces()[key])
-    .reduce(flatten, [])
-    .filter(iface => iface.family === 'IPv4')
-  ipList.unshift({ address: os.hostname() })
-  ipList = ipList
-    .map(iface => `[underline]{${isHttps ? 'https' : 'http'}://${iface.address}:${options.server.port}}`)
-    .join(', ')
-
-  console.error(ansi.format(
-    path.resolve(options.server.directory) === process.cwd()
-      ? `serving at ${ipList}`
-      : `serving [underline]{${options.server.directory}} at ${ipList}`
-  ))
-}
-
-function collectOptions () {
-  let options = {}
-
-  /* parse command line args */
-  options = commandLineArgs(cliOptions.definitions)
-
-  const builtIn = {
-    port: 8000,
-    directory: process.cwd(),
-    forbid: [],
-    rewrite: []
-  }
-
-  if (options.server.rewrite) {
-    options.server.rewrite = parseRewriteRules(options.server.rewrite)
-  }
-
-  /* override built-in defaults with stored config and then command line args */
-  options.server = Object.assign(builtIn, stored, options.server)
-  return options
-}
-
-function parseRewriteRules (rules) {
-  return rules && rules.map(rule => {
-    const matches = rule.match(/(\S*)\s*->\s*(\S*)/)
-    return {
-      from: matches[1],
-      to: matches[2]
-    }
-  })
-}
-
-function validateOptions (options) {
-  let valid = true
-  function invalid (msg) {
-    return `[red underline]{Invalid:} [bold]{${msg}}`
-  }
-
-  if (!t.isNumber(options.server.port)) {
-    stop([ invalid(`--port must be numeric`), usage ], 1)
-    valid = false
-  }
-  return valid
-}
+require('../lib/cli-app').run()