parse my args properly!

internal/argparser/argparser.go

@@ -1,30 +1,38 @@
 package argparser
 
-import "errors"
+import (
+	"errors"
+	"strings"
+)
 
 func Parse(args []string) (err error, commit_type string, commit_scope string, shouldCommit bool, shouldStage bool, commit_message []string) {
 	argparseloop:
 	for i := 0; i < len(args); i++ {
-		switch args[i] {
+		if strings.HasPrefix(args[i],"-") {
-			case "-c", "--commit", "-commit":
+			switch args[i] {
-				shouldCommit = true
+				case "-c", "--commit", "-commit":
-			case "-a", "--add", "-add":
+					shouldCommit = true
-				shouldStage = true
+				case "-a", "--add", "-add":
-			case "--":
+					shouldStage = true
-				commit_message = args[i+1:]
+				case "--":
-				break argparseloop
+					commit_message = args[i+1:]
-			default:
+					break argparseloop
-				if commit_type == "" {
+				default:
-					commit_type = args[i]
+					err = errors.New("unknown argument")
-					continue argparseloop
+					return
-				}
+			}
-				if commit_scope == "" {
-					commit_scope = args[i]
-					continue argparseloop
-				}
-				err = errors.New("unknown argument")
-				return
 		}
+		if commit_type == "" {
+			commit_type = args[i]
+		} else if commit_scope == "" {
+			commit_scope = args[i]
+		} else {
+			err = errors.New("unknown argument")
+			return
+		}
+	}
+	if commit_type == "" {
+		err = errors.New("need at least type")
 	}
 	return
 }

internal/argparser/argparser_test.go

@@ -26,5 +26,13 @@ func TestParse(t *testing.T) {
 		assert.Equal(t, shouldCommit, false)
 		assert.Equal(t, shouldStage, false)
 	})
+	t.Run("fake arg", func(t *testing.T) {
+		error,_,_,_,_,_ := Parse([]string{"-f"})
+		assert.NotEqual(t, error, nil)
+	})
+	t.Run("excess arg", func(t *testing.T) {
+		error,_,_,_,_,_ := Parse([]string{"type","scope","fool me"})
+		assert.NotEqual(t, error, nil)
+	})
 }