bugfix: Remove group reference from root group after group removal

Author: tdermendjiev

lib/pbxFile.js

@@ -204,7 +204,7 @@ function defaultGroup(fileRef) {
 function pbxFile(filepath, opt) {
     var opt = opt || {};
 
-    this.basename = path.basename(filepath);
+    this.basename = opt.basename || path.basename(filepath);
     this.lastKnownFileType = opt.lastKnownFileType || detectType(filepath);
     this.group = detectGroup(this, opt);
 

lib/pbxProject.js

@@ -581,7 +581,7 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
     if (opt.isMain) {
         let mainGroup = this.findMainPbxGroup();
         if (mainGroup) {
-            var file = new pbxFile($path.relative(this.filepath, path));
+            var file = new pbxFile($path.relative(this.filepath, path), {basename: name});
             file.fileRef = pbxGroupUuid;
             mainGroup.children.push(pbxGroupChild(file));
         }
@@ -608,6 +608,13 @@ pbxProject.prototype.removePbxGroup = function(groupName, path) {
         this.removeFromPbxSourcesBuildPhase(file);
     }
 
+    var mainGroupChildren = this.findMainPbxGroup().children, i;
+    for(i in mainGroupChildren) {
+        if (mainGroupChildren[i].comment == name) {
+            mainGroupChildren.splice(i, 1);
+        }
+    }
+
     var section = this.hash.project.objects['PBXGroup'],
         key, itemKey;