Merge pull request #15 from moul/dev/moul/short-date

feat: add '{{SHORT_DATE}}' preset
moul · Sep 17, 2020 · 2225a44 · 2225a44
2 parents 5d5dd80 + e613535
commit 2225a44
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 21 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -73,10 +73,6 @@ jobs:
     strategy:
       matrix:
         golang:
-          #- 1.11.13
-          #- 1.12.17
-          #- 1.13.15
-          #- 1.14.7
           - 1.15.1
     steps:
       - uses: actions/checkout@v2
@@ -133,7 +129,6 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.11.13
           - 1.12.17
           - 1.13.15
           - 1.14.7

diff --git a/AUTHORS b/AUTHORS
diff --git a/Makefile b/Makefile
@@ -27,5 +27,8 @@ generate: install
 	echo 'foo@bar:~$$ generate-fake-data | prefix -format="{{SLOW_LINES}} up={{.ShortUptime}} | "' > .tmp/example-4.txt
 	generate-fake-data --seed=4242 --lines=10 --sleep-max=1.5s --dict=lorem-ipsum --no-stderr | prefix --format="{{SLOW_LINES}} up={{.ShortUptime}} | " >> .tmp/example-4.txt
 
+	echo 'foo@bar:~$$ generate-fake-data | prefix -format="{{SHORT_DATE}} "' > .tmp/example-5.txt
+	generate-fake-data --seed=42 --lines=10 --dict=lorem-ipsum --no-stderr --sleep-max=1.5s | prefix --format="{{SHORT_DATE}} " >> .tmp/example-5.txt
+
 	embedmd -w README.md
 	#rm -rf .tmp
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ SYNTAX
 
 PRESETS
   {{DEFAULT}}          {{.LineNumber3}} up={{.ShortUptime}} d={{.ShortDuration}} |
+  {{SHORT_DATE}}       {{now | date "06/02/01 15:04:05"}}
   {{SLOW_LINES}}       {{if (gt .Duration 1000000000)}}SLOW{{else}}    {{end}} {{.Duration | short_duration}} 
 
 EXAMPLES
@@ -64,16 +65,16 @@ EXAMPLES
 [embedmd]:# (.tmp/example-1.txt console)
 ```console
 foo@bar:~$ generate-fake-data | prefix -format="#{{.LineNumber3}} {{.ShortUptime}} {{.ShortDuration}} | "
-#1   44.5µs  48.3µs  | At illum ut est sit soluta nulla numquam.
-#2   112ms   112ms   | Sunt quaerat ea dolores facere deleniti culpa numquam.
-#3   327ms   215ms   | Distinctio maxime consequatur est qui corporis sunt officia.
-#4   605.4ms 278.3ms | Et quia odit molestias voluptas porro repellendus magnam.
-#5   897.7ms 292.3ms | Corporis eos rem non hic esse optio quisquam.
-#6   1.1s    211.6ms | Natus earum molestias iste architecto porro et blanditiis.
-#7   1.3s    238.3ms | Eum repellendus nostrum qui eius suscipit fugit quia.
+#1   81.1µs  93.3µs  | At illum ut est sit soluta nulla numquam.
+#2   113.8ms 113.7ms | Sunt quaerat ea dolores facere deleniti culpa numquam.
+#3   328.7ms 214.9ms | Distinctio maxime consequatur est qui corporis sunt officia.
+#4   607ms   278.3ms | Et quia odit molestias voluptas porro repellendus magnam.
+#5   899.2ms 292.2ms | Corporis eos rem non hic esse optio quisquam.
+#6   1.1s    211.5ms | Natus earum molestias iste architecto porro et blanditiis.
+#7   1.3s    238.2ms | Eum repellendus nostrum qui eius suscipit fugit quia.
 #8   1.4s    50.5ms  | Et nesciunt quod fuga ut vel pariatur libero.
 #9   1.6s    209.9ms | Rerum omnis soluta facilis voluptatem possimus et voluptas.
-#10  1.9s    274.7ms | Possimus harum voluptatibus aperiam voluptatibus qui autem quam.
+#10  1.9s    274.8ms | Possimus harum voluptatibus aperiam voluptatibus qui autem quam.
 ```
 
 [embedmd]:# (.tmp/example-2.txt console)
