.editorconfig

@@ -7,8 +7,5 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.md]
-trim_trailing_whitespace = false
-
 [Makefile]
 indent_style = tab

.gitattributes

@@ -1 +1,2 @@
 * text=auto
+*.js text eol=lf

.gitignore

@@ -1,2 +1,3 @@
 node_modules
 coverage
+.nyc_output/

.travis.yml

@@ -1,11 +1,8 @@
 sudo: false
 language: node_js
 node_js:
-  - stable
-  - v5
-  - v4
-  - v0.10
-  - v0.12
+  - '6'
+  - '4'
 before_script:
   - export NODE_PATH="$NVM_PATH/../node_modules"
 env:

benchmark/env.js

@@ -1,9 +1,9 @@
-/*global suite, bench */
+/* global suite, bench */
 'use strict';
-var yeoman = require('..');
+const yeoman = require('..');
 
-suite('Environment', function () {
-  bench('#lookup()', function (done) {
+suite('Environment', () => {
+  bench('#lookup()', done => {
     yeoman.createEnv().lookup(done);
   });
 });

lib/adapter.js

@@ -1,9 +1,9 @@
 'use strict';
-
-var inquirer = require('inquirer');
-var diff = require('diff');
-var chalk = require('chalk');
-var logger = require('./util/log');
+const _ = require('lodash');
+const inquirer = require('inquirer');
+const diff = require('diff');
+const chalk = require('chalk');
+const logger = require('./util/log');
 
 /**
  * `TerminalAdapter` is the default implementation of `Adapter`, an abstraction
@@ -13,66 +13,78 @@ var logger = require('./util/log');
  *
  * @constructor
  */
-var TerminalAdapter = module.exports = function TerminalAdapter() {
-  this.prompt = inquirer.createPromptModule();
-};
+class TerminalAdapter {
+  constructor() {
+    this.promptModule = inquirer.createPromptModule();
+  }
 
-TerminalAdapter.prototype._colorDiffAdded = chalk.black.bgGreen;
-TerminalAdapter.prototype._colorDiffRemoved = chalk.bgRed;
-TerminalAdapter.prototype._colorLines = function colorLines(name, str) {
-  return str.split('\n').map(function (str) {
-    return this['_colorDiff' + name](str);
-  }, this).join('\n');
-};
+  get _colorDiffAdded() {
+    return chalk.black.bgGreen;
+  }
 
-/**
- * Prompt a user for one or more questions and pass
- * the answer(s) to the provided callback.
- *
- * It shares its interface with `Base.prompt`
- *
- * (Defined inside the constructor to keep interfaces separated between
- * instances)
- *
- * @param {Array} questions
- * @param {Function} callback
- */
-TerminalAdapter.prototype.prompt = function () {};
+  get _colorDiffRemoved() {
+    return chalk.bgRed;
+  }
 
-/**
- * Shows a color-based diff of two strings
- *
- * @param {string} actual
- * @param {string} expected
- */
-TerminalAdapter.prototype.diff = function _diff(actual, expected) {
-  var msg = diff.diffLines(actual, expected).map(function (str) {
-    if (str.added) {
-      return this._colorLines('Added', str.value);
-    }
+  _colorLines(name, str) {
+    return str.split('\n').map(line => this[`_colorDiff${name}`](line)).join('\n');
+  }
 
-    if (str.removed) {
-      return this._colorLines('Removed', str.value);
-    }
+  /**
+   * Prompt a user for one or more questions and pass
+   * the answer(s) to the provided callback.
+   *
+   * It shares its interface with `Base.prompt`
+   *
+   * (Defined inside the constructor to keep interfaces separated between
+   * instances)
+   *
+   * @param {Array} questions
+   * @param {Function} callback
+   */
+  prompt(questions, cb) {
+    const promise = this.promptModule(questions);
+    promise.then(cb || _.noop);
+    return promise;
+  }
 
-    return str.value;
-  }, this).join('');
+  /**
+   * Shows a color-based diff of two strings
+   *
+   * @param {string} actual
+   * @param {string} expected
+   */
+  diff(actual, expected) {
+    let msg = diff.diffLines(actual, expected).map(str => {
+      if (str.added) {
+        return this._colorLines('Added', str.value);
+      }
 
-  // legend
-  msg = '\n' +
-    this._colorDiffRemoved('removed') +
-    ' ' +
-    this._colorDiffAdded('added') +
-    '\n\n' +
-    msg +
-    '\n';
+      if (str.removed) {
+        return this._colorLines('Removed', str.value);
+      }
 
-  console.log(msg);
-  return msg;
-};
+      return str.value;
+    }).join('');
+
+    // Legend
+    msg = '\n' +
+      this._colorDiffRemoved('removed') +
+      ' ' +
+      this._colorDiffAdded('added') +
+      '\n\n' +
+      msg +
+      '\n';
+
+    console.log(msg);
+    return msg;
+  }
+}
 
 /**
  * Logging utility
  * @type {env/log}
  */
 TerminalAdapter.prototype.log = logger();
+
+module.exports = TerminalAdapter;