Merge pull request #17 from hartwork/fix-go-module-for-v2

Fix Go module for v2

Author: hartwork

.github/workflows/build_and_test.yml

@@ -26,6 +26,7 @@ jobs:
       - name: Build and test
         run: |-
           set -e
+          cd v2
           go build ./cmd/wait-for-it
           ./wait-for-it --help
           ./wait-for-it \
@@ -52,5 +53,6 @@ jobs:
       - name: "Require empty diff for: go mod tidy"
         run: |-
           set -e
+          cd v2
           go mod tidy -v
           git diff --exit-code -- go.mod go.sum

README.md

@@ -22,7 +22,7 @@ Thank you!
 ```console
 $ go version
 go version go1.14.6 linux/amd64
-$ go get github.com/hartwork/go-wait-for-it
+$ go get github.com/hartwork/go-wait-for-it/v2
 $ export PATH="${PATH}:$(go env GOPATH)/bin"
 $ wait-for-it --version
 wait-for-it 2.0.0
@@ -34,8 +34,8 @@ wait-for-it 2.0.0
 ```console
 $ go version
 go version go1.14.6 linux/amd64
-$ go build .
-$ ./wait-for-it --version
+$ ( cd v2 && go build ./cmd/wait-for-it )
+$ ./v2/wait-for-it --version
 wait-for-it 2.0.0
 ```
 

.gitignore renamed to v2/.gitignore

@@ -7,10 +7,10 @@ package main
 import (
 	"os"
 
-	"github.com/hartwork/go-wait-for-it/internal/cli"
-	"github.com/hartwork/go-wait-for-it/internal/logging"
-	"github.com/hartwork/go-wait-for-it/internal/network"
-	"github.com/hartwork/go-wait-for-it/internal/subprocess"
+	"github.com/hartwork/go-wait-for-it/v2/internal/cli"
+	"github.com/hartwork/go-wait-for-it/v2/internal/logging"
+	"github.com/hartwork/go-wait-for-it/v2/internal/network"
+	"github.com/hartwork/go-wait-for-it/v2/internal/subprocess"
 )
 
 var exitFunc func(int) = os.Exit

cmd/wait-for-it/main.go renamed to v2/cmd/wait-for-it/main.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hartwork/go-wait-for-it/internal/network"
-	"github.com/hartwork/go-wait-for-it/internal/testlab"
+	"github.com/hartwork/go-wait-for-it/v2/internal/network"
+	"github.com/hartwork/go-wait-for-it/v2/internal/testlab"
 	"github.com/stretchr/testify/assert"
 )
 

cmd/wait-for-it/main_test.go renamed to v2/cmd/wait-for-it/main_test.go

@@ -1,4 +1,4 @@
-module github.com/hartwork/go-wait-for-it
+module github.com/hartwork/go-wait-for-it/v2
 
 go 1.14
 

go.mod renamed to v2/go.mod

@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/hartwork/go-wait-for-it/internal/network"
+	"github.com/hartwork/go-wait-for-it/v2/internal/network"
 	"github.com/lithammer/dedent"
 	"github.com/spf13/cobra"
 )

go.sum renamed to v2/go.sum

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hartwork/go-wait-for-it/internal/network"
-	"github.com/hartwork/go-wait-for-it/internal/testlab"
+	"github.com/hartwork/go-wait-for-it/v2/internal/network"
+	"github.com/hartwork/go-wait-for-it/v2/internal/testlab"
 	"github.com/lithammer/dedent"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/cli/parser.go renamed to v2/internal/cli/parser.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hartwork/go-wait-for-it/internal/testlab"
+	"github.com/hartwork/go-wait-for-it/v2/internal/testlab"
 )
 
 func TestLoggingPlain(t *testing.T) {

internal/cli/parser_test.go renamed to v2/internal/cli/parser_test.go

@@ -9,7 +9,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/hartwork/go-wait-for-it/internal/logging"
+	"github.com/hartwork/go-wait-for-it/v2/internal/logging"
 )
 
 type connectResult struct {

internal/logging/logging.go renamed to v2/internal/logging/logging.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hartwork/go-wait-for-it/internal/logging"
+	"github.com/hartwork/go-wait-for-it/v2/internal/logging"
 	"github.com/stretchr/testify/assert"
 )
 

internal/logging/logging_test.go renamed to v2/internal/logging/logging_test.go

@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/hartwork/go-wait-for-it/internal/logging"
+	"github.com/hartwork/go-wait-for-it/v2/internal/logging"
 )
 
 func RunCommand(argv []string, log logging.Log) error {

internal/network/address.go renamed to v2/internal/network/address.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hartwork/go-wait-for-it/internal/logging"
-	"github.com/hartwork/go-wait-for-it/internal/testlab"
+	"github.com/hartwork/go-wait-for-it/v2/internal/logging"
+	"github.com/hartwork/go-wait-for-it/v2/internal/testlab"
 	"github.com/stretchr/testify/assert"
 )