Merge pull request #1 from TLINDEN/development

Dev => main

.circleci/config.yml

@@ -0,0 +1,38 @@
+---
+version: 2.1
+
+jobs:
+  compile:
+    docker:
+    - image: cimg/go:1.18
+    steps:
+    - checkout
+    - run: make
+
+  test:
+    parameters:
+      go_version:
+        type: string
+      run_test:
+        type: boolean
+        default: true
+    docker:
+    - image: cimg/go:<< parameters.go_version >>
+    steps:
+    - checkout
+    - run: make test
+
+workflows:
+  version: 2
+  unit-test:
+    jobs:
+    - compile
+    - test:
+        name: testing
+        matrix:
+          parameters:
+            go_version:
+            - "1.16"
+            - "1.17"
+            - "1.18"
+            - "1.19"

Makefile

@@ -18,16 +18,16 @@
 #
 # no need to modify anything below
 tool    = tablizer
-version = $(shell egrep "^var version = " cmd/root.go | cut -d'=' -f2 | cut -d'"' -f 2)
+version = $(shell egrep "^var Version = " lib/common.go | cut -d'=' -f2 | cut -d'"' -f 2)
 archs   = android darwin freebsd linux netbsd openbsd windows
 PREFIX = /usr/local
 UID    = root
 GID    = 0
 
-all: buildlocal man
+all: buildlocal $(tool).1
 
-man:
+%.1: %.pod
-	pod2man -c "User Commands" -r 1 -s 1 $(tool).pod > $(tool).1
+	pod2man -c "User Commands" -r 1 -s 1 $*.pod > $*.1
 
 buildlocal:
 	go build
@@ -43,4 +43,7 @@ install: buildlocal
 	install -o $(UID) -g $(GID) -m 444 $(tool).1 $(PREFIX)/man/man1/
 
 clean:
-	rm -f $(tool) $(tool).1
+	rm -rf $(tool) $(tool).1 releases
+
+test:
+	go test -v ./...

README.md

