Merge pull request #19 from lumapps/fix/allow_short_jira_ref

Fix/allow short jira ref

Author: sebastien-boulle

check.sh

@@ -20,4 +20,4 @@ do
    validate "$MESSAGE"
 done <<< $COMMITS
 
-echo "All commits succesfully checked"
+echo "All commits successfully checked"

git-commit-template

@@ -22,8 +22,8 @@ type(scope): subject
 # kebab-case.
 
 ## Subject
-# A brief but meaningfull description of the change. Here are some
-# recommandation for writing your subject:
+# A brief but meaningful description of the change. Here are some
+# recommendation for writing your subject:
 # - use the imperative, present tense: "change" not "changed" nor "changes"
 # - don't capitalize first letter
 # - no "." (dot) at the end

validator.bats

@@ -112,12 +112,12 @@ plop"
 @test "structure: valid commit message with header and multiple JIRA" {
   COMMIT="plop plop
 
-ABC-1234 DEF-1234"
+ABC-1234 DE-1234"
 
   validate_overall_structure "$COMMIT"
   [[ $GLOBAL_HEADER == "plop plop" ]]
   [[ $GLOBAL_BODY == "" ]]
-  [[ $GLOBAL_JIRA == "ABC-1234 DEF-1234" ]]
+  [[ $GLOBAL_JIRA == "ABC-1234 DE-1234" ]]
   [[ $GLOBAL_FOOTER == "" ]]
 }
 
@@ -549,6 +549,11 @@ LUM-2345'
   [[ "$status" -eq 0 ]]
 }
 
+@test "feat with short jira ref should be validated" {
+  run validate_jira "feat" "AB-123"
+  [[ "$status" -eq 0 ]]
+}
+
 @test "overall validation invalid structure" {
   MESSAGE='plop
 plop'

validator.sh

@@ -8,7 +8,7 @@ readonly HEADER_PATTERN="^([^\(]+)\(([^\)]+)\): (.+)$"
 readonly TYPE_PATTERN="^(feat|fix|docs|gen|lint|refactor|test|chore)$"
 readonly SCOPE_PATTERN="^([a-z][a-z0-9]*)(-[a-z0-9]+)*$"
 readonly SUBJECT_PATTERN="^([a-z0-9].*[^ ^\.])$"
-readonly JIRA_PATTERN="^([A-Z]{3,4}-[0-9]{1,6} ?)+$"
+readonly JIRA_PATTERN="^([A-Z]{2,4}-[0-9]{1,6} ?)+$"
 readonly JIRA_HEADER_PATTERN="^.*([A-Z]{3,4}-[0-9]{1,6}).*$"
 readonly BROKE_PATTERN="^BROKEN:$"
 readonly TRAILING_SPACE_PATTERN=" +$"