Merge pull request #222 from technote-space/feature/push_helper

feat: update push helper

Author: technote-space

__tests__/git-helper.test.ts

@@ -603,20 +603,20 @@ describe('GitHelper', () => {
 		it('should run push', async() => {
 			const mockExec = spyOnExec();
 
-			await helper.push(workDir, 'test-branch', true, context());
+			await helper.push(workDir, 'test-branch', context(), {withTag: true, args: ['--prune', '--verbose']});
 
 			execCalledWith(mockExec, [
-				'git push --tags \'https://octocat:[email protected]/hello/world.git\' \'test-branch:refs/heads/test-branch\' > /dev/null 2>&1',
+				'git push --tags --prune --verbose \'https://octocat:[email protected]/hello/world.git\' \'test-branch:refs/heads/test-branch\' > /dev/null 2>&1 || :',
 			]);
 		});
 
 		it('should run push without tags', async() => {
 			const mockExec = spyOnExec();
 
-			await helper.push(workDir, 'test-branch', false, context());
+			await helper.push(workDir, 'test-branch', context());
 
 			execCalledWith(mockExec, [
-				'git push \'https://octocat:[email protected]/hello/world.git\' \'test-branch:refs/heads/test-branch\' > /dev/null 2>&1',
+				'git push \'https://octocat:[email protected]/hello/world.git\' \'test-branch:refs/heads/test-branch\' > /dev/null 2>&1 || :',
 			]);
 		});
 	});
@@ -628,7 +628,7 @@ describe('GitHelper', () => {
 			await helper.forcePush(workDir, 'test-branch', context());
 
 			execCalledWith(mockExec, [
-				'git push --force \'https://octocat:[email protected]/hello/world.git\' \'test-branch:refs/heads/test-branch\' > /dev/null 2>&1',
+				'git push --force \'https://octocat:[email protected]/hello/world.git\' \'test-branch:refs/heads/test-branch\' > /dev/null 2>&1 || :',
 			]);
 		});
 	});

src/git-helper.ts

@@ -496,18 +496,28 @@ export default class GitHelper {
 	/**
 	 * @param {string} workDir work dir
 	 * @param {string} branch branch
-	 * @param {boolean} withTag with tag?
 	 * @param {Context} context context
+	 * @param {object} options options
 	 * @return {Promise<void>} void
 	 */
-	public push = async(workDir: string, branch: string, withTag: boolean, context: Context): Promise<void> => {
-		const url  = this.getOrigin(context);
-		const tags = withTag ? ' --tags' : '';
+	public push = async(workDir: string, branch: string, context: Context, options?: { withTag?: boolean; force?: boolean; args?: Array<string> }): Promise<void> => {
+		const url                 = this.getOrigin(context);
+		const args: Array<string> = [];
+		if (options?.withTag) {
+			args.push('--tags');
+		}
+		if (options?.force) {
+			args.push('--force');
+		}
+		if (options?.args) {
+			args.push(...options.args);
+		}
 		await this.runCommand(workDir, {
 			command: 'git push',
-			args: [withTag ? '--tags' : '', url, `${branch}:refs/heads/${branch}`],
+			args: args.concat([url, `${branch}:refs/heads/${branch}`]),
 			quiet: this.isQuiet(),
-			altCommand: `git push${tags} origin ${branch}:refs/heads/${branch}`,
+			altCommand: `git push${args.concat(['origin', `${branch}:refs/heads/${branch}`]).join(' ')}`,
+			suppressError: true,
 		});
 	};
 
@@ -517,15 +527,7 @@ export default class GitHelper {
 	 * @param {Context} context context
 	 * @return {Promise<void>} void
 	 */
-	public forcePush = async(workDir: string, branch: string, context: Context): Promise<void> => {
-		const url = this.getOrigin(context);
-		await this.runCommand(workDir, {
-			command: 'git push',
-			args: ['--force', url, `${branch}:refs/heads/${branch}`],
-			quiet: this.isQuiet(),
-			altCommand: `git push --force origin ${branch}:refs/heads/${branch}`,
-		});
-	};
+	public forcePush = async(workDir: string, branch: string, context: Context): Promise<void> => this.push(workDir, branch, context, {force: true});
 
 	/**
 	 * @param {string} workDir work dir