From 55607189cc19ea44680f12399b7fc3e6a952a318 Mon Sep 17 00:00:00 2001 From: Valentine Kiselev Date: Fri, 24 Jun 2022 07:26:27 +0300 Subject: [PATCH] chore: Move main.go to root (#285) Signed-off-by: Valentin Kiselev --- .goreleaser.yml | 1 - Makefile | 2 +- cmd/{lefthook => }/add-doc.txt | 0 cmd/{lefthook => }/add.go | 2 +- cmd/{lefthook => }/install.go | 2 +- cmd/{lefthook/main.go => lefthook.go} | 4 ++-- cmd/{lefthook => }/root.go | 2 +- cmd/{lefthook => }/run.go | 2 +- cmd/{lefthook => }/uninstall.go | 2 +- cmd/{lefthook => }/version.go | 2 +- main.go | 7 +++++++ 11 files changed, 16 insertions(+), 10 deletions(-) rename cmd/{lefthook => }/add-doc.txt (100%) rename cmd/{lefthook => }/add.go (98%) rename cmd/{lefthook => }/install.go (98%) rename cmd/{lefthook/main.go => lefthook.go} (87%) rename cmd/{lefthook => }/root.go (98%) rename cmd/{lefthook => }/run.go (97%) rename cmd/{lefthook => }/uninstall.go (98%) rename cmd/{lefthook => }/version.go (97%) create mode 100644 main.go diff --git a/.goreleaser.yml b/.goreleaser.yml index d2478d43..cd89bb8d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -5,7 +5,6 @@ before: builds: - env: - CGO_ENABLED=0 - main: ./cmd/lefthook/ goos: - linux - darwin diff --git a/Makefile b/Makefile index 875a396d..2678fb01 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build: - go build -o lefthook cmd/lefthook/*.go + go build -o lefthook test: go test -cpu 24 -race -count=1 -timeout=30s ./... diff --git a/cmd/lefthook/add-doc.txt b/cmd/add-doc.txt similarity index 100% rename from cmd/lefthook/add-doc.txt rename to cmd/add-doc.txt diff --git a/cmd/lefthook/add.go b/cmd/add.go similarity index 98% rename from cmd/lefthook/add.go rename to cmd/add.go index 4212065f..fa8a662e 100644 --- a/cmd/lefthook/add.go +++ b/cmd/add.go @@ -1,4 +1,4 @@ -package main +package cmd import ( _ "embed" diff --git a/cmd/lefthook/install.go b/cmd/install.go similarity index 98% rename from cmd/lefthook/install.go rename to cmd/install.go index 69c57340..6863e415 100644 --- a/cmd/lefthook/install.go +++ b/cmd/install.go @@ -1,4 +1,4 @@ -package main +package cmd import ( "github.com/spf13/cobra" diff --git a/cmd/lefthook/main.go b/cmd/lefthook.go similarity index 87% rename from cmd/lefthook/main.go rename to cmd/lefthook.go index 8ab96621..0b469d72 100644 --- a/cmd/lefthook/main.go +++ b/cmd/lefthook.go @@ -1,4 +1,4 @@ -package main +package cmd import ( "os" @@ -6,7 +6,7 @@ import ( "github.com/evilmartians/lefthook/internal/log" ) -func main() { +func Lefthook() { rootCmd := newRootCmd() if err := rootCmd.Execute(); err != nil { diff --git a/cmd/lefthook/root.go b/cmd/root.go similarity index 98% rename from cmd/lefthook/root.go rename to cmd/root.go index 147a5f99..8c52baa1 100644 --- a/cmd/lefthook/root.go +++ b/cmd/root.go @@ -1,4 +1,4 @@ -package main +package cmd import ( "github.com/MakeNowJust/heredoc" diff --git a/cmd/lefthook/run.go b/cmd/run.go similarity index 97% rename from cmd/lefthook/run.go rename to cmd/run.go index 0eeaaf7f..39bd79fb 100644 --- a/cmd/lefthook/run.go +++ b/cmd/run.go @@ -1,4 +1,4 @@ -package main +package cmd import ( "github.com/spf13/cobra" diff --git a/cmd/lefthook/uninstall.go b/cmd/uninstall.go similarity index 98% rename from cmd/lefthook/uninstall.go rename to cmd/uninstall.go index fee1b88d..4edb2071 100644 --- a/cmd/lefthook/uninstall.go +++ b/cmd/uninstall.go @@ -1,4 +1,4 @@ -package main +package cmd import ( "github.com/spf13/cobra" diff --git a/cmd/lefthook/version.go b/cmd/version.go similarity index 97% rename from cmd/lefthook/version.go rename to cmd/version.go index 273922ee..a5461cad 100644 --- a/cmd/lefthook/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ -package main +package cmd import ( "github.com/spf13/cobra" diff --git a/main.go b/main.go new file mode 100644 index 00000000..64accc08 --- /dev/null +++ b/main.go @@ -0,0 +1,7 @@ +package main + +import "github.com/evilmartians/lefthook/cmd" + +func main() { + cmd.Lefthook() +}