Merge branch 'develop'

Author: codejsha

.editorconfig

@@ -18,6 +18,10 @@ ij_formatter_tags_enabled = true
 ij_smart_tabs = false
 ij_visual_guides =
 ij_wrap_on_typing = false
+ktlint_ignore_back_ticked_identifier = false
+ktlint_function_naming_ignore_when_annotated_with = unset
+ktlint_function_signature_body_expression_wrapping = multiline
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
 
 [*.css]
 ij_css_align_closing_brace_with_properties = false
@@ -157,7 +161,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = never
-ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+ij_java_imports_layout = com.codejsha.**,|,*,|,java.**,javax.**,|,$*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
@@ -171,10 +175,10 @@ ij_java_keep_first_column_comment = false
 ij_java_keep_indents_on_empty_lines = false
 ij_java_keep_line_breaks = true
 ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = false
-ij_java_keep_simple_lambdas_in_one_line = false
-ij_java_keep_simple_methods_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = true
+ij_java_keep_simple_classes_in_one_line = true
+ij_java_keep_simple_lambdas_in_one_line = true
+ij_java_keep_simple_methods_in_one_line = true
 ij_java_label_indent_absolute = false
 ij_java_label_indent_size = 0
 ij_java_lambda_brace_style = end_of_line
@@ -1088,7 +1092,7 @@ ij_groovy_ginq_on_wrap_policy = 1
 ij_groovy_ginq_space_after_keyword = true
 ij_groovy_if_brace_force = never
 ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
+ij_groovy_imports_layout = com.codejsha.**,|,*,|,java.**,javax.**,|,$*
 ij_groovy_indent_case_from_switch = true
 ij_groovy_indent_label_blocks = true
 ij_groovy_insert_inner_class_imports = false
@@ -1286,6 +1290,7 @@ ij_go_wrap_func_result_newline_before_rparen = true
 
 [{*.graphqlconfig,*.graphqlrc,*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,.ws-context,bowerrc,jest.config}]
 ij_json_indent_size = 2
+ij_json_continuation_indent_size = 4
 ij_json_array_wrapping = split_into_lines
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
@@ -1326,7 +1331,7 @@ ij_html_quote_style = double
 ij_html_remove_new_line_before_tags = br
 ij_html_space_after_tag_name = false
 ij_html_space_around_equality_in_attribute = false
-ij_html_space_inside_empty_tag = false
+ij_html_space_inside_empty_tag = true
 ij_html_text_wrap = normal
 
 [{*.http,*.rest}]
@@ -1379,7 +1384,7 @@ ij_kotlin_field_annotation_wrap = split_into_lines
 ij_kotlin_finally_on_new_line = false
 ij_kotlin_if_rparen_on_new_line = true
 ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_imports_layout = com.codejsha.**,|,*,|,java.**,javax.**,kotlin.**,^
 ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
 ij_kotlin_keep_blank_lines_before_right_brace = 0
 ij_kotlin_keep_blank_lines_in_code = 1

.gitattributes

@@ -1,5 +1,8 @@
 * text=auto
 
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.ps1 text eol=crlf
 *.sh text eol=lf
 *.svg text
 *.txt text eol=lf

cpp/editorconfig/.editorconfig renamed to cpp/editorconfig/.cpp.editorconfig

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: APACHE-2.0
 # SPDX-FileCopyrightText: Copyright 2023-2024 Jinseong Ha
 
-### Microsoft Visual Studio
+### EditorConfig Settings for Microsoft Visual Studio C++
 
 root = true
 

cpp/editorconfig/README.md

@@ -43,10 +43,14 @@ GIT_TRACE=1 git push origin main
 
 ######################################################################
 
-git clone <REPO_URL>
-git clone --recurse-submodules <REPO_URL>
+### config
 
-function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -n "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
+git config --global --list
+git config --local --list
+git config --list
+
+git config user.name developer
+git config user.email [email protected]
 
 ######################################################################
 
@@ -67,6 +71,8 @@ git push -u origin main
 ######################################################################
 
 ### repo
+
+### initialize
 git init
 
 ### remote
@@ -78,21 +84,6 @@ git remote set-url origin http://git.example.com/developer/my-app-cd.git
 ### submodule
 git submodule add https://github.com/codejsha/infrastructure-examples infrastructure
 
-######################################################################
-
-### config
-
-git config --global --list
-git config --local --list
-git config --list
-
-git config user.name developer
-git config user.email [email protected]
-
-######################################################################
-
-### collaborate
-
 ### fetch
 git fetch --all
 
@@ -105,6 +96,11 @@ git push origin main
 git push --force origin main
 git push --no-verify
 
+### clone
+git clone <REPO_URL>
+git clone --recurse-submodules <REPO_URL>
+function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -n "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
+
 ######################################################################
 
 ### add

git/git-commands.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
 set -o errexit
 set -o errtrace
@@ -14,8 +14,7 @@ echo "[INFO] Repository root: ${REPO_ROOT}"
 
 ######################################################################
 
