add expected exit code support

Author: maxxbw

lib/utils/GitUtil.java

@@ -8,15 +8,15 @@
 public class GitUtil {
 
 	public static Boolean clone(String repoName, String usrName, Path targetDir) {
-		
-		if(targetDir.toFile().exists()){
+
+		if (targetDir.toFile().exists()) {
 			FileUtil.deleteDirectory(targetDir.toFile());
 		}
 		targetDir.toFile().mkdirs();
 
 		String cmd = "timeout 300 git clone https://github.com/" + repoName + "/" + usrName + " " + targetDir;
-		
-		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, targetDir);
+
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, targetDir, 0);
 		if (pr.exitCode == 0) {
 			return true;
 		} else {
@@ -31,7 +31,7 @@ public static List<String> getAllCommitsSha(Path repoDir) {
 
 		String cmd = "timeout 60 git log --pretty=format:\"%H\"";
 
-		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir, 0);
 		if (pr.exitCode == 0) {
 			return Arrays.asList(pr.out.replace("\"", "").split("\n"));
 		} else {
@@ -45,7 +45,7 @@ public static String getCommitMsg(Path repoDir, String com) {
 
 		String cmd = "timeout 60 git log --format=%B -n 1 " + com;
 
-		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir, 0);
 		if (pr.exitCode == 0) {
 			return pr.out.trim();
 		} else {
@@ -59,7 +59,7 @@ public static String getParentCommit(Path repoDir, String com) {
 
 		String cmd = "timeout 60 git log --pretty=%P -n 1 " + com;
 
-		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir, 0);
 		if (pr.exitCode == 0) {
 			return pr.out.replace("\"", "").trim();
 		} else {
@@ -81,14 +81,14 @@ public static String getDiffBetween2Commits(Path repoDir, String oldCom, String
 
 		String cmd = null;
 		if (diffMode != null) {
-			cmd = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString() + " diff "
-					+ diffMode + " --unified=0 " + oldCom + " " + newCom;
+			cmd = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
+					+ " diff " + diffMode + " --unified=0 " + oldCom + " " + newCom;
 		} else {
 			cmd = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
 					+ " diff --unified=0 " + oldCom + " " + newCom;
 		}
 
-		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir, 0);
 		if (pr.exitCode == 0) {
 			return pr.out.trim();
 		} else {
@@ -102,7 +102,7 @@ public static List<String> getChangedFileList(Path repoDir, String com) {
 
 		String cmd = "timeout 30 git diff-tree --no-commit-id --name-only -r " + com;
 
-		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir);
+		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, repoDir, 0);
 		if (pr.exitCode == 0) {
 			return Arrays.asList(pr.out.split("\n"));
 		} else {
@@ -118,7 +118,7 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 
 		if (ifForce) {
 			String resetCMD = "timeout 60 git reset --hard";
-			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir);
+			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir, 0);
 		}
 
 		String checkoutCMD = null;
@@ -127,18 +127,18 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 		} else {
 			checkoutCMD = "timeout 60 git checkout " + com;
 		}
-		pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir);
+		pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir, 0);
 
 		if (pr.exitCode == 0) {
 			return true;
 		} else {
-			String cleanCMD = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
-					+ " clean -dfx .";
-			pr = ProcessUtil.executeCMD(cleanCMD, null, repoDir);
-			String resetCMD = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree " + repoDir.toString()
-					+ " reset --hard";
-			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir);
-			pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir);
+			String cleanCMD = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree "
+					+ repoDir.toString() + " clean -dfx .";
+			pr = ProcessUtil.executeCMD(cleanCMD, null, repoDir, 0);
+			String resetCMD = "timeout 60 git --git-dir " + repoDir.toString() + " /.git --work-tree "
+					+ repoDir.toString() + " reset --hard";
+			pr = ProcessUtil.executeCMD(resetCMD, null, repoDir, 0);
+			pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir, 0);
 			if (pr.exitCode == 0) {
 				return true;
 			} else {

lib/utils/ProcessUtil.java

@@ -38,7 +38,7 @@ public String toString() {
 	 * @param workDir
 	 * @return
 	 */
-	public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir) {
+	public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir, int expectedExitCode) {
 		ProcessReporter pr = new ProcessReporter();
 		pr.cmd = cmd;
 		try {
@@ -72,7 +72,7 @@ public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir
 
 			proc.destroy();
 
-			if (pr.exitCode != 0) {
+			if (pr.exitCode != expectedExitCode) {
 				throw new Exception();
 			}
 		} catch (Exception e) {