Merge branch 'vladimir-kotikov-master'

Author: Anis Kadri

lib/pbxFile.js

@@ -166,13 +166,12 @@ function pbxFile(filepath, opt) {
     // for custom frameworks
     if (opt.customFramework == true) {
         this.customFramework = true;
-        this.dirname = path.dirname(filepath);
+        this.dirname = path.dirname(filepath).replace(/\\/g, '/');
     }
 
-    this.path = defaultPath(this, filepath);
+    this.path = defaultPath(this, filepath).replace(/\\/g, '/');
     this.fileEncoding = this.defaultEncoding = opt.defaultEncoding || defaultEncoding(self);
 
-
     // When referencing products / build output files
     if (opt.explicitFileType) {
         this.explicitFileType = opt.explicitFileType;

lib/pbxProject.js

@@ -304,7 +304,7 @@ pbxProject.prototype.removeFramework = function(fpath, opt) {
     this.removeFromPbxEmbedFrameworksBuildPhase(file); // PBXCopyFilesBuildPhase
 
     if (opt && opt.customFramework) {
-        this.removeFromFrameworkSearchPaths(path.dirname(fpath));
+        this.removeFromFrameworkSearchPaths(file.dirname);
     }
 
     return file;

test/dataModelDocument.js

@@ -152,7 +152,8 @@ exports.dataModelDocument = {
         test.equal(xcVersionGroupEntry.children[0], newFile.models[0].fileRef);
         test.equal(xcVersionGroupEntry.currentVersion, newFile.currentModel.fileRef);
         test.equal(xcVersionGroupEntry.name, path.basename(singleDataModelFilePath));
-        test.equal(xcVersionGroupEntry.path, singleDataModelFilePath);
+        // Need to validate against normalized path, since paths should contain forward slash on OSX
+        test.equal(xcVersionGroupEntry.path, singleDataModelFilePath.replace(/\\/g, '/'));
         test.equal(xcVersionGroupEntry.sourceTree, '"<group>"');
         test.equal(xcVersionGroupEntry.versionGroupType, 'wrapper.xcdatamodel');