Merges latest from next into templates branch

Author: philnash

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-twilio-function",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.5",
   "description": "A CLI tool to generate a new Twilio Function using that can be run locally with twilio-run.",
   "bin": "./bin/create-twilio-function",
   "main": "./src/create-twilio-function.js",
@@ -34,8 +34,10 @@
     "ora": "^3.2.0",
     "pkg-install": "^1.0.0",
     "twilio-run": "^2.0.0-beta.12",
-    "yargs": "^12.0.5",
-    "rimraf": "^2.6.3"
+    "rimraf": "^2.6.3",
+    "window-size": "^1.1.1",
+    "wrap-ansi": "^6.0.0",
+    "yargs": "^12.0.5"
   },
   "engines": {
     "node": ">=8.0.0"

src/cli.js

@@ -1,6 +1,6 @@
 const yargs = require('yargs');
-const { handler, describe, cliInfo } = require('./command');
 const listTemplates = require('./commands/list-templates');
+const DefaultCommand = require('./command');
 
 function cli(cwd) {
   yargs.help();
@@ -9,20 +9,8 @@ function cli(cwd) {
   yargs.alias('v', 'version');
 
   yargs.default('path', cwd);
-
-  yargs.usage(describe);
-  yargs.command(
-    '$0 <name>',
-    describe,
-    command => {
-      command.positional('name', {
-        describe: 'Name of your project.',
-        type: 'string'
-      });
-      command.options(cliInfo.options);
-    },
-    argv => handler(argv)
-  );
+  yargs.usage(DefaultCommand.describe);
+  yargs.command(DefaultCommand);
   yargs.command({
     command: 'list-templates',
     desc: 'List the available templates you can create a project with.',

src/command.js

@@ -1,4 +1,7 @@
-const createTwilioFunction = require('./create-twilio-function');
+const handler = require('./create-twilio-function');
+
+const command = '$0 <name>';
+const describe = 'Creates a new Twilio Function project';
 
 const cliInfo = {
   options: {
@@ -32,8 +35,18 @@ const cliInfo = {
   }
 };
 
+const builder = command => {
+  command.positional('name', {
+    describe: 'Name of your project.',
+    type: 'string'
+  });
+  command.options(cliInfo.options);
+};
+
 module.exports = {
-  describe: 'Creates a new Twilio Function project',
-  handler: createTwilioFunction,
-  cliInfo: cliInfo
+  command,
+  describe,
+  handler,
+  cliInfo,
+  builder
 };

src/create-twilio-function/success-message.js

@@ -1,22 +1,28 @@
 const { getPackageManager } = require('pkg-install');
 const chalk = require('chalk');
+const windowSize = require('window-size');
+const wrap = require('wrap-ansi');
 
 async function successMessage(config) {
   const packageManager = await getPackageManager({ cwd: process.cwd() });
-  return chalk`{green Success!}
+  return wrap(
+    chalk`{green Success!}
 
-  Created {bold ${config.name}} at ${config.path}
+Created {bold ${config.name}} at {bold ${config.path}}
 
-  Inside that directory, you can run the following command:
+Inside that directory, you can run the following command:
 
-  {blue ${packageManager} start}
-    Serves all functions in the ./functions subdirectory and assets in the
-    ./assets directory
+{blue ${packageManager} start}
+  Serves all functions in the ./functions subdirectory and assets in the
+  ./assets directory
 
-  Get started by running:
+Get started by running:
 
-  {blue cd ${config.name}}
-  {blue ${packageManager} start}`;
+{blue cd ${config.name}}
+{blue ${packageManager} start}`,
+    windowSize.get().width - 8,
+    { trim: false, hard: true }
+  );
 }
 
 module.exports = successMessage;

src/create-twilio-function/versions.js

@@ -1,4 +1,4 @@
 module.exports = {
-  twilioRun: '^2.0.0-beta.11',
+  twilioRun: '2.* || >2.0.0-rc',
   node: '8.10.0'
 };

tests/create-twilio-function.test.js

@@ -12,6 +12,7 @@ const mkdir = promisify(fs.mkdir);
 const stat = promisify(fs.stat);
 const readdir = promisify(fs.readdir);
 
+jest.mock('window-size', () => ({ get: () => ({ width: 80 }) }));
 jest.mock('inquirer');
 jest.mock('ora');
 jest.mock('boxen', () => {

tests/success-message.test.js

@@ -3,6 +3,7 @@ const chalk = require('chalk');
 const successMessage = require('../src/create-twilio-function/success-message');
 
 jest.mock('pkg-install');
+jest.mock('window-size', () => ({ get: () => ({ width: 80 }) }));
 
 describe('successMessage', () => {
   test('creates a success message based on the package manager', async () => {
@@ -15,7 +16,7 @@ describe('successMessage', () => {
     expect(message).toEqual(expect.stringContaining('yarn start'));
     expect(message).toEqual(
       expect.stringContaining(
-        chalk`Created {bold ${config.name}} at ${config.path}`
+        chalk`Created {bold ${config.name}} at {bold ${config.path}}`
       )
     );
   });