diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..461edd0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +releases +tablizer diff --git a/cfg/config.go b/cfg/config.go index 82ef423..147d6d2 100644 --- a/cfg/config.go +++ b/cfg/config.go @@ -19,13 +19,14 @@ package cfg import ( "errors" "fmt" - "github.com/gookit/color" "os" "regexp" + + "github.com/gookit/color" ) const DefaultSeparator string = `(\s\s+|\t)` -const Version string = "v1.0.15" +const Version string = "v1.0.16" var VERSION string // maintained by -x diff --git a/cmd/root.go b/cmd/root.go index 9a68deb..3e09fc7 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -20,13 +20,14 @@ import ( "bytes" "errors" "fmt" - "github.com/spf13/cobra" - "github.com/tlinden/tablizer/cfg" - "github.com/tlinden/tablizer/lib" "log" "os" "os/exec" "strings" + + "github.com/spf13/cobra" + "github.com/tlinden/tablizer/cfg" + "github.com/tlinden/tablizer/lib" ) func man() { @@ -105,7 +106,7 @@ func Execute() { // options rootCmd.PersistentFlags().BoolVarP(&conf.Debug, "debug", "d", false, "Enable debugging") rootCmd.PersistentFlags().BoolVarP(&conf.NoNumbering, "no-numbering", "n", false, "Disable header numbering") - rootCmd.PersistentFlags().BoolVarP(&conf.NoHeaders, "no-headers", "", false, "Disable header display") + rootCmd.PersistentFlags().BoolVarP(&conf.NoHeaders, "no-headers", "H", false, "Disable header display") rootCmd.PersistentFlags().BoolVarP(&conf.NoColor, "no-color", "N", false, "Disable pattern highlighting") rootCmd.PersistentFlags().BoolVarP(&ShowVersion, "version", "V", false, "Print program version") rootCmd.PersistentFlags().BoolVarP(&conf.InvertMatch, "invert-match", "v", false, "select non-matching rows") diff --git a/cmd/tablizer.go b/cmd/tablizer.go index 210e620..7151b53 100644 --- a/cmd/tablizer.go +++ b/cmd/tablizer.go @@ -13,7 +13,7 @@ SYNOPSIS -v, --invert-match select non-matching rows -n, --no-numbering Disable header numbering -N, --no-color Disable pattern highlighting - --no-headers Disable headers display + -H, --no-headers Disable headers display -s, --separator string Custom field separator -k, --sort-by int Sort by column (default: 1) @@ -89,9 +89,9 @@ DESCRIPTION The numbering can be suppressed by using the -n option. By default tablizer shows a header containing the names of each column. - This can be disabled using the --no-headers option. Be aware that this - only affects tabular output modes. Shell, Extended, Yaml and CSV output - modes always use the column names. + This can be disabled using the -H option. Be aware that this only + affects tabular output modes. Shell, Extended, Yaml and CSV output modes + always use the column names. By default, if a pattern has been speficied, matches will be highlighted. You can disable this behavior with the -N option. @@ -299,7 +299,7 @@ Operational Flags: -v, --invert-match select non-matching rows -n, --no-numbering Disable header numbering -N, --no-color Disable pattern highlighting - --no-headers Disable headers display + -H, --no-headers Disable headers display -s, --separator string Custom field separator -k, --sort-by int Sort by column (default: 1) diff --git a/tablizer.1 b/tablizer.1 index ff3486b..9eadc02 100644 --- a/tablizer.1 +++ b/tablizer.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "TABLIZER 1" -.TH TABLIZER 1 "2023-04-21" "1" "User Commands" +.TH TABLIZER 1 "2023-05-03" "1" "User Commands" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -151,7 +151,7 @@ tablizer \- Manipulate tabular output of other programs \& \-v, \-\-invert\-match select non\-matching rows \& \-n, \-\-no\-numbering Disable header numbering \& \-N, \-\-no\-color Disable pattern highlighting -\& \-\-no\-headers Disable headers display +\& \-H, \-\-no\-headers Disable headers display \& \-s, \-\-separator string Custom field separator \& \-k, \-\-sort\-by int Sort by column (default: 1) \& @@ -236,9 +236,9 @@ the original order. The numbering can be suppressed by using the \fB\-n\fR option. .PP By default tablizer shows a header containing the names of each -column. This can be disabled using the \fB\-\-no\-headers\fR option. Be -aware that this only affects tabular output modes. Shell, Extended, -Yaml and \s-1CSV\s0 output modes always use the column names. +column. This can be disabled using the \fB\-H\fR option. Be aware that +this only affects tabular output modes. Shell, Extended, Yaml and \s-1CSV\s0 +output modes always use the column names. .PP By default, if a \fBpattern\fR has been speficied, matches will be highlighted. You can disable this behavior with the \fB\-N\fR option. diff --git a/tablizer.pod b/tablizer.pod index e0d9c0d..8bd3ea6 100644 --- a/tablizer.pod +++ b/tablizer.pod @@ -12,7 +12,7 @@ tablizer - Manipulate tabular output of other programs -v, --invert-match select non-matching rows -n, --no-numbering Disable header numbering -N, --no-color Disable pattern highlighting - --no-headers Disable headers display + -H, --no-headers Disable headers display -s, --separator string Custom field separator -k, --sort-by int Sort by column (default: 1) @@ -92,9 +92,9 @@ the original order. The numbering can be suppressed by using the B<-n> option. By default tablizer shows a header containing the names of each -column. This can be disabled using the B<--no-headers> option. Be -aware that this only affects tabular output modes. Shell, Extended, -Yaml and CSV output modes always use the column names. +column. This can be disabled using the B<-H> option. Be aware that +this only affects tabular output modes. Shell, Extended, Yaml and CSV +output modes always use the column names. By default, if a B has been speficied, matches will be highlighted. You can disable this behavior with the B<-N> option.