add format option

Author: Brent Beardsley

.gitignore

@@ -12,7 +12,5 @@
 *.out
 
 debug
-histkeep
 histkeep-cli
-dist/histkeep.rb
-dist/histkeep*.zip
+dist/*

cmd/histkeep/go.mod

@@ -0,0 +1,7 @@
+module github.com/bbeardsley/histkeep-cli
+
+go 1.14
+
+require (
+  github.com/bbeardsley/histkeep v0.0.3
+)

cmd/histkeep/go.sum

@@ -0,0 +1,4 @@
+github.com/bbeardsley/histkeep v0.0.1 h1:Io27oE3jAG2FT/xhhspqzYFm/STvgPD1+d8Q1uweEEw=
+github.com/bbeardsley/histkeep v0.0.1/go.mod h1:bYUZoqU122IpvVr8h1H19KkV3MgQ10C9bMNKK6ZP05k=
+github.com/bbeardsley/histkeep v0.0.3 h1:clPq3s1ZuJZFqbiqivklJfnMzpAM7ndahgZjAa7ZEko=
+github.com/bbeardsley/histkeep v0.0.3/go.mod h1:bYUZoqU122IpvVr8h1H19KkV3MgQ10C9bMNKK6ZP05k=

cmd/histkeep/main.go

@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"regexp"
 	"strings"
 
 	"github.com/bbeardsley/histkeep"
 )
 
-const version = "0.0.2"
+const version = "0.0.3"
 
 func printUsage() {
 	fmt.Fprintln(os.Stderr, "Usage")
@@ -31,6 +32,7 @@ func printUsage() {
 
 func main() {
 	lastNPtr := flag.Int("last", 15, "keep the last specified number of values")
+	formatPtr := flag.String("format", "", "regex format for the values.  Accepts NUMBER and UUID as shortcuts.")
 	versionPtr := flag.Bool("version", false, "print version number and exit")
 
 	flag.Parse()
@@ -43,8 +45,7 @@ func main() {
 	command := strings.TrimSpace(flag.Arg(0))
 	file := strings.TrimSpace(flag.Arg(1))
 	value := strings.TrimSpace(flag.Arg(2))
-
-	hist := histkeep.NewHistKeep(file, *lastNPtr)
+	hist := histkeep.NewHistKeep(file, *lastNPtr, buildFormat(*formatPtr))
 
 	switch command {
 	case "", "h", "-h", "--h", "/h", "/?", "help", "-help", "--help", "/help":
@@ -93,3 +94,24 @@ func main() {
 
 	return
 }
+
+func buildFormat(formatStr string) *regexp.Regexp {
+	format := processedNamedFormats(formatStr)
+	regex, _ := regexp.Compile("^" + format + "$")
+	return regex
+}
+
+func processedNamedFormats(formatStr string) string {
+	var matched bool
+	matched, _ = regexp.MatchString("^NUMBER$", formatStr)
+	if matched {
+		return "\\d+"
+	}
+
+	matched, _ = regexp.MatchString("^UUID$", formatStr)
+	if matched {
+		return "([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}){1}"
+	}
+
+	return formatStr
+}