Move proquint from Godeps to gx

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>

Godeps/Godeps.json

@@ -9,10 +9,6 @@
 			"ImportPath": "bazil.org/fuse",
 			"Rev": "e4fcc9a2c7567d1c42861deebeb483315d222262"
 		},
-		{
-			"ImportPath": "github.com/bren2010/proquint",
-			"Rev": "5958552242606512f714d2e93513b380f43f9991"
-		},
 		{
 			"ImportPath": "github.com/briantigerchow/pubsub",
 			"Rev": "39ce5f556423a4c7223b370fa17a3bbd75b2d197"

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

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

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

@@ -1,123 +0,0 @@
-/*
-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()
-}

namesys/proquint.go

@@ -3,8 +3,8 @@ package namesys
 import (
 	"errors"
 
-	proquint "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/bren2010/proquint"
 	path "github.com/ipfs/go-ipfs/path"
+	proquint "gx/ipfs/QmYnf27kzqR2cxt6LFZdrAFJuQd6785fTkBvMuEj9EeRxM/proquint"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 )
 

package.json

@@ -75,18 +75,24 @@
       "hash": "QmcyaFHbyiZfoX5GTpcqqCPYmbjYNAhRDekXSJPFHdYNSV",
       "name": "go.uuid",
       "version": "1.0.0"
-	},
-	{
+    },
+    {
       "author": "steakknife",
       "hash": "QmeWQMDa5dSdP4n8WDeoY5z8L2EKVqF4ZvK4VEHsLqXsGu",
       "name": "hamming",
       "version": "0.0.10"
-	},
-	{
+    },
+    {
       "author": "cenk",
       "hash": "QmPJUtEJsm5YLUWhF6imvyCH8KZXRJa9Wup7FDMwTy5Ufz",
       "name": "backoff",
       "version": "1.0.0"
+    },
+    {
+      "author": "Bren2010",
+      "hash": "QmYnf27kzqR2cxt6LFZdrAFJuQd6785fTkBvMuEj9EeRxM",
+      "name": "proquint",
+      "version": "0.0.0"
     }
   ],
   "gxVersion": "0.4.0",