Merge branch 'master' into forkChanges

# Conflicts:
#	package.json

Author: robertoandrade

lib/pbxFile.js

@@ -171,13 +171,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

@@ -323,7 +323,7 @@ pbxProject.prototype.removeFramework = function(fpath, opt) {
     this.removeFromPbxFrameworksBuildPhase(file);      // PBXFrameworksBuildPhase
 
     if (opt && opt.customFramework) {
-        this.removeFromFrameworkSearchPaths(path.dirname(fpath));
+        this.removeFromFrameworkSearchPaths(file);
     }
 
     opt.embed = true;
@@ -1079,7 +1079,6 @@ pbxProject.prototype.removeFromFrameworkSearchPaths = function(file) {
                 searchPaths.splice(idx, 1);
             });
         }
-
     }
 }
 

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');
 

test/removeFramework.js

@@ -1,4 +1,4 @@
-var fullProject = require('./fixtures/full-project')
+var fullProject = require('./fixtures/full-project'),
     fullProjectStr = JSON.stringify(fullProject),
     pbx = require('../lib/pbxProject'),
     pbxFile = require('../lib/pbxFile'),
@@ -47,22 +47,22 @@ exports.removeFramework = {
         var newFile = proj.addFramework('libsqlite3.dylib');
 
         test.equal(newFile.constructor, pbxFile);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib');
 
         test.equal(deletedFile.constructor, pbxFile);
-        
+
         test.done()
     },
     'should set a fileRef on the pbxFile': function (test) {
         var newFile = proj.addFramework('libsqlite3.dylib');
 
         test.ok(newFile.fileRef);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib');
 
         test.ok(deletedFile.fileRef);
-        
+
         test.done()
     },
     'should remove 2 fields from the PBXFileReference section': function (test) {
@@ -80,7 +80,7 @@ exports.removeFramework = {
         test.equal(66, frsLength);
         test.ok(!fileRefSection[deletedFile.fileRef]);
         test.ok(!fileRefSection[deletedFile.fileRef + '_comment']);
-        
+
         test.done();
     },
     'should remove 2 fields from the PBXBuildFile section': function (test) {
@@ -93,13 +93,13 @@ exports.removeFramework = {
         test.ok(buildFileSection[newFile.uuid + '_comment']);
 
         var deletedFile = proj.removeFramework('libsqlite3.dylib');
-        
+
         bfsLength = Object.keys(buildFileSection).length;
 
         test.equal(58, bfsLength);
         test.ok(!buildFileSection[deletedFile.uuid]);
         test.ok(!buildFileSection[deletedFile.uuid + '_comment']);
-        
+
         test.done();
     },
     'should remove from the Frameworks PBXGroup': function (test) {
@@ -108,47 +108,46 @@ exports.removeFramework = {
             frameworks = proj.pbxGroupByName('Frameworks');
 
         test.equal(frameworks.children.length, newLength);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib'),
         newLength = newLength - 1;
 
         test.equal(frameworks.children.length, newLength);
-        
+
         test.done();
     },
     'should remove from the PBXFrameworksBuildPhase': function (test) {
         var newFile = proj.addFramework('libsqlite3.dylib'),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 16);
-        
+
         var deletedFile = proj.removeFramework('libsqlite3.dylib'),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 15);
-        
+
         test.done();
     },
     'should remove custom frameworks': function (test) {
-        var newFile = proj.addFramework('/path/to/Custom.framework'),
+        var newFile = proj.addFramework('/path/to/Custom.framework', { customFramework: true }),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 16);
-        
-        var deletedFile = proj.removeFramework('/path/to/Custom.framework'),
+
+        var deletedFile = proj.removeFramework('/path/to/Custom.framework', { customFramework: true }),
             frameworks = proj.pbxFrameworksBuildPhaseObj();
 
         test.equal(frameworks.files.length, 15);
-        
+
         var frameworkPaths = frameworkSearchPaths(proj);
             expectedPath = '"/path/to"';
 
         for (i = 0; i < frameworkPaths.length; i++) {
             var current = frameworkPaths[i];
-            test.ok(current.indexOf('"$(inherited)"') == -1);
             test.ok(current.indexOf(expectedPath) == -1);
         }
-        
+
         test.done();
     }
 }