Parse repo URL to create commit message (#32)

* parse org name from repo url

* remove logs

* add logs

* push logs to stderr

* use test repo for tests

* log to stdout

* mock cd

* add -T to bats

* add -T to bats

* fix missing params in test calls

* fix typo

* try making things conditional on tests

* fix commit hash

* update test

* remove vars

* update test

* fix var

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* update test

* use circleci var directly

* declare vars as global

* remove debug logs

* use correct var

Author: trevor-coleman

src/scripts/parse_commit_info.sh

@@ -1,12 +1,15 @@
 #! /bin/bash
 
+set -e
+
+
 # Global variable declarations
-COMMIT_MESSAGE=""
-COMMIT_HASH=""
-REPO_URL=""
-REPO_NAME=""
-PR_NUMBER=""
-final_commit_message=""
+declare -g PARSE_COMMIT_COMMIT_MESSAGE=""
+declare -g PARSE_COMMIT_COMMIT_HASH=""
+declare -g PARSE_COMMIT_REPO_URL=""
+declare -g PARSE_COMMIT_REPO_NAME=""
+declare -g PARSE_COMMIT_PR_NUMBER=""
+declare -g final_commit_message=""
 
 ExtractPRNumber() {
   local commit_msg="$1"
@@ -24,6 +27,8 @@ FetchCommitHash() {
 # Normalize the repository URL for consistent usage
 GetNormalizedRepoURL() {
   local circle_repo_url="$1"
+
+
   if [[ $circle_repo_url == https://* ]]; then
     # If it's already an HTTPS URL, just ensure it doesn't have the .git suffix
     echo "${circle_repo_url%.git}"
@@ -36,6 +41,7 @@ GetNormalizedRepoURL() {
 
 ExtractGitHubOrgAndRepo() {
   local repo_url="$1"
+
   if [[ $repo_url != *github.com* ]]; then
     echo "Error: Not a GitHub URL." >&2
     exit 1
@@ -86,53 +92,40 @@ CreateCommitLink() {
 
 ParseCommitInfo() {
   if [ "$ORB_TEST_ENV" = "bats-core" ]; then
-    REPOSITORY_URL="$TEST_REPO_URL"
+    PARSE_COMMIT_REPO_URL=$(GetNormalizedRepoURL "$TEST_REPO_URL")
   else
-    cd "$SOURCE_REPO_DIRECTORY" || { echo "Changing directory failed"; exit 1; }
-    REPOSITORY_URL="$CIRCLE_REPOSITORY_URL"
+    PARSE_COMMIT_REPO_URL=$(GetNormalizedRepoURL "$CIRCLE_REPOSITORY_URL")
   fi
 
-  # Debug logs
-#  >&2 echo "DEBUG: REPOSITORY_URL = $REPOSITORY_URL"
-
-  COMMIT_MESSAGE=$(FetchCommitMessage)
-  COMMIT_HASH=$(FetchCommitHash)
+  PARSE_COMMIT_COMMIT_MESSAGE=$(FetchCommitMessage)
+  PARSE_COMMIT_COMMIT_HASH=$(FetchCommitHash)
 
-  # Debug logs
-#  >&2 echo "DEBUG: COMMIT_MESSAGE = $COMMIT_MESSAGE"
-#  >&2 echo "DEBUG: COMMIT_HASH = $COMMIT_HASH"
+  read -r ORG_NAME PARSE_COMMIT_REPO_NAME <<< "$(ExtractGitHubOrgAndRepo "$PARSE_COMMIT_REPO_URL")"
+  PARSE_COMMIT_PR_NUMBER=$(ExtractPRNumber "$PARSE_COMMIT_COMMIT_MESSAGE")
 
-  REPO_URL=$(GetNormalizedRepoURL "$REPOSITORY_URL")
-
-  # Debug logs
-#  >&2 echo "DEBUG: REPO_URL = $REPO_URL"
-
-  read -r ORG_NAME REPO_NAME <<< "$(ExtractGitHubOrgAndRepo "$REPO_URL")"
-  PR_NUMBER=$(ExtractPRNumber "$COMMIT_MESSAGE")
-
-#  # Debug logs
-#  >&2 echo "DEBUG: ORG_NAME = $ORG_NAME"
-#  >&2 echo "DEBUG: REPO_NAME = $REPO_NAME"
-#  >&2 echo "DEBUG: PR_NUMBER = $PR_NUMBER"
-
-  final_commit_message=$(ConstructCommitMessage "$ORG_NAME" "$REPO_NAME" "$COMMIT_MESSAGE" "$PR_NUMBER" "$COMMIT_HASH")
+  final_commit_message=$(ConstructCommitMessage "$ORG_NAME" "$PARSE_COMMIT_REPO_NAME" "$PARSE_COMMIT_COMMIT_MESSAGE" "$PARSE_COMMIT_PR_NUMBER" "$PARSE_COMMIT_COMMIT_HASH")
 
   echo "$final_commit_message"
 }
 
 
 ORB_TEST_ENV="bats-core"
 if [ "${0#*"$ORB_TEST_ENV"}" = "$0" ]; then
+
+  cd "$SOURCE_REPO_DIRECTORY" || { echo "Changing directory failed"; exit 1; }
+
   final_commit_message="$(ParseCommitInfo)"
 
   # Logging statements to inspect variables
-  echo "COMMIT_MESSAGE: $COMMIT_MESSAGE"
-  echo "COMMIT_HASH: $COMMIT_HASH"
-  echo "REPO_URL: $REPO_URL"
-  echo "REPO_NAME: $REPO_NAME"
-  echo "PR_NUMBER: $PR_NUMBER"
+  echo "CIRCLE_REPOSITORY_URL: $CIRCLE_REPOSITORY_URL"
+  echo "SOURCE_REPO_DIRECTORY: $SOURCE_REPO_DIRECTORY"
+  echo "PARSE_COMMIT_COMMIT_MESSAGE: $PARSE_COMMIT_COMMIT_MESSAGE"
+  echo "PARSE_COMMIT_COMMIT_HASH: $PARSE_COMMIT_COMMIT_HASH"
+  echo "PARSE_COMMIT_REPO_URL: $PARSE_COMMIT_REPO_URL"
+  echo "PARSE_COMMIT_REPO_NAME: $PARSE_COMMIT_REPO_NAME"
+  echo "PARSE_COMMIT_PR_NUMBER: $PARSE_COMMIT_PR_NUMBER"
   echo "final_commit_message: $final_commit_message"
 
-  export FINAL_COMMIT_MESSAGE=$final_commit_message
-  echo "export FINAL_COMMIT_MESSAGE='$final_commit_message'" >> "$BASH_ENV"
+  export FINAL_PARSE_COMMIT_COMMIT_MESSAGE=$final_commit_message
+  echo "export FINAL_PARSE_COMMIT_COMMIT_MESSAGE='$final_commit_message'" >> "$BASH_ENV"
 fi

src/tests/parse_commit_info.bats

@@ -115,14 +115,17 @@ source ./src/scripts/parse_commit_info.sh
 
 
 @test "ParseCommitInfo: It handles commit messages with URL-like strings" {
+  echo "DEBUG: REPO_NAME Before - \"$REPO_NAME\"" >&2  # New Debug Line, directed to stderr
   export TEST_COMMIT_MESSAGE="Fix: See https://example.com/issues/42 for more info (#42)"
   run ParseCommitInfo
   FINAL_MSG=$(echo "$output" | xargs)
-  echo "DEBUG    FINAL_MSG: \"$FINAL_MSG\""
-  echo "EXPECTED FINAL_MSG: \"orb($REPO_NAME): $COMMIT_MESSAGE_WITHOUT_PR https://github.com/$ORG_NAME/$REPO_NAME/commit/$COMMIT_HASH\""
+  echo "DEBUG: REPO_NAME After - \"$REPO_NAME\"" >&2  # New Debug Line, directed to stderr
+  echo "DEBUG    FINAL_MSG: \"$FINAL_MSG\"" >&2
+  echo "EXPECTED FINAL_MSG: \"orb($REPO_NAME): $COMMIT_MESSAGE_WITHOUT_PR https://github.com/$ORG_NAME/$REPO_NAME/commit/$COMMIT_HASH\"" >&2
   [[ $FINAL_MSG == "orb($REPO_NAME): Fix: See https://example.com/issues/42 for more info (#42) https://github.com/org-name/repo-name/pull/42" ]]
 }
 
+
 @test "ParseCommitInfo: It parses and constructs the final commit message with PR link" {
   run ParseCommitInfo
   FINAL_MSG=$(echo "$output" | xargs)