fix: parse large files from git

- increase maxBuffer to 100MB
- call toString() on Buffer
- remove redundant Buffer.from for Buffer

lib/diff.js

@@ -40,10 +40,10 @@ Diff.prototype.getMetadataContainers = function(opts) {
 				// retrieve file using git
 				var parts = file.index[0].split('..');
 				if (!file.new) {
-					fileFrom.contents = Buffer.from(self.git.show(parts[0]));
+					fileFrom.contents = self.git.show(parts[0]);
 				}
 				if (!file.deleted) {
-					fileTo.contents = Buffer.from(self.git.show(parts[1]));
+					fileTo.contents = self.git.show(parts[1]);
 				}
 			}
 			containerFrom.add(fileFrom, []);
@@ -86,10 +86,10 @@ Diff.stream = function(opts) {
 					// retrieve file using git
 					var parts = file.index[0].split('..');
 					if (!file.new) {
-						fileFrom.contents = Buffer.from(git.show(parts[0]));
+						fileFrom.contents = git.show(parts[0]);
 					}
 					if (!file.deleted) {
-						fileTo.contents = Buffer.from(git.show(parts[1]));
+						fileTo.contents = git.show(parts[1]);
 					}
 				}
 				containerFrom.add(fileFrom, []);

lib/git.js

