respect <group> of Plugins

Author: alunny

lib/pbxProject.js

@@ -77,6 +77,7 @@ pbxProject.prototype.addSourceFile = function (path, opt) {
 
     file.uuid = this.generateUuid();
     file.fileRef = this.generateUuid();
+    correctForPluginsPath(file, this);
 
     this.addToPbxBuildFileSection(file);        // PBXBuildFile
     this.addToPbxFileReferenceSection(file);    // PBXFileReference
@@ -90,6 +91,7 @@ pbxProject.prototype.addHeaderFile = function (path, opt) {
     var file = new pbxFile(path, opt);
 
     file.fileRef = this.generateUuid();
+    correctForPluginsPath(file, this);
 
     this.addToPbxFileReferenceSection(file);    // PBXFileReference
     this.addToPluginsPbxGroup(file);            // PBXGroup
@@ -102,6 +104,7 @@ pbxProject.prototype.addResourceFile = function (path, opt) {
 
     file.uuid = this.generateUuid();
     file.fileRef = this.generateUuid();
+    correctForPluginsPath(file, this);
 
     this.addToPbxBuildFileSection(file);        // PBXBuildFile
     this.addToPbxFileReferenceSection(file);    // PBXFileReference
@@ -276,4 +279,14 @@ function longComment(file) {
     return f("%s in %s", file.basename, file.group);
 }
 
+// respect <group> path
+function correctForPluginsPath(file, project) {
+    var r_plugin_dir = /^Plugins\//;
+
+    if (project.pbxGroupByName('Plugins').path)
+        file.path = file.path.replace(r_plugin_dir, '');
+
+    return file;
+}
+
 module.exports = pbxProject;

test/addHeaderFile.js

@@ -54,7 +54,7 @@ exports.addHeaderFile = {
         test.equal(fileRefEntry.fileEncoding, 4);
         test.equal(fileRefEntry.lastKnownFileType, 'sourcecode.c.h');
         test.equal(fileRefEntry.name, 'file.h');
-        test.equal(fileRefEntry.path, 'Plugins/file.h');
+        test.equal(fileRefEntry.path, 'file.h');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
         test.done();

test/addResourceFile.js

@@ -82,6 +82,8 @@ exports.addResourceFile = {
         test.done();
     },
     'should add the PBXFileReference object correctly': function (test) {
+        delete proj.pbxGroupByName('Plugins').path;
+
         var newFile = proj.addResourceFile('Plugins/assets.bundle'),
             fileRefSection = proj.pbxFileReferenceSection(),
             fileRefEntry = fileRefSection[newFile.fileRef];
@@ -126,5 +128,19 @@ exports.addResourceFile = {
         test.equal(sourceObj.comment, 'assets.bundle in Resources');
         test.equal(sourceObj.value, newFile.uuid);
         test.done();
+    },
+    'should remove "Plugins/" from path if group path is set': function (test) {
+        var plugins = proj.pbxGroupByName('Plugins'),
+            newFile;
+
+        plugins.path = '"Test200/Plugins"';
+        newFile = proj.addResourceFile('Plugins/assets.bundle');
+
+        test.equal(newFile.path, 'assets.bundle');
+        test.done();
+    },
+    tearDown: function (callback) {
+        delete proj.pbxGroupByName('Plugins').path;
+        callback();
     }
 }

test/addSourceFile.js

@@ -90,7 +90,7 @@ exports.addSourceFile = {
         test.equal(fileRefEntry.fileEncoding, 4);
         test.equal(fileRefEntry.lastKnownFileType, 'sourcecode.c.objc');
         test.equal(fileRefEntry.name, 'file.m');
-        test.equal(fileRefEntry.path, 'Plugins/file.m');
+        test.equal(fileRefEntry.path, 'file.m');
         test.equal(fileRefEntry.sourceTree, '"<group>"');
 
         test.done();