add getBlueprintFilePath for custom config dirs

Author: Kelly Selden

src/bootstrap.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const path = require('path');
-const run = require('./run');
 const getProjectOptions = require('./get-project-options');
 const getPackageName = require('./get-package-name');
 const getPackageVersion = require('./get-package-version');
@@ -10,6 +9,7 @@ const getProjectVersion = require('./get-project-version');
 const saveDefaultBlueprint = require('./save-default-blueprint');
 const saveBlueprint = require('./save-blueprint');
 const loadSafeDefaultBlueprint = require('./load-safe-default-blueprint');
+const stageBlueprintFile = require('./stage-blueprint-file');
 
 module.exports = async function bootstrap() {
   let defaultBlueprint = {
@@ -46,5 +46,5 @@ module.exports = async function bootstrap() {
     });
   }
 
-  await run('git add config/ember-cli-update.json');
+  await stageBlueprintFile(cwd);
 };

src/get-blueprint-file-path.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const fs = require('fs-extra');
+const path = require('path');
+
+async function getBlueprintFilePath(cwd) {
+  let configDir = 'config';
+
+  try {
+    let packageJson = await fs.readJson(path.join(cwd, 'package.json'));
+
+    if (packageJson['ember-addon'] && packageJson['ember-addon'].configPath) {
+      configDir = packageJson['ember-addon'].configPath;
+    }
+  } catch (err) {}
+
+  return path.join(cwd, configDir, 'ember-cli-update.json');
+}
+
+module.exports = getBlueprintFilePath;

src/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const inquirer = require('inquirer');
-const run = require('./run');
 const getProjectOptions = require('./get-project-options');
 const getPackageName = require('./get-package-name');
 const getPackageVersion = require('./get-package-version');
@@ -20,6 +19,8 @@ const saveDefaultBlueprint = require('./save-default-blueprint');
 const checkForBlueprintUpdates = require('./check-for-blueprint-updates');
 const loadSafeDefaultBlueprint = require('./load-safe-default-blueprint');
 const loadSafeBlueprint = require('./load-safe-blueprint');
+const stageBlueprintFile = require('./stage-blueprint-file');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 const toDefault = require('./args').to.default;
 
@@ -197,7 +198,7 @@ All blueprints are up-to-date!`;
     runCodemods,
     codemodsUrl: 'https://raw.githubusercontent.com/ember-cli/ember-cli-update-codemods-manifest/v3/manifest.json',
     createCustomDiff,
-    ignoredFiles: ['config/ember-cli-update.json'],
+    ignoredFiles: [await getBlueprintFilePath(cwd)],
     wasRunAsExecutable
   })).promise;
 
@@ -223,7 +224,7 @@ All blueprints are up-to-date!`;
     }
 
     if (!reset) {
-      await run('git add config/ember-cli-update.json');
+      await stageBlueprintFile(cwd);
     }
   } else {
     let { blueprints } = await loadSafeBlueprintFile(cwd);
@@ -238,7 +239,7 @@ All blueprints are up-to-date!`;
       });
 
       if (!reset) {
-        await run('git add config/ember-cli-update.json');
+        await stageBlueprintFile(cwd);
       }
     }
   }

src/init.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const run = require('./run');
 const getProjectOptions = require('./get-project-options');
 const boilerplateUpdate = require('boilerplate-update');
 const getStartAndEndCommands = require('./get-start-and-end-commands');
@@ -10,6 +9,8 @@ const saveBlueprint = require('./save-blueprint');
 const saveDefaultBlueprint = require('./save-default-blueprint');
 const loadSafeDefaultBlueprint = require('./load-safe-default-blueprint');
 const loadSafeBlueprint = require('./load-safe-blueprint');
+const stageBlueprintFile = require('./stage-blueprint-file');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 module.exports = async function init({
   blueprint: _blueprint,
@@ -59,7 +60,7 @@ module.exports = async function init({
         endBlueprint: blueprint
       });
     },
-    ignoredFiles: ['config/ember-cli-update.json'],
+    ignoredFiles: [await getBlueprintFilePath(cwd)],
     wasRunAsExecutable
   })).promise;
 
@@ -78,7 +79,7 @@ module.exports = async function init({
   }
 
   if (!reset) {
-    await run('git add config/ember-cli-update.json');
+    await stageBlueprintFile(cwd);
   }
 
   return result;

src/load-blueprint-file.js

@@ -1,11 +1,11 @@
 'use strict';
 
 const fs = require('fs-extra');
-const path = require('path');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 async function loadBlueprintFile(cwd) {
   try {
-    return await fs.readJson(path.join(cwd, 'config/ember-cli-update.json'));
+    return await fs.readJson(await getBlueprintFilePath(cwd));
   } catch (err) {}
 }
 

src/save-blueprint-file.js

@@ -2,13 +2,12 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const getBlueprintFilePath = require('./get-blueprint-file-path');
 
 async function saveBlueprintFile(cwd, emberCliUpdateJson) {
-  let configDir = path.join(cwd, 'config');
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
 
-  await fs.ensureDir(configDir);
-
-  let emberCliUpdateJsonPath = path.join(configDir, 'ember-cli-update.json');
+  await fs.ensureDir(path.dirname(emberCliUpdateJsonPath));
 
   await fs.writeJson(emberCliUpdateJsonPath, emberCliUpdateJson, {
     spaces: 2,

src/save.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const run = require('./run');
 const parseBlueprint = require('./parse-blueprint');
 const downloadBlueprint = require('./download-blueprint');
 const saveBlueprint = require('./save-blueprint');
+const stageBlueprintFile = require('./stage-blueprint-file');
 
 module.exports = async function save({
   blueprint,
@@ -22,5 +22,5 @@ module.exports = async function save({
     version: downloadedBlueprint.version
   });
 
-  await run('git add config/ember-cli-update.json');
+  await stageBlueprintFile(cwd);
 };

src/stage-blueprint-file.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const getBlueprintFilePath = require('./get-blueprint-file-path');
+const run = require('./run');
+
+async function stageBlueprintFile(cwd) {
+  let emberCliUpdateJsonPath = await getBlueprintFilePath(cwd);
+
+  await run(`git add ${emberCliUpdateJsonPath}`);
+}
+
+module.exports = stageBlueprintFile;

…ocal/my-app/config/ember-cli-update.json …cal/my-app/config2/ember-cli-update.jsontest/fixtures/blueprint/app/legacy-app/local/my-app/config/ember-cli-update.json renamed to test/fixtures/blueprint/app/legacy-app/local/my-app/config2/ember-cli-update.json test/fixtures/blueprint/app/legacy-app/local/my-app/config/ember-cli-update.json renamed to test/fixtures/blueprint/app/legacy-app/local/my-app/config2/ember-cli-update.json

@@ -2,5 +2,8 @@
   "name": "my-app",
   "version": "0.0.0",
   "description": "",
-  "main": "index.js"
+  "main": "index.js",
+  "ember-addon": {
+    "configPath": "config2"
+  }
 }