@@ -1,3 +1,5 @@
+[![<ORG_NAME>](https://circleci.com/gh/TLINDEN/tablizer.svg?style=svg)](https://app.circleci.com/pipelines/github/TLINDEN/tablizer)
+
 ## tablizer - Manipulate tabular output of other programs
 
 Tablizer  can   be  used   to  re-format   tabular  output   of  other

TODO

@@ -3,4 +3,3 @@ Add a mode like FreeBSD stat(1):
 stat -s dead.letter 
 st_dev=170671546954750497 st_ino=159667 st_mode=0100644 st_nlink=1 st_uid=1001 st_gid=1001 st_rdev=18446744073709551615 st_size=573 st_atime=1661994007 st_mtime=1661961878 st_ctime=1661961878 st_birthtime=1658394900 st_blksize=4096 st_blocks=3 st_flags=2048
 
-mv UseColumns processing out of process()

cmd/printer.go

@@ -1,126 +0,0 @@
-/*
-Copyright © 2022 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package cmd
-
-import (
-	"fmt"
-	"strings"
-)
-
-func printTable(data Tabdata) {
-	if XtendedOut {
-		printExtended(data)
-		return
-	}
-
-	// needed for data output
-	var formats []string
-
-	if len(data.entries) > 0 {
-		// headers
-		for i, head := range data.headers {
-			if len(Columns) > 0 {
-				if !contains(UseColumns, i+1) {
-					continue
-				}
-			}
-
-			// calculate column width
-			var width int
-			var iwidth int
-			var format string
-
-			// generate format string
-			if len(head) > data.maxwidthPerCol[i] {
-				width = len(head)
-			} else {
-				width = data.maxwidthPerCol[i]
-			}
-
-			if NoNumbering {
-				iwidth = 0
-			} else {
-				iwidth = len(fmt.Sprintf("%d", i)) // in case i > 9
-			}
-
-			format = fmt.Sprintf("%%-%ds", 3+iwidth+width)
-
-			if NoNumbering {
-				fmt.Printf(format, fmt.Sprintf("%s ", head))
-			} else {
-				fmt.Printf(format, fmt.Sprintf("%s(%d) ", head, i+1))
-			}
-
-			// register
-			formats = append(formats, format)
-		}
-		fmt.Println()
-
-		// entries
-		var idx int
-		for _, entry := range data.entries {
-			idx = 0
-			//fmt.Println(entry)
-			for i, value := range entry {
-				if len(Columns) > 0 {
-					if !contains(UseColumns, i+1) {
-						continue
-					}
-				}
-				fmt.Printf(formats[idx], strings.TrimSpace(value))
-				idx++
-			}
-			fmt.Println()
-		}
-	}
-}
-
-/*
-   We simulate the \x command of psql (the PostgreSQL client)
-*/
-func printExtended(data Tabdata) {
-	// needed for data output
-	format := fmt.Sprintf("%%%ds: %%s\n", data.maxwidthHeader) // FIXME: re-calculate if -c has been set
-
-	if len(data.entries) > 0 {
-		var idx int
-		for _, entry := range data.entries {
-			idx = 0
-			for i, value := range entry {
-				if len(Columns) > 0 {
-					if !contains(UseColumns, i+1) {
-						continue
-					}
-				}
-
-				fmt.Printf(format, data.headers[idx], value)
-				idx++
-			}
-			fmt.Println()
-		}
-	}
-}
-
-func contains(s []int, e int) bool {
-	for _, a := range s {
-		if a == e {
-			return true
-		}
-	}
-	return false
-}

cmd/root.go

@@ -17,35 +17,36 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package cmd
 
 import (
+	"daemon.de/tablizer/lib"
 	"fmt"
 	"github.com/spf13/cobra"
 	"os"
 )
 
-var version = "v1.0.1"
-
 var rootCmd = &cobra.Command{
 	Use:   "tablizer [regex] [file, ...]",
 	Short: "[Re-]tabularize tabular data",
 	Long:  `Manipulate tabular output of other programs`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		if Version {
+		if lib.ShowVersion {
-			fmt.Printf("This is tablizer version %s\n", version)
+			fmt.Printf("This is tablizer version %s\n", lib.Version)
 			return nil
 		}
 
-		return process(args)
+		err := lib.PrepareColumns()
+		if err != nil {
+			return err
+		}
+
+		err = lib.PrepareModeFlags()
+		if err != nil {
+			return err
+		}
+
+		return lib.ProcessFiles(args)
 	},
 }
 
-var Debug bool
-var XtendedOut bool
-var NoNumbering bool
-var Version bool
-var Columns string
-var UseColumns []int
-var Separator string
-
 func Execute() {
 	err := rootCmd.Execute()
 	if err != nil {
@@ -54,10 +55,21 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.PersistentFlags().BoolVarP(&Debug, "debug", "d", false, "Enable debugging")
+	rootCmd.PersistentFlags().BoolVarP(&lib.Debug, "debug", "d", false, "Enable debugging")
-	rootCmd.PersistentFlags().BoolVarP(&XtendedOut, "extended", "x", false, "Enable extended output")
+	rootCmd.PersistentFlags().BoolVarP(&lib.NoNumbering, "no-numbering", "n", false, "Disable header numbering")
-	rootCmd.PersistentFlags().BoolVarP(&NoNumbering, "no-numbering", "n", false, "Disable header numbering")
+	rootCmd.PersistentFlags().BoolVarP(&lib.ShowVersion, "version", "v", false, "Print program version")
-	rootCmd.PersistentFlags().BoolVarP(&Version, "version", "v", false, "Print program version")
+	rootCmd.PersistentFlags().StringVarP(&lib.Separator, "separator", "s", "", "Custom field separator")
-	rootCmd.PersistentFlags().StringVarP(&Separator, "separator", "s", "", "Custom field separator")
+	rootCmd.PersistentFlags().StringVarP(&lib.Columns, "columns", "c", "", "Only show the speficied columns (separated by ,)")
-	rootCmd.PersistentFlags().StringVarP(&Columns, "columns", "c", "", "Only show the speficied columns (separated by ,)")
+
+	// output flags, only 1 allowed, hidden, since just short cuts
+	rootCmd.PersistentFlags().BoolVarP(&lib.OutflagExtended, "extended", "X", false, "Enable extended output")
+	rootCmd.PersistentFlags().BoolVarP(&lib.OutflagMarkdown, "markdown", "M", false, "Enable markdown table output")
+	rootCmd.PersistentFlags().BoolVarP(&lib.OutflagOrgtable, "orgtbl", "O", false, "Enable org-mode table output")
+	rootCmd.MarkFlagsMutuallyExclusive("extended", "markdown", "orgtbl")
+	rootCmd.Flags().MarkHidden("extended")
+	rootCmd.Flags().MarkHidden("orgtbl")
+	rootCmd.Flags().MarkHidden("markdown")
+
+	// same thing but more common, takes precedence over above group
+	rootCmd.PersistentFlags().StringVarP(&lib.OutputMode, "output", "o", "", "Output mode - one of: orgtbl, markdown, extended, ascii(default)")
 }

go.mod

@@ -2,11 +2,15 @@ module daemon.de/tablizer
 
 go 1.18
 
-require github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897
+require (
+	github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897
+	github.com/olekukonko/tablewriter v0.0.5
+	github.com/spf13/cobra v1.5.0
+)
 
 require (
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/spf13/cobra v1.5.0 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.8.0 // indirect
 )

go.sum

@@ -6,6 +6,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

lib/common.go

@@ -0,0 +1,34 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+// command line flags
+var Debug bool
+var XtendedOut bool
+var NoNumbering bool
+var ShowVersion bool
+var Columns string
+var UseColumns []int
+var Separator string
+var OutflagExtended bool
+var OutflagMarkdown bool
+var OutflagOrgtable bool
+var OutputMode string
+
+var Version = "v1.0.2"
+var validOutputmodes = "(orgtbl|markdown|extended|ascii)"

lib/helpers.go

@@ -0,0 +1,84 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+func die(v ...interface{}) {
+	fmt.Fprintln(os.Stderr, v...)
+	os.Exit(1)
+}
+
+func contains(s []int, e int) bool {
+	for _, a := range s {
+		if a == e {
+			return true
+		}
+	}
+	return false
+}
+
+func PrepareColumns() error {
+	if len(Columns) > 0 {
+		for _, use := range strings.Split(Columns, ",") {
+			usenum, err := strconv.Atoi(use)
+			if err != nil {
+				msg := fmt.Sprintf("Could not parse columns list %s: %v", Columns, err)
+				return errors.New(msg)
+			}
+			UseColumns = append(UseColumns, usenum)
+		}
+	}
+	return nil
+}
+
+func PrepareModeFlags() error {
+	if len(OutputMode) == 0 {
+		switch {
+		case OutflagExtended:
+			OutputMode = "extended"
+		case OutflagMarkdown:
+			OutputMode = "markdown"
+		case OutflagOrgtable:
+			OutputMode = "orgtbl"
+		default:
+			OutputMode = "ascii"
+		}
+	} else {
+		r, err := regexp.Compile(validOutputmodes)
+
+		if err != nil {
+			return errors.New("Failed to validate output mode spec!")
+		}
+
+		match := r.MatchString(OutputMode)
+
+		if !match {
+			return errors.New("Invalid output mode!")
+		}
+	}
+
+	return nil
+}

lib/helpers_test.go

@@ -0,0 +1,73 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+)
+
+func Testcontains(t *testing.T) {
+	var tests = []struct {
+		list   []int
+		search int
+		want   bool
+	}{
+		{[]int{1, 2, 3}, 2, true},
+		{[]int{2, 3, 4}, 5, false},
+	}
+
+	for _, tt := range tests {
+		testname := fmt.Sprintf("contains-%d,%d,%t", tt.list, tt.search, tt.want)
+		t.Run(testname, func(t *testing.T) {
+			answer := contains(tt.list, tt.search)
+			if answer != tt.want {
+				t.Errorf("got %t, want %t", answer, tt.want)
+			}
+		})
+	}
+}
+
+func TestPrepareColumns(t *testing.T) {
+	var tests = []struct {
+		input     string
+		exp       []int
+		wanterror bool // expect error
+	}{
+		{"1,2,3", []int{1, 2, 3}, false},
+		{"1,2,", []int{}, true},
+	}
+
+	for _, tt := range tests {
+		testname := fmt.Sprintf("PrepareColumns-%s-%t", tt.input, tt.wanterror)
+		t.Run(testname, func(t *testing.T) {
+			Columns = tt.input
+			err := PrepareColumns()
+			if err != nil {
+				if !tt.wanterror {
+					t.Errorf("got error: %v", err)
+				}
+			} else {
+				if !reflect.DeepEqual(UseColumns, tt.exp) {
+					t.Errorf("got: %v, expected: %v", UseColumns, tt.exp)
+				}
+			}
+		})
+	}
+}

lib/io.go

@@ -15,48 +15,52 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package cmd
+package lib
 
 import (
 	"errors"
-	"github.com/alecthomas/repr"
+	"io"
 	"os"
-	"strconv"
-	"strings"
 )
 
-func process(args []string) error {
+func ProcessFiles(args []string) error {
-	var pattern string
+	fds, pattern, err := determineIO(args)
-	havefiles := false
 
-	if len(Columns) > 0 {
-		for _, use := range strings.Split(Columns, ",") {
-			usenum, err := strconv.Atoi(use)
 	if err != nil {
-				die(err)
+		return err
-			}
-			UseColumns = append(UseColumns, usenum)
 	}
+
+	for _, fd := range fds {
+		printData(parseFile(fd, pattern))
 	}
 
+	return nil
+}
+
+func determineIO(args []string) ([]io.Reader, string, error) {
+	var pattern string
+	var fds []io.Reader
+	var havefiles bool
+
 	if len(args) > 0 {
+		// threre were args left, take a look
 		if _, err := os.Stat(args[0]); err != nil {
+			// first  one is  not a  file, consider  it as  regexp and
+			// shift arg list
 			pattern = args[0]
 			args = args[1:]
 		}
 
 		if len(args) > 0 {
+			// only files
 			for _, file := range args {
 				fd, err := os.OpenFile(file, os.O_RDONLY, 0755)
+
 				if err != nil {
-					die(err)
+					return nil, "", err
 				}
 
-				data := parseFile(fd, pattern)
+				fds = append(fds, fd)
-				if Debug {
-					repr.Print(data)
-				}
-				printTable(data)
 			}
 			havefiles = true
 		}
@@ -65,15 +69,11 @@ func process(args []string) error {
 	if !havefiles {
 		stat, _ := os.Stdin.Stat()
 		if (stat.Mode() & os.ModeCharDevice) == 0 {
-			data := parseFile(os.Stdin, pattern)
+			fds = append(fds, os.Stdin)
-			if Debug {
-				repr.Print(data)
-			}
-			printTable(data)
 		} else {
-			return errors.New("No file specified and nothing to read on stdin!")
+			return nil, "", errors.New("No file specified and nothing to read on stdin!")
 		}
 	}
 
-	return nil
+	return fds, pattern, nil
 }

lib/parser.go

@@ -15,13 +15,13 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package cmd
+package lib
 
 import (
 	"bufio"
 	"fmt"
+	"github.com/alecthomas/repr"
 	"io"
-	"os"
 	"regexp"
 	"strings"
 )
@@ -36,11 +36,6 @@ type Tabdata struct {
 	entries        [][]string
 }
 
-func die(v ...interface{}) {
-	fmt.Fprintln(os.Stderr, v...)
-	os.Exit(1)
-}
-
 /*
    Parse tabular input. We split the  header (first line) by 2 or more
    spaces, remember the positions of  the header fields. We then split
@@ -65,7 +60,7 @@ func parseFile(input io.Reader, pattern string) Tabdata {
 	scanner = bufio.NewScanner(input)
 
 	for scanner.Scan() {
-		line := scanner.Text()
+		line := strings.TrimSpace(scanner.Text())
 		values := []string{}
 
 		patternR, err := regexp.Compile(pattern)
@@ -115,22 +110,18 @@ func parseFile(input io.Reader, pattern string) Tabdata {
 				// done
 				hadFirst = true
 			}
-			// if Debug {
-			// 	fmt.Println(data.headerIndices)
-			// }
 		} else {
 			// data processing
 			if len(pattern) > 0 {
-				//fmt.Println(patternR.MatchString(line))
 				if !patternR.MatchString(line) {
 					continue
 				}
 			}
 
 			idx := 0 // we cannot use the header index, because we could exclude columns
-
 			for _, index := range data.headerIndices {
 				value := ""
+
 				if index["end"] == 0 {
 					value = string(line[index["beg"]:])
 				} else {
@@ -150,7 +141,7 @@ func parseFile(input io.Reader, pattern string) Tabdata {
 				// if Debug {
 				// 	fmt.Printf("<%s> ", value)
 				// }
-				values = append(values, value)
+				values = append(values, strings.TrimSpace(value))
 
 				idx++
 			}
@@ -165,5 +156,9 @@ func parseFile(input io.Reader, pattern string) Tabdata {
 		die(scanner.Err())
 	}
 
+	if Debug {
+		repr.Print(data)
+	}
+
 	return data
 }

lib/parser_test.go

@@ -0,0 +1,77 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+)
+
+func TestParser(t *testing.T) {
+	data := Tabdata{
+		maxwidthHeader: 5,
+		maxwidthPerCol: []int{
+			5,
+			5,
+			8,
+		},
+		columns: 3,
+		headerIndices: []map[string]int{
+			map[string]int{
+				"beg": 0,
+				"end": 6,
+			},
+			map[string]int{
+				"end": 13,
+				"beg": 7,
+			},
+			map[string]int{
+				"beg": 14,
+				"end": 0,
+			},
+		},
+		headers: []string{
+			"ONE",
+			"TWO",
+			"THREE",
+		},
+		entries: [][]string{
+			[]string{
+				"asd",
+				"igig",
+				"cxxxncnc",
+			},
+			[]string{
+				"19191",
+				"EDD 1",
+				"X",
+			},
+		},
+	}
+
+	table := `ONE    TWO    THREE  
+asd    igig   cxxxncnc  
+19191  EDD 1  X`
+
+	readFd := strings.NewReader(table)
+	gotdata := parseFile(readFd, "")
+	if !reflect.DeepEqual(data, gotdata) {
+		t.Errorf("Parser returned invalid data\nExp: %+v\nGot: %+v\n", data, gotdata)
+	}
+}

lib/printer.go

@@ -0,0 +1,188 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+import (
+	"fmt"
+	"github.com/olekukonko/tablewriter"
+	"os"
+	"regexp"
+	"strings"
+)
+
+func printData(data Tabdata) {
+	// prepare headers
+	// FIXME: maybe do this already in parseFile()?
+	if !NoNumbering {
+		numberedHeaders := []string{}
+		for i, head := range data.headers {
+			if len(Columns) > 0 {
+				if !contains(UseColumns, i+1) {
+					continue
+				}
+			}
+			numberedHeaders = append(numberedHeaders, fmt.Sprintf("%s(%d)", head, i+1))
+		}
+		data.headers = numberedHeaders
+	}
+
+	// prepare data
+	if len(Columns) > 0 {
+		reducedEntries := [][]string{}
+		reducedEntry := []string{}
+		for _, entry := range data.entries {
+			reducedEntry = nil
+			for i, value := range entry {
+				if !contains(UseColumns, i+1) {
+					continue
+				}
+
+				reducedEntry = append(reducedEntry, value)
+			}
+			reducedEntries = append(reducedEntries, reducedEntry)
+		}
+		data.entries = reducedEntries
+	}
+
+	switch OutputMode {
+	case "extended":
+		printExtendedData(data)
+	case "ascii":
+		printAsciiData(data)
+	case "orgtbl":
+		printOrgmodeData(data)
+	case "markdown":
+		printMarkdownData(data)
+	default:
+		printAsciiData(data)
+	}
+}
+
+func trimRow(row []string) []string {
+	// FIXME: remove this when we only use Tablewriter and strip in ParseFile()!
+	var fixedrow []string
+	for _, cell := range row {
+		fixedrow = append(fixedrow, strings.TrimSpace(cell))
+	}
+
+	return fixedrow
+}
+
+/*
+   Emacs org-mode compatible table (also orgtbl-mode)
+*/
+func printOrgmodeData(data Tabdata) {
+	tableString := &strings.Builder{}
+	table := tablewriter.NewWriter(tableString)
+
+	table.SetHeader(data.headers)
+
+	for _, row := range data.entries {
+		table.Append(trimRow(row))
+	}
+
+	table.Render()
+
+	/* fix output for org-mode (orgtbl)
+	   tableWriter output:
+	   +------+------+
+	   | cell | cell |
+	   +------+------+
+
+	   Needed for org-mode compatibility:
+	   |------+------|
+	   | cell | cell |
+	   |------+------|
+	*/
+	leftR := regexp.MustCompile("(?m)^\\+")
+	rightR := regexp.MustCompile("\\+(?m)$")
+
+	fmt.Print(rightR.ReplaceAllString(leftR.ReplaceAllString(tableString.String(), "|"), "|"))
+}
+
+/*
+   Markdown table
+*/
+func printMarkdownData(data Tabdata) {
+	table := tablewriter.NewWriter(os.Stdout)
+
+	table.SetHeader(data.headers)
+
+	for _, row := range data.entries {
+		table.Append(trimRow(row))
+	}
+
+	table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
+	table.SetCenterSeparator("|")
+
+	table.Render()
+}
+
+/*
+   Simple ASCII table without any borders etc, just like the input we expect
+*/
+func printAsciiData(data Tabdata) {
+	table := tablewriter.NewWriter(os.Stdout)
+
+	table.SetHeader(data.headers)
+	table.AppendBulk(data.entries)
+
+	// for _, row := range data.entries {
+	// 	table.Append(trimRow(row))
+	// }
+
+	table.SetAutoWrapText(false)
+	table.SetAutoFormatHeaders(true)
+	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
+	table.SetAlignment(tablewriter.ALIGN_LEFT)
+	table.SetCenterSeparator("")
+	table.SetColumnSeparator("")
+	table.SetRowSeparator("")
+	table.SetHeaderLine(false)
+	table.SetBorder(false)
+	table.SetTablePadding("\t") // pad with tabs
+	table.SetNoWhiteSpace(true)
+
+	table.Render()
+}
+
+/*
+   We simulate the \x command of psql (the PostgreSQL client)
+*/
+func printExtendedData(data Tabdata) {
+	// needed for data output
+	format := fmt.Sprintf("%%%ds: %%s\n", data.maxwidthHeader) // FIXME: re-calculate if -c has been set
+
+	if len(data.entries) > 0 {
+		var idx int
+		for _, entry := range data.entries {
+			idx = 0
+			for i, value := range entry {
+				if len(Columns) > 0 {
+					if !contains(UseColumns, i+1) {
+						continue
+					}
+				}
+
+				fmt.Printf(format, data.headers[idx], value)
+				idx++
+			}
+			fmt.Println()
+		}
+	}
+}

lib/printer_test.go

@@ -0,0 +1,76 @@
+/*
+Copyright © 2022 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package lib
+
+import (
+	"os"
+	"strings"
+	"testing"
+)
+
+func TestPrinter(t *testing.T) {
+	table := `ONE    TWO    THREE  
+asd    igig   cxxxncnc  
+19191  EDD 1  X`
+
+	expects := map[string]string{
+		"ascii": `ONE(1)	TWO(2)	THREE(3) 
+asd   	igig  	cxxxncnc	
+19191 	EDD 1 	X`,
+		"orgtbl": `|--------+--------+----------|
+| ONE(1) | TWO(2) | THREE(3) |
+|--------+--------+----------|
+| asd    | igig   | cxxxncnc |
+|  19191 | EDD 1  | X        |
+|--------+--------+----------|`,
+		"markdown": `| ONE(1) | TWO(2) | THREE(3) |
+|--------|--------|----------|
+| asd    | igig   | cxxxncnc |
+|  19191 | EDD 1  | X        |`,
+	}
+
+	r, w, err := os.Pipe()
+	if err != nil {
+		t.Fatal(err)
+	}
+	origStdout := os.Stdout
+	os.Stdout = w
+
+	for mode, expect := range expects {
+		OutputMode = mode
+		fd := strings.NewReader(table)
+		data := parseFile(fd, "")
+		printData(data)
+
+		buf := make([]byte, 1024)
+		n, err := r.Read(buf)
+		if err != nil {
+			t.Fatal(err)
+		}
+		buf = buf[:n]
+		output := strings.TrimSpace(string(buf))
+
+		if output != expect {
+			t.Errorf("output mode: %s, got:\n%s\nwant:\n%s\n (%d <=> %d)", mode, output, expect, len(output), len(expect))
+		}
+	}
+
+	// Restore
+	os.Stdout = origStdout
+
+}

mkrel.sh

@@ -27,6 +27,11 @@ windows/amd64"
 tool="$1"
 version="$2"
 
+if test -z "$version"; then
+  echo "Usage: $0 <tool name> <release version>"
+  exit 1
+fi
+
 rm -rf releases
 mkdir -p releases
 

tablizer.pod

@@ -10,9 +10,12 @@ tablizer - Manipulate tabular output of other programs
     Flags:
       -c, --columns string     Only show the speficied columns (separated by ,)
       -d, --debug              Enable debugging
-      -x, --extended           Enable extended output
       -h, --help               help for tablizer
       -n, --no-numbering       Disable header numbering
+      -o, --output string      Output mode - one of: orgtbl, markdown, extended, ascii(default)
+      -X, --extended           Enable extended output
+      -M, --markdown           Enable markdown table output
+      -O, --orgtbl             Enable org-mode table output
       -s, --separator string   Custom field separator
       -v, --version            Print program version
 
@@ -68,14 +71,19 @@ the original order.
 
 The numbering can be suppressed by using the B<-n> option.
 
+Finally the  B<-d> option  enables debugging  output which  is mostly
+usefull for the developer.
+
+?head2 OUTPUT MODES
+
 There might be cases  when the tabular output of a  program is way too
 large  for your  current  terminal but  you still  need  to see  every
-column.  In such  cases the B<-x> option can be  usefull which enables
+column.   In such  cases the  B<-o extended>  or B<-X>  option can  be
-I<extended mode>. In  this mode, each row will  be printed vertically,
+usefull which enables I<extended mode>. In this mode, each row will be
-header  left, value  right, aligned  by  the field  widths. Here's  an
+printed vertically,  header left,  value right,  aligned by  the field
-example:
+widths. Here's an example:
 
-    kubectl get pods | ./tablizer -x    
+    kubectl get pods | ./tablizer -X
         NAME: repldepl-7bcd8d5b64-7zq4l  
        READY: 1/1    
       STATUS: Running  
@@ -85,8 +93,9 @@ example:
 You can  of course  still use  a regex  to reduce  the number  of rows
 displayed.
 
-Finally the  B<-d> option  enables debugging  output which  is mostly
+Beside normal  ascii mode  (the default) and  extended mode  there are
-usefull for the developer.
+more output modes available: B<orgtbl>  which prints an Emacs org-mode
+table and B<markdown> which prints a Markdown table.
 
 =head1 BUGS