-### Block specific keywords
-
+### block specific keywords
 BLOCKED_KEYWORDS="$(cat ${HOOKS_DIR}/blocked_keywords.txt)"
 for KEYWORD in ${BLOCKED_KEYWORDS}; do
     if git diff --cached | grep ${KEYWORD}; then
@@ -26,34 +25,58 @@ done
 
 ######################################################################
 
-### Signing commits
+### signing commits
 
 CURRENT_USER_NAME="$(git config user.name)"
 CURRENT_USER_EMAIL="$(git config user.email)"
 CURRENT_GPG_SIGNING_KEY="$(git config user.signingkey)"
 
-### Check if the current GPG signing key exists
+### check if the current gpg signing key exists
 if [ -z "${CURRENT_GPG_SIGNING_KEY}" ]; then
     echo "[ERROR] No GPG key set for signing commits."
     exit 1
 fi
+echo "[pre-commit] [INFO] Current GPG signing key: ${CURRENT_GPG_SIGNING_KEY}"
 
-### Check if the current user name and email match the env config
+### check if the current user name and email match the env config
 if [ "${CURRENT_USER_NAME}" != "${ENV_USER_NAME}" ] ||
     [ "${CURRENT_USER_EMAIL}" != "${ENV_USER_EMAIL}" ]; then
     echo "[ERROR] Commit rejected. Your user name or email is incorrect."
     exit 1
 fi
+echo "[pre-commit] [INFO] Current user name: ${CURRENT_USER_NAME}"
+echo "[pre-commit] [INFO] Current user email: ${CURRENT_USER_EMAIL}"
 
+### check if the current gpg signing key matches the env config
 GPG_USER_INFO="$(gpg --list-keys --with-colons "${ENV_GPG_SIGNING_KEY}" | grep "^uid:" | head -n 1 | cut -d: -f10)"
 GPG_USER_NAME="${GPG_USER_INFO% <*}"
 GPG_USER_EMAIL="${GPG_USER_INFO#*<}" && GPG_USER_EMAIL="${GPG_USER_EMAIL%>}"
-
-### Check if the current GPG signing key matches the env config
 if [ "${CURRENT_USER_NAME}" != "${GPG_USER_NAME}" ] ||
     [ "${CURRENT_USER_EMAIL}" != "${GPG_USER_EMAIL}" ]; then
     echo "[ERROR] Git config user name or email doesn't match the GPG key's user name or email."
     exit 1
 fi
+echo "[pre-commit] [INFO] GPG signing key matches the environment config."
+
+######################################################################
+
+### execute formatting
+
+### format kotlin files
+git diff --cached --name-only --diff-filter=ACM | rg '\.kt$|\.kts$' | while read -r FILE; do
+    echo "[pre-commit] [INFO] Formatting file: ${FILE}"
+    ktlint -F --editorconfig ${HOME}/properties/config/.editorconfig "${REPO_ROOT}/${FILE}"
+    git add "${REPO_ROOT}/${FILE}"
+done
+
+### format golang files
+git diff --cached --name-only --diff-filter=ACM | rg '\.go$' | while read -r FILE; do
+    echo "[pre-commit] [INFO] Formatting file: ${FILE}"
+    gofmt -s -w ${REPO_ROOT}/${FILE}
+    goimports -w ${REPO_ROOT}/${FILE}
+    git add "${REPO_ROOT}/${FILE}"
+done
+
+######################################################################
 
 exit 0

git/hooks/pre-commit

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
 set -o errexit
 set -o errtrace
@@ -14,39 +14,41 @@ echo "[INFO] Repository root: ${REPO_ROOT}"
 
 ######################################################################
 
+### print commits to push
 COMMITS_TO_PUSH=""
 if [ -z "$(git ls-remote --heads origin)" ]; then
-    ### The remote repository is empty
+    ### the remote repository is empty
     COMMITS_TO_PUSH="$(git log --pretty=format:"%H")"
 else
     COMMITS_TO_PUSH="$(git log @{u}.. --pretty=format:"%H")"
 fi
 echo "[INFO] Commits to push:"
 echo "${COMMITS_TO_PUSH}"
 
+######################################################################
+
+### validate commits to push
 for COMMIT in ${COMMITS_TO_PUSH}; do
-    ### Check if the commit is GPG signed
-    if [ ! -z $(git verify-commit ${COMMIT} > /dev/null 2>&1) ]; then
-        echo "[ERROR] Commit ${COMMIT} is not GPG signed."
+    ### check if the commit is gpg signed
+    if ! { git verify-commit ${COMMIT} > /dev/null 2>&1; }; then
+        echo "[pre-push] [ERROR] Commit ${COMMIT} is not GPG signed."
         exit 1
     fi
 
+    ### check if the commit user name and email match the env config
     COMMIT_USER_NAME="$(git show -s --pretty=format:%aN ${COMMIT})"
     COMMIT_USER_EMAIL="$(git show -s --pretty=format:%aE ${COMMIT})"
-
-    ### Check if the commit user name and email match the env config
     if [ "${COMMIT_USER_NAME}" != "${ENV_USER_NAME}" ] ||
         [ "${COMMIT_USER_EMAIL}" != "${ENV_USER_EMAIL}" ]; then
         echo "[ERROR] Push rejected. Your user name or email is incorrect."
         exit 1
     fi
 
