From 78ac1e50a597a0c43b2d1489271d71b51ebba693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D7=A0=CF=85=CE=B1=CE=B7=20=D7=A0=CF=85=CE=B1=CE=B7=D1=95?= =?UTF-8?q?=CF=83=CE=B7?= Date: Tue, 6 Feb 2024 13:24:32 -0800 Subject: [PATCH] fix: correct go install latest Bump the code to v2 such that go install will function. Fixes: #145 --- cmd/init.go | 2 +- cmd/overlay.go | 2 +- cmd/root.go | 2 +- docs/docs/installation.md | 2 +- examples/go-client/go.mod | 4 ++-- examples/go-client/main.go | 4 ++-- go.mod | 2 +- internal/exec/exec_public_test.go | 4 ++-- internal/git/git.go | 2 +- internal/git/git_public_test.go | 6 +++--- internal/git/types.go | 2 +- internal/mocks/repository.go | 2 +- internal/mocks/repository/repository_mock.go | 2 +- internal/path/path_public_test.go | 2 +- internal/repositories/repositories.go | 6 +++--- internal/repositories/repositories_public_test.go | 10 +++++----- internal/repositories/repositories_test.go | 6 +++--- internal/repositories/types.go | 4 ++-- internal/repository.go | 2 +- internal/repository/copy_public_test.go | 2 +- internal/repository/repository.go | 4 ++-- internal/repository/repository_public_test.go | 10 +++++----- internal/repository/types.go | 2 +- main.go | 2 +- pkg/repositories/repositories.go | 12 ++++++------ pkg/repositories/types.go | 4 ++-- 26 files changed, 51 insertions(+), 51 deletions(-) diff --git a/cmd/init.go b/cmd/init.go index 8cbfc9a..0d51c01 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -30,7 +30,7 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v3" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/pkg/config" ) // initCmd represents the init command diff --git a/cmd/overlay.go b/cmd/overlay.go index bde5b3e..59740ad 100644 --- a/cmd/overlay.go +++ b/cmd/overlay.go @@ -23,7 +23,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/retr0h/gilt/pkg/repositories" + "github.com/retr0h/gilt/v2/pkg/repositories" ) // overlayCmd represents the overlay command diff --git a/cmd/root.go b/cmd/root.go index 6dff29a..5a26fb3 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -31,7 +31,7 @@ import ( "github.com/spf13/viper" "golang.org/x/term" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/pkg/config" ) var ( diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 31c6788..28e67ca 100644 --- a/docs/docs/installation.md +++ b/docs/docs/installation.md @@ -13,7 +13,7 @@ brew install retr0h/tap/gilt ## Go Install ```bash -go install github.com/retr0h/gilt@latest +go install github.com/retr0h/gilt/v2@latest ``` ## Python diff --git a/examples/go-client/go.mod b/examples/go-client/go.mod index e4e6d02..a87a290 100644 --- a/examples/go-client/go.mod +++ b/examples/go-client/go.mod @@ -2,11 +2,11 @@ module example.com/client go 1.21.0 -replace github.com/retr0h/gilt => ../../../gilt/ +replace github.com/retr0h/gilt/v2 => ../../../gilt/ require ( github.com/lmittmann/tint v1.0.4 - github.com/retr0h/gilt v1.0.2 + github.com/retr0h/gilt/v2 v2.1.1 ) require ( diff --git a/examples/go-client/main.go b/examples/go-client/main.go index b1b8f10..53aa7db 100644 --- a/examples/go-client/main.go +++ b/examples/go-client/main.go @@ -7,8 +7,8 @@ import ( "github.com/lmittmann/tint" - "github.com/retr0h/gilt/pkg/config" - "github.com/retr0h/gilt/pkg/repositories" + "github.com/retr0h/gilt/v2/pkg/config" + "github.com/retr0h/gilt/v2/pkg/repositories" ) type repositoriesManager interface { diff --git a/go.mod b/go.mod index b102860..9df4310 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/retr0h/gilt +module github.com/retr0h/gilt/v2 go 1.21.0 diff --git a/internal/exec/exec_public_test.go b/internal/exec/exec_public_test.go index ab4e3ea..7c77760 100644 --- a/internal/exec/exec_public_test.go +++ b/internal/exec/exec_public_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal" - "github.com/retr0h/gilt/internal/exec" + "github.com/retr0h/gilt/v2/internal" + "github.com/retr0h/gilt/v2/internal/exec" ) type ExecManagerPublicTestSuite struct { diff --git a/internal/git/git.go b/internal/git/git.go index 81cbe47..8e8d2bd 100644 --- a/internal/git/git.go +++ b/internal/git/git.go @@ -30,7 +30,7 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" + "github.com/retr0h/gilt/v2/internal" ) // New factory to create a new Git instance. diff --git a/internal/git/git_public_test.go b/internal/git/git_public_test.go index c923149..2c9721a 100644 --- a/internal/git/git_public_test.go +++ b/internal/git/git_public_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal" - "github.com/retr0h/gilt/internal/git" - "github.com/retr0h/gilt/internal/mocks/exec" + "github.com/retr0h/gilt/v2/internal" + "github.com/retr0h/gilt/v2/internal/git" + "github.com/retr0h/gilt/v2/internal/mocks/exec" ) type GitManagerPublicTestSuite struct { diff --git a/internal/git/types.go b/internal/git/types.go index 341930f..b755ec8 100644 --- a/internal/git/types.go +++ b/internal/git/types.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" + "github.com/retr0h/gilt/v2/internal" ) // Git implementation responsible for Git operations. diff --git a/internal/mocks/repository.go b/internal/mocks/repository.go index b21377b..8cb750e 100644 --- a/internal/mocks/repository.go +++ b/internal/mocks/repository.go @@ -21,7 +21,7 @@ package mocks import ( - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/pkg/config" ) // RepositoryManager manager responsible for Repository operations. diff --git a/internal/mocks/repository/repository_mock.go b/internal/mocks/repository/repository_mock.go index 167f25e..6b73c36 100644 --- a/internal/mocks/repository/repository_mock.go +++ b/internal/mocks/repository/repository_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - config "github.com/retr0h/gilt/pkg/config" + config "github.com/retr0h/gilt/v2/pkg/config" ) // MockRepositoryManager is a mock of RepositoryManager interface. diff --git a/internal/path/path_public_test.go b/internal/path/path_public_test.go index 9c0bccd..d5d6b3e 100644 --- a/internal/path/path_public_test.go +++ b/internal/path/path_public_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal/path" + "github.com/retr0h/gilt/v2/internal/path" ) type PathPublicTestSuite struct { diff --git a/internal/repositories/repositories.go b/internal/repositories/repositories.go index 2c421c1..a751a1d 100644 --- a/internal/repositories/repositories.go +++ b/internal/repositories/repositories.go @@ -28,9 +28,9 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" - intPath "github.com/retr0h/gilt/internal/path" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal" + intPath "github.com/retr0h/gilt/v2/internal/path" + "github.com/retr0h/gilt/v2/pkg/config" ) // New factory to create a new Repository instance. diff --git a/internal/repositories/repositories_public_test.go b/internal/repositories/repositories_public_test.go index 863fa55..1eb3ae1 100644 --- a/internal/repositories/repositories_public_test.go +++ b/internal/repositories/repositories_public_test.go @@ -32,11 +32,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal" - "github.com/retr0h/gilt/internal/mocks/exec" - "github.com/retr0h/gilt/internal/mocks/repository" - "github.com/retr0h/gilt/internal/repositories" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal" + "github.com/retr0h/gilt/v2/internal/mocks/exec" + "github.com/retr0h/gilt/v2/internal/mocks/repository" + "github.com/retr0h/gilt/v2/internal/repositories" + "github.com/retr0h/gilt/v2/pkg/config" ) type RepositoriesPublicTestSuite struct { diff --git a/internal/repositories/repositories_test.go b/internal/repositories/repositories_test.go index 171f286..bb7af73 100644 --- a/internal/repositories/repositories_test.go +++ b/internal/repositories/repositories_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal/mocks/exec" - "github.com/retr0h/gilt/internal/mocks/repository" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal/mocks/exec" + "github.com/retr0h/gilt/v2/internal/mocks/repository" + "github.com/retr0h/gilt/v2/pkg/config" ) type RepositoriesTestSuite struct { diff --git a/internal/repositories/types.go b/internal/repositories/types.go index 0dfb70c..27ddf5e 100644 --- a/internal/repositories/types.go +++ b/internal/repositories/types.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal" + "github.com/retr0h/gilt/v2/pkg/config" ) // Repositories perform repository operations. diff --git a/internal/repository.go b/internal/repository.go index 6754d0a..62ea24c 100644 --- a/internal/repository.go +++ b/internal/repository.go @@ -21,7 +21,7 @@ package internal import ( - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/pkg/config" ) // RepositoryManager manager responsible for Repository operations. diff --git a/internal/repository/copy_public_test.go b/internal/repository/copy_public_test.go index 2d9fcaf..a72861f 100644 --- a/internal/repository/copy_public_test.go +++ b/internal/repository/copy_public_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal/repository" + "github.com/retr0h/gilt/v2/internal/repository" ) type CopyPublicTestSuite struct { diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 0767200..529c76b 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -29,8 +29,8 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal" + "github.com/retr0h/gilt/v2/pkg/config" ) // We'll use this to normalize Git URLs as "safe" filenames diff --git a/internal/repository/repository_public_test.go b/internal/repository/repository_public_test.go index 4989d99..11ff25b 100644 --- a/internal/repository/repository_public_test.go +++ b/internal/repository/repository_public_test.go @@ -32,11 +32,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/retr0h/gilt/internal/mocks" - "github.com/retr0h/gilt/internal/mocks/git" - mock_repo "github.com/retr0h/gilt/internal/mocks/repository" - "github.com/retr0h/gilt/internal/repository" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal/mocks" + "github.com/retr0h/gilt/v2/internal/mocks/git" + mock_repo "github.com/retr0h/gilt/v2/internal/mocks/repository" + "github.com/retr0h/gilt/v2/internal/repository" + "github.com/retr0h/gilt/v2/pkg/config" ) type RepositoryPublicTestSuite struct { diff --git a/internal/repository/types.go b/internal/repository/types.go index 53d7d72..b660767 100644 --- a/internal/repository/types.go +++ b/internal/repository/types.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" + "github.com/retr0h/gilt/v2/internal" ) // Repository contains the repository's details for cloning. diff --git a/main.go b/main.go index 633e4ec..be42712 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ package main import ( - "github.com/retr0h/gilt/cmd" + "github.com/retr0h/gilt/v2/cmd" ) func main() { diff --git a/pkg/repositories/repositories.go b/pkg/repositories/repositories.go index 3bf289b..767a98c 100644 --- a/pkg/repositories/repositories.go +++ b/pkg/repositories/repositories.go @@ -30,12 +30,12 @@ import ( "github.com/danjacques/gofslock/fslock" "github.com/spf13/afero" - "github.com/retr0h/gilt/internal/exec" - "github.com/retr0h/gilt/internal/git" - intPath "github.com/retr0h/gilt/internal/path" - intRepos "github.com/retr0h/gilt/internal/repositories" - "github.com/retr0h/gilt/internal/repository" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal/exec" + "github.com/retr0h/gilt/v2/internal/git" + intPath "github.com/retr0h/gilt/v2/internal/path" + intRepos "github.com/retr0h/gilt/v2/internal/repositories" + "github.com/retr0h/gilt/v2/internal/repository" + "github.com/retr0h/gilt/v2/pkg/config" ) // New factory to create a new Repository instance. diff --git a/pkg/repositories/types.go b/pkg/repositories/types.go index a1f673a..abfa9d4 100644 --- a/pkg/repositories/types.go +++ b/pkg/repositories/types.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/afero" - "github.com/retr0h/gilt/internal" - "github.com/retr0h/gilt/pkg/config" + "github.com/retr0h/gilt/v2/internal" + "github.com/retr0h/gilt/v2/pkg/config" ) // Repositories perform repository operations.