ember-cli 7.1.0-beta.1 → 7.2.0-alpha.1

package/packages/blueprint-model/utilities/file-info.js

@@ -0,0 +1,170 @@
+'use strict';
+
+const fs = require('fs');
+const util = require('util');
+const { default: chalk } = require('chalk');
+const EditFileDiff = require('./edit-file-diff');
+const EOL = require('os').EOL;
+const rxEOL = new RegExp(EOL, 'g');
+const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
+const hash = require('promise.hash.helper');
+const canEdit = require('./open-editor').canEdit;
+const processTemplate = require('./process-template');
+
+const readFile = util.promisify(fs.readFile);
+const lstat = util.promisify(fs.stat);
+
+function diffHighlight(line) {
+  if (line[0] === '+') {
+    return chalk.green(line);
+  } else if (line[0] === '-') {
+    return chalk.red(line);
+  } else if (/^@@/.test(line)) {
+    return chalk.cyan(line);
+  } else {
+    return line;
+  }
+}
+
+const NOOP = (_) => _;
+class FileInfo {
+  constructor(options) {
+    this.action = options.action;
+    this.outputBasePath = options.outputBasePath;
+    this.outputPath = options.outputPath;
+    this.displayPath = options.displayPath;
+    this.inputPath = options.inputPath;
+    this.templateVariables = options.templateVariables;
+    this.replacer = options.replacer || NOOP;
+    this.ui = options.ui;
+  }
+
+  confirmOverwrite(path) {
+    let promptOptions = {
+      type: 'expand',
+      name: 'answer',
+      default: false,
+      message: `${chalk.red('Overwrite')} ${path}?`,
+      choices: [
+        { key: 'y', name: 'Yes, overwrite', value: 'overwrite' },
+        { key: 'n', name: 'No, skip', value: 'skip' },
+      ],
+    };
+
+    let outputPathIsFile = false;
+    try {
+      outputPathIsFile = fs.statSync(this.outputPath).isFile();
+    } catch (err) {
+      /* ignore */
+    }
+
+    let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
+
+    if (canDiff) {
+      promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
+
+      if (canEdit()) {
+        promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' });
+      }
+    }
+
+    return this.ui.prompt(promptOptions).then((response) => response.answer);
+  }
+
+  displayDiff() {
+    let info = this,
+      { createPatch } = require('diff');
+    return hash({
+      input: this.render(),
+      output: readFile(info.outputPath),
+    }).then((result) => {
+      let diff = createPatch(
+        info.outputPath,
+        result.output.toString().replace(rxEOL, '\n'),
+        result.input.replace(rxEOL, '\n')
+      );
+      let lines = diff.split('\n');
+
+      for (let i = 0; i < lines.length; i++) {
+        info.ui.write(diffHighlight(lines[i] + EOL));
+      }
+    });
+  }
+
+  async render() {
+    if (!this.rendered) {
+      let result = await this._render();
+      this.rendered = this.replacer(result, this);
+    }
+
+    return this.rendered;
+  }
+
+  _render() {
+    let path = this.inputPath;
+    let context = this.templateVariables;
+
+    return readFile(path).then((content) =>
+      lstat(path).then((fileStat) => {
+        if (isBinaryFile(content, fileStat.size)) {
+          return content;
+        } else {
+          try {
+            return processTemplate(content.toString(), context);
+          } catch (err) {
+            err.message += ` (Error in blueprint template: ${path})`;
+            throw err;
+          }
+        }
+      })
+    );
+  }
+
+  checkForConflict() {
+    return this.render().then((input) => {
+      input = input.toString().replace(rxEOL, '\n');
+
+      return readFile(this.outputPath)
+        .then((output) => {
+          output = output.toString().replace(rxEOL, '\n');
+
+          return input === output ? 'identical' : 'confirm';
+        })
+        .catch((e) => {
+          if (e.code === 'ENOENT') {
+            return 'none';
+          }
+
+          throw e;
+        });
+    });
+  }
+
+  confirmOverwriteTask() {
+    let info = this;
+
+    return function () {
+      function doConfirm() {
+        return info.confirmOverwrite(info.displayPath).then((action) => {
+          if (action === 'diff') {
+            return info.displayDiff().then(doConfirm);
+          } else if (action === 'edit') {
+            let editFileDiff = new EditFileDiff({ info });
+            return editFileDiff
+              .edit()
+              .then(() => (info.action = action))
+              .catch(() => doConfirm())
+              .then(() => info);
+          } else {
+            info.action = action;
+            return info;
+          }
+        });
+      }
+
+      return doConfirm();
+    };
+  }
+}
+
+module.exports = FileInfo;

