Merge pull request #447 from go-redis/fix/script-interface

Check that clients implement scripter interface.

cluster.go

@@ -328,8 +328,6 @@ type ClusterClient struct {
 	closed bool
 }
 
-var _ Cmdable = (*ClusterClient)(nil)
-
 // NewClusterClient returns a Redis Cluster client as described in
 // http://redis.io/topics/cluster-spec.
 func NewClusterClient(opt *ClusterOptions) *ClusterClient {

commands.go

@@ -236,6 +236,11 @@ type Cmdable interface {
 	Command() *CommandsInfoCmd
 }
 
+var _ Cmdable = (*Client)(nil)
+var _ Cmdable = (*Tx)(nil)
+var _ Cmdable = (*Ring)(nil)
+var _ Cmdable = (*ClusterClient)(nil)
+
 type cmdable struct {
 	process func(cmd Cmder) error
 }

redis.go

@@ -172,8 +172,6 @@ type Client struct {
 	cmdable
 }
 
-var _ Cmdable = (*Client)(nil)
-
 func newClient(opt *Options, pool pool.Pooler) *Client {
 	base := baseClient{opt: opt, connPool: pool}
 	client := &Client{

ring.go

@@ -136,8 +136,6 @@ type Ring struct {
 	closed bool
 }
 
-var _ Cmdable = (*Ring)(nil)
-
 func NewRing(opt *RingOptions) *Ring {
 	const nreplicas = 100
 	opt.init()

script.go

@@ -14,6 +14,10 @@ type scripter interface {
 	ScriptLoad(script string) *StringCmd
 }
 
+var _ scripter = (*Client)(nil)
+var _ scripter = (*Ring)(nil)
+var _ scripter = (*ClusterClient)(nil)
+
 type Script struct {
 	src, hash string
 }

tx.go

@@ -23,8 +23,6 @@ type Tx struct {
 	closed bool
 }
 
-var _ Cmdable = (*Tx)(nil)
-
 func (c *Client) newTx() *Tx {
 	tx := Tx{
 		baseClient: baseClient{