Merge pull request #58 from fraenky8/bump-go-module-v2

Bump go module v2

.golangci.yml

@@ -22,7 +22,7 @@ issues:
 
 linters-settings:
   goimports:
-    local-prefixes: github.com/fraenky8/tables-to-go
+    local-prefixes: github.com/fraenky8/tables-to-go/v2
 
   gosec:
     config:

Makefile

@@ -1,17 +1,24 @@
 .PHONY: all build
 
+TAG=$(shell git describe --abbrev=0 --tags 2>&1)
+TS=$(shell date '+%b %d %Y %T')
+
 all: help
 
 # Self documenting makefile. Double hashes signify help comments.
 help:                   ## Show this help
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
 
-install:                ## Installs tables-to-go. Same behavior like `go install -mod=vendor .`
-	go install -mod=vendor .
+install:                ## Installs tables-to-go. Requires `git` to be installed.
+	@go install -mod=vendor -ldflags \
+    	"-X 'main.buildTimestamp=$(TS)' -X 'main.versionTag=$(TAG)'" \
+    	.
 
 sqlite3:                ## Installs tables-to-go with sqlite3 driver and the \
                         ## User Authentication feature enabled. \
                         ## For more information see the documentation of the driver at \
                         ## - https://github.com/mattn/go-sqlite3#compilation \
                         ## - https://github.com/mattn/go-sqlite3#user-authentication
-	CGO_ENABLED=1 go install -mod=vendor -tags="sqlite3 sqlite_userauth" .
+	CGO_ENABLED=1 go install -mod=vendor -tags="sqlite3 sqlite_userauth" -ldflags \
+    	"-X 'main.buildTimestamp=$(TS)' -X 'main.versionTag=$(TAG)'" \
+    	.

README.md

@@ -21,7 +21,7 @@ This project provides a make file but can also simply be installed with the
 go-install command:
 
 ```
-go install github.com/fraenky8/tables-to-go@master
+go install github.com/fraenky8/tables-to-go@latest
 ```
 
 To enable SQLite3 support, clone the repo manually and run the make file:

go.mod

@@ -1,4 +1,4 @@
-module github.com/fraenky8/tables-to-go
+module github.com/fraenky8/tables-to-go/v2
 
 go 1.23
 

internal/cli/tables-to-go-cli.go

@@ -9,10 +9,10 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/fraenky8/tables-to-go/pkg/database"
-	"github.com/fraenky8/tables-to-go/pkg/output"
-	"github.com/fraenky8/tables-to-go/pkg/settings"
-	"github.com/fraenky8/tables-to-go/pkg/tagger"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/output"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/tagger"
 )
 
 var (

internal/cli/tables-to-go-cli_test.go

@@ -6,8 +6,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/fraenky8/tables-to-go/pkg/database"
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 type mockDB struct {

pkg/database/database.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 var (

pkg/database/mysql.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 
 	// MySQL database driver
 	_ "github.com/go-sql-driver/mysql"

pkg/database/mysql_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 func TestMySQL_DSN(t *testing.T) {

pkg/database/postgresql.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 
 	// postgres database driver
 	_ "github.com/lib/pq"

pkg/database/postgresql_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 func TestPostgresql_DSN(t *testing.T) {

pkg/database/sqlite.go

@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 // SQLite implements the Database interface with help of GeneralDatabase.

pkg/database/sqlite_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 func TestSQLite_DSN(t *testing.T) {

pkg/tagger/db.go

@@ -1,7 +1,7 @@
 package tagger
 
 import (
-	"github.com/fraenky8/tables-to-go/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
 )
 
 // Db is the standard "db"-tag.

pkg/tagger/mastermind.go

@@ -1,7 +1,7 @@
 package tagger
 
 import (
-	"github.com/fraenky8/tables-to-go/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
 )
 
 // Mastermind represents the Masterminds/structable "stbl"-tag.

pkg/tagger/mastermind_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/fraenky8/tables-to-go/pkg/database"
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 func TestMastermind_GenerateTag(t *testing.T) {

pkg/tagger/tagger.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/fraenky8/tables-to-go/pkg/database"
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 const (

pkg/tagger/tagger_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/fraenky8/tables-to-go/pkg/database"
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
 )
 
 func TestTaggers_GenerateTags(t *testing.T) {

tables-to-go.go

@@ -4,16 +4,25 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"runtime"
+	"runtime/debug"
 
-	"github.com/fraenky8/tables-to-go/internal/cli"
-	"github.com/fraenky8/tables-to-go/pkg/database"
-	"github.com/fraenky8/tables-to-go/pkg/output"
-	"github.com/fraenky8/tables-to-go/pkg/settings"
+	"github.com/fraenky8/tables-to-go/v2/internal/cli"
+	"github.com/fraenky8/tables-to-go/v2/pkg/database"
+	"github.com/fraenky8/tables-to-go/v2/pkg/output"
+	"github.com/fraenky8/tables-to-go/v2/pkg/settings"
+)
+
+var (
+	revision       = "master"
+	versionTag     = ""
+	buildTimestamp = ""
 )
 
 // CmdArgs represents the supported command line args
 type CmdArgs struct {
-	Help bool
+	Help    bool
+	Version bool
 	*settings.Settings
 }
 
@@ -28,6 +37,7 @@ func NewCmdArgs() (args *CmdArgs) {
 	flag.BoolVar(&args.Help, "help", false, "shows help and usage")
 	flag.BoolVar(&args.Verbose, "v", args.Verbose, "verbose output")
 	flag.BoolVar(&args.VVerbose, "vv", args.VVerbose, "more verbose output")
+	flag.BoolVar(&args.Version, "version", args.Version, "show version and build information")
 	flag.BoolVar(&args.Force, "f", args.Force, "force; skip tables that encounter errors")
 
 	flag.Var(&args.DbType, "t", fmt.Sprintf("type of database to use, currently supported: %v", settings.SprintfSupportedDbTypes()))
@@ -75,6 +85,11 @@ func main() {
 		os.Exit(0)
 	}
 
+	if cmdArgs.Version {
+		printVersion()
+		os.Exit(0)
+	}
+
 	if err := cmdArgs.Verify(); err != nil {
 		fmt.Print(err)
 		os.Exit(1)
@@ -94,3 +109,26 @@ func main() {
 		os.Exit(1)
 	}
 }
+
+func printVersion() {
+	info, ok := debug.ReadBuildInfo()
+	if ok {
+		if versionTag == "" {
+			versionTag = info.Main.Version
+		}
+		for _, s := range info.Settings {
+			if s.Key == "vcs.revision" {
+				revision = s.Value[:8]
+			}
+		}
+	}
+
+	fmt.Printf("tables-to-go/%s-%s %s/%s built with %s", versionTag, revision,
+		runtime.GOOS, runtime.GOARCH, runtime.Version())
+
+	//goland:noinspection GoBoolExpressions
+	if buildTimestamp != "" {
+		fmt.Printf(" on %s", buildTimestamp)
+	}
+	fmt.Println()
+}