Merge pull request #21 from rogpeppe/024-deprecate-old-macaroon-path

deprecate macaroon package; update bakery to use new macaroon package path

bakery/discharge.go

@@ -4,8 +4,7 @@ import (
 	"fmt"
 
 	"github.com/juju/errgo"
-
-	"github.com/rogpeppe/macaroon"
+	"gopkg.in/macaroon.v1"
 )
 
 // NewMacaroon mints a new macaroon with the given id and caveats.

bakery/discharge_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	gc "gopkg.in/check.v1"
+	"gopkg.in/macaroon.v1"
 
-	"github.com/rogpeppe/macaroon"
 	"github.com/rogpeppe/macaroon/bakery"
 )
 

bakery/example/client.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 
 	"github.com/juju/errgo"
 
@@ -24,7 +25,7 @@ func clientRequest(serverEndpoint string) (string, error) {
 	// when required, and retrying the request
 	// when necessary.
 
-	visitWebPage := func(url string) error {
+	visitWebPage := func(url *url.URL) error {
 		fmt.Printf("please visit this web page:\n")
 		fmt.Printf("\t%s\n", url)
 		return nil

bakery/example/idservice/idservice.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/juju/errgo"
 	"github.com/juju/utils/jsonhttp"
+	"gopkg.in/macaroon.v1"
 
-	"github.com/rogpeppe/macaroon"
 	"github.com/rogpeppe/macaroon/bakery"
 	"github.com/rogpeppe/macaroon/bakery/checkers"
 	"github.com/rogpeppe/macaroon/bakery/example/meeting"

bakery/service.go

@@ -10,7 +10,7 @@ import (
 	"log"
 	"sync"
 
-	"github.com/rogpeppe/macaroon"
+	"gopkg.in/macaroon.v1"
 )
 
 const debug = false

httpbakery/client.go

@@ -14,8 +14,8 @@ import (
 
 	"code.google.com/p/go.net/publicsuffix"
 	"github.com/juju/errgo"
+	"gopkg.in/macaroon.v1"
 
-	"github.com/rogpeppe/macaroon"
 	"github.com/rogpeppe/macaroon/bakery"
 )
 

httpbakery/discharge.go

@@ -10,8 +10,8 @@ import (
 	"path"
 
 	"github.com/juju/errgo"
+	"gopkg.in/macaroon.v1"
 
-	"github.com/rogpeppe/macaroon"
 	"github.com/rogpeppe/macaroon/bakery"
 )
 

httpbakery/error.go

@@ -5,8 +5,7 @@ import (
 
 	"github.com/juju/errgo"
 	"github.com/juju/utils/jsonhttp"
-
-	"github.com/rogpeppe/macaroon"
+	"gopkg.in/macaroon.v1"
 )
 
 // ErrorCode holds an error code that classifies

httpbakery/handler.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/rogpeppe/macaroon"
+	"gopkg.in/macaroon.v1"
 )
 
 type dischargeRequestedResponse struct {

httpbakery/service.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 
 	"code.google.com/p/go.net/publicsuffix"
+	"gopkg.in/macaroon.v1"
 
-	"github.com/rogpeppe/macaroon"
 	"github.com/rogpeppe/macaroon/bakery"
 )
 
@@ -68,7 +68,7 @@ type cookieLogger struct {
 }
 
 func (j *cookieLogger) SetCookies(u *url.URL, cookies []*http.Cookie) {
-	log.Printf("%p setting %d cookies for %s", j.CookieJar, len(cookies), u)	
+	log.Printf("%p setting %d cookies for %s", j.CookieJar, len(cookies), u)
 	for i, c := range cookies {
 		log.Printf("\t%d. path %s; name %s", i, c.Path, c.Name)
 	}

macaroon.go

@@ -1,7 +1,7 @@
-// The macaroon package implements macaroons as described in
-// the paper "Macaroons: Cookies with Contextual Caveats for
-// Decentralized Authorization in the Cloud"
-// (http://theory.stanford.edu/~ataly/Papers/macaroons.pdf)
+// WARNING
+//
+// The macaroon package is deprecated at this import path.
+// Please use gopkg.in/macaroon.v1 instead.
 package macaroon
 
 import (