@@ -109,18 +110,34 @@ foo@bar:~$ generate-fake-data | prefix -format=">>> "
 [embedmd]:# (.tmp/example-4.txt console)
 ```console
 foo@bar:~$ generate-fake-data | prefix -format="{{SLOW_LINES}} up={{.ShortUptime}} | "
-     109.3µs  up=129.7µs | Rerum natus quo quo explicabo tempore et delectus.
+     90.5µs   up=121.2µs | Rerum natus quo quo explicabo tempore et delectus.
 SLOW 1s       up=1s      | Dolor blanditiis voluptas dolorum sint laudantium eveniet amet.
 SLOW 1.3s     up=2.4s    | Qui asperiores molestiae est quia est eum omnis.
 SLOW 1.3s     up=3.6s    | Illum explicabo aut illum iste pariatur aut laudantium.
-     982.1ms  up=4.6s    | Quibusdam asperiores consequatur est dolores quas dolor ipsam.
+     982.2ms  up=4.6s    | Quibusdam asperiores consequatur est dolores quas dolor ipsam.
      185.4ms  up=4.8s    | Possimus qui non rem qui cum sit temporibus.
-     167.5ms  up=5s      | Ea debitis sit deleniti cum ut adipisci in.
-     520.5ms  up=5.5s    | Eveniet molestias voluptatem voluptatem deserunt nisi tempora iusto.
-     215.1ms  up=5.7s    | Fugiat minus quam eos voluptatem labore sit velit.
+     167.4ms  up=5s      | Ea debitis sit deleniti cum ut adipisci in.
+     520.4ms  up=5.5s    | Eveniet molestias voluptatem voluptatem deserunt nisi tempora iusto.
+     215ms    up=5.7s    | Fugiat minus quam eos voluptatem labore sit velit.
 SLOW 1s       up=6.7s    | Enim aut autem tenetur fugit minima quo atque.
 ```
 
+[embedmd]:# (.tmp/example-5.txt console)
+```console
+foo@bar:~$ generate-fake-data | prefix -format="{{SHORT_DATE}} "
+20/17/09 15:39:36 At illum ut est sit soluta nulla numquam.
+20/17/09 15:39:36 Sunt quaerat ea dolores facere deleniti culpa numquam.
+20/17/09 15:39:37 Distinctio maxime consequatur est qui corporis sunt officia.
+20/17/09 15:39:39 Et quia odit molestias voluptas porro repellendus magnam.
+20/17/09 15:39:40 Corporis eos rem non hic esse optio quisquam.
+20/17/09 15:39:41 Natus earum molestias iste architecto porro et blanditiis.
+20/17/09 15:39:42 Eum repellendus nostrum qui eius suscipit fugit quia.
+20/17/09 15:39:43 Et nesciunt quod fuga ut vel pariatur libero.
+20/17/09 15:39:44 Rerum omnis soluta facilis voluptatem possimus et voluptas.
+20/17/09 15:39:45 Possimus harum voluptatibus aperiam voluptatibus qui autem quam.
+```
+
+
 ## Install
 
 ### Using go

diff --git a/cmd/prefix/main.go b/cmd/prefix/main.go
@@ -22,7 +22,7 @@ func main() {
 }
 
 var (
-	flags  = flag.NewFlagSet("prefix", flag.ExitOnError)
+	flags  = flag.NewFlagSet("prefix", flag.ContinueOnError)
 	format = flags.String("format", "{{DEFAULT}} ", "format string")
 )
 

diff --git a/cmd/prefix/main_test.go b/cmd/prefix/main_test.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"strings"
 	"testing"
 
@@ -56,8 +57,8 @@ func TestUsage(t *testing.T) {
 
 	// simulate CLI call
 	err := run([]string{"prefix", "-h"})
-	if err != nil {
-		t.Fatalf("err should be nil: %v", err)
+	if err != flag.ErrHelp {
+		t.Fatalf("err should be flag.ErrHelp: %v", err)
 	}
 
 	// ignore output in this test

diff --git a/prefix.go b/prefix.go
@@ -40,6 +40,7 @@ var AvailablePatterns = map[string]string{
 var AvailablePresets = map[string]string{
 	"{{DEFAULT}}":    `{{.LineNumber3}} up={{.ShortUptime}} d={{.ShortDuration}} |`,
 	"{{SLOW_LINES}}": `{{if (gt .Duration 1000000000)}}SLOW{{else}}    {{end}} {{.Duration | short_duration}} `,
+	"{{SHORT_DATE}}": `{{now | date "06/02/01 15:04:05"}}`,
 }
 
 type LinePrefixer interface {