package/packages/blueprint-model/utilities/open-editor.js

@@ -0,0 +1,44 @@
+'use strict';
+
+const spawn = require('child_process').spawn;
+
+function openEditor(file) {
+  if (!openEditor.canEdit()) {
+    throw new Error('EDITOR environment variable is not set');
+  }
+
+  if (!file) {
+    throw new Error('No `file` option provided');
+  }
+
+  let editorArgs = openEditor._env().EDITOR.split(' ');
+  let editor = editorArgs.shift();
+  const args = [file].concat(editorArgs);
+  let editProcess = openEditor._spawn(editor, args, { stdio: 'inherit' });
+
+  return new Promise((resolve, reject) => {
+    editProcess.on('close', (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(
+          new Error(`Spawn('${editor}', [${args.join(',')}]) exited with a non zero error status code: '${code}'`)
+        );
+      }
+    });
+  });
+}
+
+openEditor.canEdit = function () {
+  return openEditor._env().EDITOR !== undefined;
+};
+
+openEditor._env = function () {
+  return process.env;
+};
+
+openEditor._spawn = function () {
+  return spawn.apply(this, arguments);
+};
+
+module.exports = openEditor;

package/packages/blueprint-model/utilities/prepend-emoji.js

@@ -0,0 +1,12 @@
+'use strict';
+
+function supportEmoji() {
+  const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
+  return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
+}
+
+const areEmojiSupported = supportEmoji();
+
+module.exports = function prependEmoji(emoji, msg) {
+  return areEmojiSupported ? `${emoji}  ${msg}` : msg;
+};

package/packages/blueprint-model/utilities/process-template.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = function processTemplate(content, context) {
+  let options = {
+    evaluate: /<%([\s\S]+?)%>/g,
+    interpolate: /<%=([\s\S]+?)%>/g,
+    escape: /<%-([\s\S]+?)%>/g,
+  };
+  return require('lodash/template')(content, options)(context);
+};

package/patches/ember-cli-blueprint-test-helpers.patch

@@ -0,0 +1,15 @@
+diff --git a/lib/helpers/setup.js b/lib/helpers/setup.js
+index c337ec0020f46e0e9ed3f76b325c7d174168a900..29dfd7fb0acd5ae895d470b80be15bf1c8ff9a25 100644
+--- a/lib/helpers/setup.js
++++ b/lib/helpers/setup.js
+@@ -31,7 +31,9 @@ module.exports = function setupTestHooks(scope, options) {
+   }
+ 
+   if (disabledTasks.length) {
+-    let Blueprint = requireFromCLI('lib/models/blueprint');
++    let Blueprint = require('@ember-tooling/blueprint-model', {
++      paths: [options.cliPath]
++    });
+ 
+     before(() => {
+       MockBlueprintTaskFor.disableTasks(Blueprint, disabledTasks);

package/tests/helpers/acceptance.js

@@ -139,11 +139,7 @@ async function createAndInstallTestTargets(projectName, options) {
 
   let result = await applyCommand(command, projectName, '--skip-npm', `--directory=${outputDir.path}`);
 
-  await execa('pnpm', ['install', '--prefer-offline'], {
-    preferLocal: true,
-    cwd: outputDir.path,
-  });
-
+  // we need to link these packages before we try to run pnpm install so it always uses the current version of ember-cli and the sub-packages
   for (let pkg of [
     '.',
     'packages/blueprint-model',
@@ -157,6 +153,11 @@ async function createAndInstallTestTargets(projectName, options) {
     });
   }
 
+  await execa('pnpm', ['install', '--prefer-offline'], {
+    preferLocal: true,
+    cwd: outputDir.path,
+  });
+
   return {
     result,
     cleanup: outputDir.cleanup,