[writer] handle multiple sections

Author: alunny

lib/pbxWriter.js

@@ -49,6 +49,16 @@ pbxWriter.prototype.write = function (str) {
     }
 }
 
+pbxWriter.prototype.writeFlush = function (str) {
+    var oldIndent = this.indentLevel;
+
+    this.indentLevel = 0;
+
+    this.write.apply(this, arguments)
+
+    this.indentLevel = oldIndent;
+}
+
 pbxWriter.prototype.writeSync = function () {
     this.sync = true;
     this.buffer = "";
@@ -82,13 +92,7 @@ pbxWriter.prototype.writeProject = function () {
             obj = proj[key];
 
             if (isArray(obj)) {
-                this.write("%s = (\n", key);
-                this.indentLevel++;
-
-                this.writeArray(obj)
-
-                this.indentLevel--;
-                this.write(");\n");
+                this.writeArray(obj, key)
             } else if (isObject(obj)) {
                 this.write("%s = {\n", key);
                 this.indentLevel++;
@@ -123,7 +127,9 @@ pbxWriter.prototype.writeObject = function (object) {
         cmt = comment(key, object);
         obj = object[key];
 
-        if (cmt) {
+        if (isArray(obj)) {
+            this.writeArray(obj, key)
+        } else if (cmt) {
             this.write("%s = %s /* %s */;\n", key, obj, cmt)
         } else {
             this.write("%s = %s;\n", key, obj)
@@ -132,9 +138,16 @@ pbxWriter.prototype.writeObject = function (object) {
 }
 
 pbxWriter.prototype.writeObjectsSections = function (objects) {
-    var key, obj;
+    var first = true,
+        key, obj;
 
     for (key in objects) {
+        if (!first) {
+            this.writeFlush("\n")
+        } else {
+            first = false;
+        }
+
         obj = objects[key];
 
         if (isObject(obj)) {
@@ -147,9 +160,12 @@ pbxWriter.prototype.writeObjectsSections = function (objects) {
     }
 }
 
-pbxWriter.prototype.writeArray = function (arr) {
+pbxWriter.prototype.writeArray = function (arr, name) {
     var i, entry;
 
+    this.write("%s = (\n", name);
+    this.indentLevel++;
+
     for (i=0; i < arr.length; i++) {
         entry = arr[i]
 
@@ -159,20 +175,17 @@ pbxWriter.prototype.writeArray = function (arr) {
             this.write('%s,\n', entry);
         }
     }
+
+    this.indentLevel--;
+    this.write(");\n");
 }
 
 pbxWriter.prototype.writeSectionComment = function (name, begin) {
-    var oldIndent = this.indentLevel;
-
-    this.indentLevel = 0;
-
     if (begin) {
-        this.write("/* Begin %s section */\n", name)
+        this.writeFlush("/* Begin %s section */\n", name)
     } else { // end
-        this.write("/* End %s section */\n", name)
+        this.writeFlush("/* End %s section */\n", name)
     }
-
-    this.indentLevel = oldIndent;
 }
 
 pbxWriter.prototype.writeSection = function (section) {

test/pbxWriter.js

@@ -2,45 +2,32 @@ var pbx = require('../lib/pbxProject'),
     fs = require('fs'),
     myProj;
 
-function testProjectContents(filename) {
+function testProjectContents(filename, test) {
+    var myProj = new pbx(filename),
+        content = fs.readFileSync(filename, 'utf-8');
 
-}
+    // normalize tabs vs strings
+    content = content.replace(/\t/g, '    ');
 
-exports.writeSync = {
-    'should write out the simple "hash" test': function (test) {
-        var file = 'test/parser/projects/hash.pbxproj',
-            myProj = new pbx(file),
-            contents = fs.readFileSync(file, 'utf-8');
+    myProj.parse(function (err, projHash) {
+        var written = myProj.writeSync();
 
-        myProj.parse(function (err, projHash) {
-            var written = myProj.writeSync();
+        test.equal(content, written);
+        test.done();
+    });
+}
 
-            test.equal(written, contents);
-            test.done();
-        })
+exports.writeSync = {
+    'should write out the "hash" test': function (test) {
+        testProjectContents('test/parser/projects/hash.pbxproj', test);
     },
-    'should write out the simple "with_array" test': function (test) {
-        var file = 'test/parser/projects/with_array.pbxproj',
-            myProj = new pbx(file),
-            contents = fs.readFileSync(file, 'utf-8');
-
-        myProj.parse(function (err, projHash) {
-            var written = myProj.writeSync();
-
-            test.equal(written, contents);
-            test.done();
-        })
+    'should write out the "with_array" test': function (test) {
+        testProjectContents('test/parser/projects/with_array.pbxproj', test);
     },
-    'should write out the simple "section" test': function (test) {
-        var file = 'test/parser/projects/section.pbxproj',
-            myProj = new pbx(file),
-            contents = fs.readFileSync(file, 'utf-8');
-
-        myProj.parse(function (err, projHash) {
-            var written = myProj.writeSync();
-
-            test.equal(written, contents);
-            test.done();
-        })
+    'should write out the "section" test': function (test) {
+        testProjectContents('test/parser/projects/section.pbxproj', test);
+    },
+    'should write out the "two-sections" test': function (test) {
+        testProjectContents('test/parser/projects/two-sections.pbxproj', test);
     }
 }