diff --git a/cfg/config.go b/cfg/config.go index 37e3799..1c3445d 100644 --- a/cfg/config.go +++ b/cfg/config.go @@ -28,7 +28,7 @@ import ( ) const DefaultSeparator string = `(\s\s+|\t)` -const Version string = "v1.5.3" +const Version string = "v1.5.4" const MAXPARTS = 2 var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config" diff --git a/lib/printer.go b/lib/printer.go index 19196e6..42c17c6 100644 --- a/lib/printer.go +++ b/lib/printer.go @@ -204,8 +204,8 @@ func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) { Borders: tw.BorderNone, Symbols: styleTSV, Settings: tw.Settings{ - Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.On}, - Lines: tw.Lines{ShowFooterLine: tw.Off, ShowHeaderLine: tw.Off}, + Separators: tw.SeparatorsNone, + Lines: tw.LinesNone, }, })), tablewriter.WithConfig(tablewriter.Config{ @@ -213,23 +213,18 @@ func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) { Formatting: tw.CellFormatting{ AutoFormat: tw.Off, }, - Padding: tw.CellPadding{ - Global: tw.Padding{Left: "", Right: ""}, - }, + Padding: tw.CellPadding{Global: tw.Padding{Left: "", Right: " "}}, }, Row: tw.CellConfig{ Formatting: tw.CellFormatting{ AutoWrap: tw.WrapNone, Alignment: tw.AlignLeft, }, - Padding: tw.CellPadding{ - Global: tw.Padding{Left: "", Right: ""}, - }, + Padding: tw.CellPadding{Global: tw.Padding{Right: " "}}, }, Debug: true, }), - tablewriter.WithPadding(tw.PaddingNone), ) if !conf.NoHeaders { diff --git a/lib/printer_test.go b/lib/printer_test.go index e652838..7ae4bd9 100644 --- a/lib/printer_test.go +++ b/lib/printer_test.go @@ -77,10 +77,10 @@ var tests = []struct { numberize: true, name: "default", expect: ` -NAME(1) DURATION(2) COUNT(3) WHEN(4) -beta 1d10h5m1s 33 3/1/2014 -alpha 4h35m 170 2013-Feb-03 -ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, +NAME(1) DURATION(2) COUNT(3) WHEN(4) +beta 1d10h5m1s 33 3/1/2014 +alpha 4h35m 170 2013-Feb-03 +ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, }, { mode: cfg.CSV, @@ -173,10 +173,10 @@ DURATION(2): 33d12h numberize: true, desc: false, expect: ` -NAME(1) DURATION(2) COUNT(3) WHEN(4) -ceta 33d12h 9 06/Jan/2008 15:04:05 -0700 -beta 1d10h5m1s 33 3/1/2014 -alpha 4h35m 170 2013-Feb-03`, +NAME(1) DURATION(2) COUNT(3) WHEN(4) +ceta 33d12h 9 06/Jan/2008 15:04:05 -0700 +beta 1d10h5m1s 33 3/1/2014 +alpha 4h35m 170 2013-Feb-03`, }, { name: "sortbycolumn4", @@ -185,10 +185,10 @@ alpha 4h35m 170 2013-Feb-03`, desc: false, numberize: true, expect: ` -NAME(1) DURATION(2) COUNT(3) WHEN(4) -ceta 33d12h 9 06/Jan/2008 15:04:05 -0700 -alpha 4h35m 170 2013-Feb-03 -beta 1d10h5m1s 33 3/1/2014`, +NAME(1) DURATION(2) COUNT(3) WHEN(4) +ceta 33d12h 9 06/Jan/2008 15:04:05 -0700 +alpha 4h35m 170 2013-Feb-03 +beta 1d10h5m1s 33 3/1/2014`, }, { name: "sortbycolumn2", @@ -197,10 +197,10 @@ beta 1d10h5m1s 33 3/1/2014`, numberize: true, desc: false, expect: ` -NAME(1) DURATION(2) COUNT(3) WHEN(4) -alpha 4h35m 170 2013-Feb-03 -beta 1d10h5m1s 33 3/1/2014 -ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, +NAME(1) DURATION(2) COUNT(3) WHEN(4) +alpha 4h35m 170 2013-Feb-03 +beta 1d10h5m1s 33 3/1/2014 +ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, }, // ----------------------- UseColumns Tests @@ -210,44 +210,44 @@ ceta 33d12h 9 06/Jan/2008 15:04:05 -0700`, numberize: true, usecolstr: "1,4", expect: ` -NAME(1) WHEN(4) -beta 3/1/2014 -alpha 2013-Feb-03 -ceta 06/Jan/2008 15:04:05 -0700`, +NAME(1) WHEN(4) +beta 3/1/2014 +alpha 2013-Feb-03 +ceta 06/Jan/2008 15:04:05 -0700`, }, { - name: "usecolumns", + name: "usecolumns2", usecol: []int{2}, numberize: true, usecolstr: "2", expect: ` -DURATION(2) -1d10h5m1s -4h35m +DURATION(2) +1d10h5m1s +4h35m 33d12h`, }, { - name: "usecolumns", + name: "usecolumns3", usecol: []int{3}, numberize: true, usecolstr: "3", expect: ` -COUNT(3) -33 -170 +COUNT(3) +33 +170 9`, }, { - name: "usecolumns", + name: "usecolumns4", column: 0, usecol: []int{1, 3}, numberize: true, usecolstr: "1,3", expect: ` -NAME(1) COUNT(3) -beta 33 -alpha 170 -ceta 9`, +NAME(1) COUNT(3) +beta 33 +alpha 170 +ceta 9`, }, { name: "usecolumns", @@ -255,10 +255,10 @@ ceta 9`, numberize: true, usecolstr: "2,4", expect: ` -DURATION(2) WHEN(4) -1d10h5m1s 3/1/2014 -4h35m 2013-Feb-03 -33d12h 06/Jan/2008 15:04:05 -0700`, +DURATION(2) WHEN(4) +1d10h5m1s 3/1/2014 +4h35m 2013-Feb-03 +33d12h 06/Jan/2008 15:04:05 -0700`, }, } @@ -304,7 +304,8 @@ func TestPrinter(t *testing.T) { if got != exp { t.Errorf("not rendered correctly:\n+++ got:\n%s\n+++ want:\n%s", - got, exp) + strings.ReplaceAll(got, " ", "_"), + strings.ReplaceAll(exp, " ", "_")) } }) }