vendoring ipns things

Godeps/Godeps.json

@@ -38,6 +38,10 @@
 			"Comment": "null-15",
 			"Rev": "12e4b4183793ac4b061921e7980845e750679fd0"
 		},
+		{
+			"ImportPath": "github.com/bren2010/proquint",
+			"Rev": "5958552242606512f714d2e93513b380f43f9991"
+		},
 		{
 			"ImportPath": "github.com/camlistore/lock",
 			"Rev": "ae27720f340952636b826119b58130b9c1a847a0"

Godeps/_workspace/src/github.com/bren2010/proquint/README.md

@@ -0,0 +1,6 @@
+Proquint
+-------
+
+Golang implementation of [Proquint Pronounceable Identifiers](https://github.com/deoxxa/proquint).
+
+

Godeps/_workspace/src/github.com/bren2010/proquint/proquint.go

@@ -0,0 +1,123 @@
+/*
+Copyright (c) 2014 Brendan McMillion
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+package proquint
+
+import (
+    "bytes"
+    "strings"
+    "regexp"
+)
+
+var (
+    conse = [...]byte{'b', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 
+        'p', 'r', 's', 't', 'v', 'z'}
+    vowse = [...]byte{'a', 'i', 'o', 'u'}
+    
+    consd = map[byte] uint16 {
+        'b' :  0, 'd' :  1, 'f' :  2, 'g' :  3,
+        'h' :  4, 'j' :  5, 'k' :  6, 'l' :  7,
+        'm' :  8, 'n' :  9, 'p' : 10, 'r' : 11,
+        's' : 12, 't' : 13, 'v' : 14, 'z' : 15,
+    }
+    
+    vowsd = map[byte] uint16 {
+        'a' : 0, 'i' : 1, 'o' : 2, 'u' : 3,
+    }
+)
+
+/**
+* Tests if a given string is a Proquint identifier
+*
+* @param {string} str The candidate string.
+*
+* @return {bool} Whether or not it qualifies.
+* @return {error} Error
+*/
+func IsProquint(str string) (bool, error) {
+    exp := "^([abdfghijklmnoprstuvz]{5}-)*[abdfghijklmnoprstuvz]{5}$"
+    ok, err := regexp.MatchString(exp, str)
+    
+    return ok, err
+}
+
+/**
+* Encodes an arbitrary byte slice into an identifier.
+*
+* @param {[]byte} buf Slice of bytes to encode.
+*
+* @return {string} The given byte slice as an identifier.
+*/
+func Encode(buf []byte) string {
+    var out bytes.Buffer
+    
+    for i := 0; i < len(buf); i = i + 2 {
+        var n uint16 = (uint16(buf[i]) * 256) + uint16(buf[i + 1])
+        
+        var (
+            c1 = n         & 0x0f
+            v1 = (n >> 4)  & 0x03
+            c2 = (n >> 6)  & 0x0f
+            v2 = (n >> 10) & 0x03
+            c3 = (n >> 12) & 0x0f
+        )
+        
+        out.WriteByte(conse[c1])
+        out.WriteByte(vowse[v1])
+        out.WriteByte(conse[c2])
+        out.WriteByte(vowse[v2])
+        out.WriteByte(conse[c3])
+        
+        if (i + 2) < len(buf) {
+            out.WriteByte('-')
+        }
+    }
+    
+    return out.String()
+}
+
+/**
+* Decodes an identifier into its corresponding byte slice.
+*
+* @param {string} str Identifier to convert.
+*
+* @return {[]byte} The identifier as a byte slice.
+*/
+func Decode(str string) []byte {
+    var (
+        out bytes.Buffer
+        bits []string = strings.Split(str, "-")
+    )
+    
+    for i := 0; i < len(bits); i++ {
+        var x uint16 = consd[bits[i][0]] +
+                (vowsd[bits[i][1]] <<  4) +
+                (consd[bits[i][2]] <<  6) +
+                (vowsd[bits[i][3]] << 10) + 
+                (consd[bits[i][4]] << 12)
+        
+        out.WriteByte(byte(x >> 8))
+        out.WriteByte(byte(x))
+    }
+    
+    return out.Bytes()
+}

blockservice/blockservice.go

@@ -7,7 +7,7 @@ import (
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	exchange "github.com/jbenet/go-ipfs/exchange"

core/commands/publish.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/jbenet/go-ipfs/core"
 	u "github.com/jbenet/go-ipfs/util"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 
 	nsys "github.com/jbenet/go-ipfs/namesys"
 )

fuse/ipns/ipns_unix.go

@@ -13,15 +13,15 @@ import (
 
 	"bytes"
 
-	"bazil.org/fuse"
-	"bazil.org/fuse/fs"
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 	"github.com/jbenet/go-ipfs/core"
 	ci "github.com/jbenet/go-ipfs/crypto"
 	imp "github.com/jbenet/go-ipfs/importer"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	u "github.com/jbenet/go-ipfs/util"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 )
 
 var log = logging.MustGetLogger("ipns")

fuse/readonly/readonly_unix.go

@@ -14,14 +14,14 @@ import (
 	"syscall"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
 	core "github.com/jbenet/go-ipfs/core"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	u "github.com/jbenet/go-ipfs/util"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 )
 
 var log = logging.MustGetLogger("ipfs")

namesys/entry.pb.go

@@ -13,7 +13,7 @@ It has these top-level messages:
 */
 package namesys
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.

namesys/proquint.go

@@ -3,7 +3,7 @@ package namesys
 import (
 	"errors"
 
-	proquint "github.com/bren2010/proquint"
+	proquint "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/bren2010/proquint"
 )
 
 type ProquintResolver struct{}

namesys/publisher.go

@@ -3,8 +3,8 @@ package namesys
 import (
 	"time"
 
-	"code.google.com/p/go.net/context"
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
 	ci "github.com/jbenet/go-ipfs/crypto"
 	mdag "github.com/jbenet/go-ipfs/merkledag"

namesys/routing.go

@@ -3,15 +3,15 @@ package namesys
 import (
 	"fmt"
 
-	"code.google.com/p/go.net/context"
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
 
 	ci "github.com/jbenet/go-ipfs/crypto"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	"github.com/jbenet/go-ipfs/routing"
 	u "github.com/jbenet/go-ipfs/util"
-	mh "github.com/jbenet/go-multihash"
-	"github.com/op/go-logging"
+	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 )
 
 var log = logging.MustGetLogger("namesys")

path/path.go

@@ -8,7 +8,7 @@ import (
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
 	merkledag "github.com/jbenet/go-ipfs/merkledag"
 	u "github.com/jbenet/go-ipfs/util"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 )
 
 var log = logging.MustGetLogger("path")

routing/dht/dht.go

@@ -13,7 +13,7 @@ import (
 	peer "github.com/jbenet/go-ipfs/peer"
 	kb "github.com/jbenet/go-ipfs/routing/kbucket"
 	u "github.com/jbenet/go-ipfs/util"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"

util/util.go

@@ -11,7 +11,7 @@ import (
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
 	b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
-	"github.com/op/go-logging"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/op/go-logging"
 )
 
 var format = "%{color}%{time:01-02 15:04:05.9999} %{shortfile} %{level}: %{color:reset}%{message}"