Bug fix and added flags (#2)

Author: claesgill

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.0.3]
+
+### Added
+- Added new flags
+- Added new version of binary
+
+### Fixed
+- Fixed bug in regex, removed `^`
+
 ## [0.0.2]
 
 ### Fixed

README.md

@@ -14,12 +14,42 @@ gp -v
 ```
 
 ## Usage
-`gp` only serves two flags `-v` and `-status`. The latter yield the git status on a pre-defined format and will only print values if in a git folder.  
+`gp` serves a couple of flags you may want to use. See the list underneath.
 
+| flag | type | default | description |
+| :--- | :--- | :------ | :---------- |
+| -v   | bool | false   | get the version |
+| -status   | bool | false   | formatting git status if any |
+| -c   | bool | false   | color the status output |
+| -b   | bool | false   | get active branch |
+| -m   | bool | false   | get number of tracked modified files |
+| -d   | bool | false   | get number of tracked deleted files |
+| -u   | bool | false   | get number of untracked files |
+
+### Examples
+#### `-status` 
+This flag yield the git status on a pre-defined format and will only print values if in a git folder.  
 ```sh
 gp -status
 >[master | +1 -2 U…]
 ```
+You can also use the color flag `-c` in combination with `-status`.
+
+#### `-b` `-m` `-d` `-u`
+```sh
+gp -b
+>master
+gp -m
+>+1
+````
+You can use flags in combination, but they will each print on a separate line.
+```sh
+gp -b -m -d -u
+>master
+>+1
+>-1
+>U…
+```
 
 ### PS1
 > :information_source: This is an example of how you can set `PS1`. Feel free to do whatever you want.

bin/gp

@@ -10,33 +10,50 @@ import (
 )
 
 // TODO: implement random color func
-// TODO: Add flag -b branch -m modidied -d deleted -u untraced (-bmdu)
 
 func main() {
-	vers   := flag.Bool("v", false, "get the version")
+	vers      := flag.Bool("v", false, "get the version")
+	status    := flag.Bool("status", false, "formatting git status if any")
+	branch    := flag.Bool("b", false, "get active branch")
+	modified  := flag.Bool("m", false, "get number of tracked modified files")
+	deleted   := flag.Bool("d", false, "get number of tracked deleted files")
+	untracked := flag.Bool("u", false, "get number of untracked files")
+	color     := flag.Bool("c", false, "color the status output")
 
-	status := flag.Bool("status", false, "formatting git status if any")
 	flag.Parse()
 	if *vers == true {
-		fmt.Println("Git Prettier version v0.0.2")
+		fmt.Println("Git Prettier version v0.0.3")
 		os.Exit(1)
 	}
 	if *status {
-		nMod, nDel, nUntr := gitStatus()
+		nMod, nDel, isUntr := gitStatus()
 		branch 			  := gitBranch()
-	
 		if branch == "" { os.Exit(1) }
-		
-		fmtStats := fmtResults(branch, nMod, nDel, nUntr)
+		var fmtStats string
+		if *color {
+			fmtStats = fmtResultsColor(branch, nMod, nDel, isUntr)
+		} else {
+			fmtStats = fmtResults(branch, nMod, nDel, isUntr)
+		}
 		fmt.Println(fmtStats)
 	}
+	if *branch    { fmt.Println(gitBranch()) }
+	if *modified  { 
+		if nMod, _, _ := gitStatus(); nMod > 0 { fmt.Printf("+%v\n", nMod) }
+	}
+	if *deleted   {
+		if _, nDel, _ := gitStatus(); nDel > 0 { fmt.Printf("-%v\n", nDel) }
+	}
+	if *untracked {
+		if _, _, isUntr := gitStatus(); isUntr { fmt.Println("U…") }
+	}
 }
 
 func gitBranch() (string){
 	cmd := exec.Command("git", "branch")
 	output, err := cmd.Output()
 	if err != nil {}
-	rBranch    := regexp.MustCompile(`^\*\s.*`)
+	rBranch    := regexp.MustCompile(`\*\s.*`)
 	branch     := rBranch.FindAllString(string(output[:]), 1000)
 	branch     = strings.Split(strings.Join(branch, ""), "* ")
 	parsBranch := strings.Join(branch, "")
@@ -47,18 +64,29 @@ func gitStatus() (int, int, bool){
 	cmd := exec.Command("git", "status")
 	output, err := cmd.Output()
 	if err != nil {}
-	rMod  := regexp.MustCompile(`modified:`)
-	nMod  := len(rMod.FindAllString(string(output[:]), 1000))
+	rMod := regexp.MustCompile(`modified:`)
+	nMod := len(rMod.FindAllString(string(output[:]), 1000))
+	rNew := regexp.MustCompile(`new file:`)
+	nNew := len(rNew.FindAllString(string(output[:]), 1000))
+	nMod =  nMod + nNew
 	rDel  := regexp.MustCompile(`deleted:`)
 	nDel  := len(rDel.FindAllString(string(output[:]), 1000))
-	rNew  := regexp.MustCompile(`new file:`)
-	nNew  := len(rNew.FindAllString(string(output[:]), 1000))
 	rUntr := regexp.MustCompile(`Untracked files:`)
-	nMod = nMod + nNew
 	return nMod, nDel, rUntr.MatchString(string(output[:]))
 }
 
 func fmtResults(branch string, nMod int, nDel int, isUntr bool) (string) {
+	stats := "["
+	stats += branch
+	if nMod  > 0 || nDel > 0 { stats += " |" }
+	if nMod  > 0 { stats = fmt.Sprint(stats, " +", nMod) }
+	if nDel  > 0 { stats = fmt.Sprint(stats, " -", nDel) }
+	if isUntr    { stats = fmt.Sprint(stats, " U…")      }
+	stats += "]"
+	return stats
+}
+
+func fmtResultsColor(branch string, nMod int, nDel int, isUntr bool) (string) {
 	RED     := "\033[91m"
 	BLUE    := "\033[34m"
 	GREEN   := "\033[32m"