bugfix: Remove group reference from root group after group removal

Author: tdermendjiev

lib/pbxFile.js

@@ -118,7 +118,7 @@ function pbxFile(filepath, opt) {
       this.dirname = $path.dirname(filepath);
     }
 
-    this.basename = $path.basename(filepath);
+    this.basename = opt.basename || $path.basename(filepath);
     this.path = correctPath(this, filepath);
     this.group = correctGroup(this);
 

lib/pbxProject.js

@@ -376,7 +376,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));
         }
@@ -403,6 +403,13 @@ pbxProject.prototype.removePbxGroup = function(name, path) {
         this.removeFromPbxSourcesBuildPhase(file);
     }
 
+    var mainGroupChildren = this.findMainPbxGroup().children, i;
+    for(i in mainGroupChildren) {
+        if (mainGroupChildren[i].comment == name) {
+            mainGroupChildren.splice(i, 1);
+        }
+    }
+
     //copied from https://github.com/alunny/node-xcode/blob/master/lib/pbxProject.js#L527
     var section = this.hash.project.objects['PBXGroup'],
         key, itemKey;