Merge pull request #41 from rnpm/fix/handle-missing-list

Alexey · Alexey · commit 6205faf5fe8c · 2016-03-20T10:52:23.000+01:00
Handle missing Info.plist better
diff --git a/src/ios/copyAssets.js b/src/ios/copyAssets.js
@@ -5,7 +5,7 @@ const log = require('npmlog');
 const plistParser = require('plist');
 const groupFilesByType = require('../groupFilesByType');
 const createGroup = require('./createGroup');
-const getPlistPath = require('./getPlistPath');
+const getPlist = require('./getPlist');
 
 /**
  * This function works in a similar manner to its Android version,
@@ -14,12 +14,12 @@ const getPlistPath = require('./getPlistPath');
 module.exports = function linkAssetsIOS(files, projectConfig) {
   const project = xcode.project(projectConfig.pbxprojPath).parseSync();
   const assets = groupFilesByType(files);
-  const plistPath = path.join(projectConfig.sourceDir, getPlistPath(project));
+  const plist = getPlist(project, projectConfig.sourceDir);
 
-  if (!fs.existsSync(plistPath)) {
+  if (!plist) {
     return log.error(
       'ERRPLIST',
-      `Could not locate Info.plist file at ${plistPath}. Check if your project has Info.plist set properly`
+      `Could not locate Info.plist. Check if your project has 'INFOPLIST_FILE' set properly`
     );
   }
 
@@ -32,10 +32,6 @@ module.exports = function linkAssetsIOS(files, projectConfig) {
     );
   }
 
-  const plist = plistParser.parse(
-    fs.readFileSync(plistPath, 'utf-8')
-  );
-
   const fonts = (assets.font || [])
     .map(asset =>
       project.addResourceFile(
diff --git a/src/ios/getBuildProperty.js b/src/ios/getBuildProperty.js
@@ -0,0 +1,18 @@
+/**
+ * Gets build property from the main target build section
+ *
+ * It differs from the project.getBuildProperty exposed by xcode in the way that:
+ * - it only checks for build property in the main target `Debug` section
+ * - `xcode` library iterates over all build sections and because it misses
+ * an early return when property is found, it will return undefined/wrong value
+ * when there's another build section typically after the one you want to access
+ * without the property defined (e.g. CocoaPods sections appended to project
+ * miss INFOPLIST_FILE), see: https://github.com/alunny/node-xcode/blob/master/lib/pbxProject.js#L1765
+ */
+module.exports = function getBuildProperty(project, prop) {
+  const target = project.getFirstTarget().firstTarget;
+  const config = project.pbxXCConfigurationList()[target.buildConfigurationList];
+  const buildSection = project.pbxXCBuildConfigurationSection()[config.buildConfigurations[0].value];
+
+  return buildSection.buildSettings[prop];
+};
diff --git a/src/ios/getPlist.js b/src/ios/getPlist.js
@@ -0,0 +1,30 @@
+const getBuildProperty = require('./getBuildProperty');
+const plistParser = require('plist');
+const path = require('path');
+const fs = require('fs');
+
+/**
+ * Returns Info.plist located in the iOS project
+ *
+ * Returns `null` if INFOPLIST_FILE is not specified.
+ */
+module.exports = function getPlistPath(project, sourceDir) {
+  const plistFile = getBuildProperty(project, 'INFOPLIST_FILE');
+
+  if (!plistFile) {
+    return null;
+  }
+
+  const plistPath = path.join(
+    sourceDir,
+    plistFile.replace(/"/g, '').replace('$(SRCROOT)', '')
+  );
+
+  if (!fs.existsSync(plistPath)) {
+    return null;
+  }
+
+  return plistParser.parse(
+    fs.readFileSync(plistPath, 'utf-8')
+  );
+};
diff --git a/src/ios/getPlistPath.js b/src/ios/getPlistPath.js
diff --git a/src/ios/unlinkAssets.js b/src/ios/unlinkAssets.js
@@ -5,7 +5,7 @@ const log = require('npmlog');
 const plistParser = require('plist');
 const groupFilesByType = require('../groupFilesByType');
 const createGroup = require('./createGroup');
-const getPlistPath = require('./getPlistPath');
+const getPlist = require('./getPlist');
 const diff = require('lodash.difference');
 
 /**
@@ -15,12 +15,12 @@ const diff = require('lodash.difference');
 module.exports = function unlinkAssetsIOS(files, projectConfig) {
   const project = xcode.project(projectConfig.pbxprojPath).parseSync();
   const assets = groupFilesByType(files);
-  const plistPath = path.join(projectConfig.sourceDir, getPlistPath(project));
+  const plist = getPlist(project, projectConfig.sourceDir);
 
-  if (!fs.existsSync(plistPath)) {
+  if (!plist) {
     return log.error(
       'ERRPLIST',
-      `Could not locate Info.plist file at ${plistPath}. Check if your project has Info.plist set properly`
+      `Could not locate Info.plist file. Check if your project has 'INFOPLIST_FILE' set properly`
     );
   }
 
@@ -31,10 +31,6 @@ module.exports = function unlinkAssetsIOS(files, projectConfig) {
     );
   }
 
-  const plist = plistParser.parse(
-    fs.readFileSync(plistPath, 'utf-8')
-  );
-
   const fonts = (assets.font || [])
     .map(asset =>
       project.removeResourceFile(
diff --git a/src/link.js b/src/link.js
@@ -21,7 +21,7 @@ const promisify = (func) => () => new Promise((resolve, reject) =>
  */
 const getProjectDependencies = () => {
   const pjson = require(path.join(process.cwd(), './package.json'));
-  return Object.keys(pjson.dependencies).filter(name => name !== 'react-native');
+  return Object.keys(pjson.dependencies || {}).filter(name => name !== 'react-native');
 };
 
 const linkDependency = (project, dependency) => {
diff --git a/test/ios/getBuildProperty.spec.js b/test/ios/getBuildProperty.spec.js
@@ -0,0 +1,19 @@
+const chai = require('chai');
+const expect = chai.expect;
+const xcode = require('xcode');
+const getBuildProperty = require('../../src/ios/getBuildProperty');
+
+const project = xcode.project('test/fixtures/project.pbxproj');
+
+describe('ios::getBuildProperty', () => {
+
+  beforeEach(() => {
+    project.parseSync();
+  });
+
+  it('should return build property from main target', () => {
+    const plistPath = getBuildProperty(project, 'INFOPLIST_FILE');
+    expect(plistPath).to.equals('"Basic/Info.plist"');
+  });
+
+});
diff --git a/test/ios/getPlist.spec.js b/test/ios/getPlist.spec.js
@@ -0,0 +1,23 @@
+const chai = require('chai');
+const expect = chai.expect;
+const xcode = require('xcode');
+const getPlist = require('../../src/ios/getPlist');
+
+const project = xcode.project('test/fixtures/project.pbxproj');
+
+describe('ios::getPlist', () => {
+
+  beforeEach(() => {
+    project.parseSync();
+  });
+
+  it('should return null when `.plist` file missing', () => {
+    const plistPath = getPlist(project, process.cwd());
+    expect(plistPath).to.equals(null);
+  });
+
+  it.skip('should return parsed `plist`', () => {
+    // @todo mock fs here
+  });
+
+});
diff --git a/test/ios/getPlistPath.spec.js b/test/ios/getPlistPath.spec.js
