various changes:

- added copying in every file
- disasembled rootCmd into separate wrapper func
- print usage if no file and no stdin

Makefile

@@ -1,3 +1,20 @@
+
+# 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/>.
+
+
 #
 # no need to modify anything below
 tool    = tablizer

cmd/parser.go

@@ -1,3 +1,20 @@
+/*
+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 (

cmd/printer.go

@@ -1,3 +1,20 @@
+/*
+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 (

cmd/processinput.go

@@ -0,0 +1,79 @@
+/*
+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 (
+	"errors"
+	"github.com/alecthomas/repr"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func process(args []string) error {
+	var pattern string
+	havefiles := false
+
+	if len(Columns) > 0 {
+		for _, use := range strings.Split(Columns, ",") {
+			usenum, err := strconv.Atoi(use)
+			if err != nil {
+				die(err)
+			}
+			UseColumns = append(UseColumns, usenum)
+		}
+	}
+
+	if len(args) > 0 {
+		if _, err := os.Stat(args[0]); err != nil {
+			pattern = args[0]
+			args = args[1:]
+		}
+
+		if len(args) > 0 {
+			for _, file := range args {
+				fd, err := os.OpenFile(file, os.O_RDONLY, 0755)
+				if err != nil {
+					die(err)
+				}
+
+				data := parseFile(fd, pattern)
+				if Debug {
+					repr.Print(data)
+				}
+				printTable(data)
+			}
+			havefiles = true
+		}
+	}
+
+	if !havefiles {
+		stat, _ := os.Stdin.Stat()
+		if (stat.Mode() & os.ModeCharDevice) == 0 {
+			data := parseFile(os.Stdin, pattern)
+			if Debug {
+				repr.Print(data)
+			}
+			printTable(data)
+		} else {
+			return errors.New("No file specified and nothing to read on stdin!")
+		}
+	}
+
+	return nil
+}

cmd/root.go

@@ -18,68 +18,23 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/alecthomas/repr"
 	"github.com/spf13/cobra"
 	"os"
-	"strconv"
-	"strings"
 )
 
-var version = "v1.0.0"
+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`,
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if Version {
 			fmt.Printf("This is tablizer version %s\n", version)
-			return
+			return nil
 		}
 
-		var pattern string
+		return process(args)
-		havefiles := false
-
-		if len(Columns) > 0 {
-			for _, use := range strings.Split(Columns, ",") {
-				usenum, err := strconv.Atoi(use)
-				if err != nil {
-					die(err)
-				}
-				UseColumns = append(UseColumns, usenum)
-			}
-		}
-
-		if len(args) > 0 {
-			if _, err := os.Stat(args[0]); err != nil {
-				pattern = args[0]
-				args = args[1:]
-			}
-
-			if len(args) > 0 {
-				for _, file := range args {
-					fd, err := os.OpenFile(file, os.O_RDONLY, 0755)
-					if err != nil {
-						die(err)
-					}
-
-					data := parseFile(fd, pattern)
-					if Debug {
-						repr.Print(data)
-					}
-					printTable(data)
-				}
-				havefiles = true
-			}
-		}
-
-		if !havefiles {
-			data := parseFile(os.Stdin, pattern)
-			if Debug {
-				repr.Print(data)
-			}
-			printTable(data)
-		}
 	},
 }
 

main.go

@@ -1,3 +1,20 @@
+/*
+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 main
 
 import (

mkrel.sh

@@ -1,5 +1,21 @@
 #!/bin/bash
 
+# 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/>.
+
+
 # get list with: go tool dist list
 DIST="darwin/amd64
 freebsd/amd64