Merge branch 'Icenium-bektchiev/merge-sections-with-same-name'

Author: Anis Kadri

lib/parser/pbxproj.js

@@ -1,11 +1,22 @@
 {
     function merge(hash, secondHash) {
         secondHash = secondHash[0]
-        for(var i in secondHash)
-            hash[i] = secondHash[i]
+        for(var i in secondHash) {
+       		hash[i] = merge_obj(hash[i], secondHash[i]);
+        }
 
         return hash;
     }
+    
+    function merge_obj(obj, secondObj) {
+    	if (!obj)
+    		return secondObj;
+
+        for(var i in secondObj)
+            obj[i] = merge_obj(obj[i], secondObj[i]);
+
+        return obj;
+    }
 }
 
 /*

lib/parser/pbxproj.pegjs

@@ -0,0 +1,25 @@
+// !$*UTF8*$!
+{
+    archiveVersion = 1;
+    classes = {
+    };
+    objectVersion = 45;
+    rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+    objects = {
+/* Begin PBXTargetDependency section */
+        301BF551109A68C00062928A /* PBXTargetDependency */ = {
+            isa = PBXTargetDependency;
+            name = PhoneGapLib;
+            targetProxy = 301BF550109A68C00062928A /* PBXContainerItemProxy */;
+        };
+/* End PBXTargetDependency section */
+
+/* Begin PBXTargetDependency section */
+        45FDD1944D304A9F96DF3AC6 /* PBXTargetDependency */ = {
+            isa = PBXTargetDependency;
+            name = SecondLib;
+            targetProxy = 301BF550109A68C00062928A /* PBXContainerItemProxy */;
+        };
+/* End PBXTargetDependency section */
+    };
+}

test/parser/projects/section-split.pbxproj

@@ -0,0 +1,35 @@
+var PEG = require('pegjs'),
+	fs = require('fs'),
+	pbx = fs.readFileSync('test/parser/projects/section-split.pbxproj', 'utf-8'),
+	grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
+	parser = PEG.buildParser(grammar),
+	rawProj = parser.parse(pbx),
+	project = rawProj.project;
+
+exports['should have a PBXTargetDependency section'] = function (test) {
+	test.ok(project.objects['PBXTargetDependency']);
+	test.done();
+}
+
+exports['should have the right child of PBXTargetDependency section'] = function (test) {
+	test.ok(project.objects['PBXTargetDependency']['301BF551109A68C00062928A']);
+	test.done();
+}
+
+exports['should have the right properties on the dependency'] = function (test) {
+	var dependency = project.objects['PBXTargetDependency']['301BF551109A68C00062928A'];
+
+	test.equal(dependency.isa, 'PBXTargetDependency')
+	test.equal(dependency.name, 'PhoneGapLib')
+	test.equal(dependency.targetProxy, '301BF550109A68C00062928A')
+	test.equal(dependency['targetProxy_comment'], 'PBXContainerItemProxy')
+
+	test.done();
+}
+
+exports['should merge two PBXTargetDependency sections'] = function (test) {
+	test.ok(project.objects['PBXTargetDependency']['301BF551109A68C00062928A']);
+	test.ok(project.objects['PBXTargetDependency']['45FDD1944D304A9F96DF3AC6']);
+	test.done();
+}
+