Merge pull request #305 from go-redis/fix/gopkg-v4

Use redis.v4 that is in alpha/beta state.

.travis.yml

@@ -19,5 +19,5 @@ install:
   - go get github.com/onsi/gomega
   - go get github.com/garyburd/redigo/redis
   - mkdir -p $HOME/gopath/src/gopkg.in
-  - mv $HOME/gopath/src/github.com/go-redis/redis $HOME/gopath/src/gopkg.in/redis.v3
-  - cd $HOME/gopath/src/gopkg.in/redis.v3
+  - mv $HOME/gopath/src/github.com/go-redis/redis $HOME/gopath/src/gopkg.in/redis.v4
+  - cd $HOME/gopath/src/gopkg.in/redis.v4

bench_test.go

@@ -7,7 +7,7 @@ import (
 
 	redigo "github.com/garyburd/redigo/redis"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 func benchmarkRedisClient(poolSize int) *redis.Client {

cluster.go

@@ -6,8 +6,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v3/internal/hashtag"
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/hashtag"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 // ClusterClient is a Redis Cluster client representing a pool of zero

cluster_test.go

@@ -14,8 +14,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
-	"gopkg.in/redis.v3/internal/hashtag"
+	"gopkg.in/redis.v4"
+	"gopkg.in/redis.v4/internal/hashtag"
 )
 
 type clusterScenario struct {

command.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var (

command_test.go

@@ -4,7 +4,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Command", func() {

commands_test.go

@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Commands", func() {

example_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var client *redis.Client

export_test.go

@@ -3,7 +3,7 @@ package redis
 import (
 	"time"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 func (c *baseClient) Pool() pool.Pooler {

internal/pool/bench_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 func benchmarkPoolGetPut(b *testing.B, poolSize int) {

internal/pool/pool_test.go

@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var _ = Describe("ConnPool", func() {

main_test.go

@@ -14,7 +14,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 const (
@@ -94,7 +94,7 @@ var _ = AfterSuite(func() {
 
 func TestGinkgoSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "gopkg.in/redis.v3")
+	RunSpecs(t, "gopkg.in/redis.v4")
 }
 
 //------------------------------------------------------------------------------

options.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"time"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 type Options struct {

parser.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"strconv"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 const (

parser_test.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"testing"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 func BenchmarkParseReplyStatus(b *testing.B) {

pipeline.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 // Pipeline implements pipelining as described in

pipeline_test.go

@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Pipelining", func() {

pool_test.go

@@ -4,8 +4,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var _ = Describe("pool", func() {

pubsub.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var receiveMessageTimeout = 5 * time.Second

pubsub_test.go

@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("PubSub", func() {

race_test.go

@@ -11,8 +11,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var _ = Describe("races", func() {

redis.go

@@ -1,11 +1,11 @@
-package redis // import "gopkg.in/redis.v3"
+package redis // import "gopkg.in/redis.v4"
 
 import (
 	"fmt"
 	"io/ioutil"
 	"log"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 // Deprecated. Use SetLogger instead.

redis_test.go

@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Client", func() {

ring.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v3/internal/consistenthash"
-	"gopkg.in/redis.v3/internal/hashtag"
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/consistenthash"
+	"gopkg.in/redis.v4/internal/hashtag"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var (

ring_test.go

@@ -8,7 +8,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Redis ring", func() {

sentinel.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 //------------------------------------------------------------------------------

sentinel_test.go

@@ -4,7 +4,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Sentinel", func() {

tx.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"gopkg.in/redis.v3/internal/pool"
+	"gopkg.in/redis.v4/internal/pool"
 )
 
 var errDiscard = errors.New("redis: Discard can be used only inside Exec")

tx_test.go

@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v3"
+	"gopkg.in/redis.v4"
 )
 
 var _ = Describe("Tx", func() {