Remove git abstraction per PR feedback request

bin/plugin/commands/common.js

@@ -1,72 +1,26 @@
 /**
  * External dependencies
  */
-const fs = require( 'fs' );
-const rimraf = require( 'rimraf' );
 const semver = require( 'semver' );
+const SimpleGit = require( 'simple-git' );
 
 /**
  * Internal dependencies
  */
-const { log, formats } = require( '../lib/logger' );
-const { runStep, readJSONFile } = require( '../lib/utils' );
-const git = require( '../lib/git' );
-const config = require( '../config' );
-
-/**
- * Clone the repository and returns the working directory.
- *
- * @param {string} abortMessage Abort message.
- *
- * @return {Promise<string>} Repository local path.
- */
-async function runGitRepositoryCloneStep( abortMessage ) {
-	// Cloning the repository.
-	let gitWorkingDirectoryPath;
-	await runStep( 'Cloning the Git repository', abortMessage, async () => {
-		log( '>> Cloning the Git repository' );
-		gitWorkingDirectoryPath = await git.clone( config.gitRepositoryURL );
-		log(
-			'>> The Git repository has been successfully cloned in the following temporary folder: ' +
-				formats.success( gitWorkingDirectoryPath )
-		);
-	} );
-
-	return gitWorkingDirectoryPath;
-}
-
-/**
- * Clean the working directories.
- *
- * @param {string[]} folders      Folders to clean.
- * @param {string}   abortMessage Abort message.
- */
-async function runCleanLocalFoldersStep( folders, abortMessage ) {
-	await runStep( 'Cleaning the temporary folders', abortMessage, async () => {
-		await Promise.all(
-			folders.map( async ( directoryPath ) => {
-				if ( fs.existsSync( directoryPath ) ) {
-					await rimraf( directoryPath, ( err ) => {
-						if ( err ) {
-							throw err;
-						}
-					} );
-				}
-			} )
-		);
-	} );
-}
+const { readJSONFile } = require( '../lib/utils' );
 
 /**
  * Finds the name of the current plugin release branch based on the version in
- * the package.json file.
+ * the package.json file and the latest `trunk` branch in `git`.
  *
  * @param {string} gitWorkingDirectoryPath Path to the project's working directory.
  *
  * @return {string} Name of the plugin release branch.
  */
 async function findPluginReleaseBranchName( gitWorkingDirectoryPath ) {
-	await git.checkoutRemoteBranch( gitWorkingDirectoryPath, 'trunk' );
+	await SimpleGit( gitWorkingDirectoryPath )
+		.fetch( 'origin', 'trunk' )
+		.checkout( 'trunk' );
 
 	const packageJsonPath = gitWorkingDirectoryPath + '/package.json';
 	const mainPackageJson = readJSONFile( packageJsonPath );
@@ -141,6 +95,4 @@ function calculateVersionBumpFromChangelog(
 module.exports = {
 	calculateVersionBumpFromChangelog,
 	findPluginReleaseBranchName,
-	runGitRepositoryCloneStep,
-	runCleanLocalFoldersStep,
 };

bin/plugin/commands/packages.js

@@ -6,20 +6,24 @@ const path = require( 'path' );
 const glob = require( 'fast-glob' );
 const fs = require( 'fs' );
 const { inc: semverInc } = require( 'semver' );
+const rimraf = require( 'rimraf' );
 const readline = require( 'readline' );
+const { default: git } = require( 'simple-git' );
 
 /**
  * Internal dependencies
  */
 const { log, formats } = require( '../lib/logger' );
-const { askForConfirmation, runStep, readJSONFile } = require( '../lib/utils' );
+const {
+	askForConfirmation,
+	runStep,
+	readJSONFile,
+	getRandomTemporaryPath,
+} = require( '../lib/utils' );
 const {
 	calculateVersionBumpFromChangelog,
 	findPluginReleaseBranchName,
-	runGitRepositoryCloneStep,
-	runCleanLocalFoldersStep,
 } = require( './common' );
-const git = require( '../lib/git' );
 const { join } = require( 'path' );
 
 /**
@@ -55,6 +59,17 @@ const { join } = require( 'path' );
  * @property {ReleaseType} releaseType             The selected release type.
  */
 
+/**
+ * Throws if given an error in the node.js callback style.
+ *
+ * @param {any|null} error If callback failed, this will hold a value.
+ */
+const rethrow = ( error ) => {
+	if ( error ) {
+		throw error;
+	}
+};
+
 /**
  * Checks out the npm release branch.
  *
@@ -65,8 +80,9 @@ async function checkoutNpmReleaseBranch( {
 	npmReleaseBranch,
 } ) {
 	// Creating the release branch.
-	await git.checkoutRemoteBranch( gitWorkingDirectoryPath, npmReleaseBranch );
-	await git.fetch( gitWorkingDirectoryPath, [ '--depth=100' ] );
+	await git( gitWorkingDirectoryPath )
+		.fetch( npmReleaseBranch, [ '--depth=100' ] )
+		.checkout( npmReleaseBranch );
 	log(
 		'>> The local npm release branch ' +
 			formats.success( npmReleaseBranch ) +
@@ -105,13 +121,13 @@ async function runNpmReleaseBranchSyncStep( pluginReleaseBranch, config ) {
 			`>> Syncing the latest plugin release to "${ pluginReleaseBranch }".`
 		);
 
-		await git.replaceContentFromRemoteBranch(
-			gitWorkingDirectoryPath,
-			pluginReleaseBranch
-		);
+		const repo = git( gitWorkingDirectoryPath );
+
+		await repo
+			.raw( 'rm', '-r', '.' )
+			.raw( 'checkout', `origin/${ pluginReleaseBranch }`, '--', '.' );
 
-		const commitHash = await git.commit(
-			gitWorkingDirectoryPath,
+		const { commit: commitHash } = await repo.commit(
 			`Merge changes published in the Gutenberg plugin "${ pluginReleaseBranch }" branch`
 		);
 
@@ -280,11 +296,10 @@ async function updatePackages( config ) {
 		);
 	}
 
-	const commitHash = await git.commit(
-		gitWorkingDirectoryPath,
-		'Update changelog files',
-		[ './*' ]
-	);
+	const { commit: commitHash } = await git( gitWorkingDirectoryPath )
+		.add( [ './*' ] )
+		.commit( 'Update changelog files' );
+
 	if ( commitHash ) {
 		await runPushGitChangesStep( config );
 	}
@@ -313,10 +328,7 @@ async function runPushGitChangesStep( {
 				abortMessage
 			);
 		}
-		await git.pushBranchToOrigin(
-			gitWorkingDirectoryPath,
-			npmReleaseBranch
-		);
+		await git( gitWorkingDirectoryPath ).push( 'origin', npmReleaseBranch );
 	} );
 }
 
@@ -345,9 +357,10 @@ async function publishPackagesToNpm( {
 		stdio: 'inherit',
 	} );
 
-	const beforeCommitHash = await git.getLastCommitHash(
-		gitWorkingDirectoryPath
-	);
+	const beforeCommitHash = await git( gitWorkingDirectoryPath ).revparse( [
+		'--short',
+		'HEAD',
+	] );
 
 	const yesFlag = interactive ? '' : '--yes';
 	const noVerifyAccessFlag = interactive ? '' : '--no-verify-access';
@@ -403,9 +416,10 @@ async function publishPackagesToNpm( {
 		);
 	}
 
-	const afterCommitHash = await git.getLastCommitHash(
-		gitWorkingDirectoryPath
-	);
+	const afterCommitHash = await git( gitWorkingDirectoryPath ).revparse( [
+		'--short',
+		'HEAD',
+	] );
 	if ( afterCommitHash === beforeCommitHash ) {
 		return;
 	}
@@ -439,18 +453,15 @@ async function backportCommitsToBranch(
 
 	log( `>> Backporting commits to "${ branchName }".` );
 
-	await git.resetLocalBranchAgainstOrigin(
-		gitWorkingDirectoryPath,
-		branchName
-	);
+	const repo = git( gitWorkingDirectoryPath );
+
+	await repo.fetch().checkout( branchName ).pull( 'origin', branchName );
+
 	for ( const commitHash of commits ) {
-		await git.cherrypickCommitIntoBranch(
-			gitWorkingDirectoryPath,
-			branchName,
-			commitHash
-		);
+		await repo.raw( 'cherry-pick', commitHash );
 	}
-	await git.pushBranchToOrigin( gitWorkingDirectoryPath, branchName );
+
+	await repo.push( 'origin', branchName );
 
 	log( `>> Backporting successfully finished.` );
 }
@@ -478,11 +489,20 @@ async function runPackagesRelease( config, customMessages ) {
 
 	const temporaryFolders = [];
 	if ( ! config.gitWorkingDirectoryPath ) {
-		// Cloning the Git repository.
-		config.gitWorkingDirectoryPath = await runGitRepositoryCloneStep(
-			config.abortMessage
+		const gitPath = getRandomTemporaryPath();
+		config.gitWorkingDirectoryPath = gitPath;
+		fs.mkdirSync( gitPath, { recursive: true } );
+		temporaryFolders.push( gitPath );
+
+		await runStep(
+			'Cloning the Git repository',
+			config.abortMessage,
+			async () => {
+				log( '>> Cloning the Git repository' );
+				await git( gitPath ).clone( config.gitRepositoryURL );
+				log( `   >> successfully clone into: ${ gitPath }` );
+			}
 		);
-		temporaryFolders.push( config.gitWorkingDirectoryPath );
 	}
 
 	let pluginReleaseBranch;
@@ -518,7 +538,16 @@ async function runPackagesRelease( config, customMessages ) {
 		}
 	}
 
-	await runCleanLocalFoldersStep( temporaryFolders, 'Cleaning failed.' );
+	await runStep(
+		'Cleaning the temporary folders',
+		'Cleaning failed',
+		async () =>
+			await Promise.all(
+				temporaryFolders
+					.filter( ( tempDir ) => fs.existsSync( tempDir ) )
+					.map( ( tempDir ) => rimraf( tempDir, rethrow ) )
+			)
+	);
 
 	log(
 		'\n>> 🎉 WordPress packages are now published!\n\n',