Merge branch 'zhuangya-upgrade'

Author: imhotep

package.json

@@ -11,15 +11,15 @@
     "node": ">=0.6.7"
   },
   "dependencies": {
-    "pegjs": "0.9.0",
-    "simple-plist": "0.1.4",
-    "uuid":"3.0.1"
+    "pegjs": "^0.10.0",
+    "simple-plist": "^0.2.1",
+    "uuid": "3.0.1"
   },
   "devDependencies": {
-    "nodeunit": "0.9.1"
+    "nodeunit": "^0.11.0"
   },
   "scripts": {
     "test": "node_modules/.bin/nodeunit test/parser test"
-  }, 
+  },
   "license": "Apache-2.0"
 }

test/parser/build-config.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/build-config.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     util = require('util'),
     project = rawProj.project;

test/parser/comments.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/comments.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar);
+    parser = PEG.generate(grammar);
 
 // Cordova 1.8 has the Apache headers as comments in the pbxproj file
 // I DON'T KNOW WHY

test/parser/dotsInNames.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/dots-in-names.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     project = rawProj.project;
 

test/parser/file-references.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/file-references.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     project = rawProj.project;
 

test/parser/hash.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/hash.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     project = rawProj.project;
 

test/parser/header-search.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/header-search.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     project = rawProj.project;
 

test/parser/section-entries.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/section-entries.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     project = rawProj.project;
 

test/parser/section-split.js

@@ -2,7 +2,7 @@ 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),
+	parser = PEG.generate(grammar),
 	rawProj = parser.parse(pbx),
 	project = rawProj.project;
 

test/parser/section.js

@@ -2,7 +2,7 @@ var PEG = require('pegjs'),
     fs = require('fs'),
     pbx = fs.readFileSync('test/parser/projects/section.pbxproj', 'utf-8'),
     grammar = fs.readFileSync('lib/parser/pbxproj.pegjs', 'utf-8'),
-    parser = PEG.buildParser(grammar),
+    parser = PEG.generate(grammar),
     rawProj = parser.parse(pbx),
     project = rawProj.project;