+    ### check if the commit gpg signing key matches the env config
     COMMIT_GPG_SIGNING_KEY="$(git show -s --pretty=format:%GF ${COMMIT})"
     COMMIT_GPG_USER_INFO="$(git show -s --pretty=format:%GS ${COMMIT})"
     COMMIT_GPG_USER_NAME="${COMMIT_GPG_USER_INFO% <*}"
     COMMIT_GPG_USER_EMAIL="${COMMIT_GPG_USER_INFO#*<}" && COMMIT_GPG_USER_EMAIL="${COMMIT_GPG_USER_EMAIL%>}"
-
-    ### Check if the commit GPG signing key matches the env config
     if [ "${COMMIT_GPG_SIGNING_KEY}" != "${ENV_GPG_SIGNING_KEY}" ]; then
         echo "[ERROR] Commit ${COMMIT} is signed with a different GPG key."
         exit 1

git/hooks/pre-push

@@ -1,61 +1,49 @@
-#!/bin/sh
+#!/usr/bin/env bash
 trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
 set -o errexit
 set -o errtrace
 
-echo "[INFO] prepare-commit-msg hook"
-
 source ~/properties/git/hooks/.env
 HOOKS_DIR=$(git rev-parse --git-path hooks)
 REPO_ROOT=$(git rev-parse --show-toplevel)
-echo "[INFO] Environment: ${ENV_NAME}"
-echo "[INFO] Git hooks dir: ${HOOKS_DIR}"
-echo "[INFO] Repository root: ${REPO_ROOT}"
+echo "[pre-push] [INFO] environment: ${ENV_NAME}"
+echo "[pre-push] [INFO] git hooks dir: ${HOOKS_DIR}"
+echo "[pre-push] [INFO] repository root: ${REPO_ROOT}"
 
 COMMIT_MSG_FILE=${1}
 COMMIT_SOURCE=${2}
 
 ######################################################################
 
-### Print branch name
-if [ -z "$(git rev-parse --abbrev-ref HEAD > /dev/null 2>&1)" ]; then
-  BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
-  echo "[INFO] Branch name: ${BRANCH_NAME}"
-fi
-
-### Skip for merge, squash, and rebase
-echo "[INFO] Commit source: ${COMMIT_SOURCE}"
-if [ "${COMMIT_SOURCE}" = "merge" ] || [ "${COMMIT_SOURCE}" = "squash" ] ; then
-  echo "[INFO] Skip for merge or squash commit."
-  exit 0
-fi
-if [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
-  echo "[INFO] Skip for rebase."
-  exit 0
+### print branch name
+if git rev-parse --verify HEAD >/dev/null 2>&1; then
+  BRANCH_NAME="$(git rev-parse --abbrev-ref HEAD)"
+  echo "[prepare-commit-msg] [INFO] Branch name: ${BRANCH_NAME}"
 fi
 
 ######################################################################
 
-### Validate commit message
-echo "[INFO] Commit message: $(cat ${COMMIT_MSG_FILE})"
+### validate commit message
+
+echo "[prepare-commit-msg] [INFO] Commit message: $(cat ${COMMIT_MSG_FILE})"
 COMMIT_MESSAGE="$(cat "${COMMIT_MSG_FILE}")"
 
-if [ "${COMMIT_MESSAGE}" = "Initial commit" ]; then
-  echo "[INFO] Skip for initial commit."
+if [ "${COMMIT_MESSAGE}" = "Initial commit" ] || [ "${COMMIT_MESSAGE}" = "initial commit" ]; then
+  echo "[prepare-commit-msg] [INFO] Skip for initial commit."
   exit 0
 fi
 
-COMMIT_MESSAGE_PATTERN="^(feat|fix|docs|style|refactor|chore|test|gitflow-feature-stash): .*$"
+COMMIT_MESSAGE_PATTERN="^(feat|fix|docs|style|refactor|chore|test|gitflow-feature-stash): .+|^Merge (branch|pull request).*$"
 if [[ -z "${COMMIT_MESSAGE}" ]]; then
-  echo "[ERROR] Commit message cannot be empty."
+  echo "[prepare-commit-msg] [ERROR] Commit message cannot be empty."
   exit 1
 fi
 if [[ ! "${COMMIT_MESSAGE}" =~ ${COMMIT_MESSAGE_PATTERN} ]]; then
-  echo "[ERROR] Commit message must start with a commit type: feat|fix|docs|style|refactor|chore|test"
+  echo "[prepare-commit-msg] [ERROR] Commit message must start with a commit type (feat|fix|docs|style|refactor|chore|test) or be a merge commit."
   exit 1
 fi
 if echo "${COMMIT_MESSAGE}" | grep -q -E "\s{2,}"; then
-  echo "[ERROR] Commit message must not contain two spaces."
+  echo "[prepare-commit-msg] [ERROR] Commit message must not contain two spaces."
   exit 1
 fi