From 502d6532d481568a339d9e7eeefddf9a1e619f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Thu, 29 Mar 2012 16:25:02 +0200 Subject: [PATCH 01/11] removed vestigial makefiles. --- .gitignore | 1 + version.sh | 5 +++++ 2 files changed, 6 insertions(+) create mode 100755 version.sh diff --git a/.gitignore b/.gitignore index d542d30c..58cbe997 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ _obj _test* cmd/doozer/doozer +cmd/doozer/version.go diff --git a/version.sh b/version.sh new file mode 100755 index 00000000..f4fc0474 --- /dev/null +++ b/version.sh @@ -0,0 +1,5 @@ +git describe | sed s/^v// | tr - + | tr -d '\n' +if ! git diff --quiet HEAD +then echo -n +mod +fi +echo From 753a46b245da0d100a18c8f13c273a2217452264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Thu, 29 Mar 2012 16:29:14 +0200 Subject: [PATCH 02/11] cmd/doozer: removed vestigial Makefiles, this time for sure. --- cmd/doozer/Makefile | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 cmd/doozer/Makefile diff --git a/cmd/doozer/Makefile b/cmd/doozer/Makefile deleted file mode 100644 index c293e223..00000000 --- a/cmd/doozer/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -include ../../Make.inc - -VERSION ?= $(shell ../../ver.sh) - -TARG=doozer -GOFILES=\ - add.go\ - del.go\ - doozer.go\ - get.go\ - help.go\ - nop.go\ - rev.go\ - set.go\ - stat.go\ - vers.go\ - wait.go\ - watch.go\ - find.go\ - touch.go\ - -include $(GOROOT)/src/Make.cmd - -vers.go: - printf 'package main\n\nconst version = `%s`\n' '$(VERSION)' > $@ From 55be943138cfd36932f64d67e0d3152cf44577af Mon Sep 17 00:00:00 2001 From: John Asmuth Date: Sat, 30 Jun 2012 13:53:46 -0400 Subject: [PATCH 03/11] brought in line with new protobuf --- cmd/doozer/doozer.go | 22 ++++++------ cmd/doozer/find.go | 2 +- msg.pb.go | 80 ++++++++++++++++++++++++-------------------- 3 files changed, 56 insertions(+), 48 deletions(-) diff --git a/cmd/doozer/doozer.go b/cmd/doozer/doozer.go index 6a187c41..9949943f 100644 --- a/cmd/doozer/doozer.go +++ b/cmd/doozer/doozer.go @@ -3,7 +3,7 @@ package main import ( "flag" "fmt" - "github.com/ha/doozer" + "github.com/4ad/doozer" "os" "reflect" "sort" @@ -11,17 +11,17 @@ import ( ) var ( - uri = flag.String("a", "doozer:?ca=127.0.0.1:8046", "the address to bind to") - buri = flag.String("b", "", "the DzNS uri") - rrev = flag.Int64("r", -1, "request rev") - showHelp = flag.Bool("h", false, "show help") - showVersion = flag.Bool("v", false, "print version string") + uri = flag.String("a", "doozer:?ca=127.0.0.1:8046", "the address to bind to") + buri = flag.String("b", "", "the DzNS uri") + rrev = flag.Int64("r", -1, "request rev") + showHelp = flag.Bool("h", false, "show help") + showVersion = flag.Bool("v", false, "print version string") ) type cmd struct { - f interface{} - a string // args - d string // short description + f interface{} + a string // args + d string // short description } var ( @@ -31,14 +31,14 @@ var ( ) const ( - usage1 = ` + usage1 = ` Each command takes zero or more options and zero or more arguments. In addition, there are some global options that can be used with any command. The exit status is 0 on success, 1 for a rev mismatch, and 2 otherwise. Global Options: ` - usage2 = `Environment: + usage2 = `Environment: DOOZER_URI - The doozer cluster to bind to; overriden by -a. diff --git a/cmd/doozer/find.go b/cmd/doozer/find.go index 53241ef1..02d46f15 100644 --- a/cmd/doozer/find.go +++ b/cmd/doozer/find.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/ha/doozer" + "github.com/4ad/doozer" "os" ) diff --git a/msg.pb.go b/msg.pb.go index bb89d739..297c4af5 100644 --- a/msg.pb.go +++ b/msg.pb.go @@ -79,47 +79,47 @@ func (x *request_Verb) UnmarshalJSON(data []byte) error { type response_Err int32 const ( - response_OTHER response_Err = 127 - response_TAG_IN_USE response_Err = 1 - response_UNKNOWN_VERB response_Err = 2 - response_READONLY response_Err = 3 - response_TOO_LATE response_Err = 4 - response_REV_MISMATCH response_Err = 5 - response_BAD_PATH response_Err = 6 - response_MISSING_ARG response_Err = 7 - response_RANGE response_Err = 8 - response_NOTDIR response_Err = 20 - response_ISDIR response_Err = 21 - response_NOENT response_Err = 22 + response_OTHER response_Err = 127 + response_TAG_IN_USE response_Err = 1 + response_UNKNOWN_VERB response_Err = 2 + response_READONLY response_Err = 3 + response_TOO_LATE response_Err = 4 + response_REV_MISMATCH response_Err = 5 + response_BAD_PATH response_Err = 6 + response_MISSING_ARG response_Err = 7 + response_RANGE response_Err = 8 + response_NOTDIR response_Err = 20 + response_ISDIR response_Err = 21 + response_NOENT response_Err = 22 ) var response_Err_name = map[int32]string{ - 127: "OTHER", - 1: "TAG_IN_USE", - 2: "UNKNOWN_VERB", - 3: "READONLY", - 4: "TOO_LATE", - 5: "REV_MISMATCH", - 6: "BAD_PATH", - 7: "MISSING_ARG", - 8: "RANGE", - 20: "NOTDIR", - 21: "ISDIR", - 22: "NOENT", + 127: "OTHER", + 1: "TAG_IN_USE", + 2: "UNKNOWN_VERB", + 3: "READONLY", + 4: "TOO_LATE", + 5: "REV_MISMATCH", + 6: "BAD_PATH", + 7: "MISSING_ARG", + 8: "RANGE", + 20: "NOTDIR", + 21: "ISDIR", + 22: "NOENT", } var response_Err_value = map[string]int32{ - "OTHER": 127, - "TAG_IN_USE": 1, - "UNKNOWN_VERB": 2, - "READONLY": 3, - "TOO_LATE": 4, - "REV_MISMATCH": 5, - "BAD_PATH": 6, - "MISSING_ARG": 7, - "RANGE": 8, - "NOTDIR": 20, - "ISDIR": 21, - "NOENT": 22, + "OTHER": 127, + "TAG_IN_USE": 1, + "UNKNOWN_VERB": 2, + "READONLY": 3, + "TOO_LATE": 4, + "REV_MISMATCH": 5, + "BAD_PATH": 6, + "MISSING_ARG": 7, + "RANGE": 8, + "NOTDIR": 20, + "ISDIR": 21, + "NOENT": 22, } func (x response_Err) Enum() *response_Err { @@ -127,6 +127,14 @@ func (x response_Err) Enum() *response_Err { *p = x return p } +func (x response_Err) Enum() *response_Err { + p := new(response_Err) + *p = x + return p +} +func (x response_Err) String() string { + return proto.EnumName(response_Err_name, int32(x)) +} func (x response_Err) Error() string { return x.String() } From b2d7b22d5c4767ac54331bb1282b9def7164219a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Sat, 30 Jun 2012 20:05:50 +0200 Subject: [PATCH 04/11] doozer: go fmt. --- msg.pb.go | 72 +++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/msg.pb.go b/msg.pb.go index 297c4af5..f2fa936c 100644 --- a/msg.pb.go +++ b/msg.pb.go @@ -79,47 +79,47 @@ func (x *request_Verb) UnmarshalJSON(data []byte) error { type response_Err int32 const ( - response_OTHER response_Err = 127 - response_TAG_IN_USE response_Err = 1 - response_UNKNOWN_VERB response_Err = 2 - response_READONLY response_Err = 3 - response_TOO_LATE response_Err = 4 - response_REV_MISMATCH response_Err = 5 - response_BAD_PATH response_Err = 6 - response_MISSING_ARG response_Err = 7 - response_RANGE response_Err = 8 - response_NOTDIR response_Err = 20 - response_ISDIR response_Err = 21 - response_NOENT response_Err = 22 + response_OTHER response_Err = 127 + response_TAG_IN_USE response_Err = 1 + response_UNKNOWN_VERB response_Err = 2 + response_READONLY response_Err = 3 + response_TOO_LATE response_Err = 4 + response_REV_MISMATCH response_Err = 5 + response_BAD_PATH response_Err = 6 + response_MISSING_ARG response_Err = 7 + response_RANGE response_Err = 8 + response_NOTDIR response_Err = 20 + response_ISDIR response_Err = 21 + response_NOENT response_Err = 22 ) var response_Err_name = map[int32]string{ - 127: "OTHER", - 1: "TAG_IN_USE", - 2: "UNKNOWN_VERB", - 3: "READONLY", - 4: "TOO_LATE", - 5: "REV_MISMATCH", - 6: "BAD_PATH", - 7: "MISSING_ARG", - 8: "RANGE", - 20: "NOTDIR", - 21: "ISDIR", - 22: "NOENT", + 127: "OTHER", + 1: "TAG_IN_USE", + 2: "UNKNOWN_VERB", + 3: "READONLY", + 4: "TOO_LATE", + 5: "REV_MISMATCH", + 6: "BAD_PATH", + 7: "MISSING_ARG", + 8: "RANGE", + 20: "NOTDIR", + 21: "ISDIR", + 22: "NOENT", } var response_Err_value = map[string]int32{ - "OTHER": 127, - "TAG_IN_USE": 1, - "UNKNOWN_VERB": 2, - "READONLY": 3, - "TOO_LATE": 4, - "REV_MISMATCH": 5, - "BAD_PATH": 6, - "MISSING_ARG": 7, - "RANGE": 8, - "NOTDIR": 20, - "ISDIR": 21, - "NOENT": 22, + "OTHER": 127, + "TAG_IN_USE": 1, + "UNKNOWN_VERB": 2, + "READONLY": 3, + "TOO_LATE": 4, + "REV_MISMATCH": 5, + "BAD_PATH": 6, + "MISSING_ARG": 7, + "RANGE": 8, + "NOTDIR": 20, + "ISDIR": 21, + "NOENT": 22, } func (x response_Err) Enum() *response_Err { From 54c92fb704710b81f200a76906ede9a6c7b6e1e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Sat, 30 Jun 2012 20:09:59 +0200 Subject: [PATCH 05/11] doozer: revove vestigial info from README. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f4dbff01..eef469cf 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ # Doozer Client -**Note:** [doozerd](https://github.com/ha/doozerd) is the server. +**Note:** [doozerd](https://github.com/4ad/doozerd) is the server. This is the Go client driver for doozer. ## How to use To install the Go client: - $ go get github.com/ha/doozer + $ go get github.com/4ad/doozer To install the CLI client: - $ go get github.com/ha/doozer/cmd/doozer + $ go get github.com/4ad/doozer/cmd/doozer To use: package main import ( - "github.com/ha/doozer" + "github.com/4ad/doozer" "os" ) @@ -41,13 +41,13 @@ by doing the following: $ mkdir doozer $ cd doozer $ export GOPATH=`pwd` - $ go get github.com/ha/doozer/... + $ go get github.com/4ad/doozer/... # ...hack...hack..hack... - $ vim src/github.com/ha/doozer/cmd/doozer/help.go + $ vim src/github.com/4ad/doozer/cmd/doozer/help.go # rebuild ./bin/doozer - $ go install github.com/ha/doozer/... + $ go install github.com/4ad/doozer/... ## License and Authors From 7c6445740449904ec6bb4f49415a592c8bec1cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Sat, 30 Jun 2012 20:11:32 +0200 Subject: [PATCH 06/11] cmd/doozer: hardcode version.go so go get works. --- .gitignore | 1 - cmd/doozer/version.go | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 cmd/doozer/version.go diff --git a/.gitignore b/.gitignore index 58cbe997..d542d30c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ _obj _test* cmd/doozer/doozer -cmd/doozer/version.go diff --git a/cmd/doozer/version.go b/cmd/doozer/version.go new file mode 100644 index 00000000..0f7b928c --- /dev/null +++ b/cmd/doozer/version.go @@ -0,0 +1,3 @@ +package main + +const version = `unknown-4ad` From e258ee12660b57ef155a61a056ffa23920e8f40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Sat, 30 Jun 2012 20:13:25 +0200 Subject: [PATCH 07/11] doozer: remove vestigial stuff. --- Makefile | 9 --------- version.sh | 5 ----- 2 files changed, 14 deletions(-) delete mode 100644 Makefile delete mode 100755 version.sh diff --git a/Makefile b/Makefile deleted file mode 100644 index 69e4f627..00000000 --- a/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -msg.pb.go: msg.proto - mkdir -p _pb - protoc --go_out=_pb $< - cat _pb/$@\ - |sed s/Request/request/g\ - |sed s/Response/response/g\ - |sed s/Newrequest/newRequest/g\ - |sed s/Newresponse/newResponse/g >$@ - rm -rf _pb diff --git a/version.sh b/version.sh deleted file mode 100755 index f4fc0474..00000000 --- a/version.sh +++ /dev/null @@ -1,5 +0,0 @@ -git describe | sed s/^v// | tr - + | tr -d '\n' -if ! git diff --quiet HEAD -then echo -n +mod -fi -echo From b3a21b9ef0335a1cfafe6c19aa49013af9704f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aram=20H=C4=83v=C4=83rneanu?= Date: Sat, 30 Jun 2012 20:38:47 +0200 Subject: [PATCH 08/11] cmd/doozer: go fmt. --- cmd/doozer/doozer.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/doozer/doozer.go b/cmd/doozer/doozer.go index 9949943f..69768ee9 100644 --- a/cmd/doozer/doozer.go +++ b/cmd/doozer/doozer.go @@ -11,17 +11,17 @@ import ( ) var ( - uri = flag.String("a", "doozer:?ca=127.0.0.1:8046", "the address to bind to") - buri = flag.String("b", "", "the DzNS uri") - rrev = flag.Int64("r", -1, "request rev") - showHelp = flag.Bool("h", false, "show help") - showVersion = flag.Bool("v", false, "print version string") + uri = flag.String("a", "doozer:?ca=127.0.0.1:8046", "the address to bind to") + buri = flag.String("b", "", "the DzNS uri") + rrev = flag.Int64("r", -1, "request rev") + showHelp = flag.Bool("h", false, "show help") + showVersion = flag.Bool("v", false, "print version string") ) type cmd struct { - f interface{} - a string // args - d string // short description + f interface{} + a string // args + d string // short description } var ( @@ -31,14 +31,14 @@ var ( ) const ( - usage1 = ` + usage1 = ` Each command takes zero or more options and zero or more arguments. In addition, there are some global options that can be used with any command. The exit status is 0 on success, 1 for a rev mismatch, and 2 otherwise. Global Options: ` - usage2 = `Environment: + usage2 = `Environment: DOOZER_URI - The doozer cluster to bind to; overriden by -a. From 49e61d48ce91140308bb0a390a79e60698c2da7d Mon Sep 17 00:00:00 2001 From: Tonnerre LOMBARD Date: Thu, 13 Jun 2013 20:33:06 +0200 Subject: [PATCH 09/11] Fix some merge issues (duplicate definitions). --- msg.pb.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/msg.pb.go b/msg.pb.go index f2fa936c..bebf989f 100644 --- a/msg.pb.go +++ b/msg.pb.go @@ -122,11 +122,6 @@ var response_Err_value = map[string]int32{ "NOENT": 22, } -func (x response_Err) Enum() *response_Err { - p := new(response_Err) - *p = x - return p -} func (x response_Err) Enum() *response_Err { p := new(response_Err) *p = x @@ -138,9 +133,6 @@ func (x response_Err) String() string { func (x response_Err) Error() string { return x.String() } -func (x response_Err) String() string { - return proto.EnumName(response_Err_name, int32(x)) -} func (x response_Err) MarshalJSON() ([]byte, error) { return json.Marshal(x.String()) } From 5de93f059a863ac6d0d12acd97fdc4b334c675a4 Mon Sep 17 00:00:00 2001 From: Tonnerre LOMBARD Date: Fri, 13 Sep 2013 21:49:56 +0200 Subject: [PATCH 10/11] This file was actually deleted in the merge. --- cmd/doozer/vers.go | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 cmd/doozer/vers.go diff --git a/cmd/doozer/vers.go b/cmd/doozer/vers.go deleted file mode 100644 index 1910b239..00000000 --- a/cmd/doozer/vers.go +++ /dev/null @@ -1,3 +0,0 @@ -package main - -const version = `0.9.0` From 45c1b11548c51517f17bc5e821d705cd283532e2 Mon Sep 17 00:00:00 2001 From: Tonnerre LOMBARD Date: Wed, 2 Oct 2013 21:32:16 +0200 Subject: [PATCH 11/11] Split the manual changes of msg.pb.go out into a file of its own. --- msg.ext.go | 7 +++++++ msg.pb.go | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 msg.ext.go diff --git a/msg.ext.go b/msg.ext.go new file mode 100644 index 00000000..4cf1d089 --- /dev/null +++ b/msg.ext.go @@ -0,0 +1,7 @@ +// Extensions to msg.pb.go which are not generated by the protobuf +// compiler. +package doozer + +func (x response_Err) Error() string { + return x.String() +} diff --git a/msg.pb.go b/msg.pb.go index bebf989f..dee6167e 100644 --- a/msg.pb.go +++ b/msg.pb.go @@ -130,9 +130,6 @@ func (x response_Err) Enum() *response_Err { func (x response_Err) String() string { return proto.EnumName(response_Err_name, int32(x)) } -func (x response_Err) Error() string { - return x.String() -} func (x response_Err) MarshalJSON() ([]byte, error) { return json.Marshal(x.String()) }