Fixed name in go.mod

cavaliergopher · Jan 8, 2022 · 3c0c4ad · 3c0c4ad
1 parent 5cc128d
commit 3c0c4ad
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,13 +6,6 @@ go:
   - 1.16.x
   - 1.15.x
   - 1.14.x
-  - 1.13.x
-  - 1.12.x
-  - 1.11.x
-  - 1.10.x
-  - 1.9.x
-  - 1.8.x
-  - 1.7.x
 
 script: make check
 

diff --git a/Makefile b/Makefile
@@ -1,29 +1,17 @@
 GO = go
 GOGET = $(GO) get -u
 
-all: check lint
+all: check
 
 check:
-	$(GO) test -v -cover -race ./...
-	cd cmd/grab && $(MAKE) -B all
+	cd v3 && $(GO) test -v -cover -race ./...
+	cd v3/cmd/grab && $(MAKE) -B all
 
 install:
-	$(GO) install -v ./...
+	cd v3/cmd/grab && $(MAKE) install
 
 clean:
-	$(GO) clean -x ./...
+	cd v3 && $(GO) clean -x ./...
 	rm -rvf ./.test*
 
-lint:
-	gofmt -l -e -s . || :
-	go vet . || :
-	golint . || :
-	gocyclo -over 15 . || :
-	misspell ./* || :
-
-deps:
-	$(GOGET) github.com/golang/lint/golint
-	$(GOGET) github.com/fzipp/gocyclo
-	$(GOGET) github.com/client9/misspell/cmd/misspell
-
-.PHONY: all check install clean lint deps
+.PHONY: all check install clean
diff --git a/go.mod b/go.mod
diff --git a/client.go → v3/client.go b/client.go → v3/client.go
diff --git a/client_test.go → v3/client_test.go b/client_test.go → v3/client_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cavaliercoder/grab/pkg/grabtest"
+	"github.com/cavaliergopher/grab/v3/pkg/grabtest"
 )
 
 // TestFilenameResolutions tests that the destination filename for Requests can
@@ -205,7 +205,7 @@ func TestContentLength(t *testing.T) {
 func TestAutoResume(t *testing.T) {
 	segs := 8
 	size := 1048576
-	sum := grabtest.DefaultHandlerSHA256ChecksumBytes //grabtest.MustHexDecodeString("fbbab289f7f94b25736c58be46a994c441fd02552cc6022352e3d86d2fab7c83")
+	sum := grabtest.DefaultHandlerSHA256ChecksumBytes //grab/v3test.MustHexDecodeString("fbbab289f7f94b25736c58be46a994c441fd02552cc6022352e3d86d2fab7c83")
 	filename := ".testAutoResume"
 
 	defer os.Remove(filename)
@@ -293,7 +293,7 @@ func TestAutoResume(t *testing.T) {
 	})
 
 	t.Run("WithNoContentLengthHeaderAndChecksumFailure", func(t *testing.T) {
-		// ref: https://github.com/cavaliercoder/grab/pull/27
+		// ref: https://github.com/cavaliergopher/grab/v3/pull/27
 		size := size * 2
 		grabtest.WithTestServer(t, func(url string) {
 			req := mustNewRequest(filename, url)
@@ -474,7 +474,6 @@ func TestCancelHangingResponse(t *testing.T) {
 		if resp.BytesComplete() == int64(fileSize) {
 			t.Error("download was not supposed to be complete")
 		}
-		fmt.Println("bye")
 	},
 		grabtest.RateLimiter(1),
 		grabtest.ContentLength(fileSize),
@@ -723,7 +722,7 @@ func TestAfterCopyHook(t *testing.T) {
 }
 
 func TestIssue37(t *testing.T) {
-	// ref: https://github.com/cavaliercoder/grab/issues/37
+	// ref: https://github.com/cavaliergopher/grab/v3/issues/37
 	filename := "./.testIssue37"
 	largeSize := int64(2097152)
 	smallSize := int64(1048576)
@@ -764,7 +763,7 @@ func TestIssue37(t *testing.T) {
 // TestHeadBadStatus validates that HEAD requests that return non-200 can be
 // ignored and succeed if the GET requests succeeeds.
 //
-// Fixes: https://github.com/cavaliercoder/grab/issues/43
+// Fixes: https://github.com/cavaliergopher/grab/v3/issues/43
 func TestHeadBadStatus(t *testing.T) {
 	expect := http.StatusOK
 	filename := ".testIssue43"
@@ -796,7 +795,7 @@ func TestHeadBadStatus(t *testing.T) {
 // TestAutoResume also covers cases with checksum validation.
 //
 // Kudos to Setnička Jiří <[email protected]> for identifying and raising
-// a solution to this issue. Ref: https://github.com/cavaliercoder/grab/pull/27
+// a solution to this issue. Ref: https://github.com/cavaliergopher/grab/v3/pull/27
 func TestMissingContentLength(t *testing.T) {
 	// expectSize must be sufficiently large that DefaultClient.Do won't prefetch
 	// the entire body and compute ContentLength before returning a Response.

diff --git a/cmd/grab/.gitignore → v3/cmd/grab/.gitignore b/cmd/grab/.gitignore → v3/cmd/grab/.gitignore
diff --git a/cmd/grab/Makefile → v3/cmd/grab/Makefile b/cmd/grab/Makefile → v3/cmd/grab/Makefile
diff --git a/cmd/grab/main.go → v3/cmd/grab/main.go b/cmd/grab/main.go → v3/cmd/grab/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/cavaliercoder/grab/pkg/grabui"
+	"github.com/cavaliergopher/grab/v3/pkg/grabui"
 )
 
 func main() {

diff --git a/doc.go → v3/doc.go b/doc.go → v3/doc.go
diff --git a/error.go → v3/error.go b/error.go → v3/error.go
diff --git a/example_client_test.go → v3/example_client_test.go b/example_client_test.go → v3/example_client_test.go
diff --git a/example_request_test.go → v3/example_request_test.go b/example_request_test.go → v3/example_request_test.go
diff --git a/v3/go.mod b/v3/go.mod
@@ -0,0 +1,3 @@
+module github.com/cavaliergopher/grab/v3
+
+go 1.14
diff --git a/grab.go → v3/grab.go b/grab.go → v3/grab.go
diff --git a/grab_test.go → v3/grab_test.go b/grab_test.go → v3/grab_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cavaliercoder/grab/pkg/grabtest"
+	"github.com/cavaliergopher/grab/v3/pkg/grabtest"
 )
 
 func TestMain(m *testing.M) {

diff --git a/pkg/bps/bps.go → v3/pkg/bps/bps.go b/pkg/bps/bps.go → v3/pkg/bps/bps.go
diff --git a/pkg/bps/sma.go → v3/pkg/bps/sma.go b/pkg/bps/sma.go → v3/pkg/bps/sma.go
diff --git a/pkg/bps/sma_test.go → v3/pkg/bps/sma_test.go b/pkg/bps/sma_test.go → v3/pkg/bps/sma_test.go
diff --git a/pkg/grabtest/assert.go → v3/pkg/grabtest/assert.go b/pkg/grabtest/assert.go → v3/pkg/grabtest/assert.go
diff --git a/pkg/grabtest/handler.go → v3/pkg/grabtest/handler.go b/pkg/grabtest/handler.go → v3/pkg/grabtest/handler.go
diff --git a/pkg/grabtest/handler_option.go → v3/pkg/grabtest/handler_option.go b/pkg/grabtest/handler_option.go → v3/pkg/grabtest/handler_option.go
diff --git a/pkg/grabtest/handler_test.go → v3/pkg/grabtest/handler_test.go b/pkg/grabtest/handler_test.go → v3/pkg/grabtest/handler_test.go
diff --git a/pkg/grabtest/util.go → v3/pkg/grabtest/util.go b/pkg/grabtest/util.go → v3/pkg/grabtest/util.go
diff --git a/pkg/grabui/console_client.go → v3/pkg/grabui/console_client.go b/pkg/grabui/console_client.go → v3/pkg/grabui/console_client.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cavaliercoder/grab"
+	"github.com/cavaliergopher/grab/v3"
 )
 
 type ConsoleClient struct {

diff --git a/pkg/grabui/grabui.go → v3/pkg/grabui/grabui.go b/pkg/grabui/grabui.go → v3/pkg/grabui/grabui.go
@@ -3,7 +3,7 @@ package grabui
 import (
 	"context"
 
-	"github.com/cavaliercoder/grab"
+	"github.com/cavaliergopher/grab/v3"
 )
 
 func GetBatch(

diff --git a/rate_limiter.go → v3/rate_limiter.go b/rate_limiter.go → v3/rate_limiter.go
diff --git a/rate_limiter_test.go → v3/rate_limiter_test.go b/rate_limiter_test.go → v3/rate_limiter_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cavaliercoder/grab/pkg/grabtest"
+	"github.com/cavaliergopher/grab/v3/pkg/grabtest"
 )
 
 // testRateLimiter is a naive rate limiter that limits throughput to r tokens

diff --git a/request.go → v3/request.go b/request.go → v3/request.go
diff --git a/response.go → v3/response.go b/response.go → v3/response.go
diff --git a/response_test.go → v3/response_test.go b/response_test.go → v3/response_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cavaliercoder/grab/pkg/grabtest"
+	"github.com/cavaliergopher/grab/v3/pkg/grabtest"
 )
 
 // testComplete validates that a completed Response has all the desired fields.

diff --git a/transfer.go → v3/transfer.go b/transfer.go → v3/transfer.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/cavaliercoder/grab/pkg/bps"
+	"github.com/cavaliergopher/grab/v3/pkg/bps"
 )
 
 type transfer struct {

diff --git a/util.go → v3/util.go b/util.go → v3/util.go
diff --git a/util_test.go → v3/util_test.go b/util_test.go → v3/util_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,13 +6,6 @@ go: @@
       - 1.16.x
       - 1.15.x
       - 1.14.x
-      - 1.13.x
-      - 1.12.x
-      - 1.11.x
-      - 1.10.x
-      - 1.9.x
-      - 1.8.x
-      - 1.7.x
     script: make check
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		module github.com/cavaliergopher/grab/v3

		go 1.14