@@ -9,6 +9,7 @@ var Git = module.exports = function(basedir) {
 Git.prototype.show = function(revision) {
 	var self = this;
 	return child.spawnSync('git', ['show', revision], {
-		cwd: self.basedir
+		cwd: self.basedir,
+		maxBuffer: 1024 * 1024 * 100 // 100 MB
 	}).stdout;
 };

lib/metadata-file-container.js

@@ -126,7 +126,7 @@ MetadataFileContainer.prototype.parse = function() {
 	if (!self.contents || self.contents.length === 0) {
 		return self;
 	}
-	var parsed = new xmldoc.XmlDocument(self.contents);
+	var parsed = new xmldoc.XmlDocument(self.contents.toString());
 	var type = self.getMetadataType();
 	var objectName = self.getComponent().fullName;
 	if (type.childXmlNames) {
@@ -190,7 +190,7 @@ MetadataFileContainer.prototype.contentsWithoutChilds = function(includedChildCo
 
 	var childComponents = this.getMetadataType().childXmlNames;
 	if (childComponents) {
-		var parsed = new xmldoc.XmlDocument(this.contents);
+		var parsed = new xmldoc.XmlDocument(this.contents.toString());
 		var parentMetadata = '<' + parsed.name + ' xmlns="http://soap.sforce.com/2006/04/metadata">';
 		var tagIncludedChildNames = includedChildComponents ?
 			includedChildComponents.map(function(child) {
@@ -255,7 +255,7 @@ MetadataFileContainer.prototype.toString = function() {
 	var groupedComponents = self.getGroupedAndSortedComponents();
 	_.keys(groupedComponents).sort(MetadataUtils.compareMetadataTypeNames).forEach(function(metadataType) {
 		groupedComponents[metadataType].forEach(function(cmp) {
-			lines.push(cmp.contents);
+			lines.push(cmp.contents.toString());
 		});
 	});
 	lines.push("</" + type.xmlName + ">");

test-functional/lib/force-dev-tool.js

@@ -68,7 +68,7 @@ class Cli {
         expect(spawnRet.stdout.toString()).to.include('Running Validation of directory');
         return spawnRet;
       } else {
-        let out = JSON.parse(spawnRet.stdout);
+        let out = JSON.parse(spawnRet.stdout.toString());
         expect(out.status, JSON.stringify(out.result.details)).to.equal(fail ? 1 : 0);
         return out;
       }

test-functional/lib/git.js

@@ -46,7 +46,7 @@ class Repository {
       cwd: this._cwd
     });
     if (result.status !== 0) {
-      throw result.stdout + '\n' + result.stderr;
+      throw result.stdout.toString() + '\n' + result.stderr.toString();
     }
     return result;
   }

test-integration/changeset.js

@@ -30,11 +30,11 @@ describe("force-dev-tool changeset create ...", function() {
 					cwd: gitDir
 				}
 			);
-			assert.deepEqual(gitCloneCmd.status, 0, gitCloneCmd.stderr);
+			assert.deepEqual(gitCloneCmd.status, 0, gitCloneCmd.stderr.toString());
 			var gitCheckoutCmd = child.spawnSync("git", ["checkout", test.branch], {
 				cwd: gitDir
 			});
-			assert.deepEqual(gitCheckoutCmd.status, 0, gitCheckoutCmd.stderr);
+			assert.deepEqual(gitCheckoutCmd.status, 0, gitCheckoutCmd.stderr.toString());
 			var changesetArgs = [fdt, "changeset", "create", "test"];
 			[].push.apply(changesetArgs, test.patterns);
 			var changesetCreateCmd = child.spawnSync(
@@ -45,7 +45,7 @@ describe("force-dev-tool changeset create ...", function() {
 			assert.deepEqual(
 				changesetCreateCmd.status,
 				0,
-				changesetCreateCmd.stdout
+				changesetCreateCmd.stdout.toString()
 			);
 			var diffDirsCmd = child.spawnSync(
 				"diff", [
@@ -57,7 +57,7 @@ describe("force-dev-tool changeset create ...", function() {
 					cwd: gitDir
 				}
 			);
-			assert.deepEqual(diffDirsCmd.status, 0, diffDirsCmd.stdout);
+			assert.deepEqual(diffDirsCmd.status, 0, diffDirsCmd.stdout.toString());
 		});
 	});
 });

test-integration/deploy.js

@@ -12,7 +12,7 @@ describe('force-dev-tool deploy', function() {
 		this.timeout(1000 * 60 * 10);
 		this.slow(1000 * 60 * 5);
 		var deployCmd = child.spawnSync("node", [fdt, 'deploy', '-c', '-f', path.resolve(__dirname, '..', 'test', 'data', 'unpackaged', 'layout-with-umlauts.zip')]);
-		assert.deepEqual(deployCmd.status, 0, deployCmd.stderr);
+		assert.deepEqual(deployCmd.status, 0, deployCmd.stderr.toString());
 		assert(/Running Validation of zip file/.test(deployCmd.stdout.toString()));
 		assert(/Visit https/.test(deployCmd.stdout.toString()));
 	});
@@ -27,7 +27,7 @@ describe('force-dev-tool deploy', function() {
 				return done(err);
 			}
 			var deployCmd = child.spawnSync("node", [fdt, 'deploy', '-c', '-d', unzipDir]);
-			assert.deepEqual(deployCmd.status, 0, deployCmd.stderr);
+			assert.deepEqual(deployCmd.status, 0, deployCmd.stderr.toString());
 			assert(/Running Validation of directory/.test(deployCmd.stdout.toString()));
 			assert(/Visit https/.test(deployCmd.stdout.toString()));
 			done();
@@ -37,15 +37,15 @@ describe('force-dev-tool deploy', function() {
 		this.timeout(1000 * 60 * 10);
 		this.slow(1000 * 60 * 5);
 		var deployCmd = child.spawnSync("node", [fdt, 'deploy', '-c', '-t', '-d', path.resolve(__dirname, '..', 'test', 'data', 'metadata', 'visualforce')]);
-		assert.deepEqual(deployCmd.status, 0, deployCmd.stderr);
+		assert.deepEqual(deployCmd.status, 0, deployCmd.stderr.toString());
 		assert(/Running Validation with test execution of directory/.test(deployCmd.stdout.toString()));
 		assert(/Visit https/.test(deployCmd.stdout.toString()));
 	});
 	it('should simulate deploying an apex class with a test class', function() {
 		this.timeout(1000 * 60 * 10);
 		this.slow(1000 * 60 * 5);
 		var deployCmd = child.spawnSync("node", [fdt, 'deploy', '-c', '-t', '-d', path.resolve(__dirname, '..', 'test', 'data', 'unpackaged', 'apex')]);
-		assert.deepEqual(deployCmd.status, 0, deployCmd.stderr);
+		assert.deepEqual(deployCmd.status, 0, deployCmd.stderr.toString());
 		assert(/Running Validation with test execution of directory/.test(deployCmd.stdout.toString()));
 		assert(/Visit https/.test(deployCmd.stdout.toString()));
 	});

test-integration/fetch-package-retrieve.js

@@ -14,20 +14,20 @@ describe('force-dev-tool fetch package retrieve', function() {
 		var fetchCmd = child.spawnSync("node", [fdt, 'fetch'], {
 			cwd: tmpobj.name
 		});
-		assert.deepEqual(fetchCmd.status, 0, fetchCmd.stderr);
+		assert.deepEqual(fetchCmd.status, 0, fetchCmd.stderr.toString());
 		assert(/Fetching from remote env/.test(fetchCmd.stdout.toString()));
 		assert(/Fetching remotes finished/.test(fetchCmd.stdout.toString()));
 
 		var packageCmd = child.spawnSync("node", [fdt, 'package'], {
 			cwd: tmpobj.name
 		});
-		assert.deepEqual(packageCmd.status, 0, packageCmd.stderr);
+		assert.deepEqual(packageCmd.status, 0, packageCmd.stderr.toString());
 		assert(/Created src.*package\.xml/.test(packageCmd.stdout.toString()));
 
 		var retrieveCmd = child.spawnSync("node", [fdt, 'retrieve'], {
 			cwd: tmpobj.name
 		});
-		assert.deepEqual(retrieveCmd.status, 0, retrieveCmd.stderr);
+		assert.deepEqual(retrieveCmd.status, 0, retrieveCmd.stderr.toString());
 		assert(/Retrieving from remote env to directory src/.test(retrieveCmd.stdout.toString()));
 		assert(/Succeeded/.test(retrieveCmd.stdout.toString()));
 	});

test-integration/login.js

@@ -14,7 +14,7 @@ describe('force-dev-tool login', function() {
 		var loginCmd = child.spawnSync("node", [fdt, 'login'], {
 			cwd: tmpobj.name
 		});
-		assert.deepEqual(loginCmd.status, 0, loginCmd.stderr);
+		assert.deepEqual(loginCmd.status, 0, loginCmd.stderr.toString());
 		assert(/Logged in successfully/.test(loginCmd.stdout.toString()));
 		assert(/https/.test(loginCmd.stdout.toString()));
 	});

test/metadata-component.js

@@ -23,7 +23,7 @@ describe('MetadataComponent', function() {
 				fileName: path.join('pages', 'Test.page'),
 				contents: 'hello'
 			});
-			assert.deepEqual(metadataComponentWithContents.contents, 'hello');
+			assert.deepEqual(metadataComponentWithContents.contents.toString(), 'hello');
 		});
 		it('should return a metadata component for an ApexPage', function() {
 			var metadataComponent = new MetadataComponent('ApexPage/Test');

test/metadata-file-container.js

@@ -44,7 +44,7 @@ describe('MetadataFileContainer', function() {
 			});
 			assert.deepEqual(mfc.components.length, 1);
 			assert.deepEqual(
-				mfc.components[0].contents,
+				mfc.components[0].contents.toString(),
 				TestObject.fields.textField1
 			);
 		});
@@ -55,7 +55,7 @@ describe('MetadataFileContainer', function() {
 			});
 			assert.deepEqual(mfc.components.length, 1);
 			assert.deepEqual(
-				mfc.components[0].contents,
+				mfc.components[0].contents.toString(),
 				TestProfile.classAccesses.classAccess1
 			);
 		});
@@ -66,7 +66,7 @@ describe('MetadataFileContainer', function() {
 			});
 			assert.deepEqual(mfc.components.length, 1);
 			assert.deepEqual(
-				mfc.components[0].contents,
+				mfc.components[0].contents.toString(),
 				TestProfile.fieldPermissions.fieldPermission1
 			);
 		});