use getBlueprintRelativeFilePath for ignored files

Author: Kelly Selden

src/get-blueprint-file-path.js

@@ -4,6 +4,12 @@ const fs = require('fs-extra');
 const path = require('path');
 
 async function getBlueprintFilePath(cwd) {
+  let relative = await getBlueprintRelativeFilePath(cwd);
+
+  return path.join(cwd, relative);
+}
+
+async function getBlueprintRelativeFilePath(cwd) {
   let configDir = 'config';
 
   try {
@@ -14,7 +20,8 @@ async function getBlueprintFilePath(cwd) {
     }
   } catch (err) {}
 
-  return path.join(cwd, configDir, 'ember-cli-update.json');
+  return path.join(configDir, 'ember-cli-update.json');
 }
 
 module.exports = getBlueprintFilePath;
+module.exports.getBlueprintRelativeFilePath = getBlueprintRelativeFilePath;

src/index.js

@@ -17,7 +17,7 @@ const saveBlueprint = require('./save-blueprint');
 const loadDefaultBlueprint = require('./load-default-blueprint');
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const stageBlueprintFile = require('./stage-blueprint-file');
-const getBlueprintFilePath = require('./get-blueprint-file-path');
+const { getBlueprintRelativeFilePath } = require('./get-blueprint-file-path');
 const isDefaultBlueprint = require('./is-default-blueprint');
 const findBlueprint = require('./find-blueprint');
 const getBaseBlueprint = require('./get-base-blueprint');
@@ -243,7 +243,7 @@ All blueprints are up-to-date!`;
     codemodsUrl,
     codemodsJson,
     createCustomDiff,
-    ignoredFiles: [await getBlueprintFilePath(cwd)],
+    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)],
     wasRunAsExecutable
   })).promise;
 

src/init.js

@@ -9,7 +9,7 @@ const loadDefaultBlueprintFromDisk = require('./load-default-blueprint-from-disk
 const loadSafeBlueprint = require('./load-safe-blueprint');
 const loadSafeBlueprintFile = require('./load-safe-blueprint-file');
 const stageBlueprintFile = require('./stage-blueprint-file');
-const getBlueprintFilePath = require('./get-blueprint-file-path');
+const { getBlueprintRelativeFilePath } = require('./get-blueprint-file-path');
 const loadBlueprintFile = require('./load-blueprint-file');
 const bootstrap = require('./bootstrap');
 const findBlueprint = require('./find-blueprint');
@@ -106,7 +106,7 @@ module.exports = async function init({
       baseBlueprint,
       endBlueprint: blueprint
     }),
-    ignoredFiles: [await getBlueprintFilePath(cwd)],
+    ignoredFiles: [await getBlueprintRelativeFilePath(cwd)],
     wasRunAsExecutable
   })).promise;
 

src/stage-blueprint-file.js

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

test/fixtures/package-json/config-path/package.json

@@ -0,0 +1,5 @@
+{
+  "ember-addon": {
+    "configPath": "config2"
+  }
+}

test/fixtures/package-json/no-config-path/package.json

@@ -0,0 +1,4 @@
+{
+  "ember-addon": {
+  }
+}

test/fixtures/package-json/no-ember-addon/package.json

@@ -0,0 +1,2 @@
+{
+}

test/integration/get-blueprint-file-path-test.js

@@ -5,31 +5,62 @@ const { expect } = require('../helpers/chai');
 const getBlueprintFilePath = require('../../src/get-blueprint-file-path');
 const path = require('path');
 
+const { getBlueprintRelativeFilePath } = getBlueprintFilePath;
+
 describe(getBlueprintFilePath, function() {
-  it('finds a standard config dir', async function() {
-    let dir = 'test/fixtures/blueprint/app/local-app/local/my-app';
+  it('doesn\'t have an ember-addon key', async function() {
+    let dir = 'test/fixtures/package-json/no-ember-addon';
+    let expected = 'config/ember-cli-update.json';
 
     let filePath = await getBlueprintFilePath(dir);
 
-    expect(path.dirname(filePath)).to.have.basename('config');
-    expect(filePath).to.be.a.path();
+    expect(filePath).to.endWith(path.join(dir, expected));
   });
 
-  it('finds a custom config dir', async function() {
-    let dir = 'test/fixtures/blueprint/app/legacy-app/local/my-app';
+  it('doesn\'t have a custom config dir', async function() {
+    let dir = 'test/fixtures/package-json/no-config-path';
+    let expected = 'config/ember-cli-update.json';
 
     let filePath = await getBlueprintFilePath(dir);
 
-    expect(path.dirname(filePath)).to.not.have.basename('config');
-    expect(filePath).to.be.a.path();
+    expect(filePath).to.endWith(path.join(dir, expected));
   });
 
-  it('falls back if no state file', async function() {
-    let dir = 'test/fixtures/blueprint/addon/legacy-app/local/no-state-file/my-app';
+  it('uses a custom config dir', async function() {
+    let dir = 'test/fixtures/package-json/config-path';
+    let expected = 'config2/ember-cli-update.json';
 
     let filePath = await getBlueprintFilePath(dir);
 
-    expect(path.dirname(filePath)).to.have.basename('config');
-    expect(filePath).to.not.be.a.path();
+    expect(filePath).to.endWith(path.join(dir, expected));
+  });
+
+  describe(getBlueprintRelativeFilePath, function() {
+    it('doesn\'t have an ember-addon key', async function() {
+      let dir = 'test/fixtures/package-json/no-ember-addon';
+      let expected = 'config/ember-cli-update.json';
+
+      let filePath = await getBlueprintRelativeFilePath(dir);
+
+      expect(filePath).to.equal(path.normalize(expected));
+    });
+
+    it('doesn\'t have a custom config dir', async function() {
+      let dir = 'test/fixtures/package-json/no-config-path';
+      let expected = 'config/ember-cli-update.json';
+
+      let filePath = await getBlueprintRelativeFilePath(dir);
+
+      expect(filePath).to.equal(path.normalize(expected));
+    });
+
+    it('uses a custom config dir', async function() {
+      let dir = 'test/fixtures/package-json/config-path';
+      let expected = 'config2/ember-cli-update.json';
+
+      let filePath = await getBlueprintRelativeFilePath(dir);
+
+      expect(filePath).to.equal(path.normalize(expected));
+    });